From 4b7d11291c1593b185e299e914328a624f50bb5e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 9 Mar 2022 19:05:16 +0100 Subject: [PATCH] gnome-sudoku: fix for meson 0.61 --- srcpkgs/gnome-sudoku/patches/meson-0.61.patch | 38 +++++++++++++++++++ srcpkgs/gnome-sudoku/template | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gnome-sudoku/patches/meson-0.61.patch diff --git a/srcpkgs/gnome-sudoku/patches/meson-0.61.patch b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch new file mode 100644 index 0000000000..93549d0158 --- /dev/null +++ b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch @@ -0,0 +1,38 @@ +From 7c9935a02b48f332f67bad3e4ee020b75591084a Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Mon, 24 Jan 2022 11:44:06 +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. + +data/meson.build:5:0: ERROR: Function does not take positional arguments. +data/meson.build:24:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index f18f247..9c95e02 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml') + + resources = gnome.compile_resources('gnome-sudoku', resource_files) + +-desktop_file = i18n.merge_file('desktop', ++desktop_file = i18n.merge_file( + input: '@0@.desktop.in'.format(application_id), + output: '@0@.desktop'.format(application_id), + install: true, +@@ -21,7 +21,7 @@ if desktop_file_validate.found() + ) + endif + +-appdata_file = i18n.merge_file('appdata', ++appdata_file = i18n.merge_file( + input: '@0@.appdata.xml.in'.format(application_id), + output: '@0@.appdata.xml'.format(application_id), + install: true, +-- +GitLab + diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template index ed1759478a..6e0af45248 100644 --- a/srcpkgs/gnome-sudoku/template +++ b/srcpkgs/gnome-sudoku/template @@ -5,7 +5,7 @@ revision=1 build_helper="gir" build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config vala" -makedepends="gtk4-devel libgee08-devel json-glib-devel qqwing-devel" +makedepends="gtk+3-devel libgee08-devel json-glib-devel qqwing-devel" short_desc="GNOME Sudoku Japanese logic game" maintainer="Orphaned " license="GPL-3.0-or-later"