CVS commit: pkgsrc/games/gnome-sudoku

["Paul Goyette" <pgoyette%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pgoyette
Date:           Fri Feb 18 17:42:34 UTC 2022

Modified Files:
        pkgsrc/games/gnome-sudoku: Makefile distinfo
Added Files:
        pkgsrc/games/gnome-sudoku/patches: patch-data_meson.build

Log Message:
Deal with meson update - unused parameter no longer optional/ignored

Thanks wiz for the pointer to gentoo patch.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/games/gnome-sudoku/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/games/gnome-sudoku/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/gnome-sudoku/patches/patch-data_meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/gnome-sudoku/Makefile
diff -u pkgsrc/games/gnome-sudoku/Makefile:1.40 pkgsrc/games/gnome-sudoku/Makefile:1.41
--- pkgsrc/games/gnome-sudoku/Makefile:1.40     Wed Dec  8 16:04:30 2021
+++ pkgsrc/games/gnome-sudoku/Makefile  Fri Feb 18 17:42:34 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2021/12/08 16:04:30 adam Exp $
+# $NetBSD: Makefile,v 1.41 2022/02/18 17:42:34 pgoyette Exp $
 
 DISTNAME=      gnome-sudoku-40.2
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    games gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gnome-sudoku/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/games/gnome-sudoku/distinfo
diff -u pkgsrc/games/gnome-sudoku/distinfo:1.11 pkgsrc/games/gnome-sudoku/distinfo:1.12
--- pkgsrc/games/gnome-sudoku/distinfo:1.11     Tue Oct 26 10:44:02 2021
+++ pkgsrc/games/gnome-sudoku/distinfo  Fri Feb 18 17:42:34 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:44:02 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/02/18 17:42:34 pgoyette Exp $
 
 BLAKE2s (gnome-sudoku-40.2.tar.xz) = c1275e9b144609706a1442ff320ade953d37f1906277545a717d9d19f7b77b91
 SHA512 (gnome-sudoku-40.2.tar.xz) = 5baaba3bba714eb90c9d1597f83c310c9ef59693d5372b3871afd34b2f1c48a3257cb61f220d3cdf624cb29ad80015e0f5ec88485020b7e351540c69374131fa
 Size (gnome-sudoku-40.2.tar.xz) = 358260 bytes
+SHA1 (patch-data_meson.build) = 5e55ad32579c46dbc38a934b1229f9f0b6b1cdf2

Added files:

Index: pkgsrc/games/gnome-sudoku/patches/patch-data_meson.build
diff -u /dev/null pkgsrc/games/gnome-sudoku/patches/patch-data_meson.build:1.1
--- /dev/null   Fri Feb 18 17:42:34 2022
+++ pkgsrc/games/gnome-sudoku/patches/patch-data_meson.build    Fri Feb 18 17:42:34 2022
@@ -0,0 +1,34 @@
+$NetBSD: patch-data_meson.build,v 1.1 2022/02/18 17:42:34 pgoyette Exp $
+
+https://gitlab.gnome.org/GNOME/gnome-sudoku/-/commit/7c9935a02b48f332f67bad3e4ee020b75591084a
+https://bugs.gentoo.org/831556
+
+From: Jan Beich <jbeich%FreeBSD.org@localhost>
+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.orig
++++ 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,