From cb8116f8f09bcb658986e9eb92a0c344495a0f2b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 4 Apr 2018 14:13:01 +0300 Subject: gcr: upgrade 3.20.0 -> 3.28.0 (From OE-Core rev: 2d360c5eaf73061fd113875be19e211a900310a8) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../gcr-add-missing-dependencies-for-vapi.patch | 51 ---------------------- meta/recipes-gnome/gcr/gcr_3.20.0.bb | 26 ----------- meta/recipes-gnome/gcr/gcr_3.28.0.bb | 30 +++++++++++++ 3 files changed, 30 insertions(+), 77 deletions(-) delete mode 100644 meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch delete mode 100644 meta/recipes-gnome/gcr/gcr_3.20.0.bb create mode 100644 meta/recipes-gnome/gcr/gcr_3.28.0.bb (limited to 'meta/recipes-gnome/gcr') diff --git a/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch b/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch deleted file mode 100644 index a205429865..0000000000 --- a/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e7e0c56ca82031121f192f7f711b78418b154c9f Mon Sep 17 00:00:00 2001 -From: Jackie Huang -Date: Mon, 28 Nov 2016 10:17:34 +0800 -Subject: [PATCH] gcr: add missing dependencies for vapi - -According to the vapi_DEPS definition: -gcr-3.vapi depends on gck-1.vapi, -gcr-ui-3.vapi depends on gck-1.vapi and gcr-3.vapi - -But these dependencies are missing for the make targets, -so it will fail when build in parallel: -error: Package `gck-1' not found in specified Vala API directories or GObject-Introspection GIR directories -error: Package `gcr-3' not found in specified Vala API directories or GObject-Introspection GIR directories - -Upstream-Status: Submitted [https://bug775966.bugzilla-attachments.gnome.org/attachment.cgi?id=341791] - -Signed-off-by: Jackie Huang ---- - gcr/Makefile.am | 2 +- - ui/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gcr/Makefile.am b/gcr/Makefile.am -index eda302f..6e78dba 100644 ---- a/gcr/Makefile.am -+++ b/gcr/Makefile.am -@@ -221,7 +221,7 @@ gir_DATA += Gcr-@GCR_MAJOR@.gir - - if ENABLE_VAPIGEN - --gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps -+gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi - - VAPIGEN_VAPIS += gcr-@GCR_MAJOR@.vapi - -diff --git a/ui/Makefile.am b/ui/Makefile.am -index aa52476..6612f0d 100644 ---- a/ui/Makefile.am -+++ b/ui/Makefile.am -@@ -160,7 +160,7 @@ gir_DATA += GcrUi-@GCR_MAJOR@.gir - - if ENABLE_VAPIGEN - --gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps -+gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi gcr-@GCR_MAJOR@.vapi - - VAPIGEN_VAPIS += gcr-ui-@GCR_MAJOR@.vapi - --- -2.8.3 - diff --git a/meta/recipes-gnome/gcr/gcr_3.20.0.bb b/meta/recipes-gnome/gcr/gcr_3.20.0.bb deleted file mode 100644 index a68e0f6769..0000000000 --- a/meta/recipes-gnome/gcr/gcr_3.20.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "A library for bits of crypto UI and parsing etc" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" - -DEPENDS = "intltool-native gtk+3 p11-kit glib-2.0 libgcrypt \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" - -inherit gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection -# depends on gtk+3, but also x11 through gtk+-x11 -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += "file://gcr-add-missing-dependencies-for-vapi.patch" - -SRC_URI[archive.md5sum] = "4314bf89eac293dd0a9d806593ff1b35" -SRC_URI[archive.sha256sum] = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/gcr-3 \ -" - -# http://errors.yoctoproject.org/Errors/Details/20229/ -ARM_INSTRUCTION_SET = "arm" diff --git a/meta/recipes-gnome/gcr/gcr_3.28.0.bb b/meta/recipes-gnome/gcr/gcr_3.28.0.bb new file mode 100644 index 0000000000..6777ad2277 --- /dev/null +++ b/meta/recipes-gnome/gcr/gcr_3.28.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "A library for bits of crypto UI and parsing etc" +HOMEPAGE = "http://www.gnome.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" + +DEPENDS = "intltool-native gtk+3 p11-kit glib-2.0 libgcrypt \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" + +inherit gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection +# depends on gtk+3, but also x11 through gtk+-x11 +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "5321319307dad34dca2fd52e7c9c01ab" +SRC_URI[archive.sha256sum] = "15e175d1da7ec486d59749ba34906241c442898118ce224a7b70bf2e849faf0b" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/gcr-3 \ +" + +# http://errors.yoctoproject.org/Errors/Details/20229/ +ARM_INSTRUCTION_SET = "arm" + +# These files may be out of date or missing our fixes +# libgcrypt.m4 in particular is calling into libgcrypt-config +do_configure_prepend() { + rm -f ${S}/build/m4/* +} -- cgit v1.2.3-54-g00ecf