diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2018-03-23 22:32:20 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-08 17:00:06 -0700 |
commit | 52492e67fcb2298c5a50c66268d1e4a83ef74228 (patch) | |
tree | 2deb9618ce9c9cb4beb7b6fd9085d705aa6eea5d /meta-gnome | |
parent | 4f60adfbcd6e6bed0b700c9692e884472ac8f604 (diff) | |
download | meta-openembedded-52492e67fcb2298c5a50c66268d1e4a83ef74228.tar.gz |
gnome-keyring: update 2.32.1 -> 3.20.0
* update to 3.28.0 is not yet possible due to gcr >= 3.27.90 required
* license: Many sourcefiles are gone and those still left reference to
COPYING or COPYING.LIB
* recipe cleanup
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-gnome')
3 files changed, 42 insertions, 113 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 ad8a40ccf..000000000 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | Fixed build error with gcc 4.8 | ||
2 | |||
3 | Errors like below | ||
4 | |||
5 | egg-asn1x.c: In function 'anode_encode_build': | ||
6 | egg-asn1x.c:1280:7: warning: variable 'type' set but not used [-Wunused-but-set-variable] | ||
7 | egg-asn1x.c: In function 'traverse_and_prepare': | ||
8 | egg-asn1x.c:3354:3: warning: passing argument 1 of 'egg_asn1x_create' from incompatible pointer type [enabled by default] | ||
9 | In file included from egg-asn1x.c:50:0: | ||
10 | egg-asn1x.h:38:8: note: expected 'const struct static_struct_asn *' but argument is of type 'const struct asn1_static_node *' | ||
11 | egg-asn1x.c: At top level: | ||
12 | egg-asn1x.c:3509:1: error: conflicting types for 'egg_asn1x_create' | ||
13 | In file included from egg-asn1x.c:50:0: | ||
14 | egg-asn1x.h:38:8: note: previous declaration of 'egg_asn1x_create' was here | ||
15 | egg-asn1x.c:3572:1: error: conflicting types for 'egg_asn1x_create_quark' | ||
16 | In file included from egg-asn1x.c:50:0: | ||
17 | egg-asn1x.h:41:8: note: previous declaration of 'egg_asn1x_create_quark' was here | ||
18 | egg-asn1x.c:3579:1: error: conflicting types for 'egg_asn1x_create_and_decode' | ||
19 | In file included from egg-asn1x.c:50:0: | ||
20 | egg-asn1x.h:44:8: note: previous declaration of 'egg_asn1x_create_and_decode' was here | ||
21 | make[4]: *** [libegg_la-egg-asn1x.lo] Error 1 | ||
22 | |||
23 | |||
24 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
25 | |||
26 | Upstream-Status: Pending | ||
27 | Index: gnome-keyring-2.32.1/egg/egg-asn1x.h | ||
28 | =================================================================== | ||
29 | --- gnome-keyring-2.32.1.orig/egg/egg-asn1x.h 2010-10-18 19:11:38.000000000 -0700 | ||
30 | +++ gnome-keyring-2.32.1/egg/egg-asn1x.h 2013-06-11 15:15:00.675399263 -0700 | ||
31 | @@ -25,6 +25,7 @@ | ||
32 | #define EGG_ASN1X_H_ | ||
33 | |||
34 | #include <glib.h> | ||
35 | +#include <libtasn1.h> | ||
36 | |||
37 | #ifndef HAVE_EGG_ALLOCATOR | ||
38 | typedef void* (*EggAllocator) (void* p, gsize); | ||
39 | @@ -35,13 +36,13 @@ | ||
40 | |||
41 | struct static_struct_asn; | ||
42 | |||
43 | -GNode* egg_asn1x_create (const struct static_struct_asn *defs, | ||
44 | +GNode* egg_asn1x_create (const ASN1_ARRAY_TYPE *defs, | ||
45 | const gchar *type); | ||
46 | |||
47 | -GNode* egg_asn1x_create_quark (const struct static_struct_asn *defs, | ||
48 | +GNode* egg_asn1x_create_quark (const ASN1_ARRAY_TYPE *defs, | ||
49 | GQuark type); | ||
50 | |||
51 | -GNode* egg_asn1x_create_and_decode (const struct static_struct_asn *defs, | ||
52 | +GNode* egg_asn1x_create_and_decode (const ASN1_ARRAY_TYPE *defs, | ||
53 | const gchar *type, | ||
54 | gconstpointer data, | ||
55 | 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 5a9ca5f6e..000000000 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | SUMMARY = "Password and keyring managing daemon" | ||
2 | HOMEPAGE = "http://www.gnome.org/" | ||
3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
4 | |||
5 | LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
7 | file://gcr/gcr.h;endline=22;md5=a272df1e633e27ecf35e74fb5576250e \ | ||
8 | file://egg/egg-dbus.h;endline=25;md5=eb6f531af37165dc53420c073d774e61 \ | ||
9 | file://gp11/gp11.h;endline=24;md5=bd8c7a8a21d6c28d40536d96a35e3469 \ | ||
10 | file://pkcs11/pkcs11i.h;endline=24;md5=e72cfbb718389b76a4dae838d1c1f439" | ||
11 | |||
12 | SECTION = "x11/gnome" | ||
13 | |||
14 | PR = "r12" | ||
15 | |||
16 | inherit distro_features_check autotools gnome gtk-doc pkgconfig gsettings | ||
17 | |||
18 | REQUIRED_DISTRO_FEATURES = "x11" | ||
19 | |||
20 | SRC_URI += "file://egg-asn1x.patch \ | ||
21 | file://musl.patch \ | ||
22 | " | ||
23 | |||
24 | DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} intltool-native glib-2.0-native" | ||
25 | RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" | ||
26 | |||
27 | LDFLAGS += "-lgmodule-2.0" | ||
28 | |||
29 | EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}" | ||
30 | |||
31 | SRC_URI[archive.md5sum] = "9a8aa74e03361676f29d6e73155786fc" | ||
32 | SRC_URI[archive.sha256sum] = "31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9" | ||
33 | GNOME_COMPRESS_TYPE="bz2" | ||
34 | |||
35 | FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr \ | ||
36 | ${base_libdir}/security/*${SOLIBSDEV} \ | ||
37 | " | ||
38 | |||
39 | FILES_${PN}-dev += "${libdir}/${BPN}/devel/*.la \ | ||
40 | ${libdir}/${BPN}/devel/*${SOLIBSDEV} \ | ||
41 | ${libdir}/${BPN}/standalone/*.la \ | ||
42 | ${base_libdir}/security/*.la \ | ||
43 | " | ||
44 | |||
45 | INSANE_SKIP_${PN}-dev += "dev-elf" | ||
46 | |||
47 | FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \ | ||
48 | ${libdir}/${BPN}/devel/.debug/ \ | ||
49 | ${base_libdir}/security/.debug/" | ||
50 | |||
51 | # Make compatible with gcr version 3 or newer by removing | ||
52 | # org.gnome.crypto.pgp.*, which is the provider for this optional | ||
53 | # functionality. | ||
54 | |||
55 | do_install_append() { | ||
56 | rm ${D}${datadir}/GConf/gsettings/org.gnome.crypto.pgp.convert | ||
57 | rm ${D}${datadir}/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml | ||
58 | } | ||
diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb new file mode 100644 index 000000000..adf2ff926 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb | |||
@@ -0,0 +1,42 @@ | |||
1 | SUMMARY = "Password and keyring managing daemon" | ||
2 | HOMEPAGE = "http://www.gnome.org/" | ||
3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
4 | SECTION = "x11/gnome" | ||
5 | |||
6 | LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" | ||
7 | LIC_FILES_CHKSUM = " \ | ||
8 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
9 | file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ | ||
10 | " | ||
11 | |||
12 | inherit distro_features_check gnomebase | ||
13 | |||
14 | DEPENDS = " \ | ||
15 | intltool-native \ | ||
16 | glib-2.0-native \ | ||
17 | gtk+3 \ | ||
18 | gcr \ | ||
19 | libgcrypt \ | ||
20 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ | ||
21 | " | ||
22 | |||
23 | SRC_URI[archive.md5sum] = "e09efe8021944dae404736b5a2adb98e" | ||
24 | SRC_URI[archive.sha256sum] = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99" | ||
25 | SRC_URI += "file://musl.patch" | ||
26 | |||
27 | REQUIRED_DISTRO_FEATURES = "x11" | ||
28 | |||
29 | RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" | ||
30 | |||
31 | EXTRA_OECONF = " \ | ||
32 | --disable-doc \ | ||
33 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)} \ | ||
34 | " | ||
35 | |||
36 | |||
37 | FILES_${PN} += " \ | ||
38 | ${datadir}/dbus-1/services \ | ||
39 | ${datadir}/p11-kit \ | ||
40 | ${base_libdir}/security/*${SOLIBSDEV} \ | ||
41 | ${libdir}/pkcs11/gnome-keyring-pkcs11.so \ | ||
42 | " | ||