diff options
| author | Joshua Lock <josh@linux.intel.com> | 2011-11-01 14:46:43 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-10 11:35:30 +0000 |
| commit | f952b1bc8a4f307e2e2f3941f50becd72d88421d (patch) | |
| tree | 74609b7a55625b1ebd0f0b8775424abdc3848361 /meta/recipes-gnome/gnome/gconf-3.2.3 | |
| parent | b4457a9605988feecadfd49df22ef57245c4cd86 (diff) | |
| download | openembedded-core-f952b1bc8a4f307e2e2f3941f50becd72d88421d.tar.gz openembedded-core-f952b1bc8a4f307e2e2f3941f50becd72d88421d.tar.bz2 openembedded-core-f952b1bc8a4f307e2e2f3941f50becd72d88421d.tar.xz openembedded-core-f952b1bc8a4f307e2e2f3941f50becd72d88421d.zip | |
gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus
The D-Bus backend has been integrated into upstream GConf so we can
switch to upstream and drop gconf-dbus.
I've gone for a release in the 3.2 series as we disable Gtk+, and
therefore are not impacted by the gtk+3 changes, and the D-Bus backend
was unstable before this release.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/recipes-gnome/gnome/gconf-3.2.3')
| -rw-r--r-- | meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch | 59 |
1 files changed, 59 insertions, 0 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 new file mode 100644 index 000000000..29181e3ed --- /dev/null +++ b/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch @@ -0,0 +1,59 @@ +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) |