From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9F90F158088 for ; Tue, 25 Jan 2022 00:49:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACE432BC018; Tue, 25 Jan 2022 00:49:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 75EA52BC017 for ; Tue, 25 Jan 2022 00:49:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8954F342F1A for ; Tue, 25 Jan 2022 00:49:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 465EF2B2 for ; Tue, 25 Jan 2022 00:49:51 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1643071749.eb2cc8bc9dced2bcbfe7f92e019b849b52c3a543.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/simple-scan/, media-gfx/simple-scan/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch media-gfx/simple-scan/simple-scan-40.7.ebuild X-VCS-Directories: media-gfx/simple-scan/files/ media-gfx/simple-scan/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: eb2cc8bc9dced2bcbfe7f92e019b849b52c3a543 X-VCS-Branch: master Date: Tue, 25 Jan 2022 00:49:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 22b7093f-4aa8-4b32-8c41-7d50f08d509a X-Archives-Hash: 926644f4d369b6f691815361f9fe5e07 commit: eb2cc8bc9dced2bcbfe7f92e019b849b52c3a543 Author: Christophe Lermytte lermytte be> AuthorDate: Mon Jan 24 22:34:48 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jan 25 00:49:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb2cc8bc media-gfx/simple-scan: fix build with meson-0.61 Closes: https://bugs.gentoo.org/831891 Signed-off-by: Christophe Lermytte lermytte.be> Signed-off-by: Sam James gentoo.org> .../files/40.7-fix-build-with-meson-0.61.1.patch | 39 ++++++++++++++++++++++ media-gfx/simple-scan/simple-scan-40.7.ebuild | 1 + 2 files changed, 40 insertions(+) diff --git a/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch b/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch new file mode 100644 index 000000000000..b1a161df922a --- /dev/null +++ b/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch @@ -0,0 +1,39 @@ +https://gitlab.gnome.org/GNOME/simple-scan/-/commit/da6626debe00be1a0660f30cf2bf7629186c01d5 +https://bugs.gentoo.org/831891 + +From: r-value +Date: Tue, 16 Nov 2021 02:43:11 +0800 +Subject: [PATCH] Remove incorrect i18n.merge_file argument + +The positional argument was being silently ignored until meson 0.60.0 where +it fails with "ERROR: Function does not take positional arguments". +--- + data/meson.build | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 2b5a0ee3..cf6e4ae1 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml', + install_dir: join_paths (datadir, 'glib-2.0', 'schemas')) + meson.add_install_script ('meson_compile_gschema.py') + +-i18n.merge_file ('desktop-file', +- input: 'simple-scan.desktop.in', ++i18n.merge_file (input: 'simple-scan.desktop.in', + output: 'simple-scan.desktop', + install: true, + install_dir: join_paths (datadir, 'applications'), + po_dir: '../po', + type: 'desktop') + +-i18n.merge_file ('appdata-file', +- input: 'simple-scan.appdata.xml.in', ++i18n.merge_file (input: 'simple-scan.appdata.xml.in', + output: 'simple-scan.appdata.xml', + install: true, + install_dir: join_paths (datadir, 'metainfo'), +-- +GitLab + diff --git a/media-gfx/simple-scan/simple-scan-40.7.ebuild b/media-gfx/simple-scan/simple-scan-40.7.ebuild index 271640f4fb76..0b752878e6c9 100644 --- a/media-gfx/simple-scan/simple-scan-40.7.ebuild +++ b/media-gfx/simple-scan/simple-scan-40.7.ebuild @@ -47,6 +47,7 @@ BDEPEND=" PATCHES=( # Add control for optional dependencies "${FILESDIR}"/40.0-add-control-optional-deps.patch + "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch ) src_prepare() {