[pkgsrc/trunk]: pkgsrc/sysutils/gnome-font-viewer gnome-font-viewer: fix buil...

[gutteridge <gutteridge%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1889b9208954
branches:  trunk
changeset: 374909:1889b9208954
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Thu Mar 03 01:11:27 2022 +0000

description:
gnome-font-viewer: fix builds with meson>=0.61

(This package doesn't actually run for me on NetBSD 9.2_STABLE: it
crashes with an X error. But this gets it to build again.)

diffstat:

 sysutils/gnome-font-viewer/Makefile                       |   4 ++--
 sysutils/gnome-font-viewer/distinfo                       |   4 +++-
 sysutils/gnome-font-viewer/patches/patch-data_meson.build |  14 ++++++++++++++
 sysutils/gnome-font-viewer/patches/patch-src_meson.build  |  15 +++++++++++++++
 4 files changed, 34 insertions(+), 3 deletions(-)

diffs (63 lines):

diff -r 85c4dbcd426b -r 1889b9208954 sysutils/gnome-font-viewer/Makefile
--- a/sysutils/gnome-font-viewer/Makefile       Wed Mar 02 22:56:36 2022 +0000
+++ b/sysutils/gnome-font-viewer/Makefile       Thu Mar 03 01:11:27 2022 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2021/12/08 16:06:29 adam Exp $
+# $NetBSD: Makefile,v 1.4 2022/03/03 01:11:27 gutteridge Exp $
 
 DISTNAME=      gnome-font-viewer-3.34.0
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils gnome
 EXTRACT_SUFX=  .tar.xz
 
diff -r 85c4dbcd426b -r 1889b9208954 sysutils/gnome-font-viewer/distinfo
--- a/sysutils/gnome-font-viewer/distinfo       Wed Mar 02 22:56:36 2022 +0000
+++ b/sysutils/gnome-font-viewer/distinfo       Thu Mar 03 01:11:27 2022 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:19:38 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/03/03 01:11:27 gutteridge Exp $
 
 BLAKE2s (gnome-font-viewer-3.34.0.tar.xz) = bae23b2a2752d0670a7771ae819c04cca24065b597afbf87d40dd1f30c83774f
 SHA512 (gnome-font-viewer-3.34.0.tar.xz) = 1be6230da5ff47a129db43b5f5467d3fed8925fad7a6637f24d72c8c99c80d8dd1635eaef1b7c7f650a86132a54cde8326d3418075f5818d0154dc8d503927c7
 Size (gnome-font-viewer-3.34.0.tar.xz) = 157756 bytes
+SHA1 (patch-data_meson.build) = 4e304ba011cbb6a2e7b1a5fea7686dc324316fa0
+SHA1 (patch-src_meson.build) = 007a47747057c8499896bbbece9231c4146808a2
diff -r 85c4dbcd426b -r 1889b9208954 sysutils/gnome-font-viewer/patches/patch-data_meson.build
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gnome-font-viewer/patches/patch-data_meson.build Thu Mar 03 01:11:27 2022 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-data_meson.build,v 1.1 2022/03/03 01:11:27 gutteridge Exp $
+
+Fix builds with meson>=0.61.
+
+--- data/meson.build.orig      2019-09-14 23:36:36.000000000 +0000
++++ data/meson.build
+@@ -1,6 +1,6 @@
+ appdatadir = join_paths(datadir, 'metainfo')
+ appdata_file = 'org.gnome.font-viewer.appdata.xml'
+-i18n.merge_file(appdata_file,
++i18n.merge_file(
+   input: appdata_file + '.in',
+   output: appdata_file,
+   po_dir: '../po',
diff -r 85c4dbcd426b -r 1889b9208954 sysutils/gnome-font-viewer/patches/patch-src_meson.build
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gnome-font-viewer/patches/patch-src_meson.build  Thu Mar 03 01:11:27 2022 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_meson.build,v 1.1 2022/03/03 01:11:27 gutteridge Exp $
+
+Fix builds with meson>=0.61.
+
+--- src/meson.build.orig       2019-09-14 23:36:36.000000000 +0000
++++ src/meson.build
+@@ -37,7 +37,7 @@ executable('gnome-font-viewer', viewer_s
+   install: true)
+ 
+ desktop_file = 'org.gnome.font-viewer.desktop'
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+   input: desktop_file + '.in',
+   output: desktop_file,
+   po_dir: '../po',