* [PATCH 0/3] update libsoup, remove gnome-keyring
@ 2013-05-01 10:19 Ross Burton
2013-05-01 10:19 ` [PATCH 1/3] libsoup: upgrade to 2.42.1 Ross Burton
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Ross Burton @ 2013-05-01 10:19 UTC (permalink / raw)
To: openembedded-core
Hi,
This series upgrades libsoup to the latest stable release. This release also
remoes the libgnome-keyring use, so delete libgnome-keyring and gnome-keyring
from oe-core (these have already been integrated into meta-gnome).
Ross
The following changes since commit c42cc8fb38aee46f4778b9c68412a47ae5919923:
neard: add systemd unit file (2013-04-29 15:31:41 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ross/soup
for you to fetch changes up to 14c10a2894fd7e722a8443b03b12462ab8bdfdad:
libgnome-keyring: remove, nothing in oe-core uses this anymore (2013-05-01 11:14:39 +0100)
----------------------------------------------------------------
Ross Burton (3):
libsoup: upgrade to 2.42.1
gnome-keyring: remove, nothing uses it in oe-core
libgnome-keyring: remove, nothing in oe-core uses this anymore
meta/conf/distro/include/seperatebuilddir.inc | 2 -
.../gnome/gnome-keyring/org.gnome.keyring.service | 3 --
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 44 --------------------
.../recipes-gnome/gnome/libgnome-keyring_2.32.0.bb | 19 ---------
...libsoup-2.4_2.40.2.bb => libsoup-2.4_2.42.1.bb} | 14 +++----
5 files changed, 7 insertions(+), 75 deletions(-)
delete mode 100644 meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service
delete mode 100644 meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
delete mode 100644 meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb
rename meta/recipes-support/libsoup/{libsoup-2.4_2.40.2.bb => libsoup-2.4_2.42.1.bb} (59%)
Ross Burton (3):
libsoup: upgrade to 2.42.1
gnome-keyring: remove, nothing uses it in oe-core
libgnome-keyring: remove, nothing in oe-core uses this anymore
meta/conf/distro/include/seperatebuilddir.inc | 2 -
.../gnome/gnome-keyring/org.gnome.keyring.service | 3 --
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 44 --------------------
.../recipes-gnome/gnome/libgnome-keyring_2.32.0.bb | 19 ---------
...libsoup-2.4_2.40.2.bb => libsoup-2.4_2.42.1.bb} | 14 +++----
5 files changed, 7 insertions(+), 75 deletions(-)
delete mode 100644 meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service
delete mode 100644 meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
delete mode 100644 meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb
rename meta/recipes-support/libsoup/{libsoup-2.4_2.40.2.bb => libsoup-2.4_2.42.1.bb} (59%)
--
1.7.10.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/3] libsoup: upgrade to 2.42.1
2013-05-01 10:19 [PATCH 0/3] update libsoup, remove gnome-keyring Ross Burton
@ 2013-05-01 10:19 ` Ross Burton
2013-05-01 11:38 ` Koen Kooi
2013-05-01 10:19 ` [PATCH 2/3] gnome-keyring: remove, nothing uses it in oe-core Ross Burton
2013-05-01 10:19 ` [PATCH 3/3] libgnome-keyring: remove, nothing in oe-core uses this anymore Ross Burton
2 siblings, 1 reply; 6+ messages in thread
From: Ross Burton @ 2013-05-01 10:19 UTC (permalink / raw)
To: openembedded-core
Upgrade to the latest stable release, and fix the dependencies.
gnome-keyring use has been removed from libsoup, and sqlite3 is now a hard
dependency. The optional libsoup-gnome library is now a small stub, so enable
it by default but allow it to be disabled via PACKAGECONFIG.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../{libsoup-2.4_2.40.2.bb => libsoup-2.4_2.42.1.bb} | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
rename meta/recipes-support/libsoup/{libsoup-2.4_2.40.2.bb => libsoup-2.4_2.42.1.bb} (59%)
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.42.1.bb
similarity index 59%
rename from meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb
rename to meta/recipes-support/libsoup/libsoup-2.4_2.42.1.bb
index 53807af..ef8d439 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.40.2.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.42.1.bb
@@ -5,20 +5,20 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
-PR = "r1"
-
SECTION = "x11/gnome/libs"
-DEPENDS = "glib-2.0 gnutls libxml2 libproxy"
+DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3"
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)}"
-PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,libgnome-keyring sqlite3"
+# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards. Enable
+# by default but let it be easily disabled.
+PACKAGECONFIG ??= "gnome"
+PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
-SRC_URI[md5sum] = "211ec6b733d4de33056b56838c88436e"
-SRC_URI[sha256sum] = "32e81220f53abb1f5bbe7d8b0717119df70667fc48e2342d82209ed1593e71dc"
+SRC_URI[md5sum] = "aaccd590a8002b69716f885fa8589887"
+SRC_URI[sha256sum] = "20bd5365bb3e7de70fade91ac82c9dea31636318df90b8c26bc4cde2523a8c91"
S = "${WORKDIR}/libsoup-${PV}"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] gnome-keyring: remove, nothing uses it in oe-core
2013-05-01 10:19 [PATCH 0/3] update libsoup, remove gnome-keyring Ross Burton
2013-05-01 10:19 ` [PATCH 1/3] libsoup: upgrade to 2.42.1 Ross Burton
@ 2013-05-01 10:19 ` Ross Burton
2013-05-01 10:19 ` [PATCH 3/3] libgnome-keyring: remove, nothing in oe-core uses this anymore Ross Burton
2 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2013-05-01 10:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/conf/distro/include/seperatebuilddir.inc | 1 -
.../gnome/gnome-keyring/org.gnome.keyring.service | 3 --
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 44 --------------------
3 files changed, 48 deletions(-)
delete mode 100644 meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service
delete mode 100644 meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc
index 20376bb..f70ae68 100644
--- a/meta/conf/distro/include/seperatebuilddir.inc
+++ b/meta/conf/distro/include/seperatebuilddir.inc
@@ -188,7 +188,6 @@ B_pn-gnome-desktop = "${SEPB}"
#B_pn-gnome-doc-utils = "${SEPB}"
#B_pn-gnome-doc-utils-native = "${SEPB}"
B_pn-gnome-icon-theme = "${SEPB}"
-B_pn-gnome-keyring = "${SEPB}"
B_pn-gnome-mime-data = "${SEPB}"
B_pn-gnupg = "${SEPB}"
## libtool: link: warning: library `.../usr/lib/libgcrypt.la' was moved.
diff --git a/meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service b/meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service
deleted file mode 100644
index 96ea061..0000000
--- a/meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.gnome.keyring
-Exec=/usr/bin/gnome-keyring-daemon
diff --git a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
deleted file mode 100644
index a1cd8f9..0000000
--- a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION = "Password and keyring managing daemon"
-HOMEPAGE = "http://www.gnome.org/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://gcr/gcr.h;endline=22;md5=a272df1e633e27ecf35e74fb5576250e \
- file://egg/egg-dbus.h;endline=25;md5=eb6f531af37165dc53420c073d774e61 \
- file://gp11/gp11.h;endline=24;md5=bd8c7a8a21d6c28d40536d96a35e3469 \
- file://pkcs11/pkcs11i.h;endline=24;md5=e72cfbb718389b76a4dae838d1c1f439"
-
-SECTION = "x11/gnome"
-
-PR = "r11"
-
-inherit autotools gnome gtk-doc pkgconfig gsettings
-
-DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils"
-
-EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}"
-
-SRC_URI += "file://org.gnome.keyring.service"
-
-SRC_URI[archive.md5sum] = "9a8aa74e03361676f29d6e73155786fc"
-SRC_URI[archive.sha256sum] = "31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9"
-
-do_install_append () {
- install -d ${D}${datadir}/dbus-1/services
- install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services
-}
-
-FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr"
-
-
-FILES_${PN}-dev += "${libdir}/${BPN}/devel/*.la \
- ${libdir}/${BPN}/devel/*${SOLIBSDEV} \
- ${libdir}/${BPN}/standalone/*.la \
- ${base_libdir}/security/*.la \
- ${base_libdir}/security/*${SOLIBSDEV}"
-
-FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \
- ${libdir}/${BPN}/devel/.debug/ \
- ${base_libdir}/security/.debug/"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] libgnome-keyring: remove, nothing in oe-core uses this anymore
2013-05-01 10:19 [PATCH 0/3] update libsoup, remove gnome-keyring Ross Burton
2013-05-01 10:19 ` [PATCH 1/3] libsoup: upgrade to 2.42.1 Ross Burton
2013-05-01 10:19 ` [PATCH 2/3] gnome-keyring: remove, nothing uses it in oe-core Ross Burton
@ 2013-05-01 10:19 ` Ross Burton
2 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2013-05-01 10:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/conf/distro/include/seperatebuilddir.inc | 1 -
meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb | 19 -------------------
2 files changed, 20 deletions(-)
delete mode 100644 meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb
diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc
index f70ae68..d113f92 100644
--- a/meta/conf/distro/include/seperatebuilddir.inc
+++ b/meta/conf/distro/include/seperatebuilddir.inc
@@ -291,7 +291,6 @@ B_pn-libgcc = "${SEPB}"
#B_pn-libgcrypt-native = "${SEPB}"
B_pn-libglade = "${SEPB}"
B_pn-libglu = "${SEPB}"
-B_pn-libgnome-keyring = "${SEPB}"
B_pn-libgpg-error = "${SEPB}"
B_pn-libgpg-error-native = "${SEPB}"
B_pn-libice = "${SEPB}"
diff --git a/meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb b/meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb
deleted file mode 100644
index 8ed44f3..0000000
--- a/meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Compatibility library for accessing secrets"
-HOMEPAGE = "http://www.gnome.org/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0914b9d3ebaba41ef2e3e0ae16f296cf \
- file://library/gnome-keyring.h;endline=25;md5=68ea64f81c160d670c37da5f137be4fb \
- file://library/gnome-keyring.c;endline=26;md5=8d7a4fb674aaa012ea5a98e7c368b4a5 \
- file://egg/egg-dh.h;endline=22;md5=1626c16af2a8da1f88324cf3ced33f08"
-
-SECTION = "x11/gnome/libs"
-PR = "r3"
-
-inherit gnome gtk-doc
-
-DEPENDS = "dbus libgcrypt glib-2.0 intltool-native"
-
-SRC_URI[archive.md5sum] = "c42b2ca66204835d901d3dbfc1fa5ae6"
-SRC_URI[archive.sha256sum] = "56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-05-01 12:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-01 10:19 [PATCH 0/3] update libsoup, remove gnome-keyring Ross Burton
2013-05-01 10:19 ` [PATCH 1/3] libsoup: upgrade to 2.42.1 Ross Burton
2013-05-01 11:38 ` Koen Kooi
2013-05-01 11:44 ` Burton, Ross
2013-05-01 10:19 ` [PATCH 2/3] gnome-keyring: remove, nothing uses it in oe-core Ross Burton
2013-05-01 10:19 ` [PATCH 3/3] libgnome-keyring: remove, nothing in oe-core uses this anymore Ross Burton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.