CVS commit: pkgsrc/wm/fvwm3

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon Jun  9 19:12:35 UTC 2025

Modified Files:
        pkgsrc/wm/fvwm3: Makefile distinfo
        pkgsrc/wm/fvwm3/patches: patch-meson.build

Log Message:
wm/fvwm3: do not forcibly require editline

A bug introduced in the local meson.build patch would make meson error
out either when editline is not installed or READLINE_DEFAULT is set to
'readline'.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/wm/fvwm3/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/wm/fvwm3/distinfo
cvs rdiff -u -r1.4 -r1.5 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.55 pkgsrc/wm/fvwm3/Makefile:1.56
--- pkgsrc/wm/fvwm3/Makefile:1.55       Sat Jun  7 16:28:18 2025
+++ pkgsrc/wm/fvwm3/Makefile    Mon Jun  9 19:12:35 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2025/06/07 16:28:18 vins Exp $
+# $NetBSD: Makefile,v 1.56 2025/06/09 19:12:35 vins Exp $
 
 DISTNAME=      fvwm3-1.1.3
+PKGREVISION=   1
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fvwmorg/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}

Index: pkgsrc/wm/fvwm3/distinfo
diff -u pkgsrc/wm/fvwm3/distinfo:1.21 pkgsrc/wm/fvwm3/distinfo:1.22
--- pkgsrc/wm/fvwm3/distinfo:1.21       Sat Jun  7 16:28:18 2025
+++ pkgsrc/wm/fvwm3/distinfo    Mon Jun  9 19:12:35 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2025/06/07 16:28:18 vins Exp $
+$NetBSD: distinfo,v 1.22 2025/06/09 19:12:35 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) = 65ac85987fa7f16f4f9647782540c9fad80d4176
+SHA1 (patch-meson.build) = 8ca25e09ced62b6100b9a70bb88a3063b8812fd1
 SHA1 (patch-meson.options) = 1b39baf3ae658cc5df1b9e951a2a1707c70aa2bd

Index: pkgsrc/wm/fvwm3/patches/patch-meson.build
diff -u pkgsrc/wm/fvwm3/patches/patch-meson.build:1.4 pkgsrc/wm/fvwm3/patches/patch-meson.build:1.5
--- pkgsrc/wm/fvwm3/patches/patch-meson.build:1.4       Sun Mar  9 18:28:29 2025
+++ pkgsrc/wm/fvwm3/patches/patch-meson.build   Mon Jun  9 19:12:35 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-meson.build,v 1.4 2025/03/09 18:28:29 vins Exp $
+$NetBSD: patch-meson.build,v 1.5 2025/06/09 19:12:35 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-02-08 21:38:17.000000000 +0000
+--- 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'))
@@ -19,7 +19,7 @@ $NetBSD: patch-meson.build,v 1.4 2025/03
  conf.set('fd_set_size_t', 'int')
  conf.set('EXECUTABLE_EXTENSION', 'NULL')
  
-@@ -222,7 +226,7 @@ else
+@@ -212,7 +216,7 @@ else
  endif
  
  # Perl is a required dependency, we generate shebangs at buildtime
@@ -28,7 +28,7 @@ $NetBSD: patch-meson.build,v 1.4 2025/03
  
  golang = find_program('go', required: get_option('golang'))
  if golang.found()
-@@ -237,19 +241,29 @@ if golang.found()
+@@ -226,19 +230,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
@@ -42,7 +42,8 @@ $NetBSD: patch-meson.build,v 1.4 2025/03
 +    readline = cc.find_library(
 +              'edit', 
 +              dirs: get_option('readline_lib'), 
-+              has_headers: 'readline/readline.h')
++              has_headers: 'readline/readline.h',
++              required: false)
 +    if readline.found() == false
 +      readline = cc.find_library(
 +                  'readline', 
@@ -66,7 +67,7 @@ $NetBSD: patch-meson.build,v 1.4 2025/03
  
  # Optional dependencies
  # Tip: 'Feature' types always report 'not found' if disabled
-@@ -390,7 +404,7 @@ endforeach
+@@ -403,7 +418,7 @@ endforeach
  build_docs = false
  if get_option('htmldoc') or get_option('mandoc')
      build_docs = true