Thu Mar 3 01:11:28 2022 UTC ()
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.)


(gutteridge)
diff -r1.3 -r1.4 pkgsrc/sysutils/gnome-font-viewer/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/gnome-font-viewer/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/gnome-font-viewer/patches/patch-data_meson.build
diff -r0 -r1.1 pkgsrc/sysutils/gnome-font-viewer/patches/patch-src_meson.build
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/gnome-font-viewer/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-font-viewer/Makefile 2021/12/08 16:06:29 1.3
+++ pkgsrc/sysutils/gnome-font-viewer/Makefile 2022/03/03 01:11:27 1.4
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.3 2021/12/08 16:06:29 adam Exp $ 1# $NetBSD: Makefile,v 1.4 2022/03/03 01:11:27 gutteridge Exp $
2 2
3DISTNAME= gnome-font-viewer-3.34.0 3DISTNAME= gnome-font-viewer-3.34.0
4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/} 4MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= sysutils gnome 6CATEGORIES= sysutils gnome
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://gitlab.gnome.org/GNOME/gnome-font-viewer 10HOMEPAGE= https://gitlab.gnome.org/GNOME/gnome-font-viewer
11COMMENT= View fonts on your system 11COMMENT= View fonts on your system
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= pkg-config msgfmt xgettext 14USE_TOOLS+= pkg-config msgfmt xgettext
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
17 17
18# msgfmt: unknown option -- xml 18# msgfmt: unknown option -- xml
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/gnome-font-viewer/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-font-viewer/distinfo 2021/10/26 11:19:38 1.3
+++ pkgsrc/sysutils/gnome-font-viewer/distinfo 2022/03/03 01:11:27 1.4
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
1$NetBSD: distinfo,v 1.3 2021/10/26 11:19:38 nia Exp $ 1$NetBSD: distinfo,v 1.4 2022/03/03 01:11:27 gutteridge Exp $
2 2
3BLAKE2s (gnome-font-viewer-3.34.0.tar.xz) = bae23b2a2752d0670a7771ae819c04cca24065b597afbf87d40dd1f30c83774f 3BLAKE2s (gnome-font-viewer-3.34.0.tar.xz) = bae23b2a2752d0670a7771ae819c04cca24065b597afbf87d40dd1f30c83774f
4SHA512 (gnome-font-viewer-3.34.0.tar.xz) = 1be6230da5ff47a129db43b5f5467d3fed8925fad7a6637f24d72c8c99c80d8dd1635eaef1b7c7f650a86132a54cde8326d3418075f5818d0154dc8d503927c7 4SHA512 (gnome-font-viewer-3.34.0.tar.xz) = 1be6230da5ff47a129db43b5f5467d3fed8925fad7a6637f24d72c8c99c80d8dd1635eaef1b7c7f650a86132a54cde8326d3418075f5818d0154dc8d503927c7
5Size (gnome-font-viewer-3.34.0.tar.xz) = 157756 bytes 5Size (gnome-font-viewer-3.34.0.tar.xz) = 157756 bytes
 6SHA1 (patch-data_meson.build) = 4e304ba011cbb6a2e7b1a5fea7686dc324316fa0
 7SHA1 (patch-src_meson.build) = 007a47747057c8499896bbbece9231c4146808a2
File Added: pkgsrc/sysutils/gnome-font-viewer/patches/patch-data_meson.build
$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',
File Added: pkgsrc/sysutils/gnome-font-viewer/patches/patch-src_meson.build
$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',