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

4 files changed, 57 insertions, 74 deletions

diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 61c1184378f..076c266078e 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.112 2021/12/08 16:04:51 adam Exp $
+# $NetBSD: Makefile,v 1.113 2022/03/08 09:12:03 prlw1 Exp $
 
-DISTNAME=	eog-3.38.0
-PKGREVISION=	2
+DISTNAME=	eog-40.3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/graphics/eog/PLIST b/graphics/eog/PLIST
index 398be4aafe2..bbc4b038d22 100644
--- a/graphics/eog/PLIST
+++ b/graphics/eog/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2020/11/12 09:44:00 nia Exp $
+@comment $NetBSD: PLIST,v 1.20 2022/03/08 09:12:03 prlw1 Exp $
 bin/eog
 include/eog-3.0/eog/eog-application-activatable.h
 include/eog-3.0/eog/eog-application.h
@@ -74,7 +74,6 @@ share/help/C/eog/open.page
 share/help/C/eog/plugin-exif-digital.page
 share/help/C/eog/plugin-fullscreen-background.page
 share/help/C/eog/plugin-fullscreen-double-click.page
-share/help/C/eog/plugin-picasa.page
 share/help/C/eog/plugin-python-console.page
 share/help/C/eog/plugin-send-by-mail.page
 share/help/C/eog/plugin-slideshow-shuffle.page
@@ -83,7 +82,6 @@ share/help/C/eog/plugins.page
 share/help/C/eog/preferences.page
 share/help/C/eog/print.page
 share/help/C/eog/rename-multiple.page
-share/help/C/eog/shortcuts.page
 share/help/C/eog/slideshow.page
 share/help/C/eog/translate.page
 share/help/C/eog/view.page
@@ -114,7 +112,6 @@ share/help/ar/eog/open.page
 share/help/ar/eog/plugin-exif-digital.page
 share/help/ar/eog/plugin-fullscreen-background.page
 share/help/ar/eog/plugin-fullscreen-double-click.page
-share/help/ar/eog/plugin-picasa.page
 share/help/ar/eog/plugin-python-console.page
 share/help/ar/eog/plugin-send-by-mail.page
 share/help/ar/eog/plugin-slideshow-shuffle.page
@@ -123,7 +120,6 @@ share/help/ar/eog/plugins.page
 share/help/ar/eog/preferences.page
 share/help/ar/eog/print.page
 share/help/ar/eog/rename-multiple.page
-share/help/ar/eog/shortcuts.page
 share/help/ar/eog/slideshow.page
 share/help/ar/eog/translate.page
 share/help/ar/eog/view.page
@@ -154,7 +150,6 @@ share/help/ca/eog/open.page
 share/help/ca/eog/plugin-exif-digital.page
 share/help/ca/eog/plugin-fullscreen-background.page
 share/help/ca/eog/plugin-fullscreen-double-click.page
-share/help/ca/eog/plugin-picasa.page
 share/help/ca/eog/plugin-python-console.page
 share/help/ca/eog/plugin-send-by-mail.page
 share/help/ca/eog/plugin-slideshow-shuffle.page
@@ -163,7 +158,6 @@ share/help/ca/eog/plugins.page
 share/help/ca/eog/preferences.page
 share/help/ca/eog/print.page
 share/help/ca/eog/rename-multiple.page
-share/help/ca/eog/shortcuts.page
 share/help/ca/eog/slideshow.page
 share/help/ca/eog/translate.page
 share/help/ca/eog/view.page
@@ -194,7 +188,6 @@ share/help/cs/eog/open.page
 share/help/cs/eog/plugin-exif-digital.page
 share/help/cs/eog/plugin-fullscreen-background.page
 share/help/cs/eog/plugin-fullscreen-double-click.page
-share/help/cs/eog/plugin-picasa.page
 share/help/cs/eog/plugin-python-console.page
 share/help/cs/eog/plugin-send-by-mail.page
 share/help/cs/eog/plugin-slideshow-shuffle.page
