summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-27 12:10:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-28 09:20:54 +0100
commit656726ad6044d8b7e5661251a985770c93cb9242 (patch)
tree9240d00605c0e1c671a72c11cb201f0e170c3d57
parentb7a528b0f5ab5ed367b4b61b8e485a7543c5b58c (diff)
downloadpoky-656726ad6044d8b7e5661251a985770c93cb9242.tar.gz
gconf: Clean up introspection disabling by using gobject-introspection-stub
(From OE-Core rev: 3861dc6f52c8c3abe925302dadba15d90efbd6b5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch59
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.3.bb5
2 files changed, 2 insertions, 62 deletions
diff --git a/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch b/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
deleted file mode 100644
index 29181e3edd..0000000000
--- a/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1This is a hacky way to prevent GConf from trying to build the introspection related pieces.
2Clearly not appropriate for upstream.
3
4Upstream-Status: Inappropriate
5
6Signed-off-by: Joshua Lock <josh@linux.intel.com>
7
8Index: GConf-3.2.2/gconf/Makefile.am
9===================================================================
10--- GConf-3.2.2.orig/gconf/Makefile.am
11+++ GConf-3.2.2/gconf/Makefile.am
12@@ -145,34 +145,6 @@ libgconf_2_la_LDFLAGS = -version-info $(
13
14 libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(DEPENDENT_DBUS_LIBS) $(DEPENDENT_ORBIT_LIBS)
15
16--include $(INTROSPECTION_MAKEFILE)
17-INTROSPECTION_GIRS =
18-INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
19-INTROSPECTION_COMPILER_ARGS= --includedir=$(srcdir)
20-
21-if HAVE_INTROSPECTION
22-introspection_files = \
23- $(gconfinclude_HEADERS) \
24- $(filter-out $(CORBA_SOURCECODE), $(filter %.c,$(libgconf_2_la_SOURCES)))
25-GConf-2.0.gir: libgconf-2.la Makefile
26-GConf_2_0_gir_INCLUDES = GObject-2.0
27-GConf_2_0_gir_CFLAGS = \
28- $(INCLUDES)
29-GConf_2_0_gir_LIBS = libgconf-2.la
30-GConf_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
31-GConf_2_0_gir_SCANNERFLAGS = --identifier-prefix=GConf --symbol-prefix=gconf --c-include "gconf/gconf.h"
32-GConf_2_0_gir_EXPORT_PACKAGES = gconf-2.0
33-INTROSPECTION_GIRS += GConf-2.0.gir
34-
35-girdir = $(datadir)/gir-1.0/
36-gir_DATA = $(INTROSPECTION_GIRS)
37-
38-typelibsdir = $(libdir)/girepository-1.0/
39-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
40-
41-CLEANFILES += $(gir_DATA) $(typelibs_DATA)
42-endif
43-
44 EXTRA_DIST=GConfX.idl default.path.in org.gnome.GConf.service.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
45
46 default.path: $(srcdir)/default.path.in
47Index: GConf-3.2.2/configure.in
48===================================================================
49--- GConf-3.2.2.orig/configure.in
50+++ GConf-3.2.2/configure.in
51@@ -354,8 +354,6 @@ AM_GLIB_GNU_GETTEXT
52
53 AC_CHECK_FUNCS(bind_textdomain_codeset)
54
55-GOBJECT_INTROSPECTION_CHECK([0.9.5])
56-
57 AC_SUBST(CFLAGS)
58 AC_SUBST(CPPFLAGS)
59 AC_SUBST(LDFLAGS)
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index 60c2be2840..8388684a69 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -6,15 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
6POLKIT = "polkit" 6POLKIT = "polkit"
7POLKIT_libc-uclibc = "" 7POLKIT_libc-uclibc = ""
8 8
9DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT}" 9DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub"
10DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native" 10DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native"
11 11
12PR = "r11" 12PR = "r11"
13 13
14inherit gnomebase gtk-doc 14inherit gnomebase gtk-doc
15 15
16SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.bz2;name=archive \ 16SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.bz2;name=archive \
17 file://nointro.patch \
18 file://backenddir.patch" 17 file://backenddir.patch"
19 18
20SRC_URI[archive.md5sum] = "f80329173cd9d134ad07e36002dd2a15" 19SRC_URI[archive.md5sum] = "f80329173cd9d134ad07e36002dd2a15"