Switch to upstream GConf

The freedesktop.org.xml is required when updating the mime database but otherwise not much use. Therefore package it separately, rather than removing it completely, so that it can be used as required for on-device updates without adding almost 2MB to every image which hase shared-mime-info.

Signed-off-by Joshua Lock <[email protected]>

---
 .../shared-mime-info/shared-mime-info.inc          |    9 ++++++---
 .../shared-mime-info/shared-mime-info_0.91.bb      |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

meta/recipes-support/shared-mime-info/shared-mime-info.inc +6 -3

index c8cab29..57e829c 100644
@@ -17,13 +17,16 @@ EXTRA_OECONF = "--disable-update-mimedb"
 FILES_${PN} += "${datadir}/mime"
 FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc"
 
+# freedesktop.org.xml is only required when updating the mime database,
+# package it separately
+PACKAGES += "shared-mime-info-data"
+FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml"
+RDEPENDS_shared-mime-info-data = "shared-mime-info"
+
 do_install () {
 	autotools_do_install
 
 	update-mime-database ${D}${datadir}/mime
-
-	# we do not need it on device and it is huge
-	rm ${D}${datadir}/mime/packages/freedesktop.org.xml
 }
 
 do_install_virtclass-native () {

meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb +0 -0

index 0c3b01c..bc4a8f7 100644

Am 09.11.2011 01:53, schrieb Joshua Lock:

Quoted 4 lines

The freedesktop.org.xml is required when updating the mime database but otherwise not much use. Therefore package it separately, rather than removing it completely, so that it can be used as required for on-device updates without adding almost 2MB to every image which hase shared-mime-info.

somehow this patch breaks the image creation for systemd-gnome-image. Famous last words from bitbake:

--------------8<-snip-----------------
| Collected errors:
|  * satisfy_dependencies_for: Cannot satisfy the following dependencies for task-gnome:

|  *    shared-mime-info-data *         shared-mime-info-data *
|  * opkg_install_cmd: Cannot install package task-gnome.
| ERROR: Function 'do_rootfs' failed (see

/srv/oe/setup-scripts/build/tmp-angstrom_2010_x-eglibc/work/dm814x_evm-angstrom-linux-gnueabi/systemd-gnome-image-1.0-r0/temp/log.do_rootfs.6501 for further information)
NOTE: package systemd-gnome-image-1.0-r0: task do_rootfs: Failed
ERROR: Task 8
(/srv/oe/setup-scripts/sources/meta-angstrom/recipes-images/angstrom/systemd-gnome-image.bb,
do_rootfs) failed with exit code '1'
ERROR:
'/srv/oe/setup-scripts/sources/meta-angstrom/recipes-images/angstrom/systemd-gnome-image.bb'
failed
--------------8<-snip-----------------

And there is no package names shared-mime-info-data*. :-(

Quoted 39 lines

Signed-off-by Joshua Lock <[email protected]>

---
 .../shared-mime-info/shared-mime-info.inc          |    9 ++++++--- .../shared-mime-info/shared-mime-info_0.91.bb      |    2 +-

 2 files changed, 7 insertions(+), 4 deletions(-)

meta/recipes-support/shared-mime-info/shared-mime-info.inc +0 -0

index c8cab29..57e829c 100644
@@ -17,13 +17,16 @@ EXTRA_OECONF = "--disable-update-mimedb"

 FILES_${PN} += "${datadir}/mime"
 FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc"

meta/recipes-support/shared-mime-info/shared-mime-info.inc +6 -0

+# freedesktop.org.xml is only required when updating the mime database,
+# package it separately
+PACKAGES += "shared-mime-info-data"
+FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml"
+RDEPENDS_shared-mime-info-data = "shared-mime-info"
+

 do_install () {
      autotools_do_install

      update-mime-database ${D}${datadir}/mime
-
-     # we do not need it on device and it is huge
-     rm ${D}${datadir}/mime/packages/freedesktop.org.xml }

 do_install_virtclass-native () {

meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb +0 -0

index 0c3b01c..bc4a8f7 100644
@@ -1,5 +1,5 @@

 require shared-mime-info.inc

meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb +1 -1

-PR = "r1"
+PR = "r2"

Quoted 2 lines

 SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
 SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"

Regards
Rainer

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Quoted 6 lines · Rainer Koenig

Am 09.11.2011 01:53, schrieb Joshua Lock:

Quoted 4 lines

The freedesktop.org.xml is required when updating the mime database but otherwise not much use. Therefore package it separately, rather than removing it completely, so that it can be used as required for on-device updates without adding almost 2MB to every image which hase shared-mime-info.

Quoted 2 lines

somehow this patch breaks the image creation for systemd-gnome-image. Famous last words from bitbake:

Did you do a clean build ? if not try that

This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies.

These aren't an exact copy of the classes from meta-openembedded, notable differences are:
* gnome.bbclass - I dropped the BBCLASSEXTEND

* mime.bbclass:
- updated coding style
- use which to find update-mime-database program rather than hard coded
- fix typo in populate_packges_append such that it's actually called

Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven:

Quoted 5 lines

This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies.

Quoted 3 lines

These aren't an exact copy of the classes from meta-openembedded, notable differences are:
* gnome.bbclass - I dropped the BBCLASSEXTEND

It looks that will break a number of things in meta-oe, why was it dropped?

Quoted 7 lines

Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven:

Quoted 5 lines

This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies.

Quoted 5 lines

Quoted 3 lines

These aren't an exact copy of the classes from meta-openembedded, notable differences are:
* gnome.bbclass - I dropped the BBCLASSEXTEND

It looks that will break a number of things in meta-oe, why was it dropped?

Unconditionally BBCLASSEXTENDing everything gnome is a great way to hack around build issues and create a convoluted dependency mess that isn't really required. I'd much rather we try and minimise the amount of -native dependencies to those actually needed.

Comparing our builds against other systems its becoming clear our convoluted dependency trees are one of the areas we don't do as well and it hurts performance :(.

Op 9 nov. 2011, om 10:37 heeft Richard Purdie het volgende geschreven:

Quoted 14 lines · Koen Kooi

Quoted 7 lines

Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven:

Quoted 5 lines

This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies.

Quoted 5 lines

Quoted 3 lines

These aren't an exact copy of the classes from meta-openembedded, notable differences are:
* gnome.bbclass - I dropped the BBCLASSEXTEND

It looks that will break a number of things in meta-oe, why was it dropped?

Quoted 8 lines

Unconditionally BBCLASSEXTENDing everything gnome is a great way to hack around build issues and create a convoluted dependency mess that isn't really required. I'd much rather we try and minimise the amount of -native dependencies to those actually needed.

Comparing our builds against other systems its becoming clear our convoluted dependency trees are one of the areas we don't do as well and it hurts performance :(.

The list of -native needed in meta-gnome:

bison-native
cairo-native
docbook-utils-native
flex-native
gconf-native
gdk-pixbuf-native
glib-2.0-native
gnome-doc-utils-native
gobject-introspection-native
gtk-doc-native
icon-naming-utils-native
intltool-native

libffi-native
libidl-native
libxml-parser-perl-native
orbit2-native
pango-native
perl-native
popt-native
python-native

Quoted 39 lines

Op 9 nov. 2011, om 10:37 heeft Richard Purdie het volgende geschreven:

Quoted 14 lines · Koen Kooi

Quoted 7 lines

Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven:

Quoted 5 lines

This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies.

Quoted 5 lines

Quoted 3 lines

These aren't an exact copy of the classes from meta-openembedded, notable differences are:
* gnome.bbclass - I dropped the BBCLASSEXTEND

It looks that will break a number of things in meta-oe, why was it dropped?

Quoted 8 lines

Unconditionally BBCLASSEXTENDing everything gnome is a great way to hack around build issues and create a convoluted dependency mess that isn't really required. I'd much rather we try and minimise the amount of -native dependencies to those actually needed.

Comparing our builds against other systems its becoming clear our convoluted dependency trees are one of the areas we don't do as well and it hurts performance :(.

The list of -native needed in meta-gnome:

bison-native
cairo-native
docbook-utils-native
flex-native
gconf-native
gdk-pixbuf-native
glib-2.0-native
gnome-doc-utils-native
gobject-introspection-native
gtk-doc-native
icon-naming-utils-native
intltool-native

Quoted 8 lines

libffi-native
libidl-native
libxml-parser-perl-native
orbit2-native
pango-native
perl-native
popt-native
python-native

Many of which are not gnome bbclass derived recipes. I therefore think it makes sense to put the BBCLASSEXTEND in the recipes where its needed and not the core class...

Op 9 nov. 2011, om 11:35 heeft Richard Purdie het volgende geschreven:

Quoted 49 lines · Koen Kooi

Quoted 47 lines

Op 9 nov. 2011, om 10:37 heeft Richard Purdie het volgende geschreven:

Quoted 14 lines · Koen Kooi

Quoted 7 lines

Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven:

Quoted 5 lines

This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies.

Quoted 5 lines

Quoted 3 lines

These aren't an exact copy of the classes from meta-openembedded, notable differences are:
* gnome.bbclass - I dropped the BBCLASSEXTEND

It looks that will break a number of things in meta-oe, why was it dropped?

Quoted 8 lines

Unconditionally BBCLASSEXTENDing everything gnome is a great way to hack around build issues and create a convoluted dependency mess that isn't really required. I'd much rather we try and minimise the amount of -native dependencies to those actually needed.

Comparing our builds against other systems its becoming clear our convoluted dependency trees are one of the areas we don't do as well and it hurts performance :(.

The list of -native needed in meta-gnome:

bison-native
cairo-native
docbook-utils-native
flex-native
gconf-native
gdk-pixbuf-native
glib-2.0-native
gnome-doc-utils-native
gobject-introspection-native
gtk-doc-native
icon-naming-utils-native
intltool-native
libffi-native
libidl-native
libxml-parser-perl-native
orbit2-native
pango-native
perl-native
popt-native
python-native

Quoted 3 lines

Many of which are not gnome bbclass derived recipes. I therefore think it makes sense to put the BBCLASSEXTEND in the recipes where its needed and not the core class...

Exactly! I did a lot of dependency cleanup when importing them, so the situation isn't as bad as it was in OE classic.

Josh, what kind of test builds did you do for the meta-gnome recipes after moving the classes?

Op 9 nov. 2011, om 01:53 heeft Joshua Lock het volgende geschreven:

Quoted 5 lines

This patch pulls in the gnome related classes from oe-core which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of gnome functionality without adding a lot of extra dependencies.

Quoted 3 lines

These aren't an exact copy of the classes from meta-openembedded, notable differences are:
* gnome.bbclass - I dropped the BBCLASSEXTEND

It looks that will break a number of things in meta-oe, why was it dropped?

Quoted 4 lines

* mime.bbclass:
- updated coding style
- use which to find update-mime-database program rather than hard coded
- fix typo in populate_packges_append such that it's actually called

Will it drag in the shared-mime-info-data package you created automatically now?

Also, do you have matching patches to update meta-oe now that these things are heading into oe-core?

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 <[email protected]>

---
 meta/conf/distro/include/default-providers.inc     |    2 -
 meta/conf/multilib.conf                            |    2 +-
 meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch |   59 ++++++++++++++++++++
 meta/recipes-gnome/gnome/gconf-dbus_705.bb         |   43 --------------
 meta/recipes-gnome/gnome/gconf_3.2.3.bb            |   43 ++++++++++++++
 5 files changed, 103 insertions(+), 46 deletions(-)
 create mode 100644 meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
 delete mode 100644 meta/recipes-gnome/gnome/gconf-dbus_705.bb
 create mode 100644 meta/recipes-gnome/gnome/gconf_3.2.3.bb

meta/conf/distro/include/default-providers.inc +0 -2

index be23d36..afea5e7 100644
@@ -21,8 +21,6 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
 #
 PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
 PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
-PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
-PREFERRED_PROVIDER_gconf-native ?= "gconf-dbus-native"
 PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"
 PREFERRED_PROVIDER_libgcc ?= "libgcc"
 PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"

meta/conf/multilib.conf +1 -1

index 5e4b435..de53540 100644
@@ -103,7 +103,7 @@ BBCLASSEXTEND_append_pn-gcc-cross-initial = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gcc-cross-intermediate = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gcc-cross = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gcc-runtime = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-gconf-dbus = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-gconf = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gdbm = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gdb = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gdk-pixbuf = " ${MULTILIBS}"

meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch new file +59 -0

new file mode 100644
index 0000000..29181e3
@@ -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 <[email protected]>
+
+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)

meta/recipes-gnome/gnome/gconf-dbus_705.bb deleted +0 -43

deleted file mode 100644
index 52e8a08..0000000
@@ -1,43 +0,0 @@
-DESCRIPTION = "Settings daemon using DBUS for communication."
-SECTION = "x11/utils"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
-
-DEPENDS = "intltool-native virtual/libintl glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native"
-PROVIDES = "gconf"
-RPROVIDES_${PN} = "gconf"
-RPROVIDES_${PN}-dev = "gconf-dev"
-
-#SRCREV = "705"
-#PV = "2.16.0+svnr${SRCPV}"
-PR = "r2"
-
-# This SVN repo is no longer available use a tarball mirror site until
-# we move to proper gconf recipe.
-#SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http"
-SRC_URI = "http://autobuilder.pokylinux.org/sources/trunk_developer.imendio.com_.svn.gconf-dbus_705_.tar.gz"
-
-SRC_URI[md5sum] = "dba8d534b0c6262d24817c842b36369d"
-SRC_URI[sha256sum] = "5552b1884d42d4072a199c93e35a28dc1799f9166baefbf9243394966039e416"
-
-S = "${WORKDIR}/trunk"
-
-inherit pkgconfig autotools
-
-PARALLEL_MAKE = ""
-
-
-EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes"
-
-
-do_configure_prepend() {
-        touch gtk-doc.make
-}
-
-FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
-FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
-FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd \
-		    ${libdir}/GConf-dbus/2/*.la"
-
-BBCLASSEXTEND = "native"
-

meta/recipes-gnome/gnome/gconf_3.2.3.bb new file +0 -0

new file mode 100644
index 0000000..0e06cb5

This series' primary goal is to switch us from gconf-dbus to the upstream GConf, where the D-Bus backend is now maintained.

To ease recipe writing I also pulled in and cleaned up the GNOME related classes from meta-openembedded.

Cheers,
Joshua

The following changes since commit 25fae81538a92e15eab3fc169ebce44505f67839:

python: skip setup.py 'import check' when cross-compiling (2011-11-08 21:44:23 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib josh/work
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/work

Joshua Lock (3):
shared-mime-info: package runtime data separately classes/[gnome|gnomebase|mime]: enhance gnome related classes
gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus