deskutils/gnome-maps: update to 47.7

PR:	286697

5 files changed, 24 insertions, 22 deletions

diff --git a/deskutils/gnome-maps/Makefile b/deskutils/gnome-maps/Makefile
index 4996285847e3..5202df1c1117 100644
--- a/deskutils/gnome-maps/Makefile
+++ b/deskutils/gnome-maps/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	gnome-maps
-DISTVERSION=	47.4
+DISTVERSION=	47.7
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Map application for GNOME
-WWW=		https://wiki.gnome.org/Apps/Maps
+WWW=		https://apps.gnome.org/Maps/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -19,15 +19,14 @@ LIB_DEPENDS=	libgeocode-glib-2.so:net/geocode-glib2 \
 		libshumate-1.0.so:x11-toolkits/libshumate \
 		libsoup-3.0.so:devel/libsoup3 \
 		libportal.so:deskutils/libportal \
+		libportal-gtk4.so:deskutils/libportal-gtk4 \
 		libjson-glib-1.0.so:devel/json-glib
 RUN_DEPENDS=	geoclue>=0:net/geoclue
 
-USES=		desktop-file-utils gettext gl gnome meson pkgconfig tar:xz xorg
-USE_GNOME=	cairo gtk40 intltool libadwaita libxml2 librsvg2
-USE_GL=		egl
+USES=		desktop-file-utils gettext gnome meson pkgconfig tar:xz
+USE_GNOME=	cairo glib20 gtk40 introspection:build libadwaita \
+		libxml2 librsvg2
 USE_LDCONFIG=	yes
-USE_XORG=	x11 xcomposite xdamage xext xfixes xi xrandr
-INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.Maps.gschema.xml
 
diff --git a/deskutils/gnome-maps/distinfo b/deskutils/gnome-maps/distinfo
index 972ff11460d4..c625027031a1 100644
--- a/deskutils/gnome-maps/distinfo
+++ b/deskutils/gnome-maps/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741101797
-SHA256 (gnome/gnome-maps-47.4.tar.xz) = 18c5e270fb522cfd3c003ec01093e065eb2f2b8d1b2780dfc279e0bf77735e0b
-SIZE (gnome/gnome-maps-47.4.tar.xz) = 3272344
+TIMESTAMP = 1749285811
+SHA256 (gnome/gnome-maps-47.7.tar.xz) = 33499b35f7eb77eb835f9cb77cf7a8818f25db789c0591cf053060ebaf474ee5
+SIZE (gnome/gnome-maps-47.7.tar.xz) = 3272536
diff --git a/deskutils/gnome-maps/files/patch-lib_meson.build b/deskutils/gnome-maps/files/patch-lib_meson.build
new file mode 100644
index 000000000000..9e92b47189ae
--- /dev/null
+++ b/deskutils/gnome-maps/files/patch-lib_meson.build
@@ -0,0 +1,13 @@
+--- lib/meson.build.orig	2024-10-11 09:52:32 UTC
++++ lib/meson.build
+@@ -54,8 +54,8 @@ libmaps_gir_targets = gnome.generate_gir(
+ 		'Shumate-1.0'
+ 	],
+ 	install: true,
+-	install_dir_gir: join_paths(pkgdatadir, 'gir-' + maps_gir_version),
+-	install_dir_typelib: join_paths(pkglibdir, 'girepository-' + maps_gir_version)
++	install_dir_gir: join_paths(datadir, 'gir-' + maps_gir_version),
++	install_dir_typelib: join_paths(libdir, 'girepository-' + maps_gir_version)
+ )
+ 
+ libmaps_gir = libmaps_gir_targets[0]
diff --git a/deskutils/gnome-maps/pkg-plist b/deskutils/gnome-maps/pkg-plist
index e70ddce77642..a0782a262969 100644
--- a/deskutils/gnome-maps/pkg-plist
+++ b/deskutils/gnome-maps/pkg-plist
@@ -1,11 +1,11 @@
 bin/gnome-maps
-lib/gnome-maps/girepository-1.0/GnomeMaps-1.0.typelib
+lib/girepository-1.0/GnomeMaps-1.0.typelib
 lib/gnome-maps/libgnome-maps.so
 lib/gnome-maps/libgnome-maps.so.0
 lib/gnome-maps/libgnome-maps.so.0.0.0
 share/applications/org.gnome.Maps.desktop
 share/dbus-1/services/org.gnome.Maps.service
-%%DATADIR%%/gir-1.0/GnomeMaps-1.0.gir
+share/gir-1.0/GnomeMaps-1.0.gir
 %%DATADIR%%/icons/hicolor/16x16/apps/anniversary-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/apps/arrow1-right-symbolic.svg
 %%DATADIR%%/icons/hicolor/16x16/apps/arrow2-top-left-symbolic.svg
diff --git a/graphics/gnome-color-manager/files/patch-src_gcm-viewer.c b/graphics/gnome-color-manager/files/patch-src_gcm-viewer.c
deleted file mode 100644
index 4d9641067ab1..000000000000
--- a/graphics/gnome-color-manager/files/patch-src_gcm-viewer.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gcm-viewer.c.orig	2020-04-01 13:12:27 UTC
-+++ src/gcm-viewer.c
-@@ -12,7 +12,6 @@
- #include <gdk/gdkx.h>
- #include <glib/gstdio.h>
- #include <locale.h>
--#include <canberra-gtk.h>
- #include <colord.h>
- #include <math.h>
-