@@ -203,7 +196,6 @@ share/help/cs/eog/plugins.page
 share/help/cs/eog/preferences.page
 share/help/cs/eog/print.page
 share/help/cs/eog/rename-multiple.page
-share/help/cs/eog/shortcuts.page
 share/help/cs/eog/slideshow.page
 share/help/cs/eog/translate.page
 share/help/cs/eog/view.page
@@ -234,7 +226,6 @@ share/help/da/eog/open.page
 share/help/da/eog/plugin-exif-digital.page
 share/help/da/eog/plugin-fullscreen-background.page
 share/help/da/eog/plugin-fullscreen-double-click.page
-share/help/da/eog/plugin-picasa.page
 share/help/da/eog/plugin-python-console.page
 share/help/da/eog/plugin-send-by-mail.page
 share/help/da/eog/plugin-slideshow-shuffle.page
@@ -243,7 +234,6 @@ share/help/da/eog/plugins.page
 share/help/da/eog/preferences.page
 share/help/da/eog/print.page
 share/help/da/eog/rename-multiple.page
-share/help/da/eog/shortcuts.page
 share/help/da/eog/slideshow.page
 share/help/da/eog/translate.page
 share/help/da/eog/view.page
@@ -274,7 +264,6 @@ share/help/de/eog/open.page
 share/help/de/eog/plugin-exif-digital.page
 share/help/de/eog/plugin-fullscreen-background.page
 share/help/de/eog/plugin-fullscreen-double-click.page
-share/help/de/eog/plugin-picasa.page
 share/help/de/eog/plugin-python-console.page
 share/help/de/eog/plugin-send-by-mail.page
 share/help/de/eog/plugin-slideshow-shuffle.page
@@ -283,7 +272,6 @@ share/help/de/eog/plugins.page
 share/help/de/eog/preferences.page
 share/help/de/eog/print.page
 share/help/de/eog/rename-multiple.page
-share/help/de/eog/shortcuts.page
 share/help/de/eog/slideshow.page
 share/help/de/eog/translate.page
 share/help/de/eog/view.page
@@ -314,7 +302,6 @@ share/help/el/eog/open.page
 share/help/el/eog/plugin-exif-digital.page
 share/help/el/eog/plugin-fullscreen-background.page
 share/help/el/eog/plugin-fullscreen-double-click.page
-share/help/el/eog/plugin-picasa.page
 share/help/el/eog/plugin-python-console.page
 share/help/el/eog/plugin-send-by-mail.page
 share/help/el/eog/plugin-slideshow-shuffle.page
@@ -323,7 +310,6 @@ share/help/el/eog/plugins.page
 share/help/el/eog/preferences.page
 share/help/el/eog/print.page
 share/help/el/eog/rename-multiple.page
-share/help/el/eog/shortcuts.page
 share/help/el/eog/slideshow.page
 share/help/el/eog/translate.page
 share/help/el/eog/view.page
@@ -354,7 +340,6 @@ share/help/en_GB/eog/open.page
 share/help/en_GB/eog/plugin-exif-digital.page
 share/help/en_GB/eog/plugin-fullscreen-background.page
 share/help/en_GB/eog/plugin-fullscreen-double-click.page
-share/help/en_GB/eog/plugin-picasa.page
 share/help/en_GB/eog/plugin-python-console.page
 share/help/en_GB/eog/plugin-send-by-mail.page
 share/help/en_GB/eog/plugin-slideshow-shuffle.page
@@ -363,7 +348,6 @@ share/help/en_GB/eog/plugins.page
 share/help/en_GB/eog/preferences.page
 share/help/en_GB/eog/print.page
 share/help/en_GB/eog/rename-multiple.page
-share/help/en_GB/eog/shortcuts.page
 share/help/en_GB/eog/slideshow.page
 share/help/en_GB/eog/translate.page
 share/help/en_GB/eog/view.page
@@ -394,7 +378,6 @@ share/help/es/eog/open.page
 share/help/es/eog/plugin-exif-digital.page
 share/help/es/eog/plugin-fullscreen-background.page
 share/help/es/eog/plugin-fullscreen-double-click.page
