CVS commit: pkgsrc/graphics/geeqie

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jul 21 15:47:06 UTC 2026

Modified Files:
        pkgsrc/graphics/geeqie: Makefile options.mk

Log Message:
geeqie: pass linker flags the meson way

Fixes relro build.

Mark this as using c++17 while here.


To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 pkgsrc/graphics/geeqie/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/geeqie/options.mk

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

Modified files:

Index: pkgsrc/graphics/geeqie/Makefile
diff -u pkgsrc/graphics/geeqie/Makefile:1.167 pkgsrc/graphics/geeqie/Makefile:1.168
--- pkgsrc/graphics/geeqie/Makefile:1.167       Sun Jun 28 14:04:05 2026
+++ pkgsrc/graphics/geeqie/Makefile     Tue Jul 21 15:47:06 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.167 2026/06/28 14:04:05 wiz Exp $
+# $NetBSD: Makefile,v 1.168 2026/07/21 15:47:06 wiz Exp $
 
 DISTNAME=      geeqie-2.9
 CATEGORIES=    graphics
@@ -22,9 +22,11 @@ MESON_ARGS+= -Dpandoc=disabled
 # Do not build html documentation.
 # \todo Consider depending on yelp instead
 MESON_ARGS+=   -Dyelp-build=disabled
+MESON_ARGS+=   -Dcpp_link_args=${LDFLAGS:Q}
 
 USE_PKGLOCALEDIR=      yes
 USE_LANGUAGES=         c c++
+USE_CXX_FEATURES=      c++17
 # awk -W
 USE_TOOLS=             bash:run gawk msgfmt pkg-config
 

Index: pkgsrc/graphics/geeqie/options.mk
diff -u pkgsrc/graphics/geeqie/options.mk:1.11 pkgsrc/graphics/geeqie/options.mk:1.12
--- pkgsrc/graphics/geeqie/options.mk:1.11      Fri Jan 26 14:13:01 2024
+++ pkgsrc/graphics/geeqie/options.mk   Tue Jul 21 15:47:06 2026
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.11 2024/01/26 14:13:01 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2026/07/21 15:47:06 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.geeqie
-PKG_SUPPORTED_OPTIONS=         gspell libarchive libchamplain libraw libwebp pdf
+PKG_SUPPORTED_OPTIONS=         gspell libarchive libchamplain libraw libwebp pdf # gtk4
 PKG_SUGGESTED_OPTIONS=         # none
 
 .include "../../mk/bsd.options.mk"
@@ -10,6 +10,14 @@ PKG_SUGGESTED_OPTIONS=               # none
 .include "../../textproc/gspell/buildlink3.mk"
 .endif
 
+#.if !empty(PKG_OPTIONS:Mgtk4)
+## doesn't build as of 2.9
+#MESON_ARGS+=  -Dgtk4=enabled
+#.include "../../x11/gtk4/buildlink3.mk"
+#.else
+#.include "../../x11/gtk3/buildlink3.mk"
+#.endif
+
 .if !empty(PKG_OPTIONS:Mlibarchive)
 .include "../../archivers/libarchive/buildlink3.mk"
 .endif