git: 44f8819d3c52 - main - graphics/shotwell: update to 33.0

From: Christoph Moench-Tegeder <cmt_at_FreeBSD.org>
Date: Sun, 13 Sep 2026 17:31:52 UTC
The branch main has been updated by cmt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=44f8819d3c52c288740d3ae93c847b2d7dd0791f

commit 44f8819d3c52c288740d3ae93c847b2d7dd0791f
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2026-09-13 17:30:39 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2026-09-13 17:30:39 +0000

    graphics/shotwell: update to 33.0
    
    Release Notes:
      https://gitlab.gnome.org/GNOME/shotwell/-/blob/33.0/NEWS?ref_type=tags
---
 graphics/shotwell/Makefile                | 24 ++++++++++++------------
 graphics/shotwell/distinfo                |  6 +++---
 graphics/shotwell/files/patch-meson.build | 20 ++++++++++++++++++++
 graphics/shotwell/pkg-plist               | 13 +++++--------
 4 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index 8c9ec742b2a1..f84de5b1312e 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	shotwell
-PORTVERSION=	0.32.17
-PORTREVISION=	1
+DISTVERSION=	33.0
 CATEGORIES=	graphics gnome
-MASTER_SITES=	GNOME
+# having full DISTVERSION in the path does not play with MASTER_SITE_GNOME
+MASTER_SITES=	https://download.gnome.org/sources/${PORTNAME}/${DISTVERSION}/
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Open source photo manager for GNOME
@@ -13,31 +13,31 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libportal.so:deskutils/libportal \
-		libportal-gtk3.so:deskutils/libportal-gtk3 \
+		libportal-gtk4.so:deskutils/libportal-gtk4 \
 		libgio-2.0.so:devel/glib20 \
 		libjson-glib-1.0.so:devel/json-glib \
 		libgee-0.8.so:devel/libgee \
 		libsoup-3.0.so:devel/libsoup3 \
 		libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2 \
-		libgexiv2.so:graphics/gexiv2 \
+		libgexiv2-0.16.so:graphics/gexiv2_016 \
 		libexif.so:graphics/libexif \
 		libgphoto2.so:graphics/libgphoto2 \
 		libraw.so:graphics/libraw \
 		libwebp.so:graphics/webp \
-		libgcr-ui-3.so:security/gcr3 \
+		libgcr-4.so:security/gcr \
 		libsecret-1.so:security/libsecret
 
-USES=		compiler:c++11-lib cpe desktop-file-utils gettext gnome gstreamer meson \
-		ninja pkgconfig python:build sqlite tar:xz vala:build xorg
+USES=		compiler:c++11-lib cpe desktop-file-utils gettext \
+		gnome gstreamer meson ninja pkgconfig python:build sqlite \
+		tar:xz vala:build xorg
 CPE_VENDOR=	gnome
-USE_GNOME=	cairo gtk30 libxml2
+USE_GNOME=	cairo gtk40 libxml2
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 
-MESON_ARGS=	-Dudev=false \
+MESON_ARGS=	-Dudev=disabled \
+		-Dinstall_apport_hook=false \
 		-Dpublishers=flickr,gallery3,googlephotos,piwigo,tumblr,youtube
-PORTSCOUT=	limitw:1,even
-MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	FACED
 OPTIONS_SUB=	yes
diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo
index 817e1d419e1b..4cddbf8daaee 100644
--- a/graphics/shotwell/distinfo
+++ b/graphics/shotwell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1781113784
-SHA256 (shotwell-0.32.17.tar.xz) = 0a56684e98817c3103f54a648fe9400427c76a25a7b111457fc1d860c3167672
-SIZE (shotwell-0.32.17.tar.xz) = 35398620
+TIMESTAMP = 1789306633
+SHA256 (shotwell-33.0.tar.xz) = 79f2fa2bd5df3b18d5301012085222eb9a6e548593f6d5dbcea6d1e8559cb797
+SIZE (shotwell-33.0.tar.xz) = 35503952
diff --git a/graphics/shotwell/files/patch-meson.build b/graphics/shotwell/files/patch-meson.build
new file mode 100644
index 000000000000..8830bef945da
--- /dev/null
+++ b/graphics/shotwell/files/patch-meson.build
@@ -0,0 +1,20 @@
+commit 9ba5cf37a41df263ae9c010670682cee37535513
+Author: Christoph Moench-Tegeder <cmt@burggraben.net>
+
+    lower gtk4 version dependency
+    
+    we don't have 4.22 yet, and 4.20 seems to work without major fallout
+
+diff --git meson.build meson.build
+index 8393facc..ef6409ee 100644
+--- meson.build
++++ meson.build
+@@ -77,7 +77,7 @@ endif
+ version_h = vcs_tag(command: ['git', 'rev-parse', 'HEAD'], input: 'version.h.in', output: 'version.h', fallback: '')
+ version = declare_dependency(sources : version_h, include_directories : include_directories('.'))
+ 
+-gtk = dependency('gtk4', version : '>= 4.22')
++gtk = dependency('gtk4', version : '>= 4.20')
+ gio = dependency('gio-2.0', version: '>= 2.88')
+ gmodule = dependency('gmodule-2.0', version: '>= 2.88')
+ gee = dependency('gee-0.8', version: '>= 0.8.5')
diff --git a/graphics/shotwell/pkg-plist b/graphics/shotwell/pkg-plist
index a8406181abfc..e8b0ed493d48 100644
--- a/graphics/shotwell/pkg-plist
+++ b/graphics/shotwell/pkg-plist
@@ -1,25 +1,21 @@
 bin/shotwell
 lib/libshotwell-authenticator.so
 lib/libshotwell-authenticator.so.0
-lib/libshotwell-authenticator.so.%%DISTVERSION%%
+lib/libshotwell-authenticator.so.0.33
 lib/libshotwell-plugin-common.so
 lib/libshotwell-plugin-common.so.0
-lib/libshotwell-plugin-common.so.%%DISTVERSION%%
+lib/libshotwell-plugin-common.so.0.33
 lib/libshotwell-plugin-dev-1.0.so
 lib/libshotwell-plugin-dev-1.0.so.0
-lib/libshotwell-plugin-dev-1.0.so.%%DISTVERSION%%
+lib/libshotwell-plugin-dev-1.0.so.0.33
 lib/shotwell/plugins/builtin/libshotwell-publishing.so
 lib/shotwell/plugins/builtin/libshotwell-transitions.so
-libexec/shotwell/shotwell-authenticator
 %%FACED%%libexec/shotwell/shotwell-facedetect
 libexec/shotwell/shotwell-settings-migrator
-libexec/shotwell/shotwell-video-metadata-handler
 libexec/shotwell/shotwell-video-thumbnailer
 share/man/man1/shotwell.1.gz
 share/applications/org.gnome.Shotwell-Viewer.desktop
-share/applications/org.gnome.Shotwell.Auth.desktop
 share/applications/org.gnome.Shotwell.desktop
-share/apport/package-hooks/shotwell.py
 %%FACED%%share/dbus-1/services/org.gnome.Shotwell.Faces1.service
 share/glib-2.0/schemas/org.gnome.shotwell-extras.gschema.xml
 share/glib-2.0/schemas/org.gnome.shotwell.gschema.xml
@@ -736,6 +732,7 @@ share/locale/ie/LC_MESSAGES/shotwell.mo
 share/locale/it/LC_MESSAGES/shotwell.mo
 share/locale/ja/LC_MESSAGES/shotwell.mo
 share/locale/ka/LC_MESSAGES/shotwell.mo
+share/locale/kab/LC_MESSAGES/shotwell.mo
 share/locale/kk/LC_MESSAGES/shotwell.mo
 share/locale/km/LC_MESSAGES/shotwell.mo
 share/locale/kn/LC_MESSAGES/shotwell.mo
@@ -772,7 +769,7 @@ share/locale/vi/LC_MESSAGES/shotwell.mo
 share/locale/zh_CN/LC_MESSAGES/shotwell.mo
 share/locale/zh_HK/LC_MESSAGES/shotwell.mo
 share/locale/zh_TW/LC_MESSAGES/shotwell.mo
-share/metainfo/org.gnome.Shotwell.appdata.xml
+share/metainfo/org.gnome.Shotwell.metainfo.xml
 %%FACED%%%%DATADIR%%/facedetect/deploy.prototxt
 %%FACED%%%%DATADIR%%/facedetect/haarcascade_frontalface_alt.xml
 %%FACED%%%%DATADIR%%/facedetect/haarcascade_profileface.xml