-share/help/es/eog/plugin-picasa.page
 share/help/es/eog/plugin-python-console.page
 share/help/es/eog/plugin-send-by-mail.page
 share/help/es/eog/plugin-slideshow-shuffle.page
@@ -403,7 +386,6 @@ share/help/es/eog/plugins.page
 share/help/es/eog/preferences.page
 share/help/es/eog/print.page
 share/help/es/eog/rename-multiple.page
-share/help/es/eog/shortcuts.page
 share/help/es/eog/slideshow.page
 share/help/es/eog/translate.page
 share/help/es/eog/view.page
@@ -434,7 +416,6 @@ share/help/eu/eog/open.page
 share/help/eu/eog/plugin-exif-digital.page
 share/help/eu/eog/plugin-fullscreen-background.page
 share/help/eu/eog/plugin-fullscreen-double-click.page
-share/help/eu/eog/plugin-picasa.page
 share/help/eu/eog/plugin-python-console.page
 share/help/eu/eog/plugin-send-by-mail.page
 share/help/eu/eog/plugin-slideshow-shuffle.page
@@ -443,7 +424,6 @@ share/help/eu/eog/plugins.page
 share/help/eu/eog/preferences.page
 share/help/eu/eog/print.page
 share/help/eu/eog/rename-multiple.page
-share/help/eu/eog/shortcuts.page
 share/help/eu/eog/slideshow.page
 share/help/eu/eog/translate.page
 share/help/eu/eog/view.page
@@ -474,7 +454,6 @@ share/help/fi/eog/open.page
 share/help/fi/eog/plugin-exif-digital.page
 share/help/fi/eog/plugin-fullscreen-background.page
 share/help/fi/eog/plugin-fullscreen-double-click.page
-share/help/fi/eog/plugin-picasa.page
 share/help/fi/eog/plugin-python-console.page
 share/help/fi/eog/plugin-send-by-mail.page
 share/help/fi/eog/plugin-slideshow-shuffle.page
@@ -483,7 +462,6 @@ share/help/fi/eog/plugins.page
 share/help/fi/eog/preferences.page
 share/help/fi/eog/print.page
 share/help/fi/eog/rename-multiple.page
-share/help/fi/eog/shortcuts.page
 share/help/fi/eog/slideshow.page
 share/help/fi/eog/translate.page
 share/help/fi/eog/view.page
@@ -514,7 +492,6 @@ share/help/fr/eog/open.page
 share/help/fr/eog/plugin-exif-digital.page
 share/help/fr/eog/plugin-fullscreen-background.page
 share/help/fr/eog/plugin-fullscreen-double-click.page
-share/help/fr/eog/plugin-picasa.page
 share/help/fr/eog/plugin-python-console.page
 share/help/fr/eog/plugin-send-by-mail.page
 share/help/fr/eog/plugin-slideshow-shuffle.page
@@ -523,7 +500,6 @@ share/help/fr/eog/plugins.page
 share/help/fr/eog/preferences.page
 share/help/fr/eog/print.page
 share/help/fr/eog/rename-multiple.page
-share/help/fr/eog/shortcuts.page
 share/help/fr/eog/slideshow.page
 share/help/fr/eog/translate.page
 share/help/fr/eog/view.page
@@ -554,7 +530,6 @@ share/help/gl/eog/open.page
 share/help/gl/eog/plugin-exif-digital.page
 share/help/gl/eog/plugin-fullscreen-background.page
 share/help/gl/eog/plugin-fullscreen-double-click.page
-share/help/gl/eog/plugin-picasa.page
 share/help/gl/eog/plugin-python-console.page
 share/help/gl/eog/plugin-send-by-mail.page
 share/help/gl/eog/plugin-slideshow-shuffle.page
@@ -563,7 +538,6 @@ share/help/gl/eog/plugins.page
 share/help/gl/eog/preferences.page
 share/help/gl/eog/print.page
 share/help/gl/eog/rename-multiple.page
