diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-gnome | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-gnome')
33 files changed, 478 insertions, 401 deletions
diff --git a/poky/meta/recipes-gnome/epiphany/epiphany_3.26.6.bb b/poky/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb index e250f76ed..b46c9d3b4 100644 --- a/poky/meta/recipes-gnome/epiphany/epiphany_3.26.6.bb +++ b/poky/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb @@ -3,20 +3,20 @@ LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ - gsettings-desktop-schemas gnome-desktop3 libxml2-native \ + gsettings-desktop-schemas libxml2-native \ glib-2.0 glib-2.0-native json-glib" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings distro_features_check upstream-version-is-even gettext -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "8449968366a6f9aaff3ac228ddfc7c66" -SRC_URI[archive.sha256sum] = "01b16aa55d312ae0f17d3136f90d8c68ac748715f119412fb1917023c6f630a8" +SRC_URI[archive.md5sum] = "31a4a443e8e22f085a10f80b7e41d5f3" +SRC_URI[archive.sha256sum] = "690546a701f046c5c2b3a092659589ea6e17cb0f9a81ec3fdb3046b00cede6f7" EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}" -FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers" -RDEPENDS_${PN} = "iso-codes adwaita-icon-theme" +FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" +RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" diff --git a/poky/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch b/poky/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch index 249517d8f..d4f3cc1d3 100644 --- a/poky/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch +++ b/poky/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch @@ -1,34 +1,30 @@ -From fc314fc3a66c92fe73e1a0cea4f49d11b29e1f45 Mon Sep 17 00:00:00 2001 +From 0048ae2d225d25cc58f378718ca6f9ddb1a228f9 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 31 Jan 2018 15:50:38 +0200 -Subject: [PATCH 2/2] help/meson.build: disable the use of yelp +Subject: [PATCH] help/meson.build: disable the use of yelp In particular this avoids calling itstool which oe-core doesn't provide. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- - help/meson.build | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + help/meson.build | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/help/meson.build b/help/meson.build -index f720add..cbfeb1e 100644 +index fddcf4c..f7d76c6 100644 --- a/help/meson.build +++ b/help/meson.build -@@ -46,8 +46,8 @@ help_linguas = [ - 'sv' +@@ -32,7 +32,7 @@ help_media = [ + 'media/web-browser.png' ] -gnome.yelp(meson.project_name(), - sources: help_files, - media: help_media, -- languages: help_linguas, -) +#gnome.yelp(meson.project_name(), +# sources: help_files, +# media: help_media, -+# languages: help_linguas, +#) --- -2.15.1 - diff --git a/poky/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch b/poky/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch deleted file mode 100644 index a20542986..000000000 --- a/poky/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 <jackie.huang@windriver.com> -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 <jackie.huang@windriver.com> ---- - 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/poky/meta/recipes-gnome/gcr/gcr_3.20.0.bb b/poky/meta/recipes-gnome/gcr/gcr_3.28.0.bb index a68e0f676..0796362e4 100644 --- a/poky/meta/recipes-gnome/gcr/gcr_3.20.0.bb +++ b/poky/meta/recipes-gnome/gcr/gcr_3.28.0.bb @@ -12,10 +12,8 @@ inherit gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version- # 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" +SRC_URI[archive.md5sum] = "5321319307dad34dca2fd52e7c9c01ab" +SRC_URI[archive.sha256sum] = "15e175d1da7ec486d59749ba34906241c442898118ce224a7b70bf2e849faf0b" FILES_${PN} += " \ ${datadir}/dbus-1 \ @@ -23,4 +21,12 @@ FILES_${PN} += " \ " # http://errors.yoctoproject.org/Errors/Details/20229/ -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "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/* +} diff --git a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch b/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch deleted file mode 100644 index 10b07435c..000000000 --- a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9dfada06f8d2e02d7a04f793ba6e1d4a2aa5ffb7 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 5 Oct 2017 14:54:17 +0300 -Subject: [PATCH] Disable libseccomp (sycall filtering mechanism) - -Upstream forgot to make it optional, and it is not currently used in Yocto - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - configure.ac | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 86bcf1f..8911f19 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -157,17 +157,6 @@ else - fi - - SECCOMP_PKG="" --dnl Check for bubblewrap compatible platform --case $host_os in -- linux*) -- PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp]) -- SECCOMP_PKG="libseccomp" -- AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define to include GNU extensions]) -- AC_DEFINE_UNQUOTED(HAVE_BWRAP, 1, [Define to 1 if Bubblewrap support is available]) -- AC_DEFINE([ENABLE_SECCOMP], [1], [Define if using seccomp]) -- AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "$prefix", [Path to library install prefix]) -- ;; --esac - - dnl pkg-config dependency checks - --- -2.14.1 - diff --git a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch b/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch deleted file mode 100644 index e95393c6b..000000000 --- a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 834bc861921fe0361f2d6a5b5716fc97a9519478 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Thu, 6 Jul 2017 13:13:45 +0300 -Subject: [PATCH] configure.ac: Remove gnome-common macro calls - -gnome-common is deprecated and these aren't doing much for us. - -Upstreamable fix would probably involve using autoconf-archive: -Trying to avoid that dependency for now. - -Upstream-Status: Inappropriate -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - configure.ac | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7adcf0e..bb7659d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,9 +71,6 @@ AC_SUBST(GNOME_DATE) - AC_SUBST(GNOME_DATE_COMMENT_START) - AC_SUBST(GNOME_DATE_COMMENT_END) - --GNOME_COMPILE_WARNINGS([maximum]) --GNOME_MAINTAINER_MODE_DEFINES -- - AC_ARG_ENABLE(deprecation_flags, - [AC_HELP_STRING([--enable-deprecation-flags], - [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],, --- -2.1.4 - diff --git a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch b/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch deleted file mode 100644 index fcc152fde..000000000 --- a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 9048939b76b3bd10783adb79ed0aaf6cd13895cc Mon Sep 17 00:00:00 2001 -From: Christopher Larson <chris_larson@mentor.com> -Date: Tue, 13 Dec 2016 20:39:51 -0700 -Subject: [PATCH 1/2] gnome-desktop-thumbnail: don't convert time_t to long - -Explicitly use strftime+strptime rather than snprintf+atol. This fixes the -build for X32, where long's size doesn't match that of time_t. - -Upstream-Status: Pending -Signed-off-by: Christopher Larson <chris_larson@mentor.com> - - -Modify patch described above to eliminate replacement of - -g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime) - -which is not necessary. Retain replacement of atol(). - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - ---- - libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c -index e56c3d7..5d96bf3 100644 ---- a/libgnome-desktop/gnome-desktop-thumbnail.c -+++ b/libgnome-desktop/gnome-desktop-thumbnail.c -@@ -120,6 +120,8 @@ - * Since: 2.2 - */ - -+#define _XOPEN_SOURCE -+ - #include <config.h> - - #include <glib.h> -@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, - { - const char *thumb_uri, *thumb_mtime_str; - time_t thumb_mtime; -+ struct tm tmp_mtime; - - thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI"); - if (g_strcmp0 (uri, thumb_uri) != 0) -@@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, - thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime"); - if (!thumb_mtime_str) - return FALSE; -- thumb_mtime = atol (thumb_mtime_str); -+ if (!strptime (thumb_mtime_str, "%s", &tmp_mtime)) -+ return FALSE; -+ thumb_mtime = mktime (&tmp_mtime); -+ if (!thumb_mtime) -+ return FALSE; - if (mtime != thumb_mtime) - return FALSE; - --- -2.14.1 - diff --git a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb b/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb deleted file mode 100644 index 879dc9a2f..000000000 --- a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "GNOME library for reading .desktop files" -SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -BPN = "gnome-desktop" - -inherit gnome pkgconfig upstream-version-is-even gobject-introspection -SRC_URI[archive.md5sum] = "6cee2ecd677d87eaa0eb5ebfa7b45fb3" -SRC_URI[archive.sha256sum] = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a" - -SRC_URI += " \ - file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ - file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \ - file://0001-Disable-libseccomp-sycall-filtering-mechanism.patch \ - " - -DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev" - -inherit distro_features_check gtk-doc -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OECONF = "--disable-desktop-docs" - -PACKAGES =+ "libgnome-desktop3" -FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" - -RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" diff --git a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch index 96ec96bdb..b5992eba7 100644 --- a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch +++ b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch @@ -1,7 +1,7 @@ -From 88ed996cc9e2b296cacfdbeece4be28a90bab511 Mon Sep 17 00:00:00 2001 +From 9661951838773251d0a914e897e8a0d95ce027f6 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 30 May 2017 14:55:49 +0300 -Subject: [PATCH 1/2] Don't use AC_CANONICAL_HOST +Subject: [PATCH] Don't use AC_CANONICAL_HOST This won't work when building allarch (and is only used to find out if target is windows). @@ -13,13 +13,13 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> configure.ac | 1 - 1 file changed, 1 deletion(-) -Index: adwaita-icon-theme-3.26.1/configure.ac -=================================================================== ---- adwaita-icon-theme-3.26.1.orig/configure.ac -+++ adwaita-icon-theme-3.26.1/configure.ac +diff --git a/configure.ac b/configure.ac +index fb787dc..5caef0c 100644 +--- a/configure.ac ++++ b/configure.ac @@ -3,7 +3,6 @@ AC_PREREQ(2.53) - AC_INIT([adwaita-icon-theme], [3.26.1], + AC_INIT([adwaita-icon-theme], [3.28.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) -AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff --git a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.26.1.bb b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb index 6437d5e2d..40dd35ba3 100644 --- a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.26.1.bb +++ b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.28.0.bb @@ -15,8 +15,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-Run-installation-commands-as-shell-jobs.patch \ " -SRC_URI[md5sum] = "3ef87e789711e5130792d4b5366c005d" -SRC_URI[sha256sum] = "28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d" +SRC_URI[md5sum] = "b25b2d82cbebf2cc9cd469457b604f2c" +SRC_URI[sha256sum] = "7aae8c1dffd6772fd1a21a3d365a0ea28b7c3988bdbbeafbf8742cda68242150" do_install_append() { # Build uses gtk-encode-symbolic-svg to create png versions: diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch new file mode 100644 index 000000000..ba85c317f --- /dev/null +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch @@ -0,0 +1,62 @@ +From 4cf37d56fddcc22bcd818f6d470404f56d907f3c Mon Sep 17 00:00:00 2001 +From: Sascha Silbe <x-yo17@se-silbe.de> +Date: Fri, 8 Jun 2018 13:55:10 +0200 +Subject: [PATCH] Relocate the repository directory for native builds + +Instead of hard-coding GOBJECT_INTROSPECTION_LIBDIR when +gobject-introspection is built, use dladdr() to determine where +GOBJECT_INTROSPECTION_LIBDIR is and use that path to calculate the +repository directory. + +This fixes gobject-introspection-native accessing paths across build +directories (e.g. if the build directories use the same shared state +cache or sstate mirror). + +Upstream-Status: Inappropriate +Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de> + +--- + girepository/girepository.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/girepository/girepository.c b/girepository/girepository.c +index c1fa3d3..efa557e 100644 +--- a/girepository/girepository.c ++++ b/girepository/girepository.c +@@ -21,6 +21,8 @@ + * Boston, MA 02111-1307, USA. + */ + ++#define _GNU_SOURCE ++ + #include "config.h" + + #include <stdio.h> +@@ -34,6 +36,8 @@ + #include "gitypelib-internal.h" + #include "girepository-private.h" + ++#include <dlfcn.h> ++ + /** + * SECTION:girepository + * @short_description: GObject Introspection repository manager +@@ -188,9 +192,16 @@ init_globals (void) + g_free (custom_dirs); + } + +- libdir = GOBJECT_INTROSPECTION_LIBDIR; ++ Dl_info gi_lib_info; + +- typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL); ++ if (dladdr (g_irepository_get_default, &gi_lib_info)) { ++ char *libdir = g_path_get_dirname (gi_lib_info.dli_fname); ++ typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL); ++ g_free (libdir); ++ } else { ++ libdir = GOBJECT_INTROSPECTION_LIBDIR; ++ typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL); ++ } + + typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); + diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch index 9abaea7e7..86cd4ead2 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch @@ -1,11 +1,12 @@ -From 3a9d1e5ee0aae56fafec0beba2014c19e4ff310c Mon Sep 17 00:00:00 2001 +From ca0fb17e268c176ac89df081b1efa4a42989f014 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 23 Mar 2016 17:07:28 +0200 -Subject: [PATCH 1/5] Revert an incomplete upstream attempt at cross-compile +Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile support Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- common.mk | 4 ---- giscanner/gdumpparser.py | 6 ------ @@ -29,10 +30,10 @@ index b778f7a..e26c637 100644 INTROSPECTION_COMPILER_ARGS = \ diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py -index 1134f33..9bdc2bc 100644 +index cd9d94d..b41772c 100644 --- a/giscanner/gdumpparser.py +++ b/giscanner/gdumpparser.py -@@ -162,12 +162,6 @@ blob containing data gleaned from GObject's primitive introspection.""" +@@ -161,12 +161,6 @@ blob containing data gleaned from GObject's primitive introspection.""" out_path = os.path.join(self._binary.tmpdir, 'dump.xml') args = [] @@ -45,6 +46,3 @@ index 1134f33..9bdc2bc 100644 args.extend(self._binary.args) args.append('--introspect-dump=%s,%s' % (in_path, out_path)) --- -2.7.0 - diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch new file mode 100644 index 000000000..e0402f8f4 --- /dev/null +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-configure.ac-make-GIR_DIR-configurable.patch @@ -0,0 +1,68 @@ +configure.ac: make GIR_DIR configurable + +Some .gir files such as GLib-2.0.gir are arch related which contain such +as lengths of pointers that they are different for 64 and 32 bit target. +It causes install file conflicts for multilib when intall +gobject-introspection and lib32-gobject-introspection both. + +Add configure option 'with-gir-dir-prefix' for autotools to make .gir +could be installed to a configured path such as ${libdir}. And update +girdir in .pc files as well. + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gobject-introspection/commit/3301c7e] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure.ac | 7 +++++-- + gobject-introspection-1.0.pc.in | 2 +- + gobject-introspection-no-export-1.0.pc.in | 2 +- + 3 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b4294c57..60506947 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -114,9 +114,12 @@ GIR_SUFFIX="gir-1.0" + AC_SUBST(GIR_SUFFIX) + AC_DEFINE_UNQUOTED(GIR_SUFFIX, "$GIR_SUFFIX", [Name of the gir directory]) + +-GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX" ++AC_ARG_WITH([gir-dir-prefix], ++ [AS_HELP_STRING([--with-gir-dir-prefix], [Directory prefix for gir installation])], ++ [GIR_DIR_PREFIX="$withval"], [GIR_DIR_PREFIX="$EXPANDED_DATADIR"]) ++GIR_DIR="$GIR_DIR_PREFIX/$GIR_SUFFIX" + AC_SUBST(GIR_DIR) +-AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation]) ++AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Directory prefix for gir installation]) + + PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.58.0]) + +diff --git a/gobject-introspection-1.0.pc.in b/gobject-introspection-1.0.pc.in +index a08b5d27..3409856c 100644 +--- a/gobject-introspection-1.0.pc.in ++++ b/gobject-introspection-1.0.pc.in +@@ -10,7 +10,7 @@ g_ir_scanner=${bindir}/g-ir-scanner + g_ir_compiler=${bindir}/g-ir-compiler@EXEEXT@ + g_ir_generate=${bindir}/g-ir-generate@EXEEXT@ + gidatadir=${datadir}/gobject-introspection-1.0 +-girdir=${datadir}/gir-1.0 ++girdir=@GIR_DIR@ + typelibdir=${libdir}/girepository-1.0 + + Cflags: -I${includedir}/gobject-introspection-1.0 @FFI_PC_CFLAGS@ +diff --git a/gobject-introspection-no-export-1.0.pc.in b/gobject-introspection-no-export-1.0.pc.in +index d214d22d..745aaade 100644 +--- a/gobject-introspection-no-export-1.0.pc.in ++++ b/gobject-introspection-no-export-1.0.pc.in +@@ -9,7 +9,7 @@ includedir=@includedir@ + g_ir_scanner=${bindir}/g-ir-scanner + g_ir_compiler=${bindir}/g-ir-compiler@EXEEXT@ + g_ir_generate=${bindir}/g-ir-generate@EXEEXT@ +-girdir=${datadir}/gir-1.0 ++girdir=@GIR_DIR@ + typelibdir=${libdir}/girepository-1.0 + + Cflags: -I${includedir}/gobject-introspection-1.0 @FFI_PC_CFLAGS@ +-- +2.17.0 + diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch index 4ec527dcc..e9338e92e 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch @@ -1,4 +1,4 @@ -From e48f1e18f5ea41656f0ba10fe61d69d2604b0064 Mon Sep 17 00:00:00 2001 +From 3fea5e83803f4cfef21b2e06e37a6ba56f2bb914 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 3 Jan 2018 17:02:01 +0200 Subject: [PATCH] giscanner: add a --lib-dirs-envvar option @@ -19,7 +19,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py -index 29de0ee..928eae8 100644 +index c003828..8a8ba2b 100644 --- a/giscanner/ccompiler.py +++ b/giscanner/ccompiler.py @@ -109,7 +109,7 @@ class CCompiler(object): @@ -32,19 +32,19 @@ index 29de0ee..928eae8 100644 # is being built in the current directory. @@ -119,7 +119,7 @@ class CCompiler(object): - if self.check_is_msvc(): + if os.name == 'nt': runtime_path_envvar = ['LIB', 'PATH'] else: -- runtime_path_envvar = ['LD_LIBRARY_PATH'] -+ runtime_path_envvar = ['LD_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar] +- runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH'] ++ runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar] # Search the current directory first # (This flag is not supported nor needed for Visual C++) args.append('-L.') diff --git a/giscanner/dumper.py b/giscanner/dumper.py -index 7f77bd2..db96df6 100644 +index 2c668f5..2e515a0 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py -@@ -259,7 +259,8 @@ class DumpCompiler(object): +@@ -249,7 +249,8 @@ class DumpCompiler(object): libtool, self._options.libraries, self._options.extra_libraries, @@ -55,10 +55,10 @@ index 7f77bd2..db96df6 100644 else: diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index 38a45c1..b603850 100755 +index 5cb793e..87227e2 100644 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py -@@ -130,6 +130,9 @@ def _get_option_parser(): +@@ -132,6 +132,9 @@ def _get_option_parser(): parser.add_option("", "--use-ldd-wrapper", action="store", dest="ldd_wrapper", default=None, help="wrapper to use instead of ldd (useful when cross-compiling)") @@ -68,6 +68,3 @@ index 38a45c1..b603850 100755 parser.add_option("", "--program-arg", action="append", dest="program_args", default=[], help="extra arguments to program") --- -2.15.1 - diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch new file mode 100644 index 000000000..9167f042e --- /dev/null +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch @@ -0,0 +1,27 @@ +From f128cbeead687bfc6532cc1f2cc3e2dc5a2b5b30 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 5 Sep 2018 16:46:52 +0200 +Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper + +prelink-rtld, which we use instead of ldd returns 127 when it can't find a library. +It is not an error per se, but it breaks subprocess.check_output(). + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + giscanner/shlibs.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py +index 01d21a3..3bd3250 100644 +--- a/giscanner/shlibs.py ++++ b/giscanner/shlibs.py +@@ -108,7 +108,7 @@ def _resolve_non_libtool(options, binary, libraries): + args.extend(['otool', '-L', binary.args[0]]) + else: + args.extend(['ldd', binary.args[0]]) +- output = subprocess.check_output(args) ++ output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout + if isinstance(output, bytes): + output = output.decode("utf-8", "replace") + diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch index c682b42af..03ef2b005 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch @@ -1,8 +1,8 @@ -From b1503fe2693d602b3e24e4b832dc0934960d5d22 Mon Sep 17 00:00:00 2001 +From a28cc8413b68bec5b4cf2ee5f37b40a8965490a5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 19 Oct 2015 18:29:21 +0300 -Subject: [PATCH 2/5] configure.ac: add host-gi, gi-cross-wrapper, - gi-ldd-wrapper and introspection-data options +Subject: [PATCH] configure.ac: add host-gi, gi-cross-wrapper, gi-ldd-wrapper + and introspection-data options With the first option, gobject-introspection tools (g-ir-doc-tool and g-ir-scanner) that are already installed in the host system will be used for building the source tree. @@ -25,6 +25,7 @@ These options are useful when cross-compiling for a different target architectur Upstream-Status: Pending [review on oe-core list] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- Makefile.am | 2 ++ common.mk | 39 +++++++++++++++++++++++++++++++++++++++ @@ -32,10 +33,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> tests/Makefile.am | 5 ++++- 4 files changed, 87 insertions(+), 1 deletion(-) -Index: gobject-introspection-1.52.1/Makefile.am -=================================================================== ---- gobject-introspection-1.52.1.orig/Makefile.am -+++ gobject-introspection-1.52.1/Makefile.am +diff --git a/Makefile.am b/Makefile.am +index 44ed115..2a1fa56 100644 +--- a/Makefile.am ++++ b/Makefile.am @@ -21,7 +21,9 @@ include Makefile-cmph.am include Makefile-girepository.am include Makefile-giscanner.am @@ -44,12 +45,12 @@ Index: gobject-introspection-1.52.1/Makefile.am include Makefile-gir.am +endif include Makefile-tools.am - include Makefile-msvcproj.am -Index: gobject-introspection-1.52.1/common.mk -=================================================================== ---- gobject-introspection-1.52.1.orig/common.mk -+++ gobject-introspection-1.52.1/common.mk + ## Process this file with automake to produce Makefile.in +diff --git a/common.mk b/common.mk +index e26c637..9f3a65f 100644 +--- a/common.mk ++++ b/common.mk @@ -6,6 +6,15 @@ # module itself. # @@ -130,11 +131,11 @@ Index: gobject-introspection-1.52.1/common.mk INTROSPECTION_DOCTOOL_ARGS = \ --add-include-path=$(srcdir) \ -Index: gobject-introspection-1.52.1/configure.ac -=================================================================== ---- gobject-introspection-1.52.1.orig/configure.ac -+++ gobject-introspection-1.52.1/configure.ac -@@ -366,6 +366,48 @@ dnl +diff --git a/configure.ac b/configure.ac +index d48e6c3..ed5f8a2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -367,6 +367,48 @@ dnl AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x]) AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x]) @@ -183,10 +184,10 @@ Index: gobject-introspection-1.52.1/configure.ac AC_CONFIG_FILES([ Makefile tests/Makefile -Index: gobject-introspection-1.52.1/tests/Makefile.am -=================================================================== ---- gobject-introspection-1.52.1.orig/tests/Makefile.am -+++ gobject-introspection-1.52.1/tests/Makefile.am +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 4bdb9c3..10b0f27 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am @@ -1,6 +1,9 @@ include $(top_srcdir)/common.mk diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch new file mode 100644 index 000000000..5e4176725 --- /dev/null +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-g-ir-tools-respect-gir_dir_prefix.patch @@ -0,0 +1,76 @@ +g-ir-tools: respect gir_dir_prefix + +Configure option gir_dir_prefix is used to configure install dir for +.gir files, so add its value to include file search paths. + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gobject-introspection/commit/3fe995a] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + Makefile-tools.am | 2 +- + giscanner/transformer.py | 1 + + tests/warn/warningtester.py | 1 + + tools/g-ir-tool-template.in | 10 ++++++++++ + 6 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/Makefile-tools.am b/Makefile-tools.am +index c70d9850..fcaf1e01 100644 +--- a/Makefile-tools.am ++++ b/Makefile-tools.am +@@ -9,7 +9,7 @@ EXTRA_DIST += \ + tools/g-ir-tool-template.in \ + tools/meson.build + +-TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON_CMD\@,\/usr\/bin\/env\ $(PYTHON), ++TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON_CMD\@,\/usr\/bin\/env\ $(PYTHON), -e s,@GIR_DIR\@,$(GIR_DIR),g + + g-ir-scanner: tools/g-ir-tool-template.in _giscanner.la Makefile + $(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,scannermain, -e s,@TOOL_FUNCTION\@,scanner_main, $< > $@.tmp && mv $@.tmp $@ +diff --git a/giscanner/transformer.py b/giscanner/transformer.py +index 335e229f..2c412339 100644 +--- a/giscanner/transformer.py ++++ b/giscanner/transformer.py +@@ -184,6 +184,7 @@ None.""" + def _get_gi_data_dirs(self): + data_dirs = utils.get_system_data_dirs() + data_dirs.append(DATADIR) ++ data_dirs.append(GIRDIR) + if os.name != 'nt': + # For backwards compatibility, was always unconditionally added to the list. + data_dirs.append('/usr/share') +diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py +index f17c8889..be5aec13 100644 +--- a/tests/warn/warningtester.py ++++ b/tests/warn/warningtester.py +@@ -18,6 +18,7 @@ sys.path.insert(0, path) + + # Not correct, but enough to get the tests going uninstalled + builtins.__dict__['DATADIR'] = path ++builtins.__dict__['GIRDIR'] = '' + + from giscanner.annotationparser import GtkDocCommentBlockParser + from giscanner.ast import Include, Namespace +diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in +index ed33d16b..b9cf0911 100755 +--- a/tools/g-ir-tool-template.in ++++ b/tools/g-ir-tool-template.in +@@ -60,6 +60,16 @@ if not os.path.isdir(os.path.join(datadir, 'gir-1.0')): + + builtins.__dict__['DATADIR'] = datadir + ++# Respect gir_dir_prefix for meson and autotools ++girdir = '' ++# for meson ++if '@gir_dir_prefix@' and not '@gir_dir_prefix@'.startswith('@'): ++ girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@')) ++# for autotools ++elif '@GIR_DIR@' and not '@GIR_DIR@'.startswith('@'): ++ girdir = os.path.dirname(os.path.abspath('@GIR_DIR@')) ++builtins.__dict__['GIRDIR'] = girdir ++ + # Again, relative paths first so that the installation prefix is relocatable + pylibdir = os.path.abspath(os.path.join(filedir, '..', 'lib', 'gobject-introspection')) + +-- +2.17.0 + diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch index f21eaca85..45fe27ad6 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch @@ -1,7 +1,7 @@ -From 704b888d0abfb01067352c40156f49f655691c7c Mon Sep 17 00:00:00 2001 +From 46dbe963aa6435591c87e788cdb54bc0daeac42e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 19 Oct 2015 18:26:40 +0300 -Subject: [PATCH 3/5] giscanner: add --use-binary-wrapper option +Subject: [PATCH] giscanner: add --use-binary-wrapper option With this option, giscanner will use a wrapper executable to run binaries it's producing, instead of running them directly. This @@ -10,15 +10,16 @@ but they can be run using for example QEMU emulation. Upstream-Status: Pending [review on oe-core list] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- giscanner/scannermain.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index 633496f..d684cd0 100755 +index ccb14e9..061def0 100644 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py -@@ -124,6 +124,9 @@ def _get_option_parser(): +@@ -126,6 +126,9 @@ def _get_option_parser(): parser.add_option("", "--program", action="store", dest="program", default=None, help="program to execute") @@ -28,7 +29,7 @@ index 633496f..d684cd0 100755 parser.add_option("", "--program-arg", action="append", dest="program_args", default=[], help="extra arguments to program") -@@ -419,6 +422,17 @@ def create_binary(transformer, options, args): +@@ -418,6 +421,17 @@ def create_binary(transformer, options, args): gdump_parser.get_error_quark_functions()) shlibs = resolve_shlibs(options, binary, options.libraries) @@ -46,6 +47,3 @@ index 633496f..d684cd0 100755 gdump_parser.set_introspection_binary(binary) gdump_parser.parse() return shlibs --- -2.7.0 - diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch index afb71e767..2e36b64ba 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch @@ -1,23 +1,24 @@ -From d4ad57fd4a32c4f0d2f0522a3090ef940746431b Mon Sep 17 00:00:00 2001 +From eba2b999e81d81b5f43bb1f0ab33881786bebdec Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 30 Oct 2015 16:28:46 +0200 -Subject: [PATCH 4/5] giscanner: add a --use-ldd-wrapper option +Subject: [PATCH] giscanner: add a --use-ldd-wrapper option This is useful in cross-compile environments where system's ldd command does not work on binaries built for a different architecture Upstream-Status: Pending [review in oe-core] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- giscanner/scannermain.py | 3 +++ giscanner/shlibs.py | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index d684cd0..1b3b369 100755 +index 061def0..5cb793e 100644 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py -@@ -127,6 +127,9 @@ def _get_option_parser(): +@@ -129,6 +129,9 @@ def _get_option_parser(): parser.add_option("", "--use-binary-wrapper", action="store", dest="wrapper", default=None, help="wrapper to use for running programs (useful when cross-compiling)") @@ -28,10 +29,10 @@ index d684cd0..1b3b369 100755 action="append", dest="program_args", default=[], help="extra arguments to program") diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index c93d20c..c5b5942 100644 +index 7b7b2d0..01d21a3 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py -@@ -105,7 +105,9 @@ def _resolve_non_libtool(options, binary, libraries): +@@ -102,7 +102,9 @@ def _resolve_non_libtool(options, binary, libraries): args.extend(libtool) args.append('--mode=execute') platform_system = platform.system() @@ -42,6 +43,3 @@ index c93d20c..c5b5942 100644 args.extend(['otool', '-L', binary.args[0]]) else: args.extend(['ldd', binary.args[0]]) --- -2.7.0 - diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch index 47a18ec84..2a31117b1 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch @@ -1,7 +1,7 @@ -From e08b3677dd04d6ec407ba8f74f601b2d51310eff Mon Sep 17 00:00:00 2001 +From a97d060933932e478c03f1de9513b69bc459eefc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 8 Oct 2015 18:30:35 +0300 -Subject: [PATCH 5/5] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR +Subject: [PATCH] Prefix pkg-config paths with PKG_CONFIG_SYSROOT_DIR environment variable This environment variable sets the location of sysroot directory in cross-compilation @@ -9,16 +9,17 @@ environments; if the variable is not set, the prefix will be empty. Upstream-Status: Pending [review on oe-core list] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- Makefile-gir.am | 18 +++++++++--------- m4/introspection.m4 | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile-gir.am b/Makefile-gir.am -index a09260a..ba6e89e 100644 +index 2cd7358..eaf0afd 100644 --- a/Makefile-gir.am +++ b/Makefile-gir.am -@@ -55,8 +55,8 @@ else +@@ -58,8 +58,8 @@ else endif # glib @@ -29,7 +30,7 @@ index a09260a..ba6e89e 100644 GLIB_LIBRARY=glib-2.0 -@@ -92,8 +92,8 @@ GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT) +@@ -95,8 +95,8 @@ GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT) gir/DBusGLib-1.0.typelib: GObject-2.0.gir # gobject @@ -40,7 +41,7 @@ index a09260a..ba6e89e 100644 GOBJECT_LIBRARY=gobject-2.0 -@@ -120,8 +120,8 @@ GObject_2_0_gir_FILES = \ +@@ -123,8 +123,8 @@ GObject_2_0_gir_FILES = \ BUILT_GIRSOURCES += GObject-2.0.gir # gmodule @@ -51,7 +52,7 @@ index a09260a..ba6e89e 100644 GMODULE_LIBRARY=gmodule-2.0 -@@ -146,13 +146,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \ +@@ -149,13 +149,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \ BUILT_GIRSOURCES += GModule-2.0.gir # gio @@ -91,6 +92,3 @@ index d89c3d9..b562266 100644 fi AC_SUBST(INTROSPECTION_SCANNER) AC_SUBST(INTROSPECTION_COMPILER) --- -2.7.0 - diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb index 85c8001de..55ca87dda 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb @@ -3,30 +3,34 @@ HOMEPAGE = "https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" BUGTRACKER = "https://bugzilla.gnome.org/" SECTION = "libs" LICENSE = "LGPLv2+ & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \ +LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ file://tools/compiler.c;endline=20;md5=fc5007fc20022720e6c0b0cdde41fabd \ file://giscanner/sourcescanner.c;endline=22;md5=194d6e0c1d00662f32d030ce44de8d39 \ - file://girepository/giregisteredtypeinfo.c;endline=21;md5=661847611ae6979465415f31a759ba27" + file://girepository/giregisteredtypeinfo.c;endline=21;md5=661847611ae6979465415f31a759ba27 \ + " -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.54/${BPN}-${PV}.tar.xz \ +SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ file://0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch \ file://0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch \ file://0003-giscanner-add-use-binary-wrapper-option.patch \ file://0004-giscanner-add-a-use-ldd-wrapper-option.patch \ file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \ file://0001-giscanner-add-a-lib-dirs-envvar-option.patch \ + file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ + file://0001-configure.ac-make-GIR_DIR-configurable.patch \ + file://0002-g-ir-tools-respect-gir_dir_prefix.patch \ " -SRC_URI[md5sum] = "126c29e4d54adbed2ed4e2b04483de41" -SRC_URI[sha256sum] = "b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e" -inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even -BBCLASSEXTEND = "native" +SRC_URI[md5sum] = "94fec875276262037bfcd51226db12fe" +SRC_URI[sha256sum] = "27c1590a32749de0a5481ce897772547043e94bccba4bc0a7edb3d8513e401ec" -# needed for writing out the qemu wrapper script -export STAGING_DIR_HOST -export B +SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" + +inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even multilib_script -DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native" +MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" + +DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive" # target build needs qemu to run temporary introspection binaries created # on the fly by g-ir-scanner and a native version of itself to run @@ -35,7 +39,30 @@ DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native" # (standard ldd doesn't work when cross-compiling). DEPENDS_class-target_append = " gobject-introspection-native qemu-native prelink-native" -SSTATE_SCAN_FILES += "g-ir-scanner-qemuwrapper g-ir-scanner-wrapper g-ir-compiler-wrapper g-ir-scanner-lddwrapper Gio-2.0.gir postinst-ldsoconf-${PN}" +# needed for writing out the qemu wrapper script +export STAGING_DIR_HOST +export B + +PACKAGECONFIG ?= "" +PACKAGECONFIG[doctool] = "--enable-doctool,--disable-doctool,python3-mako," + +# Configure target build to use native tools of itself and to use a qemu wrapper +# and optionally to generate introspection data +EXTRA_OECONF_class-target = " \ + --disable-static \ + --enable-host-gi \ + --enable-gi-cross-wrapper=${B}/g-ir-scanner-qemuwrapper \ + --enable-gi-ldd-wrapper=${B}/g-ir-scanner-lddwrapper \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection-data', '--disable-introspection-data', d)} \ + ${@'--with-gir-dir-prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \ +" + +# Need to ensure ld.so.conf exists so prelink-native works +# both before we build and if we install from sstate +do_configure[prefuncs] += "gobject_introspection_preconfigure" +python gobject_introspection_preconfigure () { + oe.utils.write_ld_so_conf(d) +} do_configure_prepend_class-native() { # Tweak the native python scripts so that they don't refer to the @@ -72,7 +99,7 @@ EOF # This prevents g-ir-scanner from writing cache data to $HOME export GI_SCANNER_DISABLE_CACHE=1 -g-ir-scanner --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH --use-binary-wrapper=${STAGING_BINDIR}/g-ir-scanner-qemuwrapper --use-ldd-wrapper=${STAGING_BINDIR}/g-ir-scanner-lddwrapper --add-include-path=${STAGING_DATADIR}/gir-1.0 "\$@" +g-ir-scanner --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH --use-binary-wrapper=${STAGING_BINDIR}/g-ir-scanner-qemuwrapper --use-ldd-wrapper=${STAGING_BINDIR}/g-ir-scanner-lddwrapper --add-include-path=${STAGING_DATADIR}/gir-1.0 --add-include-path=${STAGING_LIBDIR}/gir-1.0 "\$@" EOF chmod +x ${B}/g-ir-scanner-wrapper @@ -97,18 +124,6 @@ EOF sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/tools/g-ir-tool-template.in } -# Configure target build to use native tools of itself and to use a qemu wrapper -# and optionally to generate introspection data -EXTRA_OECONF_class-target += "--enable-host-gi \ - --disable-static \ - --enable-gi-cross-wrapper=${B}/g-ir-scanner-qemuwrapper \ - --enable-gi-ldd-wrapper=${B}/g-ir-scanner-lddwrapper \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection-data', '--disable-introspection-data', d)} \ - " - -PACKAGECONFIG ?= "" -PACKAGECONFIG[doctool] = "--enable-doctool,--disable-doctool,python3-mako," - do_compile_prepend() { # This prevents g-ir-scanner from writing cache data to $HOME export GI_SCANNER_DISABLE_CACHE=1 @@ -127,27 +142,6 @@ do_install_append_class-target() { install ${B}/g-ir-scanner-lddwrapper ${D}${bindir}/ } -# .typelib files are needed at runtime and so they go to the main package -FILES_${PN}_append = " ${libdir}/girepository-*/*.typelib" - -# .gir files go to dev package, as they're needed for developing (but not for running) -# things that depends on introspection. -FILES_${PN}-dev_append = " ${datadir}/gir-*/*.gir" -FILES_${PN}-dev_append = " ${datadir}/gir-*/*.rnc" - -# These are used by gobject-based packages -# to generate transient introspection binaries -FILES_${PN}-dev_append = " ${datadir}/gobject-introspection-1.0/gdump.c \ - ${datadir}/gobject-introspection-1.0/Makefile.introspection" - -# These are used by dependent packages (e.g. pygobject) to build their -# testsuites. -FILES_${PN}-dev_append = " ${datadir}/gobject-introspection-1.0/tests/*.c \ - ${datadir}/gobject-introspection-1.0/tests/*.h" - -FILES_${PN}-dbg += "${libdir}/gobject-introspection/giscanner/.debug/" -FILES_${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a" - # we need target versions of introspection tools in sysroot so that they can be run via qemu # when building introspection files in other packages SYSROOT_DIRS_append_class-target = " ${bindir}" @@ -162,13 +156,6 @@ gi_binaries_sysroot_preprocess() { ${SYSROOT_DESTDIR}${libdir}/pkgconfig/gobject-introspection-1.0.pc } -# Need to ensure ld.so.conf exists so prelink-native works -# both before we build and if we install from sstate -do_configure[prefuncs] += "gobject_introspection_preconfigure" -python gobject_introspection_preconfigure () { - oe.utils.write_ld_so_conf(d) -} - SYSROOT_PREPROCESS_FUNCS_append = " gi_ldsoconf_sysroot_preprocess" gi_ldsoconf_sysroot_preprocess () { mkdir -p ${SYSROOT_DESTDIR}${bindir} @@ -188,3 +175,30 @@ gi_package_preprocess() { rm -f ${PKGD}${bindir}/g-ir-compiler-wrapper rm -f ${PKGD}${bindir}/g-ir-scanner-lddwrapper } + +SSTATE_SCAN_FILES += "g-ir-scanner-qemuwrapper g-ir-scanner-wrapper g-ir-compiler-wrapper g-ir-scanner-lddwrapper Gio-2.0.gir postinst-ldsoconf-${PN}" + +# .typelib files are needed at runtime and so they go to the main package +FILES_${PN}_append = " ${libdir}/girepository-*/*.typelib" + +# .gir files go to dev package, as they're needed for developing (but not for running) +# things that depends on introspection. +FILES_${PN}-dev_append = " ${datadir}/gir-*/*.gir ${libdir}/gir-*/*.gir" +FILES_${PN}-dev_append = " ${datadir}/gir-*/*.rnc" + +# These are used by gobject-based packages +# to generate transient introspection binaries +FILES_${PN}-dev_append = " ${datadir}/gobject-introspection-1.0/gdump.c \ + ${datadir}/gobject-introspection-1.0/Makefile.introspection" + +# These are used by dependent packages (e.g. pygobject) to build their +# testsuites. +FILES_${PN}-dev_append = " ${datadir}/gobject-introspection-1.0/tests/*.c \ + ${datadir}/gobject-introspection-1.0/tests/*.h" + +FILES_${PN}-dbg += "${libdir}/gobject-introspection/giscanner/.debug/" +FILES_${PN}-staticdev += "${libdir}/gobject-introspection/giscanner/*.a" + +RDEPENDS_${PN} = "python3-pickle python3-xml" + +BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.24.1.bb b/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.28.0.bb index b61fd2408..c2b3cd895 100644 --- a/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.24.1.bb +++ b/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.28.0.bb @@ -9,5 +9,5 @@ DEPENDS = "glib-2.0 intltool-native" inherit gnomebase gsettings gettext gobject-introspection upstream-version-is-even -SRC_URI[archive.md5sum] = "796b6ac1eff450261edd521b72e7fe6d" -SRC_URI[archive.sha256sum] = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7" +SRC_URI[archive.md5sum] = "370610e29b37d063ede3ef0f29c06eb9" +SRC_URI[archive.sha256sum] = "4cb4cd7790b77e5542ec75275237613ad22f3a1f2f41903a298cf6cc996a9167" diff --git a/poky/meta/recipes-gnome/gtk+/gtk+.inc b/poky/meta/recipes-gnome/gtk+/gtk+.inc index 558bc485a..14ed8d812 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+.inc +++ b/poky/meta/recipes-gnome/gtk+/gtk+.inc @@ -90,6 +90,10 @@ do_install () { install -m 0644 ${S}/gtk/gtkfilesystemmodel.h ${D}${includedir}/gtk-2.0/gtk/ mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-2.0 + + # duplicate gtk-query-immodules for post install script update_gtk_immodules_cache + mkdir -p ${D}${libexecdir} + ln ${D}${bindir}/gtk-query-immodules-2.0 ${D}${libexecdir}/${MLPREFIX}gtk-query-immodules-2.0 } SYSROOT_PREPROCESS_FUNCS += "gtk_sysroot_preprocess" diff --git a/poky/meta/recipes-gnome/gtk+/gtk+/0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch b/poky/meta/recipes-gnome/gtk+/gtk+/0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch new file mode 100644 index 000000000..83be39c3b --- /dev/null +++ b/poky/meta/recipes-gnome/gtk+/gtk+/0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch @@ -0,0 +1,29 @@ +From 34ce93e1c50bfb88f92a687d4f82de55584f3f6a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 11 Apr 2018 14:20:39 +0300 +Subject: [PATCH] Do not look into $HOME when looking for gtk modules + +On the host it causes host contamination, on the target it's a +potential security issue. Gtk+3 has already removed this. + +Upstream-Status: Inappropriate [gtk2 is in maintenance mode] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + gtk/gtkmodules.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c +index 50729b6..e09b583 100644 +--- a/gtk/gtkmodules.c ++++ b/gtk/gtkmodules.c +@@ -65,10 +65,6 @@ get_module_path (void) + if (result) + return result; + +- home_dir = g_get_home_dir(); +- if (home_dir) +- home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL); +- + module_path_env = g_getenv ("GTK_PATH"); + exe_prefix = g_getenv ("GTK_EXE_PREFIX"); + diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3.inc b/poky/meta/recipes-gnome/gtk+/gtk+3.inc index 420ead2ca..6331a4323 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/poky/meta/recipes-gnome/gtk+/gtk+3.inc @@ -53,6 +53,10 @@ PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,way do_install_append() { mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 + + # duplicate gtk-query-immodules for post install script update_gtk_immodules_cache + mkdir -p ${D}${libexecdir} + ln ${D}${bindir}/gtk-query-immodules-3.0 ${D}${libexecdir}/${MLPREFIX}gtk-query-immodules-3.0 } PACKAGES =+ "${PN}-demo" diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3_3.22.28.bb b/poky/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb index 864e8260c..697b51854 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3_3.22.28.bb +++ b/poky/meta/recipes-gnome/gtk+/gtk+3_3.22.30.bb @@ -7,8 +7,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ file://0003-Add-disable-opengl-configure-option.patch \ " -SRC_URI[md5sum] = "8c1f5ab987ddc7dab3e59660f89dcd9b" -SRC_URI[sha256sum] = "d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f" +SRC_URI[md5sum] = "61e60dc073e0a6893c72043d20579dc0" +SRC_URI[sha256sum] = "a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567" S = "${WORKDIR}/gtk+-${PV}" diff --git a/poky/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb b/poky/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb index 20703588c..89fca736b 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb +++ b/poky/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb @@ -10,7 +10,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ file://toggle-font.diff;striplevel=0 \ file://doc-fixes.patch \ file://strict-prototypes.patch \ - " + file://0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch \ + " SRC_URI[md5sum] = "d5742aa42275203a499b59b4c382a784" SRC_URI[sha256sum] = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e" diff --git a/poky/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.28.bb b/poky/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.30.bb index 942c04717..28e7a312d 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.28.bb +++ b/poky/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.30.bb @@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch" -SRC_URI[md5sum] = "8c1f5ab987ddc7dab3e59660f89dcd9b" -SRC_URI[sha256sum] = "d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f" +SRC_URI[md5sum] = "61e60dc073e0a6893c72043d20579dc0" +SRC_URI[sha256sum] = "a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ diff --git a/poky/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch b/poky/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch index 2fe3ab922..19e05f1b9 100644 --- a/poky/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch +++ b/poky/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch @@ -1,7 +1,7 @@ -From 928102874bc2339a1d57c6b178877e0c6002cb3a Mon Sep 17 00:00:00 2001 +From 80e6aff72affa6d92f5abd7ff6353dfc4a7bff38 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 31 Aug 2016 16:44:46 +0300 -Subject: [PATCH 1/3] Do not hardocode paths to perl/python in scripts. +Subject: [PATCH] Do not hardocode paths to perl/python in scripts. Doing so when the interpreters are somewhere deep in a sysroot directory can reach the shebang line limit, and resulting scripts wouldn't work @@ -35,7 +35,7 @@ index 8c8e917..f6a25f6 100755 # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in -index 9bfaf30..aadc952 100644 +index 9bfaf30..aadc952 100755 --- a/gtkdoc-depscan.in +++ b/gtkdoc-depscan.in @@ -1,4 +1,4 @@ @@ -45,7 +45,7 @@ index 9bfaf30..aadc952 100644 from __future__ import print_function diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in -index 0ea02d4..bdd443a 100755 +index 44f6bd1..26fbd93 100755 --- a/gtkdoc-fixxref.in +++ b/gtkdoc-fixxref.in @@ -1,4 +1,4 @@ @@ -65,7 +65,7 @@ index 42d5731..3a56d56 100755 # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in -index 0d0a15d..914ff55 100644 +index 0d0a15d..914ff55 100755 --- a/gtkdoc-mkhtml.in +++ b/gtkdoc-mkhtml.in @@ -1,4 +1,4 @@ @@ -75,7 +75,7 @@ index 0d0a15d..914ff55 100644 # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-mkman.in b/gtkdoc-mkman.in -index c5445cd..65db71a 100644 +index c5445cd..65db71a 100755 --- a/gtkdoc-mkman.in +++ b/gtkdoc-mkman.in @@ -1,4 +1,4 @@ @@ -115,7 +115,7 @@ index 954c811..f461504 100755 # # gtk-doc - GTK DocBook documentation generator. diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in -index 4cbe130..52c2c24 100644 +index 4cbe130..52c2c24 100755 --- a/gtkdoc-scangobj.in +++ b/gtkdoc-scangobj.in @@ -1,4 +1,4 @@ @@ -125,18 +125,15 @@ index 4cbe130..52c2c24 100644 # # gtk-doc - GTK DocBook documentation generator. diff --git a/tests/tools.sh.in b/tests/tools.sh.in -index 4d301d0..565fc1e 100644 +index 343844a..9dc6692 100644 --- a/tests/tools.sh.in +++ b/tests/tools.sh.in -@@ -31,7 +31,7 @@ done - # TODO: test python 2 and 3 (python3 -mcompileall gtkdoc/*.py) - for file in gtkdoc-check gtkdoc-depscan gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mkhtml gtkdoc-mkman gtkdoc-mkpdf gtkdoc-rebase gtkdoc-scangobj; do +@@ -30,7 +30,7 @@ done + # TODO: also test the module files + for file in gtkdoc-check gtkdoc-depscan gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mkhtml gtkdoc-mkhtml2 gtkdoc-mkman gtkdoc-mkpdf gtkdoc-rebase gtkdoc-scangobj; do fullfile=`which $file` - @PYTHON@ -m py_compile $fullfile + python3 -m py_compile $fullfile if test $? != 0 ; then failed=`expr $failed + 1`; fi tested=`expr $tested + 1` done --- -2.14.1 - diff --git a/poky/meta/recipes-gnome/gtk-doc/files/no-clobber.patch b/poky/meta/recipes-gnome/gtk-doc/files/no-clobber.patch index 0fa22b209..d1695479d 100644 --- a/poky/meta/recipes-gnome/gtk-doc/files/no-clobber.patch +++ b/poky/meta/recipes-gnome/gtk-doc/files/no-clobber.patch @@ -1,3 +1,8 @@ +From 8bc4c1f169f89bc5531da5b7e892b8f20e0f9a18 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Wed, 21 Mar 2018 14:47:29 +0000 +Subject: [PATCH] gtk-doc: don't regenerate gtk-doc in do_install + In out-of-tree builds gtk-doc's setup-build target copies all the content from $srcdir to $builddir. However, if some of this content is regenerated at configure time this can happen: @@ -16,12 +21,20 @@ files which don't already exist. Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=794571] Signed-off-by: Ross Burton <ross.burton@intel.com> -diff --git a/gtk-doc.make b/gtk-doc.make -index f87eaab..246f3c0 100644 ---- a/gtk-doc.make -+++ b/gtk-doc.make -@@ -113,3 +113,3 @@ setup-build.stamp: +--- + buildsystems/autotools/gtk-doc.make | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/buildsystems/autotools/gtk-doc.make b/buildsystems/autotools/gtk-doc.make +index 7d9a27f..8cb336d 100644 +--- a/buildsystems/autotools/gtk-doc.make ++++ b/buildsystems/autotools/gtk-doc.make +@@ -111,7 +111,7 @@ setup-build.stamp: + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ - cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + cp -pn $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ + fi; \ + fi diff --git a/poky/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch b/poky/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch index bfbc777ff..9b128e1ce 100644 --- a/poky/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +++ b/poky/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch @@ -1,7 +1,7 @@ -From 5f145621b4780cfd6a5632fcc97c45f572938efc Mon Sep 17 00:00:00 2001 +From 04af15322f677db42ecc2acc465334a04de9a871 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Mon, 5 Sep 2016 22:25:44 +0100 -Subject: [PATCH 5/5] Use native pkg-config when looking for gtk-doc. +Subject: [PATCH] Use native pkg-config when looking for gtk-doc. Upstream-Status: Inappropriate Signed-off-by: Ross Burton <ross.burton@intel.com> @@ -10,10 +10,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> gtk-doc.m4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -Index: gtk-doc-1.27/gtk-doc.m4 -=================================================================== ---- gtk-doc-1.27.orig/gtk-doc.m4 -+++ gtk-doc-1.27/gtk-doc.m4 +diff --git a/gtk-doc.m4 b/gtk-doc.m4 +index 2d12f01..e5afc3f 100644 +--- a/buildsystems/autotools/gtk-doc.m4 ++++ b/buildsystems/autotools/gtk-doc.m4 @@ -25,7 +25,7 @@ # Macro appear in them. The GNU General Public License (GPL) does govern # all other use of the material that constitutes the Autoconf Macro. diff --git a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.29.bb index 45528111c..2c4ee175a 100644 --- a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb +++ b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.29.bb @@ -18,8 +18,8 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation", PACKAGECONFIG[working-scripts] = "--with-highlight=source-highlight,--with-highlight=no,libxslt-native xmlto-native source-highlight-native python3-six" PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0" -SRC_URI[archive.md5sum] = "b29949e0964762e474b706ce22171602" -SRC_URI[archive.sha256sum] = "e26bd3f7080c749b1cb66c46c6bf8239e2f320a949964fb9c6d56e1b0c6d9a6f" +SRC_URI[archive.md5sum] = "df26a38c209b3d7358f26268fcbdb9e3" +SRC_URI[archive.sha256sum] = "14578e002496567276d310a62c9ffd6c56ee8806ce5079ffb0b81c4111f586b1" SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ file://conditionaltests.patch \ diff --git a/poky/meta/recipes-gnome/libsecret/libsecret_0.18.5.bb b/poky/meta/recipes-gnome/libsecret/libsecret_0.18.6.bb index 2b917ec51..518c71feb 100644 --- a/poky/meta/recipes-gnome/libsecret/libsecret_0.18.5.bb +++ b/poky/meta/recipes-gnome/libsecret/libsecret_0.18.6.bb @@ -8,11 +8,13 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native intltool-native" PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" -SRC_URI[archive.md5sum] = "2d688825921313da8731313b0a7f394c" -SRC_URI[archive.sha256sum] = "9ce7bd8dd5831f2786c935d82638ac428fa085057cc6780aba0e39375887ccb3" +SRC_URI[archive.md5sum] = "c6cf132a56bd346fbf49a43abb02e5c2" +SRC_URI[archive.sha256sum] = "5efbc890ba41a323ffe0599cd260fd12bd8eb62a04aa1bd1b2762575d253d66f" # http://errors.yoctoproject.org/Errors/Details/20228/ -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "arm" # vapigen.m4 bundled with the tarball does not yet have our cross-compilation fixes do_configure_prepend() { |