CVS commit: pkgsrc/games/hitori

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Tue Mar  8 09:33:35 UTC 2022

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

Log Message:
Fix build with meson >= 0.61

Update hitori to 3.38.3

Overview of changes in Hitori 3.38.3
====================================

* Bugs fixed:
 - !30 docs: Document renaming of master branch to main
 - !31 appdata: Update OARS ratings from 1.0 to 1.1 and add requires/recommends data
 - !33 Update Occitan locale

* Translation updates:
 - Occitan (post 1500)


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/games/hitori/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/games/hitori/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/hitori/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/hitori/Makefile
diff -u pkgsrc/games/hitori/Makefile:1.26 pkgsrc/games/hitori/Makefile:1.27
--- pkgsrc/games/hitori/Makefile:1.26   Wed Dec  8 16:04:31 2021
+++ pkgsrc/games/hitori/Makefile        Tue Mar  8 09:33:35 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2021/12/08 16:04:31 adam Exp $
+# $NetBSD: Makefile,v 1.27 2022/03/08 09:33:35 prlw1 Exp $
 
-DISTNAME=      hitori-3.38.2
-PKGREVISION=   1
+DISTNAME=      hitori-3.38.3
 CATEGORIES=    games gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/hitori/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/games/hitori/distinfo
diff -u pkgsrc/games/hitori/distinfo:1.12 pkgsrc/games/hitori/distinfo:1.13
--- pkgsrc/games/hitori/distinfo:1.12   Tue Oct 26 10:44:04 2021
+++ pkgsrc/games/hitori/distinfo        Tue Mar  8 09:33:35 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 10:44:04 nia Exp $
+$NetBSD: distinfo,v 1.13 2022/03/08 09:33:35 prlw1 Exp $
 
-BLAKE2s (hitori-3.38.2.tar.xz) = ff1b2245f259a3be8409b75d780547502f1345d3831a9fb8dc30a4a046826b02
-SHA512 (hitori-3.38.2.tar.xz) = 6a094e7bf9b528b965819a28b64db0f7b6c474dbd1a54c3063ad2f20b726193a46b4b058566baea7dee889c3d692bd36bdf775a177e430b5772b16762bdc2785
-Size (hitori-3.38.2.tar.xz) = 204992 bytes
+BLAKE2s (hitori-3.38.3.tar.xz) = 73ffe7fa9a1f502a71b20b3cc2f748c4edbf592ce2b2f1d9081fb6e4f491161c
+SHA512 (hitori-3.38.3.tar.xz) = 1ba966c22304a2538026234fbb9e0ae34a433643af02ecc26a6e5cd240efa89524ee0e98334d01728f25ec987865a8ff724036e37859503d2517e7480d2dc744
+Size (hitori-3.38.3.tar.xz) = 205100 bytes
+SHA1 (patch-data_meson.build) = 83b268d62064dc3d130a39c449cedffb3aa813d1

Added files:

Index: pkgsrc/games/hitori/patches/patch-data_meson.build
diff -u /dev/null pkgsrc/games/hitori/patches/patch-data_meson.build:1.1
--- /dev/null   Tue Mar  8 09:33:35 2022
+++ pkgsrc/games/hitori/patches/patch-data_meson.build  Tue Mar  8 09:33:35 2022
@@ -0,0 +1,24 @@
+$NetBSD: patch-data_meson.build,v 1.1 2022/03/08 09:33:35 prlw1 Exp $
+
+Fix build with meson >= 0.61
+commit d25728e122f1d7b985029a5ba96810c3e57c27f7
+
+--- data/meson.build.orig      2021-09-17 11:09:51.891512600 +0000
++++ data/meson.build
+@@ -1,6 +1,6 @@
+ subdir('icons')
+ 
+-desktop_file = i18n.merge_file('desktop-file',
++desktop_file = i18n.merge_file(
+   type: 'desktop',
+   input: '@0@.desktop.in'.format(application_id),
+   output: '@0@.desktop'.format(application_id),
+@@ -20,7 +20,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file('appdata-file',
++appdata_file = i18n.merge_file(
+   input: '@0@.appdata.xml.in'.format(application_id),
+   output: '@0@.appdata.xml'.format(application_id),
+   po_dir: join_paths(meson.source_root(), 'po'),