-share/help/gl/eog/shortcuts.page
 share/help/gl/eog/slideshow.page
 share/help/gl/eog/translate.page
 share/help/gl/eog/view.page
@@ -594,7 +568,6 @@ share/help/hu/eog/open.page
 share/help/hu/eog/plugin-exif-digital.page
 share/help/hu/eog/plugin-fullscreen-background.page
 share/help/hu/eog/plugin-fullscreen-double-click.page
-share/help/hu/eog/plugin-picasa.page
 share/help/hu/eog/plugin-python-console.page
 share/help/hu/eog/plugin-send-by-mail.page
 share/help/hu/eog/plugin-slideshow-shuffle.page
@@ -603,7 +576,6 @@ share/help/hu/eog/plugins.page
 share/help/hu/eog/preferences.page
 share/help/hu/eog/print.page
 share/help/hu/eog/rename-multiple.page
-share/help/hu/eog/shortcuts.page
 share/help/hu/eog/slideshow.page
 share/help/hu/eog/translate.page
 share/help/hu/eog/view.page
@@ -634,7 +606,6 @@ share/help/id/eog/open.page
 share/help/id/eog/plugin-exif-digital.page
 share/help/id/eog/plugin-fullscreen-background.page
 share/help/id/eog/plugin-fullscreen-double-click.page
-share/help/id/eog/plugin-picasa.page
 share/help/id/eog/plugin-python-console.page
 share/help/id/eog/plugin-send-by-mail.page
 share/help/id/eog/plugin-slideshow-shuffle.page
@@ -643,7 +614,6 @@ share/help/id/eog/plugins.page
 share/help/id/eog/preferences.page
 share/help/id/eog/print.page
 share/help/id/eog/rename-multiple.page
-share/help/id/eog/shortcuts.page
 share/help/id/eog/slideshow.page
 share/help/id/eog/translate.page
 share/help/id/eog/view.page
@@ -674,7 +644,6 @@ share/help/it/eog/open.page
 share/help/it/eog/plugin-exif-digital.page
 share/help/it/eog/plugin-fullscreen-background.page
 share/help/it/eog/plugin-fullscreen-double-click.page
-share/help/it/eog/plugin-picasa.page
 share/help/it/eog/plugin-python-console.page
 share/help/it/eog/plugin-send-by-mail.page
 share/help/it/eog/plugin-slideshow-shuffle.page
@@ -683,7 +652,6 @@ share/help/it/eog/plugins.page
 share/help/it/eog/preferences.page
 share/help/it/eog/print.page
 share/help/it/eog/rename-multiple.page
-share/help/it/eog/shortcuts.page
 share/help/it/eog/slideshow.page
 share/help/it/eog/translate.page
 share/help/it/eog/view.page
@@ -714,7 +682,6 @@ share/help/ja/eog/open.page
 share/help/ja/eog/plugin-exif-digital.page
 share/help/ja/eog/plugin-fullscreen-background.page
 share/help/ja/eog/plugin-fullscreen-double-click.page
-share/help/ja/eog/plugin-picasa.page
 share/help/ja/eog/plugin-python-console.page
 share/help/ja/eog/plugin-send-by-mail.page
 share/help/ja/eog/plugin-slideshow-shuffle.page
@@ -723,7 +690,6 @@ share/help/ja/eog/plugins.page
 share/help/ja/eog/preferences.page
 share/help/ja/eog/print.page
 share/help/ja/eog/rename-multiple.page
-share/help/ja/eog/shortcuts.page
 share/help/ja/eog/slideshow.page
 share/help/ja/eog/translate.page
 share/help/ja/eog/view.page
@@ -754,7 +720,6 @@ share/help/ko/eog/open.page
 share/help/ko/eog/plugin-exif-digital.page
 share/help/ko/eog/plugin-fullscreen-background.page
 share/help/ko/eog/plugin-fullscreen-double-click.page
