[GConf2/f14/master] damn introspection

Matthias Clasen mclasen at fedoraproject.org
Wed Sep 29 02:59:27 UTC 2010


commit ea973a9257da1c1c023ebb64f53eb43fa0441d18
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Sep 28 22:58:43 2010 -0400

    damn introspection

 GConf2.spec              |    2 ++
 damn-introspection.patch |   24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/GConf2.spec b/GConf2.spec
index dec32f3..20ace56 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -39,6 +39,7 @@ Conflicts: GConf2-dbus
 Patch0: GConf-2.18.0.1-reload.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=568845
 Patch1: GConf-gettext.patch
+Patch2: damn-introspection.patch
 
 %description
 GConf is a process-transparent configuration database API used to
@@ -75,6 +76,7 @@ which require GTK+.
 %setup -q -n GConf-%{version}
 %patch0 -p1 -b .reload
 %patch1 -p1 -b .gettext
+%patch2 -p1 -b .damn-introspection
 
 %build
 %configure --disable-static --enable-defaults-service
diff --git a/damn-introspection.patch b/damn-introspection.patch
new file mode 100644
index 0000000..6aad92c
--- /dev/null
+++ b/damn-introspection.patch
@@ -0,0 +1,24 @@
+diff -up GConf-2.32.0/configure.in.damn-introspection GConf-2.32.0/configure.in
+--- GConf-2.32.0/configure.in.damn-introspection	2010-09-28 22:56:24.912472006 -0400
++++ GConf-2.32.0/configure.in	2010-09-28 22:56:33.686472003 -0400
+@@ -303,7 +303,7 @@ AM_GLIB_GNU_GETTEXT
+ 
+ AC_CHECK_FUNCS(bind_textdomain_codeset)
+ 
+-GOBJECT_INTROSPECTION_CHECK([0.9.5])
++GOBJECT_INTROSPECTION_CHECK([0.9.3])
+ 
+ AC_SUBST(CFLAGS)
+ AC_SUBST(CPPFLAGS)
+diff -up GConf-2.32.0/gconf/Makefile.am.damn-introspection GConf-2.32.0/gconf/Makefile.am
+--- GConf-2.32.0/gconf/Makefile.am.damn-introspection	2010-09-28 22:57:25.674472000 -0400
++++ GConf-2.32.0/gconf/Makefile.am	2010-09-28 22:57:38.937472008 -0400
+@@ -137,7 +137,7 @@ GConf_2_0_gir_CFLAGS = \
+ 	$(INCLUDES)
+ GConf_2_0_gir_LIBS = libgconf-2.la
+ GConf_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+-GConf_2_0_gir_SCANNERFLAGS = --identifier-prefix=GConf --symbol-prefix=gconf
++GConf_2_0_gir_SCANNERFLAGS = --strip-prefix=GConf
+ INTROSPECTION_GIRS += GConf-2.0.gir
+ 
+ girdir = $(datadir)/gir-1.0/


More information about the scm-commits mailing list