CVS commit: pkgsrc/wm/fvwm3

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/wm/fvwm3
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Mon, 8 Sep 2025 07:05:27 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon Sep  8 07:05:27 UTC 2025

Modified Files:
        pkgsrc/wm/fvwm3: Makefile distinfo options.mk
        pkgsrc/wm/fvwm3/patches: patch-meson.build
Added Files:
        pkgsrc/wm/fvwm3: hacks.mk

Log Message:
wm/fvwm3: fix build on SunOS when using pkgsrc iconv.

Use a hacks.mk fragment to detect the iconv implementation in use and
apply a fix for the iconv() prototype only if needed.
Bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/wm/fvwm3/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/wm/fvwm3/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/fvwm3/hacks.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/wm/fvwm3/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/wm/fvwm3/patches/patch-meson.build

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

Modified files:

Index: pkgsrc/wm/fvwm3/Makefile
diff -u pkgsrc/wm/fvwm3/Makefile:1.59 pkgsrc/wm/fvwm3/Makefile:1.60
--- pkgsrc/wm/fvwm3/Makefile:1.59       Sat Sep  6 13:17:13 2025
+++ pkgsrc/wm/fvwm3/Makefile    Mon Sep  8 07:05:27 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2025/09/06 13:17:13 bsiegert Exp $
+# $NetBSD: Makefile,v 1.60 2025/09/08 07:05:27 vins Exp $
 
 DISTNAME=      fvwm3-1.1.3
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fvwmorg/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -52,7 +52,7 @@ MESON_ARGS+=  -Dperl=${PERL5:Q}
 
 .include "options.mk"
 
-.include "../../converters/libiconv/buildlink3.mk"
+#.include "../../converters/libiconv/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libevent+=       libevent>=2.0
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/wm/fvwm3/distinfo
diff -u pkgsrc/wm/fvwm3/distinfo:1.22 pkgsrc/wm/fvwm3/distinfo:1.23
--- pkgsrc/wm/fvwm3/distinfo:1.22       Mon Jun  9 19:12:35 2025
+++ pkgsrc/wm/fvwm3/distinfo    Mon Sep  8 07:05:27 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2025/06/09 19:12:35 vins Exp $
+$NetBSD: distinfo,v 1.23 2025/09/08 07:05:27 vins Exp $
 
 BLAKE2s (fvwm3-1.1.3/fvwm3-1.1.3.tar.gz) = 6ff48c0c558f079a785c448028c18393ac5d042ceac35b29dbbdc5230b2199a4
 SHA512 (fvwm3-1.1.3/fvwm3-1.1.3.tar.gz) = 0f774e282ea86d93f20fedd9ca91e9d7c3e94d01160631ff87e331f8a48923949b965624546557c1d9fdbe3b3dd81d51bd90137a21b60c7b0960ae137476b48d