-share/help/ko/eog/plugin-picasa.page
 share/help/ko/eog/plugin-python-console.page
 share/help/ko/eog/plugin-send-by-mail.page
 share/help/ko/eog/plugin-slideshow-shuffle.page
@@ -763,7 +728,6 @@ share/help/ko/eog/plugins.page
 share/help/ko/eog/preferences.page
 share/help/ko/eog/print.page
 share/help/ko/eog/rename-multiple.page
-share/help/ko/eog/shortcuts.page
 share/help/ko/eog/slideshow.page
 share/help/ko/eog/translate.page
 share/help/ko/eog/view.page
@@ -794,7 +758,6 @@ share/help/lv/eog/open.page
 share/help/lv/eog/plugin-exif-digital.page
 share/help/lv/eog/plugin-fullscreen-background.page
 share/help/lv/eog/plugin-fullscreen-double-click.page
-share/help/lv/eog/plugin-picasa.page
 share/help/lv/eog/plugin-python-console.page
 share/help/lv/eog/plugin-send-by-mail.page
 share/help/lv/eog/plugin-slideshow-shuffle.page
@@ -803,7 +766,6 @@ share/help/lv/eog/plugins.page
 share/help/lv/eog/preferences.page
 share/help/lv/eog/print.page
 share/help/lv/eog/rename-multiple.page
-share/help/lv/eog/shortcuts.page
 share/help/lv/eog/slideshow.page
 share/help/lv/eog/translate.page
 share/help/lv/eog/view.page
@@ -834,7 +796,6 @@ share/help/ne/eog/open.page
 share/help/ne/eog/plugin-exif-digital.page
 share/help/ne/eog/plugin-fullscreen-background.page
 share/help/ne/eog/plugin-fullscreen-double-click.page
-share/help/ne/eog/plugin-picasa.page
 share/help/ne/eog/plugin-python-console.page
 share/help/ne/eog/plugin-send-by-mail.page
 share/help/ne/eog/plugin-slideshow-shuffle.page
@@ -843,7 +804,6 @@ share/help/ne/eog/plugins.page
 share/help/ne/eog/preferences.page
 share/help/ne/eog/print.page
 share/help/ne/eog/rename-multiple.page
-share/help/ne/eog/shortcuts.page
 share/help/ne/eog/slideshow.page
 share/help/ne/eog/translate.page
 share/help/ne/eog/view.page
@@ -874,7 +834,6 @@ share/help/oc/eog/open.page
 share/help/oc/eog/plugin-exif-digital.page
 share/help/oc/eog/plugin-fullscreen-background.page
 share/help/oc/eog/plugin-fullscreen-double-click.page
-share/help/oc/eog/plugin-picasa.page
 share/help/oc/eog/plugin-python-console.page
 share/help/oc/eog/plugin-send-by-mail.page
 share/help/oc/eog/plugin-slideshow-shuffle.page
@@ -883,7 +842,6 @@ share/help/oc/eog/plugins.page
 share/help/oc/eog/preferences.page
 share/help/oc/eog/print.page
 share/help/oc/eog/rename-multiple.page
-share/help/oc/eog/shortcuts.page
 share/help/oc/eog/slideshow.page
 share/help/oc/eog/translate.page
 share/help/oc/eog/view.page
@@ -914,7 +872,6 @@ share/help/pa/eog/open.page
 share/help/pa/eog/plugin-exif-digital.page
 share/help/pa/eog/plugin-fullscreen-background.page
 share/help/pa/eog/plugin-fullscreen-double-click.page
-share/help/pa/eog/plugin-picasa.page
 share/help/pa/eog/plugin-python-console.page
 share/help/pa/eog/plugin-send-by-mail.page
 share/help/pa/eog/plugin-slideshow-shuffle.page
@@ -923,7 +880,6 @@ share/help/pa/eog/plugins.page
 share/help/pa/eog/preferences.page
 share/help/pa/eog/print.page
 share/help/pa/eog/rename-multiple.page
