CVS commit: pkgsrc/graphics/ristretto

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sat Jun 14 01:14:51 UTC 2025

Modified Files:
        pkgsrc/graphics/ristretto: Makefile distinfo
Added Files:
        pkgsrc/graphics/ristretto/patches: patch-src_Makefile.am
Removed Files:
        pkgsrc/graphics/ristretto/patches: patch-src_Makefile.in

Log Message:
ristretto: update to 0.13.4

Though this has moved to meson by default, I've opted to retain use of
the autotools build, since we had problems with the meson-enabled build
of libxfce4windowing failing due to dependency ordering issues.

0.13.4 (2025-03-26)
======
Meson has been added as a build system in this release, and the
associated archive has been generated by 'meson dist'. Although
autotools has been retained for the time being and can still be used
via 'autogen.sh', meson is now the preferred build system, and
autotools will be removed in a future release.

- flatpak: Updates from flathub and use meson when possible
- meson-build: Remove check for xdt-csource
- autotools-build: Be sure gdbus-codegen files are regenerated
- build: Replace xdt-csource with glib-compile-resources
- build: Automate copyright year management
- Replace deprecated exo with libxfce4ui 4.21.0
- Completely hide pointer when fullscreen-timeout is set to 0
- viewer: Reset adjustments when switching file
- Revert "viewer: Reset viewer geometry data when setting file"
- Store adjustment values and restore them when switching file
- viewer: Reset viewer geometry data when setting file
- flatpak: Updates from Flathub and git
- icon-bar: Silence -Wmaybe-uninitialized warning
- Add meson build
- icons: Remove old app icon
- viewer: Don't set adjustement values if unchanged
- Add support for showing containing folder
- Translation Updates:
  Albanian, Bulgarian, Catalan, Chinese (China), Chinese (Taiwan),
  Czech, Danish, Dutch, English (United Kingdom), Estonian, French,
  German, Greek, Hebrew, Hungarian, Italian, Japanese, Lithuanian,
  Norwegian Bokmål, Polish, Portuguese, Portuguese (Brazil), Romanian,
  Russian, Serbian, Swedish, Turkish, Ukrainian


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/graphics/ristretto/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/ristretto/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/ristretto/patches/patch-src_Makefile.am
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/ristretto/patches/patch-src_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/ristretto/Makefile
diff -u pkgsrc/graphics/ristretto/Makefile:1.78 pkgsrc/graphics/ristretto/Makefile:1.79
--- pkgsrc/graphics/ristretto/Makefile:1.78     Thu Apr 24 14:14:38 2025
+++ pkgsrc/graphics/ristretto/Makefile  Sat Jun 14 01:14:51 2025
@@ -1,28 +1,32 @@
-# $NetBSD: Makefile,v 1.78 2025/04/24 14:14:38 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2025/06/14 01:14:51 gutteridge Exp $
 
-VERSION=       0.13.3
+VERSION=       0.13.4
 DISTNAME=      ristretto-${VERSION}
-PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  https://archive.xfce.org/src/apps/ristretto/${VERSION:R}/
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    youri%NetBSD.org@localhost
 HOMEPAGE=      https://goodies.xfce.org/projects/applications/ristretto
 COMMENT=       Xfce image viewer
 LICENSE=       gnu-gpl-v2
 
+CONFIGURE_ARGS+=       --enable-maintainer-mode
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
 USE_PKGLOCALEDIR=      yes
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
+USE_TOOLS+=            autoconf automake autoreconf
 USE_TOOLS+=            gmake pkg-config msgfmt gdbus-codegen
 
 LDFLAGS.DragonFly=     -lX11
 LDFLAGS.FreeBSD=       -lX11
 LDFLAGS.SunOS=         -lX11
 
+pre-configure:
+       cd ${WRKSRC} && autoreconf -fiv
+
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
@@ -35,5 +39,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.5
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libxfce4util/buildlink3.mk"
 .include "../../x11/libxfce4ui/buildlink3.mk"
+.include "../../x11/xfce4-exo/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/ristretto/distinfo
diff -u pkgsrc/graphics/ristretto/distinfo:1.19 pkgsrc/graphics/ristretto/distinfo:1.20
--- pkgsrc/graphics/ristretto/distinfo:1.19     Mon Jan 27 23:25:34 2025
+++ pkgsrc/graphics/ristretto/distinfo  Sat Jun 14 01:14:51 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2025/01/27 23:25:34 gutteridge Exp $
+$NetBSD: distinfo,v 1.20 2025/06/14 01:14:51 gutteridge Exp $
 
-BLAKE2s (ristretto-0.13.3.tar.bz2) = b164a80a1bdbebf332355bd1392e3487d34ce5d7480804d5c7a9e7797224ae8b
-SHA512 (ristretto-0.13.3.tar.bz2) = 92eb0993cbe64a83c80cd78972a64762a03766a055ac66ad16f86c2ee4360a2cc9114723a60d60257f56052ccd579c618df8110a909e45a5cab10ee7c4a3d0f3
-Size (ristretto-0.13.3.tar.bz2) = 854176 bytes
-SHA1 (patch-src_Makefile.in) = efe5b0923709f5b2087e9faec15f11fcd8106924
+BLAKE2s (ristretto-0.13.4.tar.xz) = c66e9dbf6c8ce6e4b39b886f2bd44e16609342b16795b1de37eeaa26e95b3883
+SHA512 (ristretto-0.13.4.tar.xz) = 07eede11a88b5565bf311fb1d0c5702ef8d655d4970558638cee6a9df27c426fb591d0a693d3e3a0954b40106636d2092e5febfd033201d41e579c8f4b785923
+Size (ristretto-0.13.4.tar.xz) = 277320 bytes
+SHA1 (patch-src_Makefile.am) = 924a64620b4e073916f63a346bfb5a4ec66b4dbf

Added files:

Index: pkgsrc/graphics/ristretto/patches/patch-src_Makefile.am
diff -u /dev/null pkgsrc/graphics/ristretto/patches/patch-src_Makefile.am:1.1
--- /dev/null   Sat Jun 14 01:14:51 2025
+++ pkgsrc/graphics/ristretto/patches/patch-src_Makefile.am     Sat Jun 14 01:14:51 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_Makefile.am,v 1.1 2025/06/14 01:14:51 gutteridge Exp $
+
+Find dbus-glib correctly.
+
+--- src/Makefile.am.orig       2025-03-26 17:18:57.000000000 +0000
++++ src/Makefile.am
+@@ -30,6 +30,7 @@ ristretto_CFLAGS = \
+       $(GIO_CFLAGS) \
+       $(GIO_UNIX_CFLAGS) \
+       $(LIBEXIF_CFLAGS) \
++      $(DBUS_GLIB_CFLAGS) \
+       $(XFCONF_CFLAGS) \
+       $(EXO_CFLAGS) \
+       $(CAIRO_CFLAGS) \
+@@ -50,6 +51,7 @@ ristretto_LDADD = \
+       $(GIO_LIBS) \
+       $(GIO_UNIX_LIBS) \
+       $(LIBEXIF_LIBS) \
++      $(DBUS_GLIB_LIBS) \
+       $(XFCONF_LIBS) \
+       $(EXO_LIBS) \
+       $(CAIRO_LIBS) \