gtkmm3: add gdk-pixbuf-native to satisfy meson 0.61
PATCH 1/19 gtkmm3: add gdk-pixbuf-native to satisfy meson 0.61
This version of meson checks for gkd-pixbuf utilities regardless of whether demos are enabled or not.
--- meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb +1 -1
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1 & GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "glib-2.0-native atkmm pangomm glibmm gtk+3 cairomm" +DEPENDS = "glib-2.0-native atkmm pangomm glibmm gtk+3 cairomm gdk-pixbuf-native" BPN = "gtkmm"
Signature · 1 line
2.20.1
PATCH 2/19 gjs: drop patch to satisfy meson 0.61
With this version of meson the patch is no longer needed.
--- ...r-install-via-list-to-pacify-meson-0.patch | 79 ------------------- meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb | 1 - 2 files changed, 80 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gjs/gjs/0001-build-disable-gir-install-via-list-to-pacify-meson-0.patch
meta-gnome/recipes-gnome/gjs/gjs/0001-build-disable-gir-install-via-list-to-pacify-meson-0.patch deleted +0 -79
@@ -1,79 +0,0 @@ -From 4c8c84941146715d9c7077e8c5625490332d8bc5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 10 Dec 2021 09:32:17 -0800 -Subject: [PATCH] build: disable gir install via list to pacify meson >= 0.60.2 - -Fixes -../gjs-1.70.0/meson.build:564:0: ERROR: "install_dir" must be specified when installing a target - -see meson bug -https://github.com/mesonbuild/meson/issues/9472 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <[email protected]> ---- - installed-tests/js/libgjstesttools/meson.build | 2 +- - installed-tests/js/meson.build | 6 +++--- - meson.build | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/installed-tests/js/libgjstesttools/meson.build b/installed-tests/js/libgjstesttools/meson.build -index 2e57483..3ca4d7e 100644 ---- a/installed-tests/js/libgjstesttools/meson.build -+++ b/installed-tests/js/libgjstesttools/meson.build -@@ -14,7 +14,7 @@ gjstest_tools_gir = gnome.generate_gir(libgjstesttools, - includes: ['GObject-2.0', 'Gio-2.0'], sources: gjstest_tools_sources, - namespace: 'GjsTestTools', nsversion: '1.0', - symbol_prefix: 'gjs_test_tools_', extra_args: '--warn-error', -- install: get_option('installed_tests'), install_dir_gir: false, -+ install: get_option('installed_tests'), install_dir_gir: [false], - install_dir_typelib: installed_tests_execdir) - gjstest_tools_typelib = gjstest_tools_gir[1] - libgjstesttools_dep = declare_dependency( -diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build -index b42f3b2..1085e2f 100644 ---- a/installed-tests/js/meson.build -+++ b/installed-tests/js/meson.build -@@ -74,7 +74,7 @@ regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes, - sources: regress_sources, namespace: 'Regress', nsversion: '1.0', - identifier_prefix: 'Regress', symbol_prefix: 'regress_', - extra_args: ['--warn-all', '--warn-error'] + regress_gir_c_args, -- install: get_option('installed_tests'), install_dir_gir: false, -+ install: get_option('installed_tests'), install_dir_gir: [false], - install_dir_typelib: installed_tests_execdir) - regress_typelib = regress_gir[1] - -@@ -91,7 +91,7 @@ if not skip_warnlib - warnlib_gir = gnome.generate_gir(libwarnlib, includes: ['Gio-2.0'], - sources: warnlib_sources, namespace: 'WarnLib', nsversion: '1.0', - symbol_prefix: 'warnlib_', header: 'warnlib.h', -- install: get_option('installed_tests'), install_dir_gir: false, -+ install: get_option('installed_tests'), install_dir_gir: [false], - install_dir_typelib: installed_tests_execdir) - warnlib_typelib = warnlib_gir[1] - endif -@@ -105,7 +105,7 @@ gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests, - includes: ['Gio-2.0'], sources: gimarshallingtests_sources, - namespace: 'GIMarshallingTests', nsversion: '1.0', - symbol_prefix: 'gi_marshalling_tests_', extra_args: '--warn-error', -- install: get_option('installed_tests'), install_dir_gir: false, -+ install: get_option('installed_tests'), install_dir_gir: [false], - install_dir_typelib: installed_tests_execdir) - gimarshallingtests_typelib = gimarshallingtests_gir[1] - -diff --git a/meson.build b/meson.build -index 192b1b5..076656d 100644 ---- a/meson.build -+++ b/meson.build -@@ -565,7 +565,7 @@ gjs_private_gir = gnome.generate_gir(libgjs, - includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources, - namespace: 'GjsPrivate', nsversion: '1.0', identifier_prefix: 'Gjs', - symbol_prefix: 'gjs_', extra_args: '--warn-error', install: true, -- install_dir_gir: false, install_dir_typelib: pkglibdir / 'girepository-1.0') -+ install_dir_gir: [false], install_dir_typelib: pkglibdir / 'girepository-1.0') - gjs_private_typelib = gjs_private_gir[1] - - ### Build gjs-console interpreter ############################################## --- -2.34.1 -
meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb +0 -1
@@ -12,7 +12,6 @@ SRC_URI[archive.sha256sum] = "4b0629341a318a02374e113ab97f9a9f3325423269fc1e0b04 SRC_URI += " \ file://0001-Support-cross-builds-a-bit-better.patch \ file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \ - file://0001-build-disable-gir-install-via-list-to-pacify-meson-0.patch \ " # gobject-introspection is mandatory and cannot be configured
Signature · 1 line
2.20.1
PATCH 3/19 gnome-terminal: backport a meson 0.61 patch
In reply to Alexander Kanavin--- .../0001-build-Fix-for-newer-meson.patch | 46 +++++++++++++++++++ .../gnome-terminal/gnome-terminal_3.42.2.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-build-Fix-for-newer-meson.patch
meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-build-Fix-for-newer-meson.patch new file +46 -0
@@ -0,0 +1,46 @@ +From f88447850e162c8d514be367db574c6fa2fec2a5 Mon Sep 17 00:00:00 2001 +From: Christian Persch <[email protected]> +Date: Fri, 14 Jan 2022 11:33:32 +0100 +Subject: [PATCH] build: Fix for newer meson + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + data/meson.build | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 79d97e5..e0bcbb9 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -18,7 +18,6 @@ + metainfodir = gt_datadir / 'metainfo' + + i18n.merge_file( +- gt_dns_name + '.metainfo.xml', + input: gt_dns_name + '.metainfo.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -27,7 +26,6 @@ i18n.merge_file( + ) + + i18n.merge_file( +- gt_dns_name + '.Nautilus.metainfo.xml', + input: gt_dns_name + '.Nautilus.metainfo.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -40,7 +38,6 @@ i18n.merge_file( + desktopdatadir = gt_datadir / 'applications' + + i18n.merge_file( +- gt_dns_name + '.desktop', + input: gt_dns_name + '.desktop.in', + output: '@BASENAME@', + type: 'desktop', +@@ -57,4 +54,4 @@ meson.add_install_script( + + # Subdirs + +-subdir('icons') +\ No newline at end of file ++subdir('icons')
meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb +1 -0
@@ -24,6 +24,7 @@ DEPENDS = " \ SRC_URI[archive.sha256sum] = "8a9c8e5ef7a3a73b246a947e1190bb08ec98935af860cf0b3aa2fbf4606817a0" SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" +SRC_URI += " file://0001-build-Fix-for-newer-meson.patch" EXTRA_OEMESON += " \ -Dsearch_provider=false \
Signature · 1 line
2.20.1
PATCH 4/19 gnome-bluetooth: backport a meson 0.61 patch
In reply to Alexander Kanavin--- ...ix-build-for-newer-versions-of-meson.patch | 25 +++++++++++++++++++ .../gnome-bluetooth/gnome-bluetooth_3.34.5.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch
meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 7355664f671bec7852e3c4523d75c27fc77a2eb2 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <[email protected]> +Date: Fri, 7 Jan 2022 12:51:22 +0100 +Subject: [PATCH] build: Fix build for newer versions of meson + +sendto/meson.build:24:5: ERROR: Function does not take positional arguments. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + sendto/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sendto/meson.build b/sendto/meson.build +index 24a4e39..3e233a0 100644 +--- a/sendto/meson.build ++++ b/sendto/meson.build +@@ -22,7 +22,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop,
meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb +1 -0
@@ -18,6 +18,7 @@ REQUIRED_DISTRO_FEATURES = "x11" # gtk-icon-cache bbclass will take care of this for us. EXTRA_OEMESON = "-Dicon_update=false" +SRC_URI += " file://0001-build-Fix-build-for-newer-versions-of-meson.patch" SRC_URI[archive.md5sum] = "d83faa54abaf64bb40b5313bc233e74e" SRC_URI[archive.sha256sum] = "6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9"
Signature · 1 line
2.20.1
PATCH 5/19 gnome-font-viewer: backport a meson 0.61 patch
In reply to Alexander Kanavin--- ...01-Fix-meson-build-with-meson-0.60.0.patch | 40 +++++++++++++++++++ .../gnome-font-viewer_41.0.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch
meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 9c5ce6836498fdb057a7f865f516ce28609f542a Mon Sep 17 00:00:00 2001 +From: r-value <[email protected]> +Date: Thu, 30 Dec 2021 17:14:47 +0800 +Subject: [PATCH] Fix meson build with meson 0.60.0+ + +`i18n.merge_file` has been ignoring positional arguments for a time +and explicitly rejects with error since meson 0.60.0 + +Upstrean-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + data/meson.build | 2 +- + src/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index bfc9caa..8e42134 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,6 +1,6 @@ + appdatadir = join_paths(datadir, 'metainfo') + appdata_file = 'org.gnome.font-viewer.appdata.xml' +-merged_appdata = i18n.merge_file(appdata_file, ++merged_appdata = i18n.merge_file( + input: appdata_file + '.in', + output: appdata_file, + po_dir: '../po', +diff --git a/src/meson.build b/src/meson.build +index f863d45..826c59b 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop' + desktop_conf = configuration_data() + desktop_conf.set('VERSION', meson.project_version()) + desktop_conf.set('APPLICATION_ID', application_id) +-i18n.merge_file(desktop_file, ++i18n.merge_file( + input: configure_file(input: desktop_file + '.in.in', + output: desktop_file + '.in', + configuration: desktop_conf),
meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb +1 -0
@@ -16,6 +16,7 @@ inherit gnomebase gtk-icon-cache gettext features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI += " file://0001-Fix-meson-build-with-meson-0.60.0.patch" SRC_URI[archive.sha256sum] = "5dd410331be070e4e034397f2754980e073851d50a2119f2fbf96adc6fe2e876" FILES:${PN} += " \
Signature · 1 line
2.20.1
PATCH 6/19 gnome-session: update 40.1.1 -> 41.3
In reply to Alexander KanavinThis addresses meson 0.61 issues.
---
.../{gnome-session_40.1.1.bb => gnome-session_41.3.bb} | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
rename meta-gnome/recipes-gnome/gnome-session/{gnome-session_40.1.1.bb => gnome-session_41.3.bb} (84%)meta-gnome/recipes-gnome/gnome-session/gnome-session_41.3.bb renamed from meta-gnome/recipes-gnome/gnome-session/gnome-session_40.1.1.bb +1 -4
@@ -21,11 +21,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext gsettings upstream-version-is-even features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" -# This can go when they come back to a one-dot version -def gnome_verdir(v): - return '40' -SRC_URI[archive.sha256sum] = "9c787829ee32e13e1508b9aee2b1d9ba42a02c48e6c8094e34f3e7f92af4df82" +SRC_URI[archive.sha256sum] = "ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit',d)}"
Signature · 1 line
2.20.1
PATCH 7/19 gnome-settings-daemon: add a meson 0.61 patch
In reply to Alexander Kanavin--- ...positional-i18n.merge_file-arguments.patch | 40 +++++++++++++++++++ .../gnome-settings-daemon_41.0.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch
meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 56535d2f1ec64e847e5fbd0613e78bd0dc046519 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek <[email protected]> +Date: Fri, 14 Jan 2022 23:55:06 +0100 +Subject: [PATCH] build: remove positional i18n.merge_file arguments + +otherwise building with meson 0.61+ fails: + + ERROR: Function does not take positional arguments. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/281] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + plugins/power/meson.build | 1 - + plugins/wacom/meson.build | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/plugins/power/meson.build b/plugins/power/meson.build +index 69e619f..014bb6d 100644 +--- a/plugins/power/meson.build ++++ b/plugins/power/meson.build +@@ -76,7 +76,6 @@ if host_is_linux + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: policy, + po_dir: po_dir, +diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build +index d8dd0ec..c00323d 100644 +--- a/plugins/wacom/meson.build ++++ b/plugins/wacom/meson.build +@@ -7,7 +7,6 @@ policy_in = configure_file( + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: policy, + po_dir: po_dir,
meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb +1 -0
@@ -25,6 +25,7 @@ DEPENDS = " \ REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data" GIR_MESON_OPTION = "" +SRC_URI += " file://0001-build-remove-positional-i18n.merge_file-arguments.patch" SRC_URI[archive.sha256sum] = "e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884" PACKAGECONFIG ??= " \
Signature · 1 line
2.20.1
PATCH 8/19 gnome-shell: backport a meson 0.61 patch
In reply to Alexander Kanavin--- ...-build-Drop-incorrect-positional-arg.patch | 81 +++++++++++++++++++ .../gnome-shell/gnome-shell_41.2.bb | 1 + 2 files changed, 82 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-build-Drop-incorrect-positional-arg.patch
meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-build-Drop-incorrect-positional-arg.patch new file +81 -0
@@ -0,0 +1,81 @@ +From 6f797c21703ce9e996da17c49879e2a16dfbc256 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= <[email protected]> +Date: Thu, 23 Dec 2021 17:18:16 +0100 +Subject: [PATCH] build: Drop incorrect positional arg + +Unlike other targets that take a name, i18n.merge_file() does not. + +Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078> +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + data/meson.build | 2 +- + src/calendar-server/meson.build | 2 +- + subprojects/extensions-app/data/meson.build | 2 +- + subprojects/extensions-app/data/metainfo/meson.build | 2 +- + subprojects/extensions-tool/src/templates/meson.build | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index f924fdf..76ae45c 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir) + desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false') + + foreach desktop_file : desktop_files +- i18n.merge_file('desktop', ++ i18n.merge_file( + input: configure_file( + input: desktop_file + '.in.in', + output: desktop_file + '.in', +diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build +index 7363282..8b4ef41 100644 +--- a/src/calendar-server/meson.build ++++ b/src/calendar-server/meson.build +@@ -27,7 +27,7 @@ configure_file( + install_dir: servicedir + ) + +-i18n.merge_file('evolution-calendar.desktop', ++i18n.merge_file( + input: 'evolution-calendar.desktop.in', + output: 'evolution-calendar.desktop', + po_dir: po_dir, +diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build +index d7e7d40..4b601e8 100644 +--- a/subprojects/extensions-app/data/meson.build ++++ b/subprojects/extensions-app/data/meson.build +@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir) + desktopconf.set('app_id', app_id) + desktopconf.set('prgname', prgname) + +-i18n.merge_file('desktop', ++i18n.merge_file( + input: configure_file( + input: base_id + '.desktop.in.in', + output: desktop_file + '.in', +diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build +index c4962c0..a19bfa8 100644 +--- a/subprojects/extensions-app/data/metainfo/meson.build ++++ b/subprojects/extensions-app/data/metainfo/meson.build +@@ -1,5 +1,5 @@ + metainfo = app_id + '.metainfo.xml' +-i18n.merge_file(metainfo, ++i18n.merge_file( + input: base_id + '.metainfo.xml.in', + output: metainfo, + po_dir: po_dir, +diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build +index 670e2bf..d693bfa 100644 +--- a/subprojects/extensions-tool/src/templates/meson.build ++++ b/subprojects/extensions-tool/src/templates/meson.build +@@ -4,7 +4,7 @@ template_metas = [ + ] + template_deps = [] + foreach template : template_metas +- template_deps += i18n.merge_file(template, ++ template_deps += i18n.merge_file( + input: template + '.in', + output: template, + po_dir: po_dir,
meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb +1 -0
@@ -32,6 +32,7 @@ REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" SRC_URI[archive.sha256sum] = "384651eb051393dbabe006d1ad057bf29d5cd73ebb87bc779ff5e1c31e80a827" SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" +SRC_URI += " file://0001-build-Drop-incorrect-positional-arg.patch" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth"
Signature · 1 line
2.20.1
PATCH 9/19 accountsservice: backport a meson 0.61 patch
In reply to Alexander Kanavin--- .../0001-Fix-build-with-meson-0.60.patch | 29 +++++++++++++++++++ .../0001-musl-Hack-to-fix-build.patch | 8 +---- .../0002-musl-add-missing-fgetspent_r.patch | 6 ++-- .../accountsservice/accountsservice_0.6.55.bb | 4 ++- 4 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 meta-gnome/recipes-support/accountsservice/accountsservice/0001-Fix-build-with-meson-0.60.patch
meta-gnome/recipes-support/accountsservice/accountsservice/0001-Fix-build-with-meson-0.60.patch new file +29 -0
@@ -0,0 +1,29 @@ +From bedec82615ca6858c3e9494650a5bbf33c710ebb Mon Sep 17 00:00:00 2001 +From: Luca Boccassi <[email protected]> +Date: Sun, 31 Oct 2021 12:29:14 +0000 +Subject: [PATCH] Fix build with meson 0.60 + +Positional parameters to merge_file() were never allowed and always +ignored, so just drop it. +See: https://github.com/mesonbuild/meson/issues/9441 + +Fixes #97 + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + data/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 4987937..ed0e2c4 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -29,7 +29,6 @@ configure_file( + policy = act_namespace.to_lower() + '.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: policy, + po_dir: po_dir,
meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch +1 -7
@@ -1,10 +1,7 @@ -From 2a1c7103839c20df5ca9ce2fa863535d802f8f3a Mon Sep 17 00:00:00 2001 +From ff0718174faf1167fb4765ebe4bd280bbe8d2ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Sun, 8 Dec 2019 23:42:00 +0100 Subject: [PATCH] musl: Hack to fix configure -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit --- meson.build | 10 ++++++++--
@@ -31,6 +28,3 @@ index 4465a26..726c9fe 100644 endif # compiler flags --- -2.21.0 -
meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch +2 -4
@@ -1,4 +1,4 @@ -From 820249ea8e38c568e6a36fbd9c852718c7665b56 Mon Sep 17 00:00:00 2001 +From 7401e682400df87f3258f795bb1d143f64a35a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Mon, 9 Dec 2019 00:12:08 +0100 Subject: [PATCH] musl: add missing fgetspent_r
@@ -6,6 +6,7 @@ Subject: [PATCH] musl: add missing fgetspent_r Stolen from void-linux Upstream-Status: Inappropriate [musl-specific] + --- src/daemon.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
@@ -41,6 +42,3 @@ index c52bda3..a7676fe 100644 static struct passwd * entry_generator_fgetpwent (Daemon *daemon, GHashTable *users, --- -2.21.0 -
meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb +3 -1
@@ -12,7 +12,9 @@ inherit meson gobject-introspection gtk-doc features_check systemd REQUIRED_DISTRO_FEATURES = "polkit" -SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" +SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-Fix-build-with-meson-0.60.patch \ + " SRC_URI:append:libc-musl = " \ file://0001-musl-Hack-to-fix-build.patch \ file://0002-musl-add-missing-fgetspent_r.patch \
Signature · 1 line
2.20.1
PATCH 10/19 gnome-screenshot: backport a meson 0.61 patch
In reply to Alexander Kanavin--- ...emove-extraneous-positional-argument.patch | 36 +++++++++++++++++++ .../gnome-screenshot/gnome-screenshot_41.0.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-meson-remove-extraneous-positional-argument.patch
meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-meson-remove-extraneous-positional-argument.patch new file +36 -0
@@ -0,0 +1,36 @@ +From c38c604b06a63f690d67318d4ef97ac556264876 Mon Sep 17 00:00:00 2001 +From: Jack Hill <[email protected]> +Date: Thu, 18 Nov 2021 00:46:58 -0500 +Subject: [PATCH] meson: remove extraneous positional argument + +* data/meson.build (desktop_file) + (metainfo_file): Remove extraneous positional argument. + +Closes #186 + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index fd570b3..4e2e2e8 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,7 +1,6 @@ + gnome = import('gnome') + + desktop_file = i18n.merge_file( +- 'desktop', + type: 'desktop', + input: 'org.gnome.Screenshot.desktop.in', + output: 'org.gnome.Screenshot.desktop', +@@ -23,7 +22,6 @@ if desktop_file_validate.found() + endif + + metainfo_file = i18n.merge_file( +- 'appdata', + input: 'org.gnome.Screenshot.metainfo.xml.in', + output: 'org.gnome.Screenshot.metainfo.xml', + po_dir: join_paths(meson.current_source_dir(), '../po'),
meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb +1 -0
@@ -10,6 +10,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit features_check gnomebase gettext upstream-version-is-even pkgconfig +SRC_URI += " file://0001-meson-remove-extraneous-positional-argument.patch" SRC_URI[archive.sha256sum] = "4adb7dec926428f74263d5796673cf142e4720b6e768f5468a8d0933f98c9597" DEPENDS += "glib-2.0 glib-2.0-native gtk+3 libhandy xext"
Signature · 1 line
2.20.1
PATCH 11/19 evince: fix meson 0.61 builds
In reply to Alexander Kanavin--- ...e-incorrect-args-for-i18n.merge_file.patch | 52 +++++++++++++++++++ .../recipes-gnome/evince/evince_41.3.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch
meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch new file +52 -0
@@ -0,0 +1,52 @@ +From b525a64d26bcba4e3a74f09c580429625d8a2104 Mon Sep 17 00:00:00 2001 +From: r-value <[email protected]> +Date: Wed, 17 Nov 2021 18:22:45 +0800 +Subject: [PATCH] Remove incorrect args for i18n.merge_file + +`i18n.merge_file` has been ignoring positional arguments for +a time and explicitly rejects with error since meson 0.60.0 + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + backend/meson.build | 1 - + data/meson.build | 1 - + meson.build | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/backend/meson.build b/backend/meson.build +index 14629f2..2f972a8 100644 +--- a/backend/meson.build ++++ b/backend/meson.build +@@ -53,7 +53,6 @@ foreach backend, backend_mime_types: backends + ) + + i18n.merge_file( +- appstream, + input: appstream_in, + output: appstream, + po_dir: po_dir, +diff --git a/data/meson.build b/data/meson.build +index 8a308b8..afc3020 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -15,7 +15,6 @@ foreach desktop: desktops + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/meson.build b/meson.build +index 07fb8ec..0bb5d0f 100644 +--- a/meson.build ++++ b/meson.build +@@ -498,7 +498,6 @@ install_headers( + appdata = ev_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir,
meta-gnome/recipes-gnome/evince/evince_41.3.bb +1 -0
@@ -24,6 +24,7 @@ inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection g def gnome_verdir(v): return oe.utils.trim_version(v, 1) +SRC_URI += " file://0001-Remove-incorrect-args-for-i18n.merge_file.patch" SRC_URI[archive.sha256sum] = "3346b01f9bdc8f2d5ffea92f110a090c64a3624942b5b543aad4592a9de33bb0" GTKDOC_MESON_OPTION = "gtk_doc"
Signature · 1 line
2.20.1
PATCH 12/19 gnome-calendar: fix meson 0.61 builds
In reply to Alexander Kanavin--- ...01-meson.build-fix-meson-0.61-builds.patch | 23 +++++++++++++++++++ .../gnome-calendar/gnome-calendar_41.2.bb | 1 + 2 files changed, 24 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch
meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch new file +23 -0
@@ -0,0 +1,23 @@ +From 7060aa63abbb64e7c6cbacc167d5f939d2a77e41 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 21 Jan 2022 21:18:39 +0100 +Subject: [PATCH] meson.build: fix meson 0.61 builds + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/198] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + data/appdata/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/appdata/meson.build b/data/appdata/meson.build +index b5ee6540..200c3507 100644 +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,7 +1,6 @@ + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) + appdata = i18n.merge_file( +- 'appdata', + input: configure_file( + input: files('org.gnome.Calendar.appdata.xml.in.in'), + output: 'org.gnome.Calendar.appdata.xml.in',
meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb +1 -0
@@ -22,6 +22,7 @@ inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-versi REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI += " file://0001-meson.build-fix-meson-0.61-builds.patch" SRC_URI[archive.sha256sum] = "956b2f190322651c67fe667223896f8aa5acf33b70ada5a3b05a5361bda6611a" FILES:${PN} += " \
Signature · 1 line
2.20.1
PATCH 13/19 gthumb: fix meson 0.61 builds
In reply to Alexander Kanavin--- ...001-LINGUAS-removed-duplicated-entry.patch | 23 +++++++++++++++++++ .../recipes-gnome/gthumb/gthumb_3.12.0.bb | 1 + 2 files changed, 24 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gthumb/gthumb/0001-LINGUAS-removed-duplicated-entry.patch
meta-gnome/recipes-gnome/gthumb/gthumb/0001-LINGUAS-removed-duplicated-entry.patch new file +23 -0
@@ -0,0 +1,23 @@ +From f3d399892e59a2e850be1d0de30c429417c78360 Mon Sep 17 00:00:00 2001 +From: Paolo Bacchilega <[email protected]> +Date: Tue, 11 Jan 2022 12:30:44 +0100 +Subject: [PATCH] LINGUAS: removed duplicated entry + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + help/LINGUAS | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/help/LINGUAS b/help/LINGUAS +index 0e8a52d..fa1fc3e 100644 +--- a/help/LINGUAS ++++ b/help/LINGUAS +@@ -8,7 +8,6 @@ eu + fr + hu + id +-id + nl + oc + sl
meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb +1 -0
@@ -26,6 +26,7 @@ DEPENDS = " \ inherit features_check gnomebase gnome-help gsettings itstool mime-xdg +SRC_URI += " file://0001-LINGUAS-removed-duplicated-entry.patch" SRC_URI[archive.sha256sum] = "3deffc030384e64b57361c437c79b481ae1489ef44c87ae856e81bb10d8e383f" FILES:${PN} += "${datadir}/metainfo"
Signature · 1 line
2.20.1
PATCH 14/19 gedit: add a meson 0.61 patch
In reply to Alexander Kanavin--- ...e-incorrect-args-for-i18n.merge_file.patch | 34 +++++++++++++++++++ meta-gnome/recipes-gnome/gedit/gedit_40.1.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gedit/gedit/0001-Remove-incorrect-args-for-i18n.merge_file.patch
meta-gnome/recipes-gnome/gedit/gedit/0001-Remove-incorrect-args-for-i18n.merge_file.patch new file +34 -0
@@ -0,0 +1,34 @@ +From ea9a15afb76c093aea37f6c56c559b61afd9a9f2 Mon Sep 17 00:00:00 2001 +From: rvalue <[email protected]> +Date: Wed, 15 Dec 2021 07:02:09 +0000 +Subject: [PATCH] Remove incorrect args for i18n.merge_file + +The positional argument has been silently ignored for a time. And it causes failure +with "ERROR: Function does not take positional arguments" since meson 0.60.0 + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/124] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index bb61387..28d72a1 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -4,7 +4,6 @@ install_man('gedit.1') + + appdata = 'org.gnome.gedit.appdata.xml' + appdata_file = i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: '../po/', +@@ -23,7 +22,6 @@ endif + + desktop_file = 'org.gnome.gedit.desktop' + desktop_output_file = i18n.merge_file( +- desktop_file, + type: 'desktop', + input: desktop_file + '.in', + output: desktop_file,
meta-gnome/recipes-gnome/gedit/gedit_40.1.bb +1 -0
@@ -23,6 +23,7 @@ def gnome_verdir(v): REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI += " file://0001-Remove-incorrect-args-for-i18n.merge_file.patch" SRC_URI[archive.sha256sum] = "55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691" # gobject-introspection is mandatory and cannot be configured
Signature · 1 line
2.20.1
PATCH 15/19 gnome-disk-utility: add a meson 0.61 patch
In reply to Alexander Kanavin--- ...ild-fix-arguments-of-i18n.merge_file.patch | 34 +++++++++++++++++++ .../gnome-disk-utility_41.0.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 629ca0e61bb59303d43d7eac44a47ae866cc78f0 Mon Sep 17 00:00:00 2001 +From: rvalue <[email protected]> +Date: Fri, 17 Dec 2021 12:29:30 +0000 +Subject: [PATCH] build: fix arguments of i18n.merge_file + +`i18n.merge_file` has been ignoring positional arguments for a time +and explicitly rejects with error since meson 0.60.0 + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index e38a1d8..38fb520 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -11,7 +11,6 @@ desktops = [ + + foreach desktop: desktops + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -38,7 +37,6 @@ install_data( + info = 'org.gnome.DiskUtility.appdata.xml' + + i18n.merge_file( +- info, + input: info + '.in', + output: info, + po_dir: po_dir,
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb +1 -0
@@ -26,6 +26,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" # As soon as elogind is of interest this needs rework: meson option is combo PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" +SRC_URI += " file://0001-build-fix-arguments-of-i18n.merge_file.patch" SRC_URI[archive.sha256sum] = "8743c98fd656062ef862933efe30c5be4c6b322ec02eee154ec70d08ed0895df" FILES:${PN} += " \
Signature · 1 line
2.20.1
PATCH 16/19 gnome-control-center: add a meson 0.61 patch
In reply to Alexander Kanavin--- ...-unused-argument-for-i18n.merge_file.patch | 504 ++++++++++++++++++ .../gnome-control-center_41.2.bb | 1 + 2 files changed, 505 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-meson-drop-unused-argument-for-i18n.merge_file.patch
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-meson-drop-unused-argument-for-i18n.merge_file.patch new file +504 -0
@@ -0,0 +1,504 @@ +From 90715329c277f21537eb5af86d8f222c4a2abd24 Mon Sep 17 00:00:00 2001 +From: Jan Beich <[email protected]> +Date: Fri, 7 Jan 2022 01:53:52 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +panels/applications/meson.build:10:5: ERROR: Function does not take positional arguments. +panels/background/meson.build:10:5: ERROR: Function does not take positional arguments. +panels/camera/meson.build:10:5: ERROR: Function does not take positional arguments. +[...] + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + panels/applications/meson.build | 1 - + panels/background/meson.build | 1 - + panels/bluetooth/meson.build | 1 - + panels/camera/meson.build | 1 - + panels/color/meson.build | 1 - + panels/datetime/meson.build | 2 -- + panels/default-apps/meson.build | 1 - + panels/diagnostics/meson.build | 1 - + panels/display/meson.build | 1 - + panels/info-overview/meson.build | 1 - + panels/keyboard/meson.build | 2 -- + panels/location/meson.build | 1 - + panels/lock/meson.build | 1 - + panels/microphone/meson.build | 1 - + panels/mouse/meson.build | 1 - + panels/multitasking/meson.build | 1 - + panels/network/meson.build | 1 - + panels/notifications/meson.build | 1 - + panels/online-accounts/meson.build | 1 - + panels/power/meson.build | 1 - + panels/printers/meson.build | 1 - + panels/region/meson.build | 1 - + panels/removable-media/meson.build | 1 - + panels/search/meson.build | 1 - + panels/sharing/meson.build | 2 -- + panels/sound/meson.build | 1 - + panels/thunderbolt/meson.build | 1 - + panels/universal-access/meson.build | 1 - + panels/usage/meson.build | 1 - + panels/user-accounts/meson.build | 2 -- + panels/wacom/meson.build | 1 - + panels/wwan/meson.build | 1 - + shell/appdata/meson.build | 1 - + shell/meson.build | 1 - + tests/interactive-panels/applications/meson.build | 1 - + 35 files changed, 39 deletions(-) + +diff --git a/panels/applications/meson.build b/panels/applications/meson.build +index d511bf6..bd4fd64 100644 +--- a/panels/applications/meson.build ++++ b/panels/applications/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type : 'desktop', + input : desktop_in, + output : desktop, +diff --git a/panels/background/meson.build b/panels/background/meson.build +index 730cf54..1f231b9 100644 +--- a/panels/background/meson.build ++++ b/panels/background/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/bluetooth/meson.build b/panels/bluetooth/meson.build +index c3fce74..4bed812 100644 +--- a/panels/bluetooth/meson.build ++++ b/panels/bluetooth/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/camera/meson.build b/panels/camera/meson.build +index 4f26118..bf2e727 100644 +--- a/panels/camera/meson.build ++++ b/panels/camera/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/color/meson.build b/panels/color/meson.build +index 742caf6..bb038cd 100644 +--- a/panels/color/meson.build ++++ b/panels/color/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build +index 6568394..9bbdc7c 100644 +--- a/panels/datetime/meson.build ++++ b/panels/datetime/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +@@ -20,7 +19,6 @@ i18n.merge_file( + polkit = 'org.gnome.controlcenter.@[email protected]'.format(cappletname) + + i18n.merge_file( +- polkit, + input: polkit + '.in', + output: polkit, + po_dir: po_dir, +diff --git a/panels/default-apps/meson.build b/panels/default-apps/meson.build +index 6855006..2a24321 100644 +--- a/panels/default-apps/meson.build ++++ b/panels/default-apps/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/diagnostics/meson.build b/panels/diagnostics/meson.build +index fac9b4c..2f25c21 100644 +--- a/panels/diagnostics/meson.build ++++ b/panels/diagnostics/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/display/meson.build b/panels/display/meson.build +index 12f35cc..57bdfcf 100644 +--- a/panels/display/meson.build ++++ b/panels/display/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/info-overview/meson.build b/panels/info-overview/meson.build +index 2fe10b3..aa81c48 100644 +--- a/panels/info-overview/meson.build ++++ b/panels/info-overview/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/keyboard/meson.build b/panels/keyboard/meson.build +index a2ae026..ae71c94 100644 +--- a/panels/keyboard/meson.build ++++ b/panels/keyboard/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +@@ -45,7 +44,6 @@ xml_files = [ + + foreach file: xml_files + i18n.merge_file( +- file, + input: file + '.in', + output: file, + po_dir: po_dir, +diff --git a/panels/location/meson.build b/panels/location/meson.build +index bfc6e82..f4c835d 100644 +--- a/panels/location/meson.build ++++ b/panels/location/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/lock/meson.build b/panels/lock/meson.build +index 0661af4..18dbfb2 100644 +--- a/panels/lock/meson.build ++++ b/panels/lock/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/microphone/meson.build b/panels/microphone/meson.build +index e0847a4..bc7f73a 100644 +--- a/panels/microphone/meson.build ++++ b/panels/microphone/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/mouse/meson.build b/panels/mouse/meson.build +index 357aaae..7b46097 100644 +--- a/panels/mouse/meson.build ++++ b/panels/mouse/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/multitasking/meson.build b/panels/multitasking/meson.build +index 772b638..53fd0d8 100644 +--- a/panels/multitasking/meson.build ++++ b/panels/multitasking/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/network/meson.build b/panels/network/meson.build +index d7cd6e4..43a5690 100644 +--- a/panels/network/meson.build ++++ b/panels/network/meson.build +@@ -25,7 +25,6 @@ foreach name: panel_names + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/notifications/meson.build b/panels/notifications/meson.build +index df70261..1b04b24 100644 +--- a/panels/notifications/meson.build ++++ b/panels/notifications/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/online-accounts/meson.build b/panels/online-accounts/meson.build +index 82f1d56..6870977 100644 +--- a/panels/online-accounts/meson.build ++++ b/panels/online-accounts/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/power/meson.build b/panels/power/meson.build +index 0e3ea1d..1cafe2a 100644 +--- a/panels/power/meson.build ++++ b/panels/power/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/printers/meson.build b/panels/printers/meson.build +index ccce64c..042c67a 100644 +--- a/panels/printers/meson.build ++++ b/panels/printers/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/region/meson.build b/panels/region/meson.build +index 68b7f00..27bc5ff 100644 +--- a/panels/region/meson.build ++++ b/panels/region/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/removable-media/meson.build b/panels/removable-media/meson.build +index b51799a..fc07c48 100644 +--- a/panels/removable-media/meson.build ++++ b/panels/removable-media/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/search/meson.build b/panels/search/meson.build +index 39b076b..a4dd79d 100644 +--- a/panels/search/meson.build ++++ b/panels/search/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/sharing/meson.build b/panels/sharing/meson.build +index b3803bc..49dbb06 100644 +--- a/panels/sharing/meson.build ++++ b/panels/sharing/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +@@ -29,7 +28,6 @@ polkit_in = configure_file( + ) + + i18n.merge_file( +- polkit, + input: polkit_in, + output: polkit, + po_dir: po_dir, +diff --git a/panels/sound/meson.build b/panels/sound/meson.build +index fa0f128..18f75dd 100644 +--- a/panels/sound/meson.build ++++ b/panels/sound/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/thunderbolt/meson.build b/panels/thunderbolt/meson.build +index 53aa9b4..38ef294 100644 +--- a/panels/thunderbolt/meson.build ++++ b/panels/thunderbolt/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/universal-access/meson.build b/panels/universal-access/meson.build +index 5e225fe..d845e70 100644 +--- a/panels/universal-access/meson.build ++++ b/panels/universal-access/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/usage/meson.build b/panels/usage/meson.build +index 74f720e..6047ce0 100644 +--- a/panels/usage/meson.build ++++ b/panels/usage/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +diff --git a/panels/user-accounts/meson.build b/panels/user-accounts/meson.build +index b8ee9d9..fa56aae 100644 +--- a/panels/user-accounts/meson.build ++++ b/panels/user-accounts/meson.build +@@ -8,7 +8,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +@@ -85,7 +84,6 @@ meson.add_install_script('sh', '-c', + polkit = 'org.gnome.controlcenter.@[email protected]'.format(cappletname) + + i18n.merge_file( +- polkit, + input: polkit + '.in', + output: polkit, + po_dir: po_dir, +diff --git a/panels/wacom/meson.build b/panels/wacom/meson.build +index 5f62220..88a9137 100644 +--- a/panels/wacom/meson.build ++++ b/panels/wacom/meson.build +@@ -30,7 +30,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type : 'desktop', + input : desktop_in, + output : desktop, +diff --git a/panels/wwan/meson.build b/panels/wwan/meson.build +index 8c1b02f..2ab238a 100644 +--- a/panels/wwan/meson.build ++++ b/panels/wwan/meson.build +@@ -11,7 +11,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type : 'desktop', + input : desktop_in, + output : desktop, +diff --git a/shell/appdata/meson.build b/shell/appdata/meson.build +index 3b36171..fdb8279 100644 +--- a/shell/appdata/meson.build ++++ b/shell/appdata/meson.build +@@ -1,7 +1,6 @@ + appdata = 'gnome-control-center.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +diff --git a/shell/meson.build b/shell/meson.build +index 89b9659..4667804 100644 +--- a/shell/meson.build ++++ b/shell/meson.build +@@ -23,7 +23,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type : 'desktop', + input : desktop_in, + output : desktop, +diff --git a/tests/interactive-panels/applications/meson.build b/tests/interactive-panels/applications/meson.build +index 2657f95..82eed4d 100644 +--- a/tests/interactive-panels/applications/meson.build ++++ b/tests/interactive-panels/applications/meson.build +@@ -12,7 +12,6 @@ desktop_files = [ + + foreach desktop_file : desktop_files + i18n.merge_file( +- desktop, + type : 'desktop', + input : 'gtp-@[email protected]'.format(desktop_file), + output : 'gnome-@[email protected]'.format(desktop_file),
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb +1 -0
@@ -33,6 +33,7 @@ REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11" SRC_URI[archive.sha256sum] = "8271fc6b33ec2418a578304dd3e57d665f0d7cc706a99a97be419848618fe248" SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" +SRC_URI += " file://0001-meson-drop-unused-argument-for-i18n.merge_file.patch" PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus"
Signature · 1 line
2.20.1
PATCH 17/19 gnome-photos: add a meson 0.61 patch
In reply to Alexander Kanavin--- ...e-incorrect-args-for-i18n.merge_file.patch | 31 +++++++++++++++++++ .../gnome-photos/gnome-photos_40.0.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch
meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch new file +31 -0
@@ -0,0 +1,31 @@ +From a112e8a089851035945b6848849149bb36787906 Mon Sep 17 00:00:00 2001 +From: rvalue <[email protected]> +Date: Fri, 21 Jan 2022 12:36:02 +0000 +Subject: [PATCH] meson: remove incorrect args for i18n.merge_file + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 6e7192e..94271de 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -3,7 +3,6 @@ subdir('icons') + appdata = photos_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +@@ -23,7 +22,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop,
meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb +1 -0
@@ -30,6 +30,7 @@ def gnome_verdir(v): REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI += " file://0001-meson-remove-incorrect-args-for-i18n.merge_file.patch" SRC_URI[archive.sha256sum] = "e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af" do_install:append() {
Signature · 1 line
2.20.1
PATCH 18/19 dconf-editor: add a meson 0.61 patch
In reply to Alexander Kanavin--- ...or-meson.build-fix-meson-0.61-errors.patch | 31 +++++++++++++++++++ .../dconf/dconf-editor_3.38.3.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta-gnome/recipes-gnome/dconf/dconf-editor/0001-editor-meson.build-fix-meson-0.61-errors.patch
meta-gnome/recipes-gnome/dconf/dconf-editor/0001-editor-meson.build-fix-meson-0.61-errors.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 86379a220a4eb00c309f514d2ca57ed6c1c8b35c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 21 Jan 2022 22:22:58 +0100 +Subject: [PATCH] editor/meson.build: fix meson 0.61 errors + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/21] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + editor/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/editor/meson.build b/editor/meson.build +index 4c89ab99..0eb3bb1a 100644 +--- a/editor/meson.build ++++ b/editor/meson.build +@@ -1,7 +1,6 @@ + desktop = dconf_editor_namespace + '.desktop' + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -26,7 +25,6 @@ configure_file( + appdata = dconf_editor_namespace + '.appdata.xml' + + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir,
meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb +1 -0
@@ -8,6 +8,7 @@ DEPENDS = "dconf gtk+3" inherit gnomebase vala gettext gsettings bash-completion +SRC_URI += " file://0001-editor-meson.build-fix-meson-0.61-errors.patch" SRC_URI[archive.sha256sum] = "571af4c7dad4f049b53e6cd728b79addf08c27ddab6bc57b396d211866ee79e3" FILES:${PN} += " \
Signature · 1 line
2.20.1
PATCH 19/19 network-manager-applet: add meson 0.61 patch
In reply to Alexander Kanavin--- ...on.build-address-meson-0.61-failures.patch | 31 +++++++++++++++++++ .../network-manager-applet_1.24.0.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch
meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch new file +31 -0
@@ -0,0 +1,31 @@ +From ab27e6e6c839e1c65e4059a06982453a7aa1b6b3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 21 Jan 2022 22:34:09 +0100 +Subject: [PATCH] meson.build: address meson 0.61 failures + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 7ab613c8..688a7311 100644 +--- a/meson.build ++++ b/meson.build +@@ -253,7 +253,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false) + + foreach desktop: desktop_files + i18n.merge_file( +- desktop + '-desktop', + input: desktop + '.desktop.in', + output: desktop + '.desktop', + install: true, +@@ -274,7 +273,6 @@ endforeach + appdata = 'nm-connection-editor.appdata.xml' + + i18n.merge_file( +- 'desktop', + input: appdata + '.in', + output: appdata, + install: true,
meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb +1 -0
@@ -9,6 +9,7 @@ inherit features_check gnomebase gsettings gtk-icon-cache gettext REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI += " file://0001-meson.build-address-meson-0.61-failures.patch" SRC_URI[archive.sha256sum] = "b9f4bca5d0352718e07b7385fb195a9bbc8fd686b7959b74137854d52aab9c58" # We don't not have ubuntu's appindicator (yet?)
Signature · 1 line
2.20.1