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


desc
@@


1.1
log
@Fix build with meson >= 0.61

Update eog to 40.3

Highlights:
- !106, EogImage: Do not crash if content type or filesize cannot be
        detected (Felix Riemann)
- #195, Critical warning after closing EOG (invalid unclassed pointer;
        assertion 'EOG_IS_IMAGE (img)' failed) (Felix Riemann)
- !100, Remove directories when unmount external drive (Krifa75)
- #189, Crash Report: eog_thumb_view_clear_range: assertion failed:
        (start_thumb <= end_thumb) (Andrew Consroe)
- #146, Part of a large image (exceeding certain dimensions)
        does not display (Felix Riemann)
- #181, docs: Remove PicasaWeb support (Andre Klapper)
- !83, Re-detect mimetype from data if loading fails the first time (Krifa75)
- !89, Update EogWindow and EogListStore when deleting
       a monitored directory (Krifa75)
- !85, Fix several image reference counting issues (Felix Riemann)
- many new and updated translations
@
text
@$NetBSD$

Fix build with meson >= 0.61
commits:
- 07b60839da44988b3ad9e6ebc78bde4f3b0e622b
- 7aad17c1471792590af6f614e8fbc324f381cc1d

--- data/meson.build.orig	2021-08-14 16:04:19.984650600 +0000
+++ data/meson.build
@@@@ -14,30 +14,22 @@@@ resource_data = files(
   'popup-menus.ui',
 )
 
-desktop = 'org.gnome.eog.desktop'
-
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: '@@BASENAME@@',
-  configuration: {'VERSION': eog_version, 'icon': application_id },
-)
-
 i18n.merge_file(
-  desktop,
-  type: 'desktop',
-  input: desktop_in,
-  output: desktop,
+  input: configure_file(
+    input: 'org.gnome.eog.desktop.in.in',
+    output: '@@BASENAME@@',
+    configuration: {'VERSION': eog_version, 'icon': application_id },
+  ),
+  output: '@@BASENAME@@',
   po_dir: po_dir,
+  type: 'desktop',
   install: true,
   install_dir: eog_datadir / 'applications',
 )
 
-appdata = 'eog.appdata.xml'
-
 i18n.merge_file(
-  appdata,
-  input: appdata + '.in',
-  output: appdata,
+  input: 'eog.appdata.xml.in',
+  output: '@@BASENAME@@',
   po_dir: po_dir,
   install: true,
   install_dir: eog_datadir / 'metainfo',
@