From 1aacaa1021be57b511872ba548283068ecc9b1d6 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Thu, 9 Jun 2011 17:35:53 +0200
Subject: gconf: update to 2.32.3 (latest stable in 2.32.x series)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta-gnome/recipes-gnome/gconf/gconf_2.28.0.bb | 40 --------------------------
 meta-gnome/recipes-gnome/gconf/gconf_2.32.3.bb | 39 +++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 40 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gconf/gconf_2.28.0.bb
 create mode 100644 meta-gnome/recipes-gnome/gconf/gconf_2.32.3.bb

(limited to 'meta-gnome')

diff --git a/meta-gnome/recipes-gnome/gconf/gconf_2.28.0.bb b/meta-gnome/recipes-gnome/gconf/gconf_2.28.0.bb
deleted file mode 100644
index defb5fe2f9..0000000000
--- a/meta-gnome/recipes-gnome/gconf/gconf_2.28.0.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "GNOME configuration database system"
-SECTION = "x11/gnome"
-DEPENDS = "gtk+ orbit2 glib-2.0 libxml2 polkit"
-ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
-
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
-
-S = "${WORKDIR}/GConf-${PV}"
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.28/GConf-${PV}.tar.bz2;name=archive"
-SRC_URI[archive.md5sum] = "ad2aeb9c7d906b274954c51a615caeac"
-SRC_URI[archive.sha256sum] = "d057dcfe2bfb2a80e592349c2a78d7dce12d19542aeced466c64fb701c806ac8"
-
-PR = "r3"
-
-RDEPENDS_${PN} += "dbus-x11"
-
-EXTRA_OECONF = " --without-openldap --disable-gtk-doc --enable-gtk POLKIT_POLICY_FILE_VALIDATE=true"
-
-inherit autotools gettext
-
-EXTRA_OEMAKE = 'ORBIT_IDL="${ORBIT_IDL_SRC}"'
-
-do_install_append() {
-	# this directory need to be created to avoid an Error 256 at gdm launch
-	install -d ${D}${sysconfdir}/gconf/gconf.xml.system
-
-	# this stuff is unusable
-	rm ${D}${libdir}/GConf/*/*.*a
-}
-
-FILES_${PN} += "${libdir}/GConf/* \
-		${datadir}/polkit* \
-		${datadir}/dbus-1/services/*.service \
-		${datadir}/dbus-1/system-services/*.service \
-"
-
-FILES_${PN}-dbg += "${libdir}/*/*/.debug"
-FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd"
diff --git a/meta-gnome/recipes-gnome/gconf/gconf_2.32.3.bb b/meta-gnome/recipes-gnome/gconf/gconf_2.32.3.bb
new file mode 100644
index 0000000000..619ccfb4bb
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gconf/gconf_2.32.3.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "GNOME configuration database system"
+SECTION = "x11/gnome"
+DEPENDS = "gtk+ orbit2 glib-2.0 libxml2 polkit"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
+
+S = "${WORKDIR}/GConf-${PV}"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.32/GConf-${PV}.tar.bz2;name=archive"
+SRC_URI[archive.md5sum] = "a7c683fe6566e05a67ecb1ee3b20056c"
+SRC_URI[archive.sha256sum] = "63e249d16b1b50820e9c32f1d85ff2c94498afdd45544fa5f37b8e1d084c5bae"
+
+RDEPENDS_${PN} += "dbus-x11"
+
+EXTRA_OECONF = " --without-openldap --disable-gtk-doc --enable-gtk --with-gtk=2.0 POLKIT_POLICY_FILE_VALIDATE=true"
+
+inherit autotools gettext
+
+EXTRA_OEMAKE = 'ORBIT_IDL="${ORBIT_IDL_SRC}"'
+
+do_install_append() {
+	# this directory need to be created to avoid an Error 256 at gdm launch
+	install -d ${D}${sysconfdir}/gconf/gconf.xml.system
+
+	# this stuff is unusable
+	rm ${D}${libdir}/GConf/*/*.*a
+}
+
+FILES_${PN} += "${libdir}/GConf/* \
+		${libdir}/gio/*/*.so \
+		${datadir}/polkit* \
+		${datadir}/dbus-1/services/*.service \
+		${datadir}/dbus-1/system-services/*.service \
+"
+
+FILES_${PN}-dbg += "${libdir}/*/*/.debug"
+FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd"
-- 
cgit v1.2.3-54-g00ecf