From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R8iG2-0007Y6-5X for garchives@archives.gentoo.org; Wed, 28 Sep 2011 00:44:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EBCF21C142; Wed, 28 Sep 2011 00:43:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B120021C137 for ; Wed, 28 Sep 2011 00:43:15 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D96BD1B4007 for ; Wed, 28 Sep 2011 00:43:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3F2CD8005B for ; Wed, 28 Sep 2011 00:43:14 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: Subject: [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-keyring/files/gnome-keyring-3.1.1-automagic-libcap-ng.patch gnome-base/gnome-keyring/files/gnome-keyring-3.1.90-debug.patch gnome-base/gnome-keyring/gnome-keyring-3.1.90.ebuild gnome-base/gnome-keyring/gnome-keyring-3.2.0.ebuild gnome-base/gnome-keyring/gnome-keyring-9999.ebuild X-VCS-Directories: gnome-base/gnome-keyring/ gnome-base/gnome-keyring/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: b5cca2d1b9c45a37858bd9518c00e4ffb92c475f Date: Wed, 28 Sep 2011 00:43:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 62729dcdc78172d434840ad5842ecda6 commit: b5cca2d1b9c45a37858bd9518c00e4ffb92c475f Author: Alexandre Rostovtsev gmail com> AuthorDate: Wed Sep 28 00:14:48 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Wed Sep 28 00:14:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Db5cca2d1 gnome-base/gnome-keyring: 3.1.90 =E2=86=92 3.2.0 Bump. Patches were applied upstream. Drop unneeded gconf dependency. --- .../gnome-keyring-3.1.1-automagic-libcap-ng.patch | 60 --------- .../files/gnome-keyring-3.1.90-debug.patch | 138 --------------= ------ ...ng-3.1.90.ebuild =3D> gnome-keyring-3.2.0.ebuild} | 14 +-- gnome-base/gnome-keyring/gnome-keyring-9999.ebuild | 11 +- 4 files changed, 8 insertions(+), 215 deletions(-) diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.1.1-automagic= -libcap-ng.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.1.1-aut= omagic-libcap-ng.patch deleted file mode 100644 index b87bae3..0000000 --- a/gnome-base/gnome-keyring/files/gnome-keyring-3.1.1-automagic-libcap= -ng.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 8191a26b9717f0b0b8beabdc765cc3c4713b2586 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Fri, 20 May 2011 18:06:00 -0400 -Subject: [PATCH] Fix automagic libcap-ng dependency (GNOME bug #649936) - -A slight modification of the patch by Saleem Abdulrasool -. Like his patch, this is for 3.1.x. - -Signed-off-by: Alexandre Rostovtsev ---- - configure.ac | 32 ++++++++++++++++++++++---------- - 1 files changed, 22 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d9e947a..02372d8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -451,18 +451,30 @@ fi - # libcap-ng - # - --AC_CHECK_LIB([cap-ng], [capng_clear], have_libcapng=3D"yes", have_libca= png=3D"no") -- --if test "$have_libcapng" =3D "yes"; then -- AC_DEFINE(HAVE_LIBCAPNG, 1, [Have libcap-ng package, libcap-ng libra= ry]) -- DAEMON_LIBS=3D"$DAEMON_LIBS -lcap-ng" --else -- have_lipcapng=3D"no" -- AC_MSG_WARN([libcap-ng (or development headers) is not installed]) -+AC_ARG_WITH([libcap-ng], -+ [AC_HELP_STRING([--without-libcap-ng], -+ [build without libcap-ng (disables Linux ca= pabilities support)])],, -+ [with_libcap_ng=3Dauto]) -+ -+if test x"$with_libcap_ng" !=3D x"no" ; then -+ AC_CHECK_LIB([cap-ng], [capng_clear], -+ [ -+ with_libcap_ng=3D"yes" -+ AC_DEFINE([HAVE_LIBCAPNG], [1], [have libcap-ng head= ers and library]) -+ DAEMON_LIBS=3D"$DAEMON_LIBS -lcap-ng" -+ ], -+ [ -+ if test x"$with_libcap_ng" =3D x"yes" ; then -+ AC_MSG_ERROR([libcap-ng support requested, but pac= kage not found]) -+ else -+ AC_MSG_WARN([libcap-ng (or development headers) is= not installed]) -+ fi -+ with_libcap_ng=3D"no" -+ ]) - fi - --AM_CONDITIONAL(WITH_CAPS, test "$have_libcapng" =3D "yes") --libcapng_status=3D$have_libcapng -+AM_CONDITIONAL([WITH_CAPS], [test x"$with_libcap_ng" =3D x"yes"]) -+libcapng_status=3D"$with_libcap_ng" - - # -------------------------------------------------------------------- - # Debug mode --- -1.7.5.rc3 diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.1.90-debug.pa= tch b/gnome-base/gnome-keyring/files/gnome-keyring-3.1.90-debug.patch deleted file mode 100644 index 478c796..0000000 --- a/gnome-base/gnome-keyring/files/gnome-keyring-3.1.90-debug.patch +++ /dev/null @@ -1,138 +0,0 @@ -From f591c2326710dbc685a39eb6056eb7734219f181 Mon Sep 17 00:00:00 2001 -From: Stef Walter -Date: Tue, 30 Aug 2011 11:36:15 +0000 -Subject: Fix compile warnings when building with --disable-debug - ---- -diff --git a/daemon/dbus/gkd-secret-property.c b/daemon/dbus/gkd-secret-= property.c -index cd2104e..35c7d38 100644 ---- a/daemon/dbus/gkd-secret-property.c -+++ b/daemon/dbus/gkd-secret-property.c -@@ -377,8 +377,8 @@ static void - iter_append_variant (DBusMessageIter *iter, DataType data_type, GckAttr= ibute *attr) - { - DBusMessageIter sub; -- IterAppendFunc func; -- const gchar *sig; -+ IterAppendFunc func =3D NULL; -+ const gchar *sig =3D NULL; -=20 - g_assert (iter); - g_assert (attr); -@@ -414,9 +414,9 @@ static gboolean - iter_get_variant (DBusMessageIter *iter, DataType data_type, GckAttribu= te *attr) - { - DBusMessageIter variant; -- IterGetFunc func; -+ IterGetFunc func =3D NULL; - gboolean ret; -- const gchar *sig; -+ const gchar *sig =3D NULL; - char *signature; -=20 - g_assert (iter); -diff --git a/daemon/ssh-agent/gkd-ssh-agent-ops.c b/daemon/ssh-agent/gkd= -ssh-agent-ops.c -index 7e2e9fe..691ebe0 100644 ---- a/daemon/ssh-agent/gkd-ssh-agent-ops.c -+++ b/daemon/ssh-agent/gkd-ssh-agent-ops.c -@@ -983,7 +983,7 @@ op_sign_request (GkdSshAgentCall *call) - gsize n_data, n_result; - guint32 flags; - gsize offset; -- gboolean ret; -+ gboolean ret =3D FALSE; - guint blobpos, sz; - guint8 *hash; - gulong algo, mech; -diff --git a/egg/egg-asn1x.c b/egg/egg-asn1x.c -index aae8ddd..46d302c 100644 ---- a/egg/egg-asn1x.c -+++ b/egg/egg-asn1x.c -@@ -1579,10 +1579,8 @@ anode_encode_prepare_choice (GNode *node, gboolea= n want) - { - Atlv *tlv; - GNode *child; -- gint type; -=20 -- type =3D anode_def_type (node); -- g_assert (type =3D=3D TYPE_CHOICE); -+ g_assert (anode_def_type (node) =3D=3D TYPE_CHOICE); -=20 - child =3D egg_asn1x_get_choice (node); - if (!child) -diff --git a/egg/egg-secure-memory.c b/egg/egg-secure-memory.c -index f699203..facc9fe 100644 ---- a/egg/egg-secure-memory.c -+++ b/egg/egg-secure-memory.c -@@ -263,6 +263,8 @@ pool_free (void* item) - unused_push (&pool->unused, item); - } -=20 -+#ifndef G_DISABLE_ASSERT -+ - static int - pool_valid (void* item) - { -@@ -282,6 +284,8 @@ pool_valid (void* item) - return 0; - } -=20 -+#endif /* G_DISABLE_ASSERT */ -+ - /* --------------------------------------------------------------------= --------- - * SEC ALLOCATION - *=20 -diff --git a/gcr/gcr-certificate-renderer.c b/gcr/gcr-certificate-render= er.c -index 5f53cb6..6c8535d 100644 ---- a/gcr/gcr-certificate-renderer.c -+++ b/gcr/gcr-certificate-renderer.c -@@ -330,7 +330,7 @@ on_parsed_dn_part (guint index, GQuark oid, const gu= char *value, - GcrDisplayView *view =3D ((on_parsed_dn_args*)user_data)->view; - const gchar *attr; - const gchar *desc; -- gchar *field; -+ gchar *field =3D NULL; - gchar *display; -=20 - g_return_if_fail (GCR_IS_CERTIFICATE_RENDERER (self)); -diff --git a/gcr/gcr-parser.c b/gcr/gcr-parser.c -index 1766e06..2162b98 100644 ---- a/gcr/gcr-parser.c -+++ b/gcr/gcr-parser.c -@@ -1671,7 +1671,7 @@ gcr_parser_parse_data (GcrParser *self, gconstpoin= ter data, - gsize n_data, GError **error) - { - ForeachArgs args =3D { self, data, n_data, GCR_ERROR_UNRECOGNIZED }; -- const gchar *message; -+ const gchar *message =3D NULL; - gint i; - =09 - g_return_val_if_fail (GCR_IS_PARSER (self), FALSE); -diff --git a/pkcs11/gnome2-store/gkm-gnome2-storage.c b/pkcs11/gnome2-st= ore/gkm-gnome2-storage.c -index 6c8ef7f..feaf252 100644 ---- a/pkcs11/gnome2-store/gkm-gnome2-storage.c -+++ b/pkcs11/gnome2-store/gkm-gnome2-storage.c -@@ -387,7 +387,7 @@ begin_modification_state (GkmGnome2Storage *self, Gk= mTransaction *transaction) - { - GkmDataResult res; - struct stat sb; -- CK_RV rv; -+ CK_RV rv =3D CKR_OK; -=20 - if (!begin_write_state (self, transaction)) - return FALSE; -diff --git a/pkcs11/secret-store/gkm-secret-collection.c b/pkcs11/secret= -store/gkm-secret-collection.c -index 0aedc5c..c8906d9 100644 ---- a/pkcs11/secret-store/gkm-secret-collection.c -+++ b/pkcs11/secret-store/gkm-secret-collection.c -@@ -473,7 +473,7 @@ gkm_secret_collection_real_unlock (GkmObject *obj, G= kmCredential *cred) - GkmDataResult res; - GkmSecretData *sdata; - GkmSecret *master; -- CK_RV rv; -+ CK_RV rv =3D CKR_GENERAL_ERROR; -=20 - master =3D gkm_credential_get_secret (cred); -=20 --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.1.90.ebuild b/gnome= -base/gnome-keyring/gnome-keyring-3.2.0.ebuild similarity index 84% rename from gnome-base/gnome-keyring/gnome-keyring-3.1.90.ebuild rename to gnome-base/gnome-keyring/gnome-keyring-3.2.0.ebuild index 0f18bcb..b911436 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-3.1.90.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.0.ebuild @@ -6,7 +6,7 @@ EAPI=3D"4" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit autotools eutils gnome2 multilib pam virtualx +inherit gnome2 multilib pam virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -26,11 +26,11 @@ fi # USE=3Dvalgrind is probably not a good idea for the tree RDEPEND=3D">=3Ddev-libs/glib-2.25:2 >=3Dx11-libs/gtk+-2.90.0:3 - gnome-base/gconf:2 - >=3Dsys-apps/dbus-1.0 + app-misc/ca-certificates >=3Ddev-libs/libgcrypt-1.2.2 >=3Ddev-libs/libtasn1-1 - dev-libs/p11-kit + >=3Ddev-libs/p11-kit-0.6 + >=3Dsys-apps/dbus-1.0 caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) " @@ -66,12 +66,6 @@ src_prepare() { sed -e 's/^\(SUBDIRS =3D \.\)\(.*\)/\1/' \ -i gcr/Makefile.* || die "sed failed" =20 - # Upstream patch to initialize variables properly, will be in next rele= ase - epatch "${FILESDIR}/${P}-debug.patch" - - # https://bugzilla.gnome.org/show_bug.cgi?id=3D649936 - epatch "${FILESDIR}"/${PN}-3.1.1-automagic-libcap-ng.patch - [[ ${PV} =3D 9999 ]] || eautoreconf gnome2_src_prepare } =20 diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-b= ase/gnome-keyring/gnome-keyring-9999.ebuild index f1d6944..b911436 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild @@ -6,7 +6,7 @@ EAPI=3D"4" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit autotools eutils gnome2 multilib pam virtualx +inherit gnome2 multilib pam virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -26,11 +26,11 @@ fi # USE=3Dvalgrind is probably not a good idea for the tree RDEPEND=3D">=3Ddev-libs/glib-2.25:2 >=3Dx11-libs/gtk+-2.90.0:3 - gnome-base/gconf:2 - >=3Dsys-apps/dbus-1.0 + app-misc/ca-certificates >=3Ddev-libs/libgcrypt-1.2.2 >=3Ddev-libs/libtasn1-1 - dev-libs/p11-kit + >=3Ddev-libs/p11-kit-0.6 + >=3Dsys-apps/dbus-1.0 caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) " @@ -66,9 +66,6 @@ src_prepare() { sed -e 's/^\(SUBDIRS =3D \.\)\(.*\)/\1/' \ -i gcr/Makefile.* || die "sed failed" =20 - # https://bugzilla.gnome.org/show_bug.cgi?id=3D649936 - epatch "${FILESDIR}"/${PN}-3.1.1-automagic-libcap-ng.patch - [[ ${PV} =3D 9999 ]] || eautoreconf gnome2_src_prepare } =20