From patchwork Fri Jan 21 21:38:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2796 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB84FC433F5 for ; Fri, 21 Jan 2022 21:39:09 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web09.589.1642801148535311159 for ; Fri, 21 Jan 2022 13:39:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=mAeuf9+Z; spf=pass (domain: gmail.com, ip: 209.85.221.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f44.google.com with SMTP id i2so1988756wrb.12 for ; Fri, 21 Jan 2022 13:39:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SlJ/qUBKln4faZ+td4AaKIwQBD0SIdc5jAvup98gYoQ=; b=mAeuf9+ZftwOZbE1kdfwQ59PZV/Vc1ysadoGkOhZpG5BnS0zwkl9VKcGnsylM2gxvx decxfTyaYhtzhDYmoDzaMeLN4Ia/yE7zeMze09/L0iw13M8MjhucKfKVLawZdo5Pywbp DI1RVCldIkcJ4rk6XpXQI79hSA55wCuVnBMYHYNCsPKy5egG3m37Ew5QlUYPDS4DQf2e ZwkJ5LxRSTjSvD4bn1krH4uj57aBzVmqkiRWtw4/yYXeUn6xnl3H5EbParf1JIIikDLE G6SdScsNuEieuvwIReyyQE8J+NtKeNODNk7sidA+TH9lB3fezdBsfQpVd8AprpV6uURc IMHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SlJ/qUBKln4faZ+td4AaKIwQBD0SIdc5jAvup98gYoQ=; b=jtwYY56H6nz0zTJzMCly2mceBxdROJQEbOguJo0jQLWjUZ/r+3wiEdsy6ld9zn9MuK VyJWv6vjt+xwP7aO0ImOk5O0J00Uy7FavcrNf/ROmwA/Yl0cTZPyBbzv2ShjWRhAWmLC 4+riJRsMN6uIoy94R+PJGnIAeHnlN+ZMUd6D00vtk6Nrnz2SB9O67KSiCHe2rADUtBsz 4QyM3UJ7XCi6E4bmwjpG0/FsAUPXQjXyZDpFgHJK/BAHG0kxOsVQTCY6C8hFCwIsyxfL tkI+Lr3TZ4Eb3XS6Gof6bqSIddvj05SK5Yyce1SfbO/w+z8iCk0avWyctO0JhcObCXFJ EMlA== X-Gm-Message-State: AOAM532BlCs6khaDxrFpwE7uEfZ7iWVXy0qHPBERusxrNzlE4G3aDpUv OzocaMbkKcKSVi0cUC32yO61drKeVQE= X-Google-Smtp-Source: ABdhPJx/vhp286lP+MiAM53bM5WrobWYCHMuuzwWAWV5Br0IgYNeBBj0eqhduPosQakMevo/BMhZTQ== X-Received: by 2002:a5d:5582:: with SMTP id i2mr5454216wrv.442.1642801146895; Fri, 21 Jan 2022 13:39:06 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:06 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 01/19] gtkmm3: add gdk-pixbuf-native to satisfy meson 0.61 Date: Fri, 21 Jan 2022 22:38:40 +0100 Message-Id: <20220121213858.762625-1-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94979 This version of meson checks for gkd-pixbuf utilities regardless of whether demos are enabled or not. Signed-off-by: Alexander Kanavin --- meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb index 428ec69d7..a8c771364 100644 --- a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb +++ b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb @@ -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" From patchwork Fri Jan 21 21:38:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2797 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F883C433FE for ; Fri, 21 Jan 2022 21:39:10 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web09.590.1642801149157462045 for ; Fri, 21 Jan 2022 13:39:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bFJdNOuN; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id az25so1983080wrb.6 for ; Fri, 21 Jan 2022 13:39:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dvna/bruC7B6TSwx6Bugx02A0xiypxLlfdtL/Ry2CJY=; b=bFJdNOuNK0gNEUUTePzHG5seQUPbsySI0r2m4AvFJzsOt9Q87n2YDps3dVLzRZdfAe 3tFrbZWvJai+XBnYa4xjdL8hZJedFwmIMoYYPaMqI+NzK/6w+NFLmmDA2Y1cA6o5uvaO k8xAFZPcBKIgRSgQb7GDz7+ThSbUiFavBCGFb8Yv8gjzrc6+PZlk5crdi1k+2NPZYPSA IYxg8LPzDnH3SFqCVLcoNwIEecKJZ/6dwiUhCkJ+QjzU4T+rWVn+pEIFpBLDYzIQxSD9 262SCnWLjil9x431FxzhtmXuEgznBzjIeJ7CcPe7cbZWNBbumGgbDNwhaHSO8AHNw6az /8wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dvna/bruC7B6TSwx6Bugx02A0xiypxLlfdtL/Ry2CJY=; b=BbXruTtx6sDna9hm0/7N4kLCkHy6vDWVQGzBwdHHvy+KgmWXPWjtmMxAEwa2JFXSAZ kN9e7I0yJ1gVYsKT3BO4NiNNwJeT/qH2jQn/Q8lPPgBN7HrCjFgQ4Y2GUp+uHpdnIOyW RulCwA2i6ldfpekZSNY0fsh1Nl/qJYpYSkTqYKb7kiAUnDZ6FUrjNzAQwNXQhg5CyYIo QoBfYyQ+Oiqxn/As+qonEhHZ3HkM+GlGhSeUphkb3nXriaxuB42RhY3WYw6V0aqg34JC qjUh8RY/tBl4gTGeLuaxx3+dCzkFUrh734suliJ7y0dVH3OVsS/9u0qKzI+4Y8Vh6R9L Al8g== X-Gm-Message-State: AOAM530BVmmG241V/ZvxLM/8Clr8lnggeHPHXPP3Qd0Y+mR2zTHgODUi Z8+eAfr0rMu3QlIDih/5RyZYWWXr8tk= X-Google-Smtp-Source: ABdhPJyRV6G4k8vi813V8kUWM2PLMbWs9kIllH7kyGaNrzM1EPJTPP9QtmI/ilOT6Cc1CyEKM0lcLg== X-Received: by 2002:adf:9f14:: with SMTP id l20mr5373937wrf.65.1642801147656; Fri, 21 Jan 2022 13:39:07 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:07 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin , Khem Raj Subject: [PATCH 02/19] gjs: drop patch to satisfy meson 0.61 Date: Fri, 21 Jan 2022 22:38:41 +0100 Message-Id: <20220121213858.762625-2-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94980 With this version of meson the patch is no longer needed. Signed-off-by: Alexander Kanavin --- ...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 diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0001-build-disable-gir-install-via-list-to-pacify-meson-0.patch b/meta-gnome/recipes-gnome/gjs/gjs/0001-build-disable-gir-install-via-list-to-pacify-meson-0.patch deleted file mode 100644 index cf85c4e70..000000000 --- a/meta-gnome/recipes-gnome/gjs/gjs/0001-build-disable-gir-install-via-list-to-pacify-meson-0.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 4c8c84941146715d9c7077e8c5625490332d8bc5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 ---- - 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 - diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb index e0d982123..af4d7f6ca 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb +++ b/meta-gnome/recipes-gnome/gjs/gjs_1.70.0.bb @@ -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 From patchwork Fri Jan 21 21:38:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2799 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89B25C4332F for ; Fri, 21 Jan 2022 21:39:12 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.groups.io with SMTP id smtpd.web10.556.1642801149704362526 for ; Fri, 21 Jan 2022 13:39:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=PwXiLRo5; spf=pass (domain: gmail.com, ip: 209.85.128.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f47.google.com with SMTP id l35-20020a05600c1d2300b0034d477271c1so23548055wms.3 for ; Fri, 21 Jan 2022 13:39:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k5CLAFITjj66AdlAuR6pnP4T7Cb4labPZht4WvtazZg=; b=PwXiLRo5aN4xaVQoEbmWXUG/mBxVckR/6D6CFgoMmeyLUjXuc2KP82aCXYMlU7jgWc Sbi+wczL3KNt5v2cSpHe+dM0A00q+k+pl6dMSFFuVo2S0XXsdfHQhS+T77PbT39yM5XJ Py0PQb9OiNiIwrgMVzp4eyqxG7tvzb9XZjRGZbITdLJL+NuWB34rE9TnQpD1SDPUoNfs woc7ONZah5+XyggRs7GYg9JA5L+HnACW5BPGgOm6Kq4ryBof/LTNqggmbsH3WP27SV+X ZAdgtm9u43AJhSLAxdNeK9KJN6agwqi9QVaBv/UoJtfMierwa/FDGlWdiRpfFpcBRmPD 7UOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k5CLAFITjj66AdlAuR6pnP4T7Cb4labPZht4WvtazZg=; b=4xO6reGWjWiik128MlijloCkkKhQbIFS6+V1uNAVlDoyd3IiAPQjf9XOm6FdjyoAHK NY81am/jzkCA7Ke9LOhpqgs7GgC+cJigr0evX7bLgCOYYlV8qAPTp4ofK25xqYzfOna6 rM4+jCB6vXvGOGy70Rw9AsmX9vnQYKa+Dr/gxuyYz1obmMqsOX5o9okIES9FZV9/AlXE GR3DDAoh91Abrkz0V2pj4A3kUm7yrs/ojhCHXAh/B65mvVK+JDMRjpMZI+aZyBwtr0Bn wV7yIvCjiBjMHeJpT3015ug3S9g0Rzq9vpA0WqaCSTEuADcidwydyyGXGwgtamOd521B 7q1w== X-Gm-Message-State: AOAM53152/GV1SRxZTjvTGAii/YmAsDJJmKPHs+4W6AvFtfo+N20s16i eMtgTwh/4IUInrUbEH19MTMUBS8ue40= X-Google-Smtp-Source: ABdhPJxThqvee7eQjXgisn48oZb818cZ7Z4bum0EyJOPKjDRULqrQSBIYXm7q0JqlMGAWekziN49/w== X-Received: by 2002:a05:600c:2f17:: with SMTP id r23mr84338wmn.6.1642801148265; Fri, 21 Jan 2022 13:39:08 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:07 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 03/19] gnome-terminal: backport a meson 0.61 patch Date: Fri, 21 Jan 2022 22:38:42 +0100 Message-Id: <20220121213858.762625-3-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94981 Signed-off-by: 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 diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-build-Fix-for-newer-meson.patch b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-build-Fix-for-newer-meson.patch new file mode 100644 index 000000000..12520b177 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-build-Fix-for-newer-meson.patch @@ -0,0 +1,46 @@ +From f88447850e162c8d514be367db574c6fa2fec2a5 Mon Sep 17 00:00:00 2001 +From: Christian Persch +Date: Fri, 14 Jan 2022 11:33:32 +0100 +Subject: [PATCH] build: Fix for newer meson + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + 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') diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb index b000fa80f..2b3f3a616 100644 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb @@ -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 \ From patchwork Fri Jan 21 21:38:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2801 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3A7FC433F5 for ; Fri, 21 Jan 2022 21:39:12 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web11.581.1642801150342239367 for ; Fri, 21 Jan 2022 13:39:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CHU5Pd1v; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id e8so241893wrc.0 for ; Fri, 21 Jan 2022 13:39:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4A1R6YLO2hpQa9V0PBrd5QGbLTUPnUA2KajMzsbDCXA=; b=CHU5Pd1va/Badw7z78g+HEaUyzjPZGypVfaN0uEfA9nmFgeCUTAfEShoBCgYQ3LAVc bWB+PHd4Bu/oAK6O1jaD2e33TKQCQOZ5aNbYCJ3vlZcyl463cY6QhQ+zu82x2zID5xnF JOMf9qbMi7/LMFwhA3cxCQIv7hu+bMyTKvpRO+b7cf81xXNhJ5inP5hpVkVhsBZtbI+w YTl+dBlt3Z2Ep/0kCEoEJ/4E8IxYsASYrox93PLd5cB0/MLwWAkxBO5n2smS+1XErqKM 6CBwkXKdPt+k+AoNpYYsVOstVsAbGetvLgVlmJdSf/5DGO97AbGux4w2DLV0DPwHoOLo 703g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4A1R6YLO2hpQa9V0PBrd5QGbLTUPnUA2KajMzsbDCXA=; b=3BhZLQ8YhrI5iY/V2fNwbVP/P2gYme4O8s6yg/CcE3jd6d5mKbClN/cfJy3HckT1bs kyprU6Qh7Uzz0Aw8/2/vo5up9OUae5afOHqs+Bt5HsEitqbJWqilT4cvRXQDugRIxDXt QvidEMYtJ1SGsErGyBdK2kdtk/PM/C7Lbkb+teDfFTYO7M5sYmpKavJBfNueXGU/LAoD Tb5f2SZMh4vyl4r+5Bh0eWG0qfjxGOB08u7O4axCFhqqYQI9ccf5kejNwfda8jQP4DZn E0+K/aY3nKrvtBkK4u6TmaXxs7a0DCo2nEdoz+xEb3X3ipcroK8fw1g2zptvzNJFIAPs TOUg== X-Gm-Message-State: AOAM533Xq1AZMWgx0cLyg+nw+3BDBoi8CJDQOi//+G62gXqCvTMf/CXm QwR+cyXNHMeVvwgxMr5UEhnCkvyMZdQ= X-Google-Smtp-Source: ABdhPJxCQPXZN+btPt+O/sCjFfGK2WbvqHhRdwOQTWfOCVxqPluwTqaUm6I7nSiQgd4BhHk+PwPrhQ== X-Received: by 2002:a5d:64e2:: with SMTP id g2mr5444332wri.394.1642801148941; Fri, 21 Jan 2022 13:39:08 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:08 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 04/19] gnome-bluetooth: backport a meson 0.61 patch Date: Fri, 21 Jan 2022 22:38:43 +0100 Message-Id: <20220121213858.762625-4-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94982 Signed-off-by: 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 diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch new file mode 100644 index 000000000..16c87b6a6 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch @@ -0,0 +1,25 @@ +From 7355664f671bec7852e3c4523d75c27fc77a2eb2 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +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 +--- + 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, diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb index e3806f64f..8eed26299 100644 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb @@ -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" From patchwork Fri Jan 21 21:38:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2798 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88EF3C433FE for ; Fri, 21 Jan 2022 21:39:12 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web09.591.1642801151273195400 for ; Fri, 21 Jan 2022 13:39:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=oDbzjy9I; spf=pass (domain: gmail.com, ip: 209.85.221.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f43.google.com with SMTP id az25so1983160wrb.6 for ; Fri, 21 Jan 2022 13:39:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zJpJOG0G6z8q+HcWGWotZZrcs7iJQ0Z2SHwgVSQuNSs=; b=oDbzjy9Iw/n2+TURh35j/Z5pa14mvO+/ELMvCLs0kY3nt5BqfxsBm7BR5isWoCRPOL LK/SK5zqdCts8jUGRDgxjqdbOOM6cwAqTUkpdR7M5kTNLnUhLQAFov0wlwyi0J9ZK6Vg lWoLqwaqARxP3p8I4R88XYnkiFu6mE6btnzryEGZlyQTGqE7Ygma6inQvbCHbI0gzgpH v9o595Ht8+KXX3CCULld8ytUhXpO9DzXpD9R/lT0jCXxLHFgeazyJsWYjxin4i3u6NFx avSNfn6Q3lEORCKIjhHsCVAswJ0v5HflUq8qkkSTddHRvy3visYMKCBuDv3YXIv+wc/a Ij/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zJpJOG0G6z8q+HcWGWotZZrcs7iJQ0Z2SHwgVSQuNSs=; b=AMaeFz5rIzPPS6aalps9Vxff4qMvafjl3rrsImGZQsrikZ2GSVBK7f+ySWxisq/7Yt /Gysi6FAi4+sYhMO3Wfwb4izpTnOkFcEt9UklF69Hj/adz+IJZ38LXmeH1FsvNorGsyM juH1BUi+8Yv2rf0cUUlwzeqLLQXTq1N3336TE4WwkAdXohsHR35qvas5kdSSUvL5HhPp c4zW5lHD+ZfktgU/JGNcZfuZKzW5qEsF9xY2e1ipw+56tO9qGtMHINcHFcui6Gq+hWvb SMmVGqWSwkcJEtJqvzYPW+DdF35TDNinarufDqpL+FCK3irdqIwThaEkHlhx/txupRhY itIg== X-Gm-Message-State: AOAM533r2I1vhAqr7CCvwjmPrp4YQAg89NztZy0zHb7He4bfYfIJ1ZBS LyBoXjx6+eHBI8qm47UpPdVDOfYHCXw= X-Google-Smtp-Source: ABdhPJwjAtuh2YMwxshIW8QpWmYEsvwhQKiqj77wmzWMBnVKqwYnfAbJa3+TrhNhtlftJjaEqV7kLA== X-Received: by 2002:adf:f68e:: with SMTP id v14mr5672158wrp.585.1642801149876; Fri, 21 Jan 2022 13:39:09 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:09 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 05/19] gnome-font-viewer: backport a meson 0.61 patch Date: Fri, 21 Jan 2022 22:38:44 +0100 Message-Id: <20220121213858.762625-5-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94983 Signed-off-by: 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 diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch new file mode 100644 index 000000000..f32e120c1 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-Fix-meson-build-with-meson-0.60.0.patch @@ -0,0 +1,40 @@ +From 9c5ce6836498fdb057a7f865f516ce28609f542a Mon Sep 17 00:00:00 2001 +From: r-value +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 +--- + 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), diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb index 7afdefda1..9528b6641 100644 --- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb +++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb @@ -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} += " \ From patchwork Fri Jan 21 21:38:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2800 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B35BC43217 for ; Fri, 21 Jan 2022 21:39:13 +0000 (UTC) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.groups.io with SMTP id smtpd.web12.534.1642801152259131858 for ; Fri, 21 Jan 2022 13:39:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=D0LMDGHM; spf=pass (domain: gmail.com, ip: 209.85.128.44, mailfrom: alex.kanavin@gmail.com) Received: by mail-wm1-f44.google.com with SMTP id c66so18964211wma.5 for ; Fri, 21 Jan 2022 13:39:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zdlcvV9O48SwTuYsBcTiuGAtFLugL5WPvWXZAFjrE5g=; b=D0LMDGHMmUzViga9M3XdgoJz06ncHjmMUcjHQzXVB6Ewmv7AThPBLjeqpTXY/3i7kj ZpAl7Sb/DqYJ5iRCbAekJ3+7LWKIqS5SaG2AXz/2I69RsAyec/f4eBaBe/KEljOiD+Oo AfQkuRNYDMz2454+Pxs3fQ1oCsyRXQyFmfqUm7nx26TP+s7FDrGubWYDUKqB0BVugwVJ 66IHwinqnxkqM9T1imGZ+ZUxbSPaNKhbII0QMS3d1nn/L1VlPItrbyhdbJzHWEn+h5oO gTTAljhj1C/0OjSyx8l/omOxtW6J/j5wo5ph458wP3GoeeU76M2Eej9Z1Q6vf5yCAFOU 3HSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zdlcvV9O48SwTuYsBcTiuGAtFLugL5WPvWXZAFjrE5g=; b=thz2PZneex8ZouPeThzVRZ0RLejRfx3yH8kWZBDjroBAygNajefFZQQwPtkDEntx0a q37Him9NmC+3Rqf2aJBdMfCKx4qzV2FU3fMq1LqnGRBtF1P2RaxkDoNxbyeQ3piZq7A/ KlxRFGKLUcU2Q3G55AQOa3+fEQLqSynaqvpPjgqDptc/uxrUAN9ENLrcg0FPHCkXcYhL MBuDDdmOMZVBkEMjWrjo1mgIX4TCyE8GKNZjTmNXger5q3tO6nHWenIVt+jMTIXKPEWu E6vDURNzAwZu46ztHe47eqE+2t7L3XlY6SC1Dzpf0icLKqT6ZyHC7pQCGUwTI3yhBITn FyEg== X-Gm-Message-State: AOAM530EQdMM29NpZgo916G5WQ2aByOTIrplH3qip8beu3M+QgxU1Ovk IFBEW04rsMK71Kkpdee8GQ4kilsvC8Y= X-Google-Smtp-Source: ABdhPJyaG8pey1rbVO2hS2xKmt70X5X6DPpaxpGQ18PCdMsOXVBFIJqiOMNdKfRRraZS0chJmuY5uw== X-Received: by 2002:a05:600c:5028:: with SMTP id n40mr2258188wmr.10.1642801150900; Fri, 21 Jan 2022 13:39:10 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:10 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 06/19] gnome-session: update 40.1.1 -> 41.3 Date: Fri, 21 Jan 2022 22:38:45 +0100 Message-Id: <20220121213858.762625-6-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94984 This addresses meson 0.61 issues. Signed-off-by: Alexander Kanavin --- .../{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%) diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_40.1.1.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_41.3.bb similarity index 84% rename from meta-gnome/recipes-gnome/gnome-session/gnome-session_40.1.1.bb rename to meta-gnome/recipes-gnome/gnome-session/gnome-session_41.3.bb index c2513e928..010f815cd 100644 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_40.1.1.bb +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_41.3.bb @@ -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)}" From patchwork Fri Jan 21 21:38:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2802 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91A5DC433EF for ; Fri, 21 Jan 2022 21:39:14 +0000 (UTC) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.groups.io with SMTP id smtpd.web10.557.1642801153359429970 for ; Fri, 21 Jan 2022 13:39:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Wey4VJed; spf=pass (domain: gmail.com, ip: 209.85.221.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f54.google.com with SMTP id l25so1981991wrb.13 for ; Fri, 21 Jan 2022 13:39:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=loRY/YMkzMlSGqYnOG94+MhAqiATSBvOlypGK87s4Wc=; b=Wey4VJedSiPfBPCI+Q+uPzMKdr3KushX4w7A1e32eegQmfDVLTeNOcpVMDLEl7lBop lQjYeXw6/Y7pt4aK3jxsXJYBUH6ujyINqPI6ojDzYUJ0RyWWD3x1kR3OZUps5Uwjgrn7 zh6ucU0s2W6Q1W3SrAocEPtxwDvLhUvxvag+TmvClBtomrRh92zf3nuDnpCBvh064DZB 3JHPOQs3LKneZh2F8dFcmJkEo83f4SSRQ/Xu03VwhnS7sChn7IvqR7x84Zben2mh5YNw g/3OWtFGpPrgHTtmov025xXIRd6IOkcgPT6t3E0URI7a6RazXD71XN9fHzBGcBuy2GJz x0uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=loRY/YMkzMlSGqYnOG94+MhAqiATSBvOlypGK87s4Wc=; b=MkXSuCW3H3JYL0yDflCoJcASBPseCtOFjbyPK9sawKo5iSA7qKHhci1H7kZq9CswTN 4izeWR+qDRdtgEdrZVnkNySBzGHXtphbaLgs9Ul8Dg1EyMbdx+Ces7mek8ossFzbUIJA 9ZuXn8EQkYOF0iDCt8yTBsfstbI7zX8plreIJJxyFtm/ws0Jyaw6a42OXIqc2Y6P6kGu zXA/OplZDQOjdxHM3T1Zvx6zyTYjcOa7lfTS426/g55vQ+XY25UxZwWF5Y6p9qovQukn C9BPhUQ/XTBEkAlq3oN508l1YaUzgtdROfQODJL9gNKMofyYe0daMdvbG2w9mDo2R5NH 8cNw== X-Gm-Message-State: AOAM532+qrbqmThlaIVmYaMtbp3hWSutguulgc3OOxR6fwf/R/yLqsV6 O6DZtZVPe5uQjfj98AuBBko8Nxfolt0= X-Google-Smtp-Source: ABdhPJwkibM2AmjRAJGM0FbpsMgLM7Ulph1GYnfBkkh2dqUec27chPPtANRsjDYulTkZqOZSBE70MA== X-Received: by 2002:a5d:6190:: with SMTP id j16mr5504760wru.471.1642801152001; Fri, 21 Jan 2022 13:39:12 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:11 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 07/19] gnome-settings-daemon: add a meson 0.61 patch Date: Fri, 21 Jan 2022 22:38:46 +0100 Message-Id: <20220121213858.762625-7-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94985 Signed-off-by: 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 diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch new file mode 100644 index 000000000..cb758c7c8 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch @@ -0,0 +1,40 @@ +From 56535d2f1ec64e847e5fbd0613e78bd0dc046519 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +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 +--- + 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, diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb index 2851ccfd9..78d681170 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb @@ -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 ??= " \ From patchwork Fri Jan 21 21:38:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2803 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD789C433FE for ; Fri, 21 Jan 2022 21:39:15 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web11.582.1642801154493712202 for ; Fri, 21 Jan 2022 13:39:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=a9qmZNWC; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id k18so1977775wrg.11 for ; Fri, 21 Jan 2022 13:39:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+eHPYImAcHvjzI5WdFj6vbJcChkugdnIJ+2h/atb54E=; b=a9qmZNWCuho8UQKspwVAnT6+snjOeeqr+GalAiVqpgTHocX3iiGf3aM+lEBAoDw8Cy gvMH+I+iFWyfki3ZvHn+aNRiHRfojmBuPAP/vosyxcAv64qYmMJmtaNJryuNiXsqp4L3 8BL95XmYDjevAFXZQppaOXCLa8MFVpvLNUcgQeuEZNnJw5x5HSz4V8lIsxSKhIyqV8rV YE7UhOUBF1TNMjejECvP504RqxN35G7UaMFkH47lgeMI1bl/XCohxfFP8xHmIjP7NExs OgB0iIIH+Pnnj0N0rEqQkcMTIzp5BhhsuLxQNVkQoeWEalpArC6BmW7R7Bza+lAzdcAE 4IfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+eHPYImAcHvjzI5WdFj6vbJcChkugdnIJ+2h/atb54E=; b=H5O18QP8PRrZbQ5SCsdw472wWMEhzAYBnp1PVuMJmXQsaLZjVcGy8IFFrm+IrQLoiu rxPybdzYdccAEttnowZkG23hquErpOvEs0D8qExrZcPcUEV9Ok9exw1T30nmPEkmCVaE 48G1yOioQPVm/GkjSsDfd2pOBBjF5jVjUY4OF729CucDS2U0laG35t4WtVMZTPAnMxxq KuRrgQwnWT2QqRrVodJdzdbhEDejoJLssl7/XgzDfUH2mvekZnQADfMFoK3mrziZ7IDv HbTu1IsvNyoKDyiN/BqMBSaQHhazPkZLALZXXacsgw+1L94DN5FBOZNLlvRmjRS3Mj6i eMPg== X-Gm-Message-State: AOAM53163zyeQIVDSXMAVqaBZpfdpvsvu+II8Vj7DJOBbQC8AyoLOeL/ JhCYLX3dmcfjsKhHvHl+Rtj0ykW/5cc= X-Google-Smtp-Source: ABdhPJy3AzHipnUGJmcLEDsdRQ7wQ18qcHOr9Svhb4u5cTnR1bnpvdWIqRciwWhi3ne8NKj7mCaPyg== X-Received: by 2002:a5d:47c2:: with SMTP id o2mr5347785wrc.73.1642801153099; Fri, 21 Jan 2022 13:39:13 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:12 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 08/19] gnome-shell: backport a meson 0.61 patch Date: Fri, 21 Jan 2022 22:38:47 +0100 Message-Id: <20220121213858.762625-8-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94986 Signed-off-by: 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 diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-build-Drop-incorrect-positional-arg.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-build-Drop-incorrect-positional-arg.patch new file mode 100644 index 000000000..edc32dee6 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-build-Drop-incorrect-positional-arg.patch @@ -0,0 +1,81 @@ +From 6f797c21703ce9e996da17c49879e2a16dfbc256 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +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: +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + 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, diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb index 7a438e4c6..d1b19895a 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb @@ -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" From patchwork Fri Jan 21 21:38:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2809 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 870B1C433EF for ; Fri, 21 Jan 2022 21:39:16 +0000 (UTC) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.groups.io with SMTP id smtpd.web12.535.1642801155456937844 for ; Fri, 21 Jan 2022 13:39:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HNhRpYOw; spf=pass (domain: gmail.com, ip: 209.85.221.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f42.google.com with SMTP id r14so1979177wrp.2 for ; Fri, 21 Jan 2022 13:39:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8uxSMus+y5t9aeIQd65y9JSdq3tXd//CthdvXuoUuns=; b=HNhRpYOw6f6r7PMsEXYunurwfinGG0zTxViTyKU1ib0tdcvtscfAQJ33Ja6UXv85sK kRtyxGyUZUSjOWcCshaoT7SWXWENTnqVbtTowayP+i5uxc0jpQUF8TCpjyKRVC5h+aoH 62qs0lgvGcfE1hVRKe0k30dZr2HNvuH8xIRu2d57fF3eIRVEr8O2hiWCtCrs5xGDJqGm qhhEVbw17ewXvmY6Ip08FLI1L4OCnzkRiT/27kl9hiCC/PKP/Fp5/gOc5xeHDFlhcWCB MGrEO3MRYBx7NRgG9oYjT1+Vo1yCyv9apfAzoPkatLqHqvp82pghPgeH210hSisW5If0 fa9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8uxSMus+y5t9aeIQd65y9JSdq3tXd//CthdvXuoUuns=; b=F105qYyx8+qZDqaLdMMD/P395YHk+n6wXeen8pZPcIQ/5c10rfdBMjGyVhut7s9kia 5cUb4N74jPUdfEkpDRsFhAaFObH2P2CHkJafoXSqzOwdcBSpxF8Bz8te4khJNeLUS+kc YU5aaVuT3nX9hnhOKUNzAsq0ed9dJbdf9z2KktwyGsBwatNbIdQl8pMe3t7esa7ox9Au NaEGq+ohAg/mwowHbqpizVPwm6tP9BeAHkMFSIUNlVZKhuDOBf2Bk+2CzMvOlo3ijfOD xCKYBAYy8BuGQDZoh26jf3NoOX/8io/orwDE8IvX+M9O3TjnrdTlI0r1q2g/bVcV9gbo GiEg== X-Gm-Message-State: AOAM53025YpwvG3QvU6ZDCRynNDyT1mH5CZauEpsAv1wUhZ4S7j9lO+V +JB3eJNwAzmpvpYeLfbJeZakIfi0RzQ= X-Google-Smtp-Source: ABdhPJy0VgrNNk4pBWqpQxdWKJWsF1qZdZ1w1a7uOhhI0PKjEteCYs2OB6m9FskHY786OSlrMjXWew== X-Received: by 2002:a5d:598b:: with SMTP id n11mr5257675wri.562.1642801154032; Fri, 21 Jan 2022 13:39:14 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:13 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 09/19] accountsservice: backport a meson 0.61 patch Date: Fri, 21 Jan 2022 22:38:48 +0100 Message-Id: <20220121213858.762625-9-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94987 Signed-off-by: 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 diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/0001-Fix-build-with-meson-0.60.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/0001-Fix-build-with-meson-0.60.patch new file mode 100644 index 000000000..98b483d53 --- /dev/null +++ b/meta-gnome/recipes-support/accountsservice/accountsservice/0001-Fix-build-with-meson-0.60.patch @@ -0,0 +1,29 @@ +From bedec82615ca6858c3e9494650a5bbf33c710ebb Mon Sep 17 00:00:00 2001 +From: Luca Boccassi +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 +--- + 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, diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch index c2310fe46..429192cd0 100644 --- a/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch +++ b/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch @@ -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?= 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 - diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch index 14161804e..2b0924b2e 100644 --- a/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch +++ b/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch @@ -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?= 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 - diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb b/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb index a19102e8f..26cc04b8e 100644 --- a/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb +++ b/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb @@ -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 \ From patchwork Fri Jan 21 21:38:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2804 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 881CEC433FE for ; Fri, 21 Jan 2022 21:39:17 +0000 (UTC) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.groups.io with SMTP id smtpd.web08.591.1642801156468383369 for ; Fri, 21 Jan 2022 13:39:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=dpvVOhWF; spf=pass (domain: gmail.com, ip: 209.85.221.54, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f54.google.com with SMTP id r14so1979260wrp.2 for ; Fri, 21 Jan 2022 13:39:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MKw1RAozLA5hKTgNoB8C7S4l796UujHD9uvMOXtqB5Q=; b=dpvVOhWF00N3mjpeB+F3E9St5aR18ik1SCxeP3qGUCK0mlk63pKCNDhB7prNAKu4Cs Fdhwtx+uQJMTURMp+Zob0KDlQKwQycKZCFZLzSbcCkwTUi/z3lgEasnSwumJ5jINZT3t faZ/sOEh7BOEIxQlx7DFtNXXACOfHVih9a16W4EXS2ecpGyHSg6LnsQacNBk8APBYGTX P092xMyodjgIrP1eNjbdrrMk7Na/QW0HOZ22YWcfYnCmAB8kL/fotEONnEF/2AqA//N5 nhrQWw7sGhRVLaoXOmmmBuULNwAhaVuhUuqERu60rLUML//eWoRs6HD/L4Tg0IqdpcyY x4Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MKw1RAozLA5hKTgNoB8C7S4l796UujHD9uvMOXtqB5Q=; b=8B3EhTKvyP2bEhslI6KLN24FHAeqD9/mhDLomCblr7GFPEud+o6Ep1CtSmaJFPyvpo 9n5xqRgFMg+qTTa2l3cPr1ePS1n4kiRUngi3uqHwhsPWYUAUupvghI+f8n94PS3E5VwG EMrlMd+Mi9VEOBzmTtVIisN0ES5Xjqw6EjWXqWLheoTzEBWU8lUQATzVAKyea9h2FF98 pJmP2iTRZAGEQh/puMsp1bGbx+8vPxJeeWLnwu7Y9oswCVLLcUITsS1TI5wAJV3EogXo KZEnhtgdJmlSrFGq+UEO5jhQo4kidhL6x4MN2o2ZI3yJkVZtMcQW7/dsnYCLWm/U/XuI STUQ== X-Gm-Message-State: AOAM53007QOYafxheJsTiZISkbs5b4Jw7RDErsx0q5fAYOgYQiqZfogz Rc3E3XSUob/lneXw+x3VNQYK53ODdBY= X-Google-Smtp-Source: ABdhPJxuICgNSoOlJREFsgwoqmD2VxMeYfc4sfRIrQBenQrlU5OqP0/vbRr5f+a48v9f4btYUcphEw== X-Received: by 2002:a5d:610b:: with SMTP id v11mr5398646wrt.487.1642801155041; Fri, 21 Jan 2022 13:39:15 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:14 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 10/19] gnome-screenshot: backport a meson 0.61 patch Date: Fri, 21 Jan 2022 22:38:49 +0100 Message-Id: <20220121213858.762625-10-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94988 Signed-off-by: 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 diff --git a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-meson-remove-extraneous-positional-argument.patch b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-meson-remove-extraneous-positional-argument.patch new file mode 100644 index 000000000..c80fda63a --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-meson-remove-extraneous-positional-argument.patch @@ -0,0 +1,36 @@ +From c38c604b06a63f690d67318d4ef97ac556264876 Mon Sep 17 00:00:00 2001 +From: Jack Hill +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 +--- + 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'), diff --git a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb index 834b443fa..18d73d872 100644 --- a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb +++ b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb @@ -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" From patchwork Fri Jan 21 21:38:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2806 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8980EC4332F for ; Fri, 21 Jan 2022 21:39:18 +0000 (UTC) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.groups.io with SMTP id smtpd.web12.536.1642801157266423307 for ; Fri, 21 Jan 2022 13:39:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=LoeIEJ+K; spf=pass (domain: gmail.com, ip: 209.85.221.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f42.google.com with SMTP id k18so1977920wrg.11 for ; Fri, 21 Jan 2022 13:39:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=72ijL2zfe2NDZzBU/6M+fUiuPh+j/GL6wEleG//Jl+8=; b=LoeIEJ+KaQYwwLnxPzE73BTb5zWuCN5b2kLN7eSOETyNGU5JBDw9MDzCXIYLiiE02q uHAU+ufw+5i1/41sthYTFuuAXdU+Ql11juC65K3kWZqIzm+9uTgL1BohgeVGXsMBFGOQ eAKmOsqCnNdfMWXGK4XpWJvoj6bbwfrEj/UEhGvwrldBi1EUK8hyt8mteJnQ9h6xHfAI 5eIHO5sOK8NxOhOWNHLdmJRxY4NxgZ7V7MOXVHkmgdkgXoTHHne6F4b58iMmH/mbwIsp d4/ospMddEHGgJQYmn4V1MEuZBrf/AzxoqrQSxUk7qzoUKVDLXVfImdU8lSDJej/sty2 vPqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=72ijL2zfe2NDZzBU/6M+fUiuPh+j/GL6wEleG//Jl+8=; b=TQ8jO29qIEC17WpstdDzaqg82NOYVSC+OyU35Ow5MIzHPfzxKjR4wI2QG3wLEUUUQN FLfBLRZWmT4T6MtU3uhsmO46hP5IZrzSlFUyCl2ksMO1u8vf6Dy865YpjWXqCuaB5Ep4 k/mf8RkCTw75IykyZaUlQeUQLOhVnbWBog8F2M/mLnO5lqYFt9jqE6jWgy4ITMSNaEHk oHn4hMIURYRSnc1rhbwSou6OK3JSdWt1VFa8Gkcd3JfKyqauX9Q4DeyFllNz72xahR7t u448GJYItUnf2QYqFFD2IqHO8cTRSmKjI6NMuivfD9z8kdl64CAzNxDb82X6gFFgP3ac g8mw== X-Gm-Message-State: AOAM531DkjC6KvJEZgheHL7wK1amKYM1d7ATR6E+TAolv09W/H+9C48g 1U4CKGT8GHOz5D847GgjYF8bqTJnoNY= X-Google-Smtp-Source: ABdhPJwJp6q7/ewqrgXtdYwnmIfIWOhVi8M3dN0Nua7g2O5OqpRoNIbKbck4SJDDxJQX8ZZ+4zISWw== X-Received: by 2002:a5d:60cd:: with SMTP id x13mr754154wrt.588.1642801155919; Fri, 21 Jan 2022 13:39:15 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:15 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 11/19] evince: fix meson 0.61 builds Date: Fri, 21 Jan 2022 22:38:50 +0100 Message-Id: <20220121213858.762625-11-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94989 Signed-off-by: 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 diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch b/meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch new file mode 100644 index 000000000..68447bec8 --- /dev/null +++ b/meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch @@ -0,0 +1,52 @@ +From b525a64d26bcba4e3a74f09c580429625d8a2104 Mon Sep 17 00:00:00 2001 +From: r-value +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 +--- + 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, diff --git a/meta-gnome/recipes-gnome/evince/evince_41.3.bb b/meta-gnome/recipes-gnome/evince/evince_41.3.bb index 3464bd11e..ec3dca209 100644 --- a/meta-gnome/recipes-gnome/evince/evince_41.3.bb +++ b/meta-gnome/recipes-gnome/evince/evince_41.3.bb @@ -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" From patchwork Fri Jan 21 21:38:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2805 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8987DC43217 for ; Fri, 21 Jan 2022 21:39:18 +0000 (UTC) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.groups.io with SMTP id smtpd.web12.538.1642801158036687837 for ; Fri, 21 Jan 2022 13:39:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eW4VIA20; spf=pass (domain: gmail.com, ip: 209.85.221.48, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f48.google.com with SMTP id r14so1979350wrp.2 for ; Fri, 21 Jan 2022 13:39:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NNWWM8OnPtqwqxpw4hFe/xM1dYwcTFCVtBnWdZgIqLw=; b=eW4VIA20Gg8pCPbX3TZi4eSwQRQvI96kxfPuz7r298Ke3QGurTYgzGw7jUKH7Buu6I lNuo3nrNm+0qdfVInE5jGyX2ZT7OYPEZMKVEGgsnUwRByJ2o11bu31F7VUkpzeRZwAZa Dv+Cpel7nFr7qBOJi5dcGq15LhqCgIhu5Gr2g+BNGz4qME9iyqW7Vdbc7uxKEZhsNG3P hMk9yBSnbu2np0/ha4v+T0+O/hfFHAUMQza5Cxg6fMGyDNlROLiyGEQOauHMtgkfxR8z PiqvFT3yQpGaqqyb6b+899j+D0HN4caEyG4AIhtDRPCQXJcUMS3UvGUvlF1GwD3Ec4Ps vSGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NNWWM8OnPtqwqxpw4hFe/xM1dYwcTFCVtBnWdZgIqLw=; b=YeNNgy2ezcwz6r865utcHBGaSN+pqynQMS9z8cfXIZZ43UMVXmKwzIQuDJ8yxrJK0u sDFH9mWjlczW7hyLXYIgvUdFOb/LHf/IektPGdTrNCsPnufTihi7KmTpLlRtTtYDzjHY +Gf9YkQtNyTNCsZsV660yQr4YG0NTPQ5gI0Mm+Rvt2Xl1BegjFUC/fKKsR91tJq96dCt a2vdBzxIaDkWiMsMB8ztqWm+j1I1vMhwcRERYzwW9FFV8Uj8antThe3c+4UT6OAT3VU4 Kz6QjHn0CtuHcJOY0U0zTWh6L2lO26nrU99DdDwqIeVR88Y1MzuXOd75pn4CPvWqO+o7 /hWg== X-Gm-Message-State: AOAM531TMeeKSKPW9MNavxOr4X0K6GfLUGNVyi2qnZvKjRKiGmqZNGOg vo4d+UiFWG81B9mqaIuMEbNyjbMaeUU= X-Google-Smtp-Source: ABdhPJxPhbG1+E4J8bx0g5nCZAyjA4aU/PUC81ns5k6NCc41NQa8rtSoxCsbLNyINOabqU44GplKyw== X-Received: by 2002:a5d:58c8:: with SMTP id o8mr5178915wrf.549.1642801156681; Fri, 21 Jan 2022 13:39:16 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:16 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 12/19] gnome-calendar: fix meson 0.61 builds Date: Fri, 21 Jan 2022 22:38:51 +0100 Message-Id: <20220121213858.762625-12-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94990 Signed-off-by: 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 diff --git a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch new file mode 100644 index 000000000..8ec980bb1 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar/0001-meson.build-fix-meson-0.61-builds.patch @@ -0,0 +1,23 @@ +From 7060aa63abbb64e7c6cbacc167d5f939d2a77e41 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + 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', diff --git a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb index a28913bfa..4b62a0c07 100644 --- a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb +++ b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb @@ -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} += " \ From patchwork Fri Jan 21 21:38:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2808 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A1CBC4321E for ; Fri, 21 Jan 2022 21:39:19 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web10.559.1642801158721669323 for ; Fri, 21 Jan 2022 13:39:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CmpVDhuB; spf=pass (domain: gmail.com, ip: 209.85.221.52, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f52.google.com with SMTP id az25so1983553wrb.6 for ; Fri, 21 Jan 2022 13:39:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uFQ2aL306hR4HDzIUClVND/PYpnepd2Lphgwzfw1tz8=; b=CmpVDhuBNXcfQ0aui6HBljo7t8eVfwqQnE+q314kBWR09W+ZdN9fGGdx5Mj30ldNCQ r9Vbgn8er3IDVEDvbPBf6/O69RfCvcewx/5VOIcYJzjtNxb03Ag+o2TJDPNVQ+sbB6eK e7njiBQxV6XiYtl7AFUvd4VkXAvS/ej2Psln2sFOa9F9fxbUvCIltk066pkpCrykPvA1 cBD8pMNyPn/feqm16NPnAVBHymEsEpyNfu8Fs0cCd+AeErheYT95wjT9KYm8Ofcwencc G4PR+m8sqf00XRaMdgbS6sdocmSJBVAJygXyWxrDYVkQa+TsuJqR1TLP6hc9vA9b9se+ kHuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uFQ2aL306hR4HDzIUClVND/PYpnepd2Lphgwzfw1tz8=; b=Ny4fCnxNZA9QidG8pShkRwfl09glr8DZS9VX0+jLz5ZIYWmAIY8D4G3p7bbPZYSV8v FZfs6eY9MP1+DKCKu+eVzFgFMGijDMGBFZuvKC2no1eTerAooATLGIgk/eCsbTfnlDoI sGyNRKDLMqABLhTKLLALtxilVDQUgqxuap24h55QiXuFXx4TNSHGsFJYLcpj60Isotu6 +v8Oy5JXGwSkb/2lbbY/dkIjvlSduOn3a3+39Qn9R0iXa6887gXGpkK5+l9QWTzzZsK6 VrdcC18XT5FHi8Q4UC/6APf7IxjTaCBgbZJ8JyRX6M6mTbq7AugLI3Qja5CiXqDfQpw7 2BTw== X-Gm-Message-State: AOAM532bZdXYOzK7+yPqFuQtLXOmCmayBHvOIWUp3s3D+bEsCaeyUJWZ aL+kZW/MA5k4chU43n7J2YuPmQJ+0MI= X-Google-Smtp-Source: ABdhPJwYx1IM+960I+WASU9H3XAxeTwpMKZPP3/hKotoXNGyazIHb5PwBVvo/tD4+iSZF+2zA+e3zw== X-Received: by 2002:adf:f28c:: with SMTP id k12mr5311041wro.532.1642801157325; Fri, 21 Jan 2022 13:39:17 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:17 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 13/19] gthumb: fix meson 0.61 builds Date: Fri, 21 Jan 2022 22:38:52 +0100 Message-Id: <20220121213858.762625-13-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94991 Signed-off-by: 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 diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb/0001-LINGUAS-removed-duplicated-entry.patch b/meta-gnome/recipes-gnome/gthumb/gthumb/0001-LINGUAS-removed-duplicated-entry.patch new file mode 100644 index 000000000..b50b175e7 --- /dev/null +++ b/meta-gnome/recipes-gnome/gthumb/gthumb/0001-LINGUAS-removed-duplicated-entry.patch @@ -0,0 +1,23 @@ +From f3d399892e59a2e850be1d0de30c429417c78360 Mon Sep 17 00:00:00 2001 +From: Paolo Bacchilega +Date: Tue, 11 Jan 2022 12:30:44 +0100 +Subject: [PATCH] LINGUAS: removed duplicated entry + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + 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 diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb b/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb index 4dbd82dc3..e9c52f347 100644 --- a/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb +++ b/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb @@ -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" From patchwork Fri Jan 21 21:38:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2807 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A3E7C433F5 for ; Fri, 21 Jan 2022 21:39:20 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web12.539.1642801159611722336 for ; Fri, 21 Jan 2022 13:39:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=outZXov4; spf=pass (domain: gmail.com, ip: 209.85.221.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f47.google.com with SMTP id e8so242392wrc.0 for ; Fri, 21 Jan 2022 13:39:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z9dMiJn0rAEzl/fUB/yunRoul9jZBbg0xKuhp3Kon0c=; b=outZXov4TBE2Pr+02MivmDva40QGVaYGuD8eWxhrrxDQMzVy+usMGGzyOGAtbDkcBU 7/DagfAy/PgPhGJjbTevcCWieCpXb9RcCE4wMthkY38jhnpnS5csh9UuH755RoLp4J91 2UYyE0lHoJZ9WDDWKdH5dfPCfWIhurt8j2n3qww16l9Vh7KzFyU5p8wX/Mj4lPk02OcV R3PJw6VAhLKvtenjXllsctUUhchlhQL1KS2ZS7JxZ82E0agSWs1Kr1UD+FVqhu3bBX2H Ix2V8Zlz61EFzHcxGLYKTMT2cWZCb2L59BN3doMv/FdtFVaa6yypsSrNHJPFnmGhy8oN uJQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z9dMiJn0rAEzl/fUB/yunRoul9jZBbg0xKuhp3Kon0c=; b=Jr4y8YMtkRPJStAntumOEPo/192dXUcoGyPgZDoO73frSj11OeLpbyh39O7dBuOVfD 1LLb857J/bwC5cIkR0VBoinsmpV3KxM5o3jG2xq2wVpiy7/2UgamcgZybNm2I9vory3V loG2MHZstI2wKr1wX+1bJ7nULapWZVBqJsQNA7uwdm1SJ185PiYpqr8GQrAD8OF8LjPr sKWrRifAufHLxABYRkSfj3UOeHNDmxupc5KMhR28/wjuCH9FEj6R+RUWp8LmqxDV79pI wdzIAhvvt8X+XD5xN9RQh5eiBtplPCrcY3oBfxOlYLGRglvpaU3hTUQwphdDu4P38T2p cJuQ== X-Gm-Message-State: AOAM533hgZrlCoxfujoEZmGMAyru/72VU8UlSg7rG8xAZI33w+oTO345 WRCfQ7CdZ9xs45hDIq85Rd7OQA5Cqqo= X-Google-Smtp-Source: ABdhPJyZw61BIRVZreRpwWtj8ekBzDhBGbnOePlh4Fc+JvMXYq7vH9UFI0HEu7eP3ct7yPOiB+gS/Q== X-Received: by 2002:a5d:4704:: with SMTP id y4mr4194230wrq.473.1642801158197; Fri, 21 Jan 2022 13:39:18 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:17 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 14/19] gedit: add a meson 0.61 patch Date: Fri, 21 Jan 2022 22:38:53 +0100 Message-Id: <20220121213858.762625-14-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94992 Signed-off-by: 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 diff --git a/meta-gnome/recipes-gnome/gedit/gedit/0001-Remove-incorrect-args-for-i18n.merge_file.patch b/meta-gnome/recipes-gnome/gedit/gedit/0001-Remove-incorrect-args-for-i18n.merge_file.patch new file mode 100644 index 000000000..66df3c269 --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/gedit/0001-Remove-incorrect-args-for-i18n.merge_file.patch @@ -0,0 +1,34 @@ +From ea9a15afb76c093aea37f6c56c559b61afd9a9f2 Mon Sep 17 00:00:00 2001 +From: rvalue +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 +--- + 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, diff --git a/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb b/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb index 5a9c49976..df8ab620c 100644 --- a/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb +++ b/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb @@ -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 From patchwork Fri Jan 21 21:38:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2810 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EB8BC4167B for ; Fri, 21 Jan 2022 21:39:21 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web12.540.1642801160603977085 for ; Fri, 21 Jan 2022 13:39:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=mQpWEvTe; spf=pass (domain: gmail.com, ip: 209.85.221.47, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f47.google.com with SMTP id az25so1983648wrb.6 for ; Fri, 21 Jan 2022 13:39:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3FB8o5LbSa1c/Jt/9S7SHK6GGBbkBFoqasjcLpjnWTc=; b=mQpWEvTe7z+MnVfamqaejZDKrBqZxIjzjDRWB58nUmocl4RVuDzWomdiMgmyM1N6k/ rNKHAbAC/CEzSkl8OwRcuyCAUxHcYNxH6p4NFyx3pO6CRYsmBAeVvMHCnrpuSUW9wybS eAlz3G/qvygNTGteKnMK0psfJ4W7tHOODCzu3/9RaLgapmVu7X1z4lzrPQ6zuEuFtU8a wzLSim4HGFEh/Wc55GmedDlKlRnReomcuvhLEplxfJnzdE6iUNkV4oKen0DgsqoYT2em /cgy1PVNXle7wiFhvnpW+IcYEkskulwoK4ZXPyV8SrtQ6Wt1RBhiQXonebPaPsLcDYig dyvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3FB8o5LbSa1c/Jt/9S7SHK6GGBbkBFoqasjcLpjnWTc=; b=iBWQnd3zlgQFIIbO2JWB2XCA226i805BLmqC2CcyI8w6KBKoKEQ7nzWqskz9C5Z1Ra eGjQ5WsINXQD3btlPcOY/YTUnuLIrd9oz8Mny9xTl/ADbyDQcgUqUs1uxhruBqbTZ0s5 ESJEg6eJIzjnutw8crLnGbtwGhT9WPLozUBbnNkg549o3upjJeuSk45CoWrJ5kiqQEmB gtD4mI0YxXnEIEZXUkvdfDZBBa0JXaOoc7zdEZ4MT6VRdUMALNNIZ3sDMazkwSe4RR7I J3irGZeCYTdRXO8WHcbwk7ZzbTpSl0oEjeR5CIrxuHATAtg3W4n53XIY0f0dI8EE45/6 xf+Q== X-Gm-Message-State: AOAM531KO48ABVB7mKzdpaCvZsv3eUaB+ls6rFPvyVCJlieFIUUwVzYe eU6M/QtPi7NFDWRGEktvsq8P95gRE3s= X-Google-Smtp-Source: ABdhPJwvXO5yASm2naKv7Rh8/uLABNp8ThC2E4SF/Y5xITFaCEk0VanWlarqaIqvAJ9L3Bm21FDatw== X-Received: by 2002:adf:f489:: with SMTP id l9mr4946587wro.489.1642801159254; Fri, 21 Jan 2022 13:39:19 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:18 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 15/19] gnome-disk-utility: add a meson 0.61 patch Date: Fri, 21 Jan 2022 22:38:54 +0100 Message-Id: <20220121213858.762625-15-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94993 Signed-off-by: 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 diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch new file mode 100644 index 000000000..2758af507 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch @@ -0,0 +1,34 @@ +From 629ca0e61bb59303d43d7eac44a47ae866cc78f0 Mon Sep 17 00:00:00 2001 +From: rvalue +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 +--- + 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, diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb index 462865e72..7e254f52c 100644 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb @@ -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} += " \ From patchwork Fri Jan 21 21:38:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2811 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A54EC4332F for ; Fri, 21 Jan 2022 21:39:22 +0000 (UTC) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web11.584.1642801161475420283 for ; Fri, 21 Jan 2022 13:39:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=YMpUS00J; spf=pass (domain: gmail.com, ip: 209.85.221.43, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f43.google.com with SMTP id f17so1989144wrx.1 for ; Fri, 21 Jan 2022 13:39:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yfFhM0rbkPP+kLPzf8VeELwvEA8Rkh0jp3oSXOUHCGY=; b=YMpUS00JrOtMX7WddP5zZSS6SgfDAS1YXPLeyZ06MLDHr6ZWYUZKhFnEsTRtqq98ne qLlW+g2nGE//I2hwTuWI0DL/R+lJcgLfczJyTdmVdqosIaQxDw3ev+n8xApVJnUOxNLc 8J30VU2+JlnuY1PrgYCnn6+RxjhYnZng7fWPlsT/v3SZ/SQYUW3q542iopAWUyIpZi1X gvw/n41AtuzFk0WUcKZhOdjzH45Va7W7IzvlFDW9I2lua7bm5TfBtrUp0qqJVmwFiqwr 4X+IMRvViCYCS2dxjJAjyEl3KQ609Dr/hdfbDvmfEgp4i22vQPTOWt3o+I2LVthHDL8K YO6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yfFhM0rbkPP+kLPzf8VeELwvEA8Rkh0jp3oSXOUHCGY=; b=w/MxrzJvM4s1jYdHNgxvwiTdYNNGy2SOQ2rYIoQFaG0LVvhSagGyzY8+yxASYnbtzv 2W/7s1tNQt5DiABUulKMwDgPZq9MguEr4rxfnk1GLKQtkskJ/wiz39KqjM8qgrwSQCXH Q69hYlrNxXIcIaxgx+6Wd7CCyy5SVk18xs0PqGFMD4/EdgTk+lEm5g2P7F806WxcpIIg VWSt6rIhirfMaC4eX2YJCLoIxShdTXoZtaAFI5w9mhaKP9aF0JBOdZRPK6qtU4gpdEg9 9KlUXc0X8FwJoCEjnL8xIGGMJn7GbSm9hou5MkuP4ceUB9u9FkixNulZa6r3thSKvl4m 5HkQ== X-Gm-Message-State: AOAM5314AUotwqBw7Y5W9XgAL94h/2ROQBk60IRjjaipUVoKR+jLN0PV Ygk2o4VC7UAm+bWIu9sHccbOSdwetK0= X-Google-Smtp-Source: ABdhPJxDwBlhaVj2ZwPAr215WeOwG1698e3T+43SnyQShPxSo1vxqNL99gu9OAuaJeskXpkpCYkHLg== X-Received: by 2002:a05:6000:508:: with SMTP id a8mr5308430wrf.578.1642801159997; Fri, 21 Jan 2022 13:39:19 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:19 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 16/19] gnome-control-center: add a meson 0.61 patch Date: Fri, 21 Jan 2022 22:38:55 +0100 Message-Id: <20220121213858.762625-16-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94994 Signed-off-by: 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 diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-meson-drop-unused-argument-for-i18n.merge_file.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-meson-drop-unused-argument-for-i18n.merge_file.patch new file mode 100644 index 000000000..7a1180e68 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-meson-drop-unused-argument-for-i18n.merge_file.patch @@ -0,0 +1,504 @@ +From 90715329c277f21537eb5af86d8f222c4a2abd24 Mon Sep 17 00:00:00 2001 +From: Jan Beich +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 +--- + 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.@0@.policy'.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.@0@.policy'.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-@0@.desktop.in'.format(desktop_file), + output : 'gnome-@0@-panel.desktop'.format(desktop_file), diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb index 7ed3afd37..f2b95edd0 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb @@ -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" From patchwork Fri Jan 21 21:38:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2812 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A37AC433EF for ; Fri, 21 Jan 2022 21:39:23 +0000 (UTC) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.groups.io with SMTP id smtpd.web10.562.1642801162195639701 for ; Fri, 21 Jan 2022 13:39:22 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=njIN6nwl; spf=pass (domain: gmail.com, ip: 209.85.221.42, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f42.google.com with SMTP id l25so1982456wrb.13 for ; Fri, 21 Jan 2022 13:39:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yjVZsK1b3ArUVtRwTiQ9By3n0c/iYgzeWwjtVbknrG4=; b=njIN6nwlviejzu4eeF2y92C9OywHIlqOqYQIbYVHMyur+rohHctPa3KqKSZDRICeyV BHVbpzim0BFH8FxfixU+KuSXIXwJ21b88tlekjjDZu4jCDY+9qQIKajhRT3zZKomLa+s MTPlzp6BN+zIpxCgkKSfMNK3ZudhfVOETFMB1za45MYKsu33MyRvCH/Q+bzC1Oh+S7Yb 8qG0BHXpqnUD8ox7TI45RVYdtPOZxWTSHcN4G6ryJRo/Ri7IhQ/LSEL6YXIwLgGEEW7a kSiGH4CFwprLcwf4uqmXQ7nUao0/fPA7DL2Hh+TtvllKhLYeOWoTza3+a7HPetHG06Hh Os6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yjVZsK1b3ArUVtRwTiQ9By3n0c/iYgzeWwjtVbknrG4=; b=oE2JQq0SuzZhq9YgBXG+1B51G0ja64Mc6hBKsAsnwaZT0vwtdQoaXagEyvkVnrcs+w bSRp+GIf8CuYjwZblhr8BK/EtMKxi73ui8YSUS6V/tSE6Y+EMwnMLNQBdz1l4bOVj8M6 yMNjtaGupUyPrxE7JAvsmWLBpIzlIE0JRXCQAUKdX/5gxNDIHPdO2HDNOfZlMl2QKrlr ajspHpaz2kifAo7XRP6PTQI+43roq2K38S17DkEA48UqmvfYZJo/wUL9RYPgFEml527g EVVQE4dv3Kqi3KtyWKDS1fb3GDjiv3kO67kCE1YiTWuvPL6I+AMY2eEw2wfIHxLMOr1P yphQ== X-Gm-Message-State: AOAM531EQGFqr6Blc++0x8yYcy29JN9E4J994dqUqoYRnRGZbL6r/eXl CM1Q63HRLLY3upie00RBqTejW7ohW3M= X-Google-Smtp-Source: ABdhPJxPkSDCcgzBGfGjlh/jyDGDxc6VDhXtkL4DAF8VHp9EDGzp7MRdr/xuSCKR+qs5GrUOoKIDGw== X-Received: by 2002:a05:6000:170d:: with SMTP id n13mr5425281wrc.4.1642801160836; Fri, 21 Jan 2022 13:39:20 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:20 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 17/19] gnome-photos: add a meson 0.61 patch Date: Fri, 21 Jan 2022 22:38:56 +0100 Message-Id: <20220121213858.762625-17-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94995 Signed-off-by: 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 diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch new file mode 100644 index 000000000..9fb7a5b9e --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch @@ -0,0 +1,31 @@ +From a112e8a089851035945b6848849149bb36787906 Mon Sep 17 00:00:00 2001 +From: rvalue +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 +--- + 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, diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb index fb1b7d30b..ae8ab31f6 100644 --- a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb +++ b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb @@ -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() { From patchwork Fri Jan 21 21:38:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2813 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BA39C433FE for ; Fri, 21 Jan 2022 21:39:23 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web11.586.1642801162806889630 for ; Fri, 21 Jan 2022 13:39:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CwU9CV5Q; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id e8so242557wrc.0 for ; Fri, 21 Jan 2022 13:39:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VyDizkhqGM0doSGDOwAnISk4H54CtZgbxhC2NhzWykU=; b=CwU9CV5QDyiuscg9UWtmSm4VbFaEKFCivbGe4atFN55KQVlkK1xwNzhASCYYquZWk1 /IPGE0BJ6JvwWaQuwt3oQeiOJRwnkPld02YAeGuRe53hmcnFh0Nu4eJSJIorKRdDcNci t7ssWpnaZmsltQg4xyJTELX4Dg6pvow7lygKfm2PbyudRzHBK/7zjMHyz17zv5u6MOpO ysAui+MXmcdrKUCS8vHc/tPl3rAnud9Q9oWivTOmKheGqNOagBqLvaxUV/kanYRYj1bE w1XohBgnXIuWIPduFYdaZ5SFuEtDt3AvyrCTGFnM6B+Vi78oeImlMq73cKBYBxGQjnjt 6vsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VyDizkhqGM0doSGDOwAnISk4H54CtZgbxhC2NhzWykU=; b=7ZjPMZ8kV8gWj2nbzojeArnJ8hI64jyVKq4FlK16Ho99BwkeznILsjQWT6A9PS9sC+ RvkOtcy7H4sQfN1vHt6UUv4igGeVimVO/DdIFFx0/wRP35317OQ4zJZ+yc5wVPYTWhZP psYSDv2EqfPYz8EvS/dPDzGuyyH2TYqeTU+sv5P0D0boy2Ocpbb9HBWXkQcjxjIss7Y2 vpCh6AIdlccdKAmAooUEG6Joq2sBoMYMEkGSdFeE0Vb0iiUkhoaI8KFR/TDhu/+TMNWE PHF7o4/fcngpvKAzJsr1CGSHMP16+aGSdGbPIMnI9ftijb+WtznPv9hFX4E0b+VG+DQw cG7Q== X-Gm-Message-State: AOAM533PkzMf27hxUftrhi7Umx1RbA9aCjGIV6KoTNWw24wARGYFFrCU vRC8PfeKaKOPZeLjovl/KxmDXD8THYQ= X-Google-Smtp-Source: ABdhPJzQzU9UfuHswU5+edkBUDa0lWolghtcDqw8p0nXPduPAd568BSjmyZidE9kEfSAQh5Kbr1Ktg== X-Received: by 2002:a5d:66d0:: with SMTP id k16mr1120626wrw.477.1642801161475; Fri, 21 Jan 2022 13:39:21 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:21 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 18/19] dconf-editor: add a meson 0.61 patch Date: Fri, 21 Jan 2022 22:38:57 +0100 Message-Id: <20220121213858.762625-18-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94996 Signed-off-by: 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 diff --git a/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-editor-meson.build-fix-meson-0.61-errors.patch b/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-editor-meson.build-fix-meson-0.61-errors.patch new file mode 100644 index 000000000..850d8a9d4 --- /dev/null +++ b/meta-gnome/recipes-gnome/dconf/dconf-editor/0001-editor-meson.build-fix-meson-0.61-errors.patch @@ -0,0 +1,31 @@ +From 86379a220a4eb00c309f514d2ca57ed6c1c8b35c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + 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, diff --git a/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb b/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb index 97e994c1f..55b29139b 100644 --- a/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb +++ b/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb @@ -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} += " \ From patchwork Fri Jan 21 21:38:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 2814 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E1F8C433F5 for ; Fri, 21 Jan 2022 21:39:24 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web08.592.1642801163579720350 for ; Fri, 21 Jan 2022 13:39:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qG3Ma37j; spf=pass (domain: gmail.com, ip: 209.85.221.45, mailfrom: alex.kanavin@gmail.com) Received: by mail-wr1-f45.google.com with SMTP id ba4so1973862wrb.4 for ; Fri, 21 Jan 2022 13:39:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EUmpVJDH7Wt+Ds4gsGqP7OpVcCyuoiiJ57JQRRgvdfo=; b=qG3Ma37jiu6E+NvcdXIxq//Naz6XNV6XHQoH7iV8YqpUljdWO9IRQPrnm/Mh/KRpUw Rsp3FqxhdBnokL99zSL6yunBQpXGGiBP/itV2MWKsJfB2poOwxthQTMp43Zaj07Yv6Uk lGrJ9d2IezW0DN9TZfc/DacJjxYpAl+V8/GU9pCRh0fHc6Rs0ob5sDD/c780yzEG/yXO pg2pHFn4XHPW8k8kdCKmAoN4x57MnDmvQem99dIZsrm4IN2+/y1XhFXpahWk0jPlI3Br CWIVQaS32prHYDFxfvj6pVKALQK6pl9synPnYqGryI31yxJvfTTJeAG/Jelrq3F6acft e5wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EUmpVJDH7Wt+Ds4gsGqP7OpVcCyuoiiJ57JQRRgvdfo=; b=a+gx5ObC2lXtQW7Uop6CJ8B2NwQZEG69YnwmK2tkf2McbHiSusRRiksu0J6rPooOk+ Z02mMhHZPDqSDkYk0Hmi6GMGNIStmkRjYWMabG238Rbpowmvc/UZYssdPNtSsYCwkt0F uHfeQOLLOtG8fQpiHGnseZykxekjYRYHBYDsjLAl3DG8qn94TAZgQYRf8g42pUMn98jR jkFNHNSh3tMBl8YNN2Hsu/15ZiIuKuL8UBO+88ui025CdeVlXg3wyBQeHMQTSkZrJNFz k+GBSVIhu1AHQbkIyD/qHGD9BMJqDqtKE79QDXkRQQbQXF9uE9V/BdMRkSY5N9DBhW02 OkSQ== X-Gm-Message-State: AOAM530ILCVRqMMClgJtyu/fmYvjh3i7ZNzgbdLoa679oB3BWz/vh6XT XWV2keRYzD9uX1kCKr5SJsWlig45+YM= X-Google-Smtp-Source: ABdhPJwWG1BQ9Tywr1KtY+w7LykurjNTEfgOJjsYXiPeFIvIlnCpo9MCnm1SXx5uO3E/1ii19svipg== X-Received: by 2002:a5d:45c6:: with SMTP id b6mr5373606wrs.330.1642801162146; Fri, 21 Jan 2022 13:39:22 -0800 (PST) Received: from nereus.lab.linutronix.de. (b2b-109-90-143-203.unitymedia.biz. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id l24sm5870274wme.17.2022.01.21.13.39.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:21 -0800 (PST) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Cc: Alexander Kanavin Subject: [PATCH 19/19] network-manager-applet: add meson 0.61 patch Date: Fri, 21 Jan 2022 22:38:58 +0100 Message-Id: <20220121213858.762625-19-alex@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220121213858.762625-1-alex@linutronix.de> References: <20220121213858.762625-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 21 Jan 2022 21:39:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94997 Signed-off-by: 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 diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch new file mode 100644 index 000000000..4a5cd5b81 --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch @@ -0,0 +1,31 @@ +From ab27e6e6c839e1c65e4059a06982453a7aa1b6b3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + 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, diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb index 6ebb3ea9f..c181d3943 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb @@ -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?)