Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1646947530298770"
MIME-Version: 1.0
Date: Thu, 10 Mar 2022 21:25:30 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/gnome-dictionary
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20220310212530.C2ACEFB24@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1646947530298770
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Thu Mar 10 21:25:30 UTC 2022

Modified Files:
	pkgsrc/textproc/gnome-dictionary: distinfo
Added Files:
	pkgsrc/textproc/gnome-dictionary/patches: patch-data_meson.build

Log Message:
gnome-dictionary: fix build with latest meson


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/gnome-dictionary/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/gnome-dictionary/patches/patch-data_meson.build

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


--_----------=_1646947530298770
Content-Disposition: inline
Content-Length: 2561
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/textproc/gnome-dictionary/distinfo
diff -u pkgsrc/textproc/gnome-dictionary/distinfo:1.3 pkgsrc/textproc/gnome-dictionary/distinfo:1.4
--- pkgsrc/textproc/gnome-dictionary/distinfo:1.3	Tue Oct 26 11:21:54 2021
+++ pkgsrc/textproc/gnome-dictionary/distinfo	Thu Mar 10 21:25:30 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:21:54 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/03/10 21:25:30 nia Exp $
 
 BLAKE2s (gnome-dictionary-3.26.1.tar.xz) = 822ab7b66510e33d6d8ea4920abe64e95a24e76918f438d259bd59bb2de1ec26
 SHA512 (gnome-dictionary-3.26.1.tar.xz) = da7169795740295c13f02143f5263603f0f6c621e96cecf88a4ee089114399d59f083987bc4571821467da64dc43f00bebbe4ea66b46a035088f85d35d6aee27
 Size (gnome-dictionary-3.26.1.tar.xz) = 662048 bytes
+SHA1 (patch-data_meson.build) = 22860f60098033d2ca944d9c297ca5b10fb456a6

Added files:

Index: pkgsrc/textproc/gnome-dictionary/patches/patch-data_meson.build
diff -u /dev/null pkgsrc/textproc/gnome-dictionary/patches/patch-data_meson.build:1.1
--- /dev/null	Thu Mar 10 21:25:30 2022
+++ pkgsrc/textproc/gnome-dictionary/patches/patch-data_meson.build	Thu Mar 10 21:25:30 2022
@@ -0,0 +1,34 @@
+$NetBSD: patch-data_meson.build,v 1.1 2022/03/10 21:25:30 nia Exp $
+
+Remove incorrect positional arguments, previously these would have
+been silently ignored but now they cause build failures.
+
+--- data/meson.build.orig	2017-10-01 14:14:30.000000000 +0000
++++ data/meson.build
+@@ -1,5 +1,4 @@
+-i18n.merge_file ('desktop',
+-                 input: 'org.gnome.Dictionary.desktop.in',
++i18n.merge_file (input: 'org.gnome.Dictionary.desktop.in',
+                  output: 'org.gnome.Dictionary.desktop',
+                  install: true,
+                  install_dir: join_paths(gdict_datadir, 'applications'),
+@@ -14,8 +13,7 @@ if desktop_file_validate.found()
+        workdir: meson.current_build_dir())
+ endif
+ 
+-i18n.merge_file ('desktop',
+-                 input: 'org.gnome.Dictionary.appdata.xml.in',
++i18n.merge_file (input: 'org.gnome.Dictionary.appdata.xml.in',
+                  output: 'org.gnome.Dictionary.appdata.xml',
+                  install: true,
+                  install_dir: join_paths(gdict_datadir, 'appdata'),
+@@ -48,8 +46,7 @@ sources = [
+ ]
+ 
+ foreach s: sources
+-  i18n.merge_file('desktop',
+-                  input: '@0@.in'.format(s),
++  i18n.merge_file(input: '@0@.in'.format(s),
+                   output: s,
+                   install: true,
+                   install_dir: join_paths(gdict_datadir, 'gdict-1.0', 'sources'),


--_----------=_1646947530298770--