[GConf2/f14/master] try again

[Matthias Clasen]

commit 4a3344907dc85a1da7f7ab3def89f033a7c094aa
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Sep 28 23:34:24 2010 -0400

    try again

 damn-introspection.patch |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/damn-introspection.patch b/damn-introspection.patch
index 6aad92c..ff71e0b 100644
--- a/damn-introspection.patch
+++ b/damn-introspection.patch
@@ -1,6 +1,6 @@
 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
+--- GConf-2.32.0/configure.in.damn-introspection	2010-09-27 14:04:39.000000000 -0400
++++ GConf-2.32.0/configure.in	2010-09-28 23:32:18.789472003 -0400
 @@ -303,7 +303,7 @@ AM_GLIB_GNU_GETTEXT
  
  AC_CHECK_FUNCS(bind_textdomain_codeset)
@@ -11,14 +11,22 @@ diff -up GConf-2.32.0/configure.in.damn-introspection GConf-2.32.0/configure.in
  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 = \
+--- GConf-2.32.0/gconf/Makefile.am.damn-introspection	2010-09-26 14:50:02.000000000 -0400
++++ GConf-2.32.0/gconf/Makefile.am	2010-09-28 23:34:08.205472002 -0400
+@@ -124,7 +124,7 @@ libgconf_2_la_LIBADD = $(INTLLIBS) $(DEP
+ 
+ -include $(INTROSPECTION_MAKEFILE)
+ INTROSPECTION_GIRS =
+-INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
++INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+ INTROSPECTION_COMPILER_ARGS= --includedir=$(srcdir)
+ 
+ if HAVE_INTROSPECTION
+@@ -137,7 +137,6 @@ 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/