summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-11-01 21:46:43 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 11:37:11 (GMT)
commitd4d29f7e58b0e86c6ac91d05730e319fe1706aa2 (patch)
tree8bc7e520819e32a4f6b58fa8d4d55b9a52c364d9 /meta/recipes-gnome
parent1ab3d1b5489eeaff78add14f4886269c690a3d46 (diff)
downloadpoky-d4d29f7e58b0e86c6ac91d05730e319fe1706aa2.tar.gz
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. (From OE-Core rev: f952b1bc8a4f307e2e2f3941f50becd72d88421d) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch59
-rw-r--r--meta/recipes-gnome/gnome/gconf-dbus_705.bb43
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.3.bb43
3 files changed, 102 insertions, 43 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 0000000..29181e3
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
@@ -0,0 +1,59 @@
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-dbus_705.bb b/meta/recipes-gnome/gnome/gconf-dbus_705.bb
deleted file mode 100644
index 52e8a08..0000000
--- a/meta/recipes-gnome/gnome/gconf-dbus_705.bb
+++ /dev/null
@@ -1,43 +0,0 @@
1DESCRIPTION = "Settings daemon using DBUS for communication."
2SECTION = "x11/utils"
3LICENSE = "LGPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
5
6DEPENDS = "intltool-native virtual/libintl glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native"
7PROVIDES = "gconf"
8RPROVIDES_${PN} = "gconf"
9RPROVIDES_${PN}-dev = "gconf-dev"
10
11#SRCREV = "705"
12#PV = "2.16.0+svnr${SRCPV}"
13PR = "r2"
14
15# This SVN repo is no longer available use a tarball mirror site until
16# we move to proper gconf recipe.
17#SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http"
18SRC_URI = "http://autobuilder.pokylinux.org/sources/trunk_developer.imendio.com_.svn.gconf-dbus_705_.tar.gz"
19
20SRC_URI[md5sum] = "dba8d534b0c6262d24817c842b36369d"
21SRC_URI[sha256sum] = "5552b1884d42d4072a199c93e35a28dc1799f9166baefbf9243394966039e416"
22
23S = "${WORKDIR}/trunk"
24
25inherit pkgconfig autotools
26
27PARALLEL_MAKE = ""
28
29
30EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes"
31
32
33do_configure_prepend() {
34 touch gtk-doc.make
35}
36
37FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
38FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
39FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd \
40 ${libdir}/GConf-dbus/2/*.la"
41
42BBCLASSEXTEND = "native"
43
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
new file mode 100644
index 0000000..0e06cb5
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -0,0 +1,43 @@
1DESCRIPTION = "GNOME configuration system"
2SECTION = "x11/gnome"
3LICENSE = "LGPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
5
6DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit"
7
8inherit gnomebase
9
10SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.bz2;name=archive \
11 file://nointro.patch"
12
13SRC_URI[archive.md5sum] = "f80329173cd9d134ad07e36002dd2a15"
14SRC_URI[archive.sha256sum] = "52008a82a847527877d9e1e549a351c86cc53cada4733b8a70a1123925d6aff4"
15
16S = "${WORKDIR}/GConf-${PV}"
17
18EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes --disable-introspection --disable-orbit --with-openldap=no"
19
20do_configure_prepend () {
21 touch gtk-doc.make
22}
23
24do_install_append() {
25 # this directory need to be created to avoid an Error 256 at gdm launch
26 install -d ${D}${sysconfdir}/gconf/gconf.xml.system
27
28 # this stuff is unusable
29 rm ${D}${libdir}/GConf/*/*.*a
30 rm ${D}${libdir}/gio/*/*.*a
31}
32
33RDEPENDS_${PN} += "dbus-x11"
34FILES_${PN} += "${libdir}/GConf/* \
35 ${libdir}/gio/*/*.so \
36 ${datadir}/polkit* \
37 ${datadir}/dbus-1/services/*.service \
38 ${datadir}/dbus-1/system-services/*.service \
39 "
40FILES_${PN}-dbg += "${libdir}/*/*/.debug"
41FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd"
42
43BBCLASSEXTEND = "native"