@@ -191,5 +191,5 @@ SHA512 (fvwm3-1.1.3/gopkg.in_yaml.v3_@v_
 Size (fvwm3-1.1.3/gopkg.in_yaml.v3_@v_v3.0.0.zip) = 104597 bytes
 SHA1 (patch-bin_fvwm-menu-desktop.in) = 233e16992dbf81efdb4d41421a2904bc24463c16
 SHA1 (patch-doc_meson.build) = 4fa0d191c79356b4b1c40305f1051d93f6fee247
-SHA1 (patch-meson.build) = 8ca25e09ced62b6100b9a70bb88a3063b8812fd1
+SHA1 (patch-meson.build) = 7c800b73ee5213bbcfc574215f7bba368e686f8f
 SHA1 (patch-meson.options) = 1b39baf3ae658cc5df1b9e951a2a1707c70aa2bd

Index: pkgsrc/wm/fvwm3/options.mk
diff -u pkgsrc/wm/fvwm3/options.mk:1.7 pkgsrc/wm/fvwm3/options.mk:1.8
--- pkgsrc/wm/fvwm3/options.mk:1.7      Fri Dec  6 22:24:09 2024
+++ pkgsrc/wm/fvwm3/options.mk  Mon Sep  8 07:05:27 2025
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.7 2024/12/06 22:24:09 vins Exp $
+# $NetBSD: options.mk,v 1.8 2025/09/08 07:05:27 vins Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.fvwm3
 PKG_SUPPORTED_OPTIONS= doc go svg
-PKG_SUGGESTED_OPTIONS= doc go
+PKG_SUGGESTED_OPTIONS= doc
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/wm/fvwm3/patches/patch-meson.build
diff -u pkgsrc/wm/fvwm3/patches/patch-meson.build:1.5 pkgsrc/wm/fvwm3/patches/patch-meson.build:1.6
--- pkgsrc/wm/fvwm3/patches/patch-meson.build:1.5       Mon Jun  9 19:12:35 2025
+++ pkgsrc/wm/fvwm3/patches/patch-meson.build   Mon Sep  8 07:05:27 2025
@@ -1,25 +1,11 @@
-$NetBSD: patch-meson.build,v 1.5 2025/06/09 19:12:35 vins Exp $
+$NetBSD: patch-meson.build,v 1.6 2025/09/08 07:05:27 vins Exp $
 
 * Prevent reference to build directory in perl scripts.
 * Fix detection of readline and asciidoctor.
-* Fix iconv prototype mismatch on SunOS.
 
 --- meson.build.orig   2025-06-01 13:59:03.000000000 +0000
 +++ meson.build
-@@ -89,7 +89,11 @@ conf.set_quoted('LOCALEDIR', prefix / ge
- conf.set_quoted('FVWM_CONFDIR', prefix / get_option('sysconfdir'))
- conf.set('RETSIGTYPE', 'void')
- conf.set('SIGNAL_RETURN', 'return')
--conf.set('ICONV_ARG_CONST', '')
-+if host_machine.system() == 'sunos'
-+    conf.set('ICONV_ARG_CONST', 'const')
-+else
-+    conf.set('ICONV_ARG_CONST', '')
-+endif
- conf.set('fd_set_size_t', 'int')
- conf.set('EXECUTABLE_EXTENSION', 'NULL')
- 
-@@ -212,7 +216,7 @@ else
+@@ -212,7 +212,7 @@ else
  endif
  
  # Perl is a required dependency, we generate shebangs at buildtime
@@ -28,7 +14,7 @@ $NetBSD: patch-meson.build,v 1.5 2025/06
  
  golang = find_program('go', required: get_option('golang'))
  if golang.found()
-@@ -226,19 +230,30 @@ if golang.found()
+@@ -226,19 +226,30 @@ if golang.found()
      endif
  else
      # the readline dependency is only required for FvwmConsole so let's only check for it if we're not building FvwmPrompt
@@ -67,7 +53,7 @@ $NetBSD: patch-meson.build,v 1.5 2025/06
  
  # Optional dependencies
  # Tip: 'Feature' types always report 'not found' if disabled
-@@ -403,7 +418,7 @@ endforeach
+@@ -403,7 +414,7 @@ endforeach
  build_docs = false
  if get_option('htmldoc') or get_option('mandoc')
      build_docs = true

Added files:

Index: pkgsrc/wm/fvwm3/hacks.mk
diff -u /dev/null pkgsrc/wm/fvwm3/hacks.mk:1.1
--- /dev/null   Mon Sep  8 07:05:27 2025
+++ pkgsrc/wm/fvwm3/hacks.mk    Mon Sep  8 07:05:27 2025
@@ -0,0 +1,32 @@
+# $NetBSD: hacks.mk,v 1.1 2025/09/08 07:05:27 vins Exp $
+
+.if !defined(FVWM3_HACKS_MK)
+FVWM3_HACKS_MK=        defined
+
+### [Mon Sept 8 06:52:31 UTC 2025 : vins]
+### The second argument of iconv() is of type `char **' in some
+### implementations (including GNU libiconv), while it expects a `const char **'
+### type in some others (at the very least on SunOS and NetBSD up to 9.*).
+### This is a knwon issue. See https://gnats.netbsd.org/57672.
+### Use the SUBST framework to fix the iconv prototype mismatch when needed.
+
+.if (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 100000) || ${OPSYS} == "SunOS"
+
+CHECK_BUILTIN.iconv:=   yes
+.include "../../converters/libiconv/builtin.mk"
+CHECK_BUILTIN.iconv:=   no
+
+.  if ${USE_BUILTIN.iconv:tl} == yes
+
+PKG_HACKS+=            iconv_const
+
+SUBST_CLASSES+=                iconv
+SUBST_STAGE.iconv=     pre-configure
+SUBST_MESSAGE.iconv=   Applying portability fixes for SunOS iconv.
+SUBST_FILES.iconv=     meson.build
+SUBST_SED.iconv=       -e "s:conf.set('ICONV_ARG_CONST', ''):conf.set('ICONV_ARG_CONST', 'const'):g"
+
+.  endif
+.endif
+
+.endif  # FVWM3_HACKS_MK

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/graphics/ximaging
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/graphics/ximaging
Indexes:

Home | Main Index | Thread Index | Old Index