sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

gconf: Clean up introspection disabling by using gobject-introspection-stub 

(From OE-Core rev: 3861dc6f52c8c3abe925302dadba15d90efbd6b5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2012-07-27 12:10:45 +00:00
parent b7a528b0f5
commit 656726ad60
2 changed files with 2 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
View File

@ -1,59 +0,0 @@
This is a hacky way to prevent GConf from trying to build the introspection related pieces.
Clearly not appropriate for upstream.
Upstream-Status: Inappropriate
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Index: GConf-3.2.2/gconf/Makefile.am
===================================================================
--- GConf-3.2.2.orig/gconf/Makefile.am
+++ GConf-3.2.2/gconf/Makefile.am
@@ -145,34 +145,6 @@ libgconf_2_la_LDFLAGS = -version-info $(
libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(DEPENDENT_DBUS_LIBS) $(DEPENDENT_ORBIT_LIBS)
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
-INTROSPECTION_COMPILER_ARGS= --includedir=$(srcdir)
-
-if HAVE_INTROSPECTION
-introspection_files = \
- $(gconfinclude_HEADERS) \
- $(filter-out $(CORBA_SOURCECODE), $(filter %.c,$(libgconf_2_la_SOURCES)))
-GConf-2.0.gir: libgconf-2.la Makefile
-GConf_2_0_gir_INCLUDES = GObject-2.0
-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 --c-include "gconf/gconf.h"
-GConf_2_0_gir_EXPORT_PACKAGES = gconf-2.0
-INTROSPECTION_GIRS += GConf-2.0.gir
-
-girdir = $(datadir)/gir-1.0/
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibsdir = $(libdir)/girepository-1.0/
-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-endif
-
EXTRA_DIST=GConfX.idl default.path.in org.gnome.GConf.service.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
default.path: $(srcdir)/default.path.in
Index: GConf-3.2.2/configure.in
===================================================================
--- GConf-3.2.2.orig/configure.in
+++ GConf-3.2.2/configure.in
@@ -354,8 +354,6 @@ AM_GLIB_GNU_GETTEXT
AC_CHECK_FUNCS(bind_textdomain_codeset)
-GOBJECT_INTROSPECTION_CHECK([0.9.5])
-
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)

5
meta/recipes-gnome/gnome/gconf_3.2.3.bb
View File

@ -6,15 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
POLKIT = "polkit"
POLKIT_libc-uclibc = ""
DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT}"
DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native"
DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub"
DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native"
PR = "r11"
inherit gnomebase gtk-doc
SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.bz2;name=archive \
file://nointro.patch \
file://backenddir.patch"
SRC_URI[archive.md5sum] = "f80329173cd9d134ad07e36002dd2a15"