-share/help/pa/eog/shortcuts.page
 share/help/pa/eog/slideshow.page
 share/help/pa/eog/translate.page
 share/help/pa/eog/view.page
@@ -954,7 +910,6 @@ share/help/pl/eog/open.page
 share/help/pl/eog/plugin-exif-digital.page
 share/help/pl/eog/plugin-fullscreen-background.page
 share/help/pl/eog/plugin-fullscreen-double-click.page
-share/help/pl/eog/plugin-picasa.page
 share/help/pl/eog/plugin-python-console.page
 share/help/pl/eog/plugin-send-by-mail.page
 share/help/pl/eog/plugin-slideshow-shuffle.page
@@ -963,7 +918,6 @@ share/help/pl/eog/plugins.page
 share/help/pl/eog/preferences.page
 share/help/pl/eog/print.page
 share/help/pl/eog/rename-multiple.page
-share/help/pl/eog/shortcuts.page
 share/help/pl/eog/slideshow.page
 share/help/pl/eog/translate.page
 share/help/pl/eog/view.page
@@ -994,7 +948,6 @@ share/help/pt_BR/eog/open.page
 share/help/pt_BR/eog/plugin-exif-digital.page
 share/help/pt_BR/eog/plugin-fullscreen-background.page
 share/help/pt_BR/eog/plugin-fullscreen-double-click.page
-share/help/pt_BR/eog/plugin-picasa.page
 share/help/pt_BR/eog/plugin-python-console.page
 share/help/pt_BR/eog/plugin-send-by-mail.page
 share/help/pt_BR/eog/plugin-slideshow-shuffle.page
@@ -1003,7 +956,6 @@ share/help/pt_BR/eog/plugins.page
 share/help/pt_BR/eog/preferences.page
 share/help/pt_BR/eog/print.page
 share/help/pt_BR/eog/rename-multiple.page
-share/help/pt_BR/eog/shortcuts.page
 share/help/pt_BR/eog/slideshow.page
 share/help/pt_BR/eog/translate.page
 share/help/pt_BR/eog/view.page
@@ -1034,7 +986,6 @@ share/help/ro/eog/open.page
 share/help/ro/eog/plugin-exif-digital.page
 share/help/ro/eog/plugin-fullscreen-background.page
 share/help/ro/eog/plugin-fullscreen-double-click.page
-share/help/ro/eog/plugin-picasa.page
 share/help/ro/eog/plugin-python-console.page
 share/help/ro/eog/plugin-send-by-mail.page
 share/help/ro/eog/plugin-slideshow-shuffle.page
@@ -1043,7 +994,6 @@ share/help/ro/eog/plugins.page
 share/help/ro/eog/preferences.page
 share/help/ro/eog/print.page
 share/help/ro/eog/rename-multiple.page
-share/help/ro/eog/shortcuts.page
 share/help/ro/eog/slideshow.page
 share/help/ro/eog/translate.page
 share/help/ro/eog/view.page
@@ -1074,7 +1024,6 @@ share/help/ru/eog/open.page
 share/help/ru/eog/plugin-exif-digital.page
 share/help/ru/eog/plugin-fullscreen-background.page
 share/help/ru/eog/plugin-fullscreen-double-click.page
-share/help/ru/eog/plugin-picasa.page
 share/help/ru/eog/plugin-python-console.page
 share/help/ru/eog/plugin-send-by-mail.page
 share/help/ru/eog/plugin-slideshow-shuffle.page
@@ -1083,7 +1032,6 @@ share/help/ru/eog/plugins.page
 share/help/ru/eog/preferences.page
 share/help/ru/eog/print.page
 share/help/ru/eog/rename-multiple.page
-share/help/ru/eog/shortcuts.page
 share/help/ru/eog/slideshow.page
 share/help/ru/eog/translate.page
 share/help/ru/eog/view.page
@@ -1114,7 +1062,6 @@ share/help/sl/eog/open.page
 share/help/sl/eog/plugin-exif-digital.page
 share/help/sl/eog/plugin-fullscreen-background.page
 share/help/sl/eog/plugin-fullscreen-double-click.page
