build: Add support for GIRepository-2.0.

Needed for libpeas-based plugins.

Author: mtwebster

debian/control

@@ -12,7 +12,7 @@ Build-Depends: debhelper-compat (= 12),
                libexempi-dev (>= 1.99.5),
                libexif-dev (>= 0.6.14),
                libgdk-pixbuf-xlib-2.0-dev,
-               libgirepository1.0-dev (>= 0.9.12),
+               libgirepository1.0-dev (>= 0.9.12) | libgirepository-2.0-dev,
                libglib2.0-dev (>= 2.38.0),
                libgtk-3-dev,
                libjpeg-dev,

meson.build

@@ -34,20 +34,29 @@ gnome = import('gnome')
 i18n = import('i18n')
 pkgconfig = import('pkgconfig')
 
+cc = meson.get_compiler('c')
+
 # dependencies
 gio_unix = dependency('gio-unix-2.0', version: '>= 2.38.0')
 glib = dependency('glib-2.0', version: '>= 2.38.0')
 gtk = dependency('gtk+-3.0')
 libpeas = dependency('libpeas-1.0', version: '>= 0.7.4')
 libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 0.7.4')
+
+use_gir20 = cc.has_header('girepository/girepository.h', dependencies: libpeas)
+if use_gir20
+    gi = dependency('girepository-2.0')
+else
+    gi = dependency('gobject-introspection-1.0', version: '>= 0.9.2')
+endif
+xviewer_conf.set10('USE_GIR20', use_gir20)
+
 pixbuf = dependency('gdk-pixbuf-2.0', version: '>= 2.19.1')
 X11 = dependency('x11')
 zlib = dependency('zlib')
 cinnamon_desktop = dependency('cinnamon-desktop', version: '>= 3.2.0')
 xapp = dependency('xapp', version: '>= 2.5.0')
 
-cc = meson.get_compiler('c')
-
 # on some systems we need to find the math lib to make sure it builds
 math = cc.find_library('m', required: false)
 

src/main.c

@@ -27,8 +27,12 @@
 #include "config.h"
 #endif
 #ifdef HAVE_INTROSPECTION
+#if USE_GIR20
+#include <girepository/girepository.h>
+#else
 #include <girepository.h>
 #endif
+#endif
 
 #include "xviewer-application.h"
 #include "xviewer-application-internal.h"
@@ -102,7 +106,11 @@ main (int argc, char **argv)
 	 * Using gtk_get_option_group here initializes gtk during parsing */
 	g_option_context_add_group (ctx, gtk_get_option_group (FALSE));
 #ifdef HAVE_INTROSPECTION
+#if USE_GIR20
+	g_option_context_add_group (ctx, gi_repository_get_option_group ());
+#else
 	g_option_context_add_group (ctx, g_irepository_get_option_group ());
+#endif
 #endif
 
 	if (!g_option_context_parse (ctx, &argc, &argv, &error)) {

src/meson.build

@@ -131,6 +131,7 @@ xviewer_resources = gnome.compile_resources(
 
 xviewer_deps = [
     config_h,
+    gi,
     gio_unix,
     glib,
     gtk,

src/xviewer-plugin-engine.c

@@ -34,7 +34,12 @@
 #include <glib/gi18n.h>
 #include <glib.h>
 #include <gio/gio.h>
+
+#if USE_GIR20
+#include <girepository/girepository.h>
+#else
 #include <girepository.h>
+#endif
 
 #define XVIEWER_PLUGIN_DATA_DIR XVIEWER_DATA_DIR G_DIR_SEPARATOR_S "plugins"
 
@@ -86,6 +91,35 @@ xviewer_plugin_engine_new (void)
 	GError *error = NULL;
 
 	/* This should be moved to libpeas */
+#if USE_GIR20
+	GIRepository *repo = gi_repository_dup_default ();
+
+	if (gi_repository_require (repo, "Peas", "1.0", 0, &error) == NULL)
+	{
+		g_warning ("Error loading Peas typelib: %s\n",
+			   error->message);
+		g_clear_error (&error);
+	}
+
+	if (gi_repository_require (repo, "PeasGtk", "1.0", 0, &error) == NULL)
+	{
+		g_warning ("Error loading PeasGtk typelib: %s\n",
+			   error->message);
+		g_clear_error (&error);
+	}
+
+	typelib_path = g_build_filename (LIBDIR, "xviewer", "girepository-1.0", NULL);
+
+	if (gi_repository_require_private (repo, typelib_path,
+					   "Xviewer", "3.0", 0, &error) == NULL)
+	{
+		g_warning ("Error loading Xviewer typelib: %s\n",
+			   error->message);
+		g_clear_error (&error);
+	}
+
+	g_object_unref (repo);
+#else
 	if (g_irepository_require (g_irepository_get_default (),
 				   "Peas", "1.0", 0, &error) == NULL)
 	{
@@ -112,6 +146,7 @@ xviewer_plugin_engine_new (void)
 			   error->message);
 		g_clear_error (&error);
 	}
+#endif
 
 	engine = XVIEWER_PLUGIN_ENGINE (g_object_new (XVIEWER_TYPE_PLUGIN_ENGINE,
 						  NULL));