CVS commit: pkgsrc/wm/fluxbox

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Feb 27 10:55:13 UTC 2025

Modified Files:
        pkgsrc/wm/fluxbox: Makefile distinfo
        pkgsrc/wm/fluxbox/patches: patch-bk patch-util_fluxbox-remote.cc

Log Message:
fluxbox: Fix building with modern Clang versions.

While here, document some patches.

drecklypkg's ci alerted me to build failures on OpenBSD and FreeBSD
which seem to be linked to use of std::auto_ptr, which was deprecated
in c++11.  For safety, force the use of gnu++98, since this package
was probably mostly developed on old versions of gcc.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/wm/fluxbox/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/wm/fluxbox/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/fluxbox/patches/patch-bk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/wm/fluxbox/patches/patch-util_fluxbox-remote.cc

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

Modified files:

Index: pkgsrc/wm/fluxbox/Makefile
diff -u pkgsrc/wm/fluxbox/Makefile:1.76 pkgsrc/wm/fluxbox/Makefile:1.77
--- pkgsrc/wm/fluxbox/Makefile:1.76     Sun Nov 12 13:23:47 2023
+++ pkgsrc/wm/fluxbox/Makefile  Thu Feb 27 10:55:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2023/11/12 13:23:47 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2025/02/27 10:55:13 nia Exp $
 
 DISTNAME=      fluxbox-1.3.7
 PKGREVISION=   9
@@ -17,6 +17,9 @@ USE_TOOLS+=   gmake pkg-config
 USE_LIBTOOL=   YES
 EXTRACT_USING= bsdtar
 
+# Uses auto_ptr deprecated in c++11, etc.
+FORCE_CXX_STD= gnu++98
+
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=       --enable-xinerama

Index: pkgsrc/wm/fluxbox/distinfo
diff -u pkgsrc/wm/fluxbox/distinfo:1.40 pkgsrc/wm/fluxbox/distinfo:1.41
--- pkgsrc/wm/fluxbox/distinfo:1.40     Sun Jan 16 20:10:50 2022
+++ pkgsrc/wm/fluxbox/distinfo  Thu Feb 27 10:55:13 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2022/01/16 20:10:50 gutteridge Exp $
+$NetBSD: distinfo,v 1.41 2025/02/27 10:55:13 nia Exp $
 
 BLAKE2s (fluxbox-1.3.7.tar.bz2) = c3dfa1e8b204c4874ba372af05402b7a277bb1ebac2e7cc15c92c608ea26bdf7
 SHA512 (fluxbox-1.3.7.tar.bz2) = c40cc765f5d542210e18dca21b98b97a048c6685b605a68e2c64f4e886329f4e6d3a3a7e76b3ca0ce488242f38d0ee2a4d6dfebc9ce97d37c68f84c3948aac8c
@@ -10,8 +10,8 @@ SHA1 (patch-be) = 0c8c0cfa12bbfeca28d76b
 SHA1 (patch-bf) = 7da25f4e9a0e738da7c24264a91e6ab036d5acf2
 SHA1 (patch-bg) = 8f4decdb2ff611dcc1af64145801fac35f83e25a
 SHA1 (patch-bj) = baf714907cce1f71e69f85c80d8f98efeeeaf86f
-SHA1 (patch-bk) = ae0c9857dd0cd203c8ae3f4bf5a0c7126cf48c92
+SHA1 (patch-bk) = 73e6356712495d3a8bc8a39b21d2991e3748576a
 SHA1 (patch-data_keys) = 79820ca4fd89227e24ae71bb1278f49b3930af85
 SHA1 (patch-src_FbTk_Font.cc) = ae68bbcee78bc58c1021012e5dd4f138394f2956
 SHA1 (patch-src_fluxbox.cc) = a652d685cd80896b45bfa7b2dfd5e98b2561e326
-SHA1 (patch-util_fluxbox-remote.cc) = fa2389ad36f41a6080a43ad1755cd5ad904a27cf
+SHA1 (patch-util_fluxbox-remote.cc) = fefe10464f4c83ac32ea34ccc3fd8418c90d4ceb

Index: pkgsrc/wm/fluxbox/patches/patch-bk
diff -u pkgsrc/wm/fluxbox/patches/patch-bk:1.2 pkgsrc/wm/fluxbox/patches/patch-bk:1.3
--- pkgsrc/wm/fluxbox/patches/patch-bk:1.2      Tue Jul  7 15:47:59 2009
+++ pkgsrc/wm/fluxbox/patches/patch-bk  Thu Feb 27 10:55:13 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-bk,v 1.2 2009/07/07 15:47:59 sborrill Exp $
+$NetBSD: patch-bk,v 1.3 2025/02/27 10:55:13 nia Exp $
+
+This patch was originally added to fix builds with sunpro.
 
 --- src/CurrentWindowCmd.hh.orig       2008-09-01 16:59:05.000000000 +0100
 +++ src/CurrentWindowCmd.hh    2009-07-06 12:53:48.000000000 +0100

Index: pkgsrc/wm/fluxbox/patches/patch-util_fluxbox-remote.cc
diff -u pkgsrc/wm/fluxbox/patches/patch-util_fluxbox-remote.cc:1.1 pkgsrc/wm/fluxbox/patches/patch-util_fluxbox-remote.cc:1.2
--- pkgsrc/wm/fluxbox/patches/patch-util_fluxbox-remote.cc:1.1  Tue Mar  7 13:22:28 2017
+++ pkgsrc/wm/fluxbox/patches/patch-util_fluxbox-remote.cc      Thu Feb 27 10:55:13 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-util_fluxbox-remote.cc,v 1.1 2017/03/07 13:22:28 joerg Exp $
+$NetBSD: patch-util_fluxbox-remote.cc,v 1.2 2025/02/27 10:55:13 nia Exp $
+
+Do not compare pointers with 0.
 
 --- util/fluxbox-remote.cc.orig        2017-02-28 00:35:38.013459100 +0000
 +++ util/fluxbox-remote.cc