-share/help/sl/eog/plugin-picasa.page
 share/help/sl/eog/plugin-python-console.page
 share/help/sl/eog/plugin-send-by-mail.page
 share/help/sl/eog/plugin-slideshow-shuffle.page
@@ -1123,7 +1070,6 @@ share/help/sl/eog/plugins.page
 share/help/sl/eog/preferences.page
 share/help/sl/eog/print.page
 share/help/sl/eog/rename-multiple.page
-share/help/sl/eog/shortcuts.page
 share/help/sl/eog/slideshow.page
 share/help/sl/eog/translate.page
 share/help/sl/eog/view.page
@@ -1154,7 +1100,6 @@ share/help/sv/eog/open.page
 share/help/sv/eog/plugin-exif-digital.page
 share/help/sv/eog/plugin-fullscreen-background.page
 share/help/sv/eog/plugin-fullscreen-double-click.page
-share/help/sv/eog/plugin-picasa.page
 share/help/sv/eog/plugin-python-console.page
 share/help/sv/eog/plugin-send-by-mail.page
 share/help/sv/eog/plugin-slideshow-shuffle.page
@@ -1163,7 +1108,6 @@ share/help/sv/eog/plugins.page
 share/help/sv/eog/preferences.page
 share/help/sv/eog/print.page
 share/help/sv/eog/rename-multiple.page
-share/help/sv/eog/shortcuts.page
 share/help/sv/eog/slideshow.page
 share/help/sv/eog/translate.page
 share/help/sv/eog/view.page
@@ -1194,7 +1138,6 @@ share/help/te/eog/open.page
 share/help/te/eog/plugin-exif-digital.page
 share/help/te/eog/plugin-fullscreen-background.page
 share/help/te/eog/plugin-fullscreen-double-click.page
-share/help/te/eog/plugin-picasa.page
 share/help/te/eog/plugin-python-console.page
 share/help/te/eog/plugin-send-by-mail.page
 share/help/te/eog/plugin-slideshow-shuffle.page
@@ -1203,7 +1146,6 @@ share/help/te/eog/plugins.page
 share/help/te/eog/preferences.page
 share/help/te/eog/print.page
 share/help/te/eog/rename-multiple.page
-share/help/te/eog/shortcuts.page
 share/help/te/eog/slideshow.page
 share/help/te/eog/translate.page
 share/help/te/eog/view.page
@@ -1234,7 +1176,6 @@ share/help/th/eog/open.page
 share/help/th/eog/plugin-exif-digital.page
 share/help/th/eog/plugin-fullscreen-background.page
 share/help/th/eog/plugin-fullscreen-double-click.page
-share/help/th/eog/plugin-picasa.page
 share/help/th/eog/plugin-python-console.page
 share/help/th/eog/plugin-send-by-mail.page
 share/help/th/eog/plugin-slideshow-shuffle.page
@@ -1243,7 +1184,6 @@ share/help/th/eog/plugins.page
 share/help/th/eog/preferences.page
 share/help/th/eog/print.page
 share/help/th/eog/rename-multiple.page
-share/help/th/eog/shortcuts.page
 share/help/th/eog/slideshow.page
 share/help/th/eog/translate.page
 share/help/th/eog/view.page
@@ -1274,7 +1214,6 @@ share/help/uk/eog/open.page
 share/help/uk/eog/plugin-exif-digital.page
 share/help/uk/eog/plugin-fullscreen-background.page
 share/help/uk/eog/plugin-fullscreen-double-click.page
-share/help/uk/eog/plugin-picasa.page
 share/help/uk/eog/plugin-python-console.page
 share/help/uk/eog/plugin-send-by-mail.page
 share/help/uk/eog/plugin-slideshow-shuffle.page
@@ -1283,7 +1222,6 @@ share/help/uk/eog/plugins.page
 share/help/uk/eog/preferences.page
 share/help/uk/eog/print.page
 share/help/uk/eog/rename-multiple.page
