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.03.08.09.33.35;	author prlw1;	state Exp;
branches;
next	;
commitid	DuoqXXnT3ZwLxovD;


desc
@@


1.1
log
@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)
@
text
@$NetBSD$

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'),
@