Skip to content

Commit

Permalink
media-gfx/simple-scan: fix build with meson-0.61
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/831891
Signed-off-by: Christophe Lermytte <[email protected]>
Signed-off-by: Sam James <[email protected]>
  • Loading branch information
kobboi authored and thesamesam committed Jan 25, 2022
1 parent b7d4f62 commit eb2cc8b
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 0 deletions.
39 changes: 39 additions & 0 deletions media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
https://gitlab.gnome.org/GNOME/simple-scan/-/commit/da6626debe00be1a0660f30cf2bf7629186c01d5
https://bugs.gentoo.org/831891

From: r-value <[email protected]>
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

1 change: 1 addition & 0 deletions media-gfx/simple-scan/simple-scan-40.7.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit eb2cc8b

Please sign in to comment.