diff options
Diffstat (limited to 'poky/meta/recipes-gnome')
26 files changed, 104 insertions, 370 deletions
diff --git a/poky/meta/recipes-gnome/epiphany/epiphany_3.36.4.bb b/poky/meta/recipes-gnome/epiphany/epiphany_3.38.1.bb index 4c3b18331..f9daa8bfe 100644 --- a/poky/meta/recipes-gnome/epiphany/epiphany_3.36.4.bb +++ b/poky/meta/recipes-gnome/epiphany/epiphany_3.38.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ gsettings-desktop-schemas libxml2-native \ - glib-2.0 glib-2.0-native json-glib libdazzle libhandy" + glib-2.0 glib-2.0-native json-glib libdazzle libhandy libportal" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings features_check upstream-version-is-even gettext mime-xdg @@ -14,7 +14,7 @@ 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.sha256sum] = "588a75b1588f5a509c33cf0be6a38a0f4fc1748eeb499a51d991ddef485242bf" +SRC_URI[archive.sha256sum] = "59b7576acb11fbb52eaca6dbf6fce28664de5c915ca2580c47f0b08ba83d2843" 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 d4f3cc1d3..118b5d182 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,4 +1,4 @@ -From 0048ae2d225d25cc58f378718ca6f9ddb1a228f9 Mon Sep 17 00:00:00 2001 +From 3725c254f1d1d8204fa299e71c1e2bfd0ff6a634 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] help/meson.build: disable the use of yelp @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/help/meson.build b/help/meson.build -index fddcf4c..f7d76c6 100644 +index 484860c..d9b2e80 100644 --- a/help/meson.build +++ b/help/meson.build @@ -32,7 +32,7 @@ help_media = [ - 'media/web-browser.png' + 'media/epiphany-private-3-36.png' ] -gnome.yelp(meson.project_name(), diff --git a/poky/meta/recipes-gnome/gcr/gcr/0001-meson-Make-sure-gcr-oids.h-is-built.patch b/poky/meta/recipes-gnome/gcr/gcr/0001-meson-Make-sure-gcr-oids.h-is-built.patch deleted file mode 100644 index 4bf5bfba9..000000000 --- a/poky/meta/recipes-gnome/gcr/gcr/0001-meson-Make-sure-gcr-oids.h-is-built.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9fca6ae0aa7355c27d0922c561b9fbe18dde5b3d Mon Sep 17 00:00:00 2001 -From: Niels De Graef <nielsdegraef@gmail.com> -Date: Fri, 19 Jun 2020 22:37:31 +0200 -Subject: [PATCH 1/1] meson: Make sure gcr-oids.h is built - -Fixes https://gitlab.gnome.org/GNOME/gcr/-/issues/48 ---- - gcr/meson.build | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- end of original header --- - -Upstream-Status: Backport [https://github.com/GNOME/gcr.git] - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - ---- -diff --git a/gcr/meson.build b/gcr/meson.build -index 199452f..06c3a63 100644 ---- a/gcr/meson.build -+++ b/gcr/meson.build -@@ -178,7 +178,10 @@ endif - gcr_base_dep = declare_dependency( - link_with: gcr_base_lib, - include_directories: include_directories('..'), -- sources: gcr_enums_gen[1], # Make sure gcr-enum-types-base.h can be included -+ sources: [ -+ gcr_enums_gen[1], -+ gcr_oids[1], -+ ], - ) - - if get_option('introspection') --- -2.7.4 - diff --git a/poky/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch b/poky/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch deleted file mode 100644 index b484a1b22..000000000 --- a/poky/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ebb77dad4563b882b449cbc5e882f36ac8c2de71 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 11 May 2020 22:19:16 +0000 -Subject: [PATCH] meson.build: correctly set internal vapi dependencies - -If they are set as strings, meson will supply the right -arguments to vapigen, but will not set the ninja dependencies -to ensure they get built first, and so races will occur: -https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1881/steps/8/logs/step1b - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/55] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - gcr/meson.build | 2 +- - ui/meson.build | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gcr/meson.build b/gcr/meson.build -index 254a933..199452f 100644 ---- a/gcr/meson.build -+++ b/gcr/meson.build -@@ -203,7 +203,7 @@ if get_option('introspection') - - gcr_vapi = gnome.generate_vapi('gcr-@0@'.format(gcr_major_version), - sources: gcr_gir[0], -- packages: [ 'glib-2.0', 'gio-2.0', 'gck-@0@'.format(gck_major_version) ], -+ packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ], - metadata_dirs: meson.current_source_dir(), - vapi_dirs: [ - build_root / 'gck', -diff --git a/ui/meson.build b/ui/meson.build -index 5ca3753..477412d 100644 ---- a/ui/meson.build -+++ b/ui/meson.build -@@ -174,8 +174,8 @@ if get_option('introspection') - packages: [ - 'glib-2.0', - 'gio-2.0', -- 'gck-@0@'.format(gck_major_version), -- 'gcr-@0@'.format(gcr_major_version), -+ gck_vapi, -+ gcr_vapi, - 'gtk+-3.0' - ], - metadata_dirs: meson.current_source_dir(), diff --git a/poky/meta/recipes-gnome/gcr/gcr_3.36.0.bb b/poky/meta/recipes-gnome/gcr/gcr_3.38.0.bb index ff455a68e..49e8f1848 100644 --- a/poky/meta/recipes-gnome/gcr/gcr_3.36.0.bb +++ b/poky/meta/recipes-gnome/gcr/gcr_3.38.0.bb @@ -17,11 +17,7 @@ inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even # depends on gtk+3, but also x11 through gtk+-x11 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += " file://0001-meson.build-correctly-set-internal-vapi-dependencies.patch" -SRC_URI += " file://0001-meson-Make-sure-gcr-oids.h-is-built.patch" - -SRC_URI[archive.md5sum] = "adc65563b6b458507b9a578a8b68fb61" -SRC_URI[archive.sha256sum] = "aaf9bed017a2263c6145c89a1a84178f9f40f238426463e4ae486694ef5f6601" +SRC_URI[archive.sha256sum] = "a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1" FILES_${PN} += " \ ${datadir}/dbus-1 \ 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 5da3fbf6d..c8c70c4b5 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,4 +1,4 @@ -From 0a867caa8803a78f7cf3a204c4c358bc63daaf28 Mon Sep 17 00:00:00 2001 +From 8b3b153b6b95662316528ef083365b46cf5f7841 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] Don't use AC_CANONICAL_HOST @@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index e749112..58790e8 100644 +index 449865d..888649e 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,6 @@ AC_PREREQ(2.53) - AC_INIT([adwaita-icon-theme], [3.36.1], + AC_INIT([adwaita-icon-theme], [3.38.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.36.1.bb b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb index 2d78bea2c..ff557978d 100644 --- a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.36.1.bb +++ b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.38.0.bb @@ -16,8 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://0001-Run-installation-commands-as-shell-jobs.patch \ " -SRC_URI[md5sum] = "c61ca9d6b3ce70a9ab66dcff945923ff" -SRC_URI[sha256sum] = "e498518627044dfd7db7d79a5b3d437848caf1991ef4ef036a2d3a2ac2c1f14d" +SRC_URI[sha256sum] = "6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97" DEPENDS += "librsvg-native" diff --git a/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb index ff365551d..ade93644e 100644 --- a/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb +++ b/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb @@ -3,7 +3,7 @@ DESCRIPTION = "GConf is a system for storing application preferences. \ It is intended for user preferences; not configuration of something like \ Apache, or arbitrary data storage." SECTION = "x11/gnome" -HOMEPAGE = "https://projects.gnome.org/gconf/" +HOMEPAGE = "https://gitlab.gnome.org/Archive/gconf" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" 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 index 9d6f5dea3..185ebc154 100644 --- 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 @@ -1,4 +1,4 @@ -From 8dfb44450ca9fffc15977e95eadcb7054ab60a9a Mon Sep 17 00:00:00 2001 +From 41c3ee549787333a073a3ce6303efef625c74dce 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 @@ -21,7 +21,7 @@ Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de> 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/girepository/girepository.c b/girepository/girepository.c -index b7948d6..39a2586 100644 +index 7d03485..20f4813 100644 --- a/girepository/girepository.c +++ b/girepository/girepository.c @@ -21,6 +21,8 @@ @@ -62,10 +62,10 @@ index b7948d6..39a2586 100644 typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); diff --git a/girepository/meson.build b/girepository/meson.build -index 204659f..3e61d31 100644 +index c8ef6aa..b85ff7f 100644 --- a/girepository/meson.build +++ b/girepository/meson.build -@@ -44,7 +44,7 @@ girepo_internals_lib = static_library('girepository-internals', +@@ -45,7 +45,7 @@ girepo_internals_lib = static_library('girepository-internals', ], c_args: gi_hidden_visibility_cflags + custom_c_args, include_directories : configinc, diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch deleted file mode 100644 index fc37a5bb9..000000000 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 56ba5656258b82dbc069ab3a61e597c931a16a83 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 17 Jun 2020 11:43:16 +0200 -Subject: [PATCH] gir: add a dependency for g-ir-compiler for building .girs - -meson inserts the dependency if the compiler is used directly, but -fails to do so if the compiler is run through a wrapper. This leads -to build race errors between building the compiler and using it. - -Fix provided by Quentin Schulz <quentin.schulz@streamunlimited.com> - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/228] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - gir/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gir/meson.build b/gir/meson.build -index b37fdb81..557e5517 100644 ---- a/gir/meson.build -+++ b/gir/meson.build -@@ -448,7 +448,7 @@ foreach gir : gir_files - typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), - input: gir, - output: '@BASENAME@.typelib', -- depends: [gobject_gir, ], -+ depends: [gobject_gir, gircompiler, ], - command: gircompiler_command, - install: true, - install_dir: typelibdir, --- -2.27.0 - diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch new file mode 100644 index 000000000..8fba0124c --- /dev/null +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch @@ -0,0 +1,25 @@ +From ef5446af0ddad6a341b47957097ac40c6cb5e6d3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 20 Oct 2020 22:40:14 +0200 +Subject: [PATCH] meson.build: exclude girepo_dep if introspection data is + disabled + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/248] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 14af2b1..a3c27c3 100644 +--- a/meson.build ++++ b/meson.build +@@ -283,7 +283,7 @@ pkg.generate( + # FIXME: meson.override_dependency() and declare_dependency()'s variable arguments + # are new in Meson 0.54.0, older versions of Meson won't be able to use g-i as + # subproject anyway +-if meson.version().version_compare('>=0.54.0') ++if meson.version().version_compare('>=0.54.0') and get_option('build_introspection_data') == true + girepo_dep = declare_dependency( + sources: typelibs, + dependencies: girepo_dep, diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb index 4d80f00e1..ee0ab2866 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb @@ -15,11 +15,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ - file://0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch \ + file://0001-meson.build-exclude-girepo_dep-if-introspection-data.patch \ " -SRC_URI[md5sum] = "3419dfd086efcf83768e0579ab6abd2b" -SRC_URI[sha256sum] = "80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7" +SRC_URI[sha256sum] = "dd44a55ee5f426ea22b6b89624708f9e8d53f5cc94e5485c15c87cb30e06161d" SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" @@ -48,7 +47,7 @@ PACKAGECONFIG[doctool] = "-Ddoctool=enabled,-Ddoctool=disabled,python3-mako," # Configure target build to use native tools of itself and to use a qemu wrapper # and optionally to generate introspection data EXTRA_OEMESON_class-target = " \ - -Dgi_cross_use_host_gi=true \ + -Dgi_cross_use_prebuilt_gi=true \ -Dgi_cross_binary_wrapper=${B}/g-ir-scanner-qemuwrapper \ -Dgi_cross_ldd_wrapper=${B}/g-ir-scanner-lddwrapper \ -Dgi_cross_pkgconfig_sysroot_path=${PKG_CONFIG_SYSROOT_DIR} \ diff --git a/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas/0001-Do-not-skip-gir-installation-for-cross-compiling.patch b/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas/0001-Do-not-skip-gir-installation-for-cross-compiling.patch deleted file mode 100644 index c481b18f1..000000000 --- a/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas/0001-Do-not-skip-gir-installation-for-cross-compiling.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 42e58c4c3e95a4a78ee8294f9b3901726bbbabe4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sat, 11 May 2019 00:21:11 +0200 -Subject: [PATCH] Do not skip gir installation for cross compiling -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We are cool and can handle cross gobject-introspection. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - headers/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/headers/meson.build b/headers/meson.build -index 3ce8b61..1132695 100644 ---- a/headers/meson.build -+++ b/headers/meson.build -@@ -19,7 +19,7 @@ enums_xml = custom_target( - install: true, - install_dir: schemasdir) - --if not meson.is_cross_build() and get_option('introspection') -+if get_option('introspection') - noinst_lib = shared_library('noinst', - headers, - install: false) --- -2.20.1 - diff --git a/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.36.1.bb b/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.38.0.bb index f54b242e7..34681197d 100644 --- a/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.36.1.bb +++ b/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.38.0.bb @@ -13,6 +13,4 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even -SRC_URI[archive.md5sum] = "708ddd8dec388ebda5539667604197c3" -SRC_URI[archive.sha256sum] = "004bdbe43cf8290f2de7d8537e14d8957610ca479a4fa368e34dbd03f03ec9d9" -SRC_URI += "file://0001-Do-not-skip-gir-installation-for-cross-compiling.patch" +SRC_URI[archive.sha256sum] = "5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67" diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.22.bb b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.23.bb index 6af2bd94c..338b7030e 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.22.bb +++ b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.23.bb @@ -8,7 +8,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ " -SRC_URI[sha256sum] = "bf18a4a5dff28a7b02aaef1b949c2d09c96c18387eddab152bb4cd55a5b67dda" +SRC_URI[sha256sum] = "5d864d248357a2251545b3387b35942de5f66e4c66013f0962eb5cb6f8dae2b1" S = "${WORKDIR}/gtk+-${PV}" 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 5ca4e3e08..1d260aa72 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,4 +1,4 @@ -From 657310f3842c84d28f6b77e8ad4d9b93472ca5da Mon Sep 17 00:00:00 2001 +From ebb0f7313a0931f646e86badce2627eff2fa37a8 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] Use native pkg-config when looking for gtk-doc. diff --git a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.1.bb index 1eaf370ab..5f9fe0a91 100644 --- a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb +++ b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Documentation generator for glib-based software" DESCRIPTION = "Gtk-doc is a set of scripts that extract specially formatted comments \ from glib-based software and produce a set of html documentation files from them" -HOMEPAGE = "http://www.gtk.org/gtk-doc/" +HOMEPAGE = "https://www.gtk.org/docs/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" @@ -18,8 +18,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation", PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments" PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0" -SRC_URI[archive.md5sum] = "07764836262e154e94922e5f2aa476ae" -SRC_URI[archive.sha256sum] = "de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c" +SRC_URI[archive.sha256sum] = "a5cfed2a0b73a09b796fff80ad6d8f040ab2b2655bdc941ac207ffe6d9c10f10" 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 \ @@ -59,4 +58,3 @@ gtkdoc_makefiles_sysroot_preprocess() { -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \ ${SYSROOT_DESTDIR}${datadir}/gtk-doc/data/gtk-doc*make } - diff --git a/poky/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch b/poky/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch new file mode 100644 index 000000000..0eb724418 --- /dev/null +++ b/poky/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch @@ -0,0 +1,30 @@ +From 0f06c4cb4a57083c08312144b03c8346cf620be6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 30 Oct 2020 22:15:29 +0000 +Subject: [PATCH] json-glib/json-enum-types.c.in: fix build reproducibility + +Changes the comment and include to reference the file basename +instead of the full path. This ensures that the generated file is +reproducible when it is included in source packages meant for debugging. + +Upstream-Status: Backport [6f3842abd5dff68b6ee5f2ef48a4ebf1cbebf434] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + json-glib/json-enum-types.c.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/json-glib/json-enum-types.c.in b/json-glib/json-enum-types.c.in +index da07c46..7b39290 100644 +--- a/json-glib/json-enum-types.c.in ++++ b/json-glib/json-enum-types.c.in +@@ -9,8 +9,8 @@ + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ +-#include "@filename@" ++/* enumerations from "@basename@" */ ++#include "@basename@" + + /*** END file-production ***/ + diff --git a/poky/meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch b/poky/meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch deleted file mode 100644 index 2a834b674..000000000 --- a/poky/meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d60fcd5bd5c2675e4342775b910a2ea48ec0eccb Mon Sep 17 00:00:00 2001 -From: Dimitry Andric <dim@FreeBSD.org> -Date: Wed, 19 Aug 2020 03:35:16 +0000 -Subject: [PATCH] scanner: use macro instead of cast to convert pointer to integer - -Clang 11 build failed due to a new warning (part of -Werror=pointer-to-int-cast): -../json-glib/json-scanner.c:928:13: error: cast to smaller integer type 'GTokenType' from 'gpointer' (aka 'void *') [-Werror,-Wvoid-pointer-to-enum-cast] - *token_p = (GTokenType) value_p->v_symbol; - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/json-glib/-/commit/8c5fabe962b7337066dac7a697d23fce257a5d64] -Signed-off-by: Jan Beich <jbeich@FreeBSD.org> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - json-glib/json-scanner.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/json-glib/json-scanner.c b/json-glib/json-scanner.c -index 0c9919f..59dd29c 100644 ---- a/json-glib/json-scanner.c -+++ b/json-glib/json-scanner.c -@@ -925,7 +925,7 @@ json_scanner_get_token_i (JsonScanner *scanner, - - case G_TOKEN_SYMBOL: - if (scanner->config->symbol_2_token) -- *token_p = (GTokenType) value_p->v_symbol; -+ *token_p = GPOINTER_TO_INT (value_p->v_symbol); - break; - - case G_TOKEN_BINARY: --- -2.28.0 - diff --git a/poky/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb b/poky/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb index add9ff41a..59b060990 100644 --- a/poky/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb +++ b/poky/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb @@ -13,20 +13,19 @@ DEPENDS = "glib-2.0" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase lib_package gobject-introspection gtk-doc gettext ptest-gnome manpages upstream-version-is-even +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = "gtk_doc" +GTKDOC_MESON_ENABLE_FLAG = 'enabled' +GTKDOC_MESON_DISABLE_FLAG = 'disabled' SRC_URI += "file://run-ptest \ - file://0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch \ -" -SRC_URI[archive.md5sum] = "4d4bb9837f6d31e32d0ce658ae135f68" -SRC_URI[archive.sha256sum] = "720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47" + file://0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch" +SRC_URI[archive.sha256sum] = "0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73" +PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" - -do_install_append() { - if ! ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then - rm -rf ${D}${datadir}/installed-tests ${D}${libexecdir} - fi -} +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-gnome/libdazzle/libdazzle_3.36.0.bb b/poky/meta/recipes-gnome/libdazzle/libdazzle_3.38.0.bb index 25ccee2e2..a2a1aed7b 100644 --- a/poky/meta/recipes-gnome/libdazzle/libdazzle_3.36.0.bb +++ b/poky/meta/recipes-gnome/libdazzle/libdazzle_3.38.0.bb @@ -12,8 +12,7 @@ inherit gnomebase upstream-version-is-even vala features_check gobject-introspec DEPENDS = "glib-2.0-native glib-2.0 gtk+3" -SRC_URI[archive.md5sum] = "154be45a6aac020e7d59f477bd7cafcf" -SRC_URI[archive.sha256sum] = "82b31bbf550fc62970c78bf7f9d55e5fae5b8ea13b24fe2d13c8c6039409d958" +SRC_URI[archive.sha256sum] = "e18af28217943bcec106585298a91ec3da48aa3ad62fd0992f23f0c70cd1678f" GIR_MESON_OPTION = 'with_introspection' diff --git a/poky/meta/recipes-gnome/libgudev/libgudev_233.bb b/poky/meta/recipes-gnome/libgudev/libgudev_234.bb index 8bc379ff6..9cea36df5 100644 --- a/poky/meta/recipes-gnome/libgudev/libgudev_233.bb +++ b/poky/meta/recipes-gnome/libgudev/libgudev_234.bb @@ -5,8 +5,7 @@ other programming languages, such as Javascript, because of GObject \ introspection support." HOMEPAGE = "https://wiki.gnome.org/Projects/libgudev" BUGTRACKER = "https://gitlab.gnome.org/GNOME/libgudev/issues" -SRC_URI[archive.sha256sum] = "587c4970eb23f4e2deee2cb1fb7838c94a78c578f41ce12cac0a3f4a80dabb03" -SRC_URI[archive.md5sum] = "d59a317a40aaa02a2226056c0bb4d3e1" +SRC_URI[archive.sha256sum] = "1baeacacf0db42fa073ad5183d1decce9317857416a2b0f82ce3370d711a2e37" DEPENDS = "glib-2.0 udev" diff --git a/poky/meta/recipes-gnome/libhandy/libhandy_git.bb b/poky/meta/recipes-gnome/libhandy/libhandy_1.0.1.bb index 9f7401464..146ef62f4 100644 --- a/poky/meta/recipes-gnome/libhandy/libhandy_git.bb +++ b/poky/meta/recipes-gnome/libhandy/libhandy_1.0.1.bb @@ -3,9 +3,8 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://gitlab.gnome.org/GNOME/${BPN}.git;protocol=https" -SRCREV = "7a193d7692c9c76a1a94f17c4d30b585f77d177c" +SRCREV = "5cee0927b8b39dea1b2a62ec6d19169f73ba06c6" S = "${WORKDIR}/git" -PV = "0.0.13" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' diff --git a/poky/meta/recipes-gnome/libportal/libportal_0.3.bb b/poky/meta/recipes-gnome/libportal/libportal_0.3.bb new file mode 100644 index 000000000..022628b1a --- /dev/null +++ b/poky/meta/recipes-gnome/libportal/libportal_0.3.bb @@ -0,0 +1,13 @@ +SUMMARY = "libportal provides GIO-style async APIs for most Flatpak portals." +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https" +SRCREV = "a609e06d0c4adc5c510cf9ac7b060db3d368e78f" +S = "${WORKDIR}/git" + +GTKDOC_MESON_OPTION = 'gtk_doc' + +inherit meson gtk-doc + +DEPENDS += "glib-2.0 glib-2.0-native" diff --git a/poky/meta/recipes-gnome/libsecret/files/0001-meson-add-option-introspection.patch b/poky/meta/recipes-gnome/libsecret/files/0001-meson-add-option-introspection.patch deleted file mode 100644 index 51ee66f42..000000000 --- a/poky/meta/recipes-gnome/libsecret/files/0001-meson-add-option-introspection.patch +++ /dev/null @@ -1,137 +0,0 @@ -meson: add option introspection - -Add an option 'introspection' for meson which could control whether -build GIR files or not. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/53] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - libsecret/meson.build | 86 ++++++++++++++++++++++--------------------- - meson.build | 1 + - meson_options.txt | 1 + - 3 files changed, 46 insertions(+), 42 deletions(-) - -diff --git a/libsecret/meson.build b/libsecret/meson.build -index 759b5ef..2ee8850 100644 ---- a/libsecret/meson.build -+++ b/libsecret/meson.build -@@ -104,50 +104,52 @@ libsecret_dep = declare_dependency( - ) - - # GObject Introspection --libsecret_gir_sources = [ -- 'secret-attributes.c', -- 'secret-attributes.h', -- 'secret-backend.c', -- 'secret-backend.h', -- 'secret-collection.c', -- 'secret-collection.h', -- 'secret-item.c', -- 'secret-item.h', -- 'secret-methods.c', -- 'secret-password.c', -- 'secret-password.h', -- 'secret-paths.c', -- 'secret-paths.h', -- 'secret-prompt.c', -- 'secret-prompt.h', -- 'secret-retrievable.c', -- 'secret-retrievable.h', -- 'secret-schema.c', -- 'secret-schema.h', -- 'secret-schemas.c', -- 'secret-schemas.h', -- 'secret-service.c', -- 'secret-service.h', -- 'secret-types.h', -- 'secret-value.c', -- 'secret-value.h', --] --libsecret_gir_sources += version_h --libsecret_gir_sources += _enums_generated -- --libsecret_gir = gnome.generate_gir(libsecret, -- sources: libsecret_gir_sources, -- namespace: 'Secret', -- nsversion: api_version_major, -- export_packages: 'libsecret-@0@'.format(api_version_major), -- includes: [ 'GObject-2.0', 'Gio-2.0' ], -- header: 'libsecret/secret.h', -- extra_args: [ '-D SECRET_COMPILATION'], -- install: true, --) -+if with_gir -+ libsecret_gir_sources = [ -+ 'secret-attributes.c', -+ 'secret-attributes.h', -+ 'secret-backend.c', -+ 'secret-backend.h', -+ 'secret-collection.c', -+ 'secret-collection.h', -+ 'secret-item.c', -+ 'secret-item.h', -+ 'secret-methods.c', -+ 'secret-password.c', -+ 'secret-password.h', -+ 'secret-paths.c', -+ 'secret-paths.h', -+ 'secret-prompt.c', -+ 'secret-prompt.h', -+ 'secret-retrievable.c', -+ 'secret-retrievable.h', -+ 'secret-schema.c', -+ 'secret-schema.h', -+ 'secret-schemas.c', -+ 'secret-schemas.h', -+ 'secret-service.c', -+ 'secret-service.h', -+ 'secret-types.h', -+ 'secret-value.c', -+ 'secret-value.h', -+ ] -+ libsecret_gir_sources += version_h -+ libsecret_gir_sources += _enums_generated -+ -+ libsecret_gir = gnome.generate_gir(libsecret, -+ sources: libsecret_gir_sources, -+ namespace: 'Secret', -+ nsversion: api_version_major, -+ export_packages: 'libsecret-@0@'.format(api_version_major), -+ includes: [ 'GObject-2.0', 'Gio-2.0' ], -+ header: 'libsecret/secret.h', -+ extra_args: [ '-D SECRET_COMPILATION'], -+ install: true, -+ ) -+endif - - # Vapi --if with_vapi -+if with_vapi and with_gir - libsecret_vapi = gnome.generate_vapi('libsecret-@0@'.format(api_version_major), - sources: libsecret_gir[0], - metadata_dirs: meson.source_root() / 'libsecret', -diff --git a/meson.build b/meson.build -index a26d046..d22e008 100644 ---- a/meson.build -+++ b/meson.build -@@ -22,6 +22,7 @@ with_gcrypt = get_option('gcrypt') - enable_debug = get_option('debugging') - with_vapi = get_option('vapi') - with_gtkdoc = get_option('gtk_doc') -+with_gir = get_option('introspection') - - # Some variables - config_h_dir = include_directories('.') -diff --git a/meson_options.txt b/meson_options.txt -index c1fda5d..445aeb0 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -3,3 +3,4 @@ option('gcrypt', type: 'boolean', value: true, description: 'With gcrypt and tra - option('debugging', type: 'boolean', value: false, description: 'Turn debugging on/off') - option('vapi', type: 'boolean', value: true, description: 'Create VAPI file.') - option('gtk_doc', type: 'boolean', value: true, description: 'Build reference documentation using gtk-doc') -+option('introspection', type: 'boolean', value: true, description: 'Create GIR file.') --- -2.17.1 - diff --git a/poky/meta/recipes-gnome/libsecret/libsecret_0.20.3.bb b/poky/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb index 533015a1e..96f646018 100644 --- a/poky/meta/recipes-gnome/libsecret/libsecret_0.20.3.bb +++ b/poky/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb @@ -13,10 +13,7 @@ inherit gnomebase gtk-doc vala gobject-introspection manpages DEPENDS += "glib-2.0 libgcrypt gettext-native" -SRC_URI += "file://0001-meson-add-option-introspection.patch" - -SRC_URI[archive.md5sum] = "47c3fdfeb111a87b509ad271e4a6f496" -SRC_URI[archive.sha256sum] = "4fcb3c56f8ac4ab9c75b66901fb0104ec7f22aa9a012315a14c0d6dffa5290e4" +SRC_URI[archive.sha256sum] = "325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28" GTKDOC_MESON_OPTION = 'gtk_doc' |