[oe-commits] [meta-openembedded] 12/22: gnome-keyring: delete blacklisted
git at git.openembedded.org
git at git.openembedded.org
Wed Sep 13 09:20:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.
commit 582cc1bd20d97f9079e1b4d34b27b9d1e96dab5f
Author: Martin Jansa <Martin.Jansa at gmail.com>
AuthorDate: Tue Sep 12 10:36:01 2017 +0200
gnome-keyring: delete blacklisted
* there was some work on it recently, but still contains QA issues and no
reply in 2 weeks:
http://lists.openembedded.org/pipermail/openembedded-devel/2017-August/114415.html
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../gnome-keyring/gnome-keyring/egg-asn1x.patch | 55 ----------------------
.../gnome-keyring/gnome-keyring_2.32.1.bb | 45 ------------------
2 files changed, 100 deletions(-)
diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch
deleted file mode 100644
index ad8a40c..0000000
--- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Fixed build error with gcc 4.8
-
-Errors like below
-
-egg-asn1x.c: In function 'anode_encode_build':
-egg-asn1x.c:1280:7: warning: variable 'type' set but not used [-Wunused-but-set-variable]
-egg-asn1x.c: In function 'traverse_and_prepare':
-egg-asn1x.c:3354:3: warning: passing argument 1 of 'egg_asn1x_create' from incompatible pointer type [enabled by default]
-In file included from egg-asn1x.c:50:0:
-egg-asn1x.h:38:8: note: expected 'const struct static_struct_asn *' but argument is of type 'const struct asn1_static_node *'
-egg-asn1x.c: At top level:
-egg-asn1x.c:3509:1: error: conflicting types for 'egg_asn1x_create'
-In file included from egg-asn1x.c:50:0:
-egg-asn1x.h:38:8: note: previous declaration of 'egg_asn1x_create' was here
-egg-asn1x.c:3572:1: error: conflicting types for 'egg_asn1x_create_quark'
-In file included from egg-asn1x.c:50:0:
-egg-asn1x.h:41:8: note: previous declaration of 'egg_asn1x_create_quark' was here
-egg-asn1x.c:3579:1: error: conflicting types for 'egg_asn1x_create_and_decode'
-In file included from egg-asn1x.c:50:0:
-egg-asn1x.h:44:8: note: previous declaration of 'egg_asn1x_create_and_decode' was here
-make[4]: *** [libegg_la-egg-asn1x.lo] Error 1
-
-
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
-
-Upstream-Status: Pending
-Index: gnome-keyring-2.32.1/egg/egg-asn1x.h
-===================================================================
---- gnome-keyring-2.32.1.orig/egg/egg-asn1x.h 2010-10-18 19:11:38.000000000 -0700
-+++ gnome-keyring-2.32.1/egg/egg-asn1x.h 2013-06-11 15:15:00.675399263 -0700
-@@ -25,6 +25,7 @@
- #define EGG_ASN1X_H_
-
- #include <glib.h>
-+#include <libtasn1.h>
-
- #ifndef HAVE_EGG_ALLOCATOR
- typedef void* (*EggAllocator) (void* p, gsize);
-@@ -35,13 +36,13 @@
-
- struct static_struct_asn;
-
--GNode* egg_asn1x_create (const struct static_struct_asn *defs,
-+GNode* egg_asn1x_create (const ASN1_ARRAY_TYPE *defs,
- const gchar *type);
-
--GNode* egg_asn1x_create_quark (const struct static_struct_asn *defs,
-+GNode* egg_asn1x_create_quark (const ASN1_ARRAY_TYPE *defs,
- GQuark type);
-
--GNode* egg_asn1x_create_and_decode (const struct static_struct_asn *defs,
-+GNode* egg_asn1x_create_and_decode (const ASN1_ARRAY_TYPE *defs,
- const gchar *type,
- gconstpointer data,
- gsize n_data);
diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb
deleted file mode 100644
index 4ac75cb..0000000
--- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-SUMMARY = "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 = "r12"
-
-inherit autotools gnome gtk-doc pkgconfig gsettings
-
-SRC_URI += "file://egg-asn1x.patch"
-
-DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} intltool-native"
-RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils"
-
-EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}"
-
-SRC_URI[archive.md5sum] = "9a8aa74e03361676f29d6e73155786fc"
-SRC_URI[archive.sha256sum] = "31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9"
-GNOME_COMPRESS_TYPE="bz2"
-
-FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr \
- ${base_libdir}/security/*${SOLIBSDEV} \
- "
-
-FILES_${PN}-dev += "${libdir}/${BPN}/devel/*.la \
- ${libdir}/${BPN}/devel/*${SOLIBSDEV} \
- ${libdir}/${BPN}/standalone/*.la \
- ${base_libdir}/security/*.la \
- "
-
-INSANE_SKIP_${PN}-dev += "dev-elf"
-
-FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \
- ${libdir}/${BPN}/devel/.debug/ \
- ${base_libdir}/security/.debug/"
-
-PNBLACKLIST[gnome-keyring] ?= "This version conflicts with gcr from oe-core - the recipe will be removed on 2017-09-01 unless the issue is fixed"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list