-share/help/uk/eog/shortcuts.page
 share/help/uk/eog/slideshow.page
 share/help/uk/eog/translate.page
 share/help/uk/eog/view.page
@@ -1314,7 +1252,6 @@ share/help/zh_CN/eog/open.page
 share/help/zh_CN/eog/plugin-exif-digital.page
 share/help/zh_CN/eog/plugin-fullscreen-background.page
 share/help/zh_CN/eog/plugin-fullscreen-double-click.page
-share/help/zh_CN/eog/plugin-picasa.page
 share/help/zh_CN/eog/plugin-python-console.page
 share/help/zh_CN/eog/plugin-send-by-mail.page
 share/help/zh_CN/eog/plugin-slideshow-shuffle.page
@@ -1323,7 +1260,6 @@ share/help/zh_CN/eog/plugins.page
 share/help/zh_CN/eog/preferences.page
 share/help/zh_CN/eog/print.page
 share/help/zh_CN/eog/rename-multiple.page
-share/help/zh_CN/eog/shortcuts.page
 share/help/zh_CN/eog/slideshow.page
 share/help/zh_CN/eog/translate.page
 share/help/zh_CN/eog/view.page
@@ -1354,7 +1290,6 @@ share/help/zh_TW/eog/open.page
 share/help/zh_TW/eog/plugin-exif-digital.page
 share/help/zh_TW/eog/plugin-fullscreen-background.page
 share/help/zh_TW/eog/plugin-fullscreen-double-click.page
-share/help/zh_TW/eog/plugin-picasa.page
 share/help/zh_TW/eog/plugin-python-console.page
 share/help/zh_TW/eog/plugin-send-by-mail.page
 share/help/zh_TW/eog/plugin-slideshow-shuffle.page
@@ -1363,7 +1298,6 @@ share/help/zh_TW/eog/plugins.page
 share/help/zh_TW/eog/preferences.page
 share/help/zh_TW/eog/print.page
 share/help/zh_TW/eog/rename-multiple.page
-share/help/zh_TW/eog/shortcuts.page
 share/help/zh_TW/eog/slideshow.page
 share/help/zh_TW/eog/translate.page
 share/help/zh_TW/eog/view.page
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index 776d72aea3c..f33caa35900 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.31 2021/10/26 10:46:05 nia Exp $
+$NetBSD: distinfo,v 1.32 2022/03/08 09:12:03 prlw1 Exp $
 
-BLAKE2s (eog-3.38.0.tar.xz) = 8dcfb6d783fb1795cf321348c7a0cde432b4b4507ccace6f8037d3632575ece8
-SHA512 (eog-3.38.0.tar.xz) = 2b93cfe8e421a7e57855a69c2a3592f5334dbaf3999d63594e897898aff092a45a69f9ce77146a8bb4a9ee2c4cb7d53f38c76a3422c8fc9195682ae648c8683e
-Size (eog-3.38.0.tar.xz) = 3654864 bytes
+BLAKE2s (eog-40.3.tar.xz) = 4785a0dfb1015677e66890b6e6ba68e34886006e045ba9174086443af6a56740
+SHA512 (eog-40.3.tar.xz) = 5c6af597b35adcc18846e2dbee80eaf4b3c07138826520a9f6c2567df50c20379f804f8b878c7da74dd6cab25249555113d785653c0239353e410506611ffbab
+Size (eog-40.3.tar.xz) = 3602276 bytes
+SHA1 (patch-data_meson.build) = 25d421b24dfe8efec760752d3ff8350297094f4b
diff --git a/graphics/eog/patches/patch-data_meson.build b/graphics/eog/patches/patch-data_meson.build
new file mode 100644
index 00000000000..789603457e8
--- /dev/null
+++ b/graphics/eog/patches/patch-data_meson.build
@@ -0,0 +1,49 @@
+$NetBSD: patch-data_meson.build,v 1.1 2022/03/08 09:12:03 prlw1 Exp $
+
+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',