head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.34
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.32
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.30
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.28
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.26
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.24
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.22
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.20
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.18
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.16
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.14
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.12
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.10
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.8
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.6
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.4
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.2
	pkgsrc-2022Q1-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2022.02.18.17.42.34;	author pgoyette;	state Exp;
branches;
next	;
commitid	1Zx6nzHwevirP7tD;


desc
@@


1.1
log
@Deal with meson update - unused parameter no longer optional/ignored

Thanks wiz for the pointer to gentoo patch.
@
text
@$NetBSD$

https://gitlab.gnome.org/GNOME/gnome-sudoku/-/commit/7c9935a02b48f332f67bad3e4ee020b75591084a
https://bugs.gentoo.org/831556

From: Jan Beich <jbeich@@FreeBSD.org>
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,
@