[gnome-panel] libpanel-applet: Fix build with gobject-introspection 0.9.5



commit ad0897b8fae20f11de77921c48cfba986e816d2c
Author: Colin Walters <walters verbum org>
Date:   Tue Sep 14 08:16:21 2010 +0200

    libpanel-applet: Fix build with gobject-introspection 0.9.5
    
    Use --strip-prefix=Panel. Note that this technically breaks the API
    proposed by the introspection, but since nothing depends on it...
    
    Also pass --warn-all to the scanner, so we can see missing annotations.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=629355

 libpanel-applet/Makefile.am |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/libpanel-applet/Makefile.am b/libpanel-applet/Makefile.am
index 41e5418..ad323db 100644
--- a/libpanel-applet/Makefile.am
+++ b/libpanel-applet/Makefile.am
@@ -99,7 +99,7 @@ CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA)
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 if HAVE_INTROSPECTION
@@ -122,6 +122,9 @@ PanelApplet_3_0_gir_CFLAGS =					\
 	$(LIBPANEL_APPLET_CFLAGS)
 PanelApplet_3_0_gir_LIBS = libpanel-applet-3.la
 PanelApplet_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) $(addprefix $(builddir)/,$(built_introspection_sources))
+# When requiring gobject-introspection 0.9.5, use this:
+#PanelApplet_3_0_gir_SCANNERFLAGS = --identifier-prefix=Panel --symbol-prefix=panel
+PanelApplet_3_0_gir_SCANNERFLAGS = --strip-prefix=Panel
 INTROSPECTION_GIRS += PanelApplet-3.0.gir
 
 girdir = $(datadir)/gir-1.0



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]