CVS commit: pkgsrc/wm/fluxbox

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun May 10 23:01:44 UTC 2026

Modified Files:
        pkgsrc/wm/fluxbox: Makefile distinfo
        pkgsrc/wm/fluxbox/patches: patch-src_fluxbox.cc

Log Message:
fluxbox: add upstream patch to handle monitor power cycling


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/wm/fluxbox/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/wm/fluxbox/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/fluxbox/patches/patch-src_fluxbox.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.78 pkgsrc/wm/fluxbox/Makefile:1.79
--- pkgsrc/wm/fluxbox/Makefile:1.78     Mon Nov 17 11:01:36 2025
+++ pkgsrc/wm/fluxbox/Makefile  Sun May 10 23:01:44 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2025/11/17 11:01:36 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2026/05/10 23:01:44 gutteridge Exp $
 
 DISTNAME=      fluxbox-1.3.7
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/wm/fluxbox/distinfo
diff -u pkgsrc/wm/fluxbox/distinfo:1.41 pkgsrc/wm/fluxbox/distinfo:1.42
--- pkgsrc/wm/fluxbox/distinfo:1.41     Thu Feb 27 10:55:13 2025
+++ pkgsrc/wm/fluxbox/distinfo  Sun May 10 23:01:44 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2025/02/27 10:55:13 nia Exp $
+$NetBSD: distinfo,v 1.42 2026/05/10 23:01:44 gutteridge Exp $
 
 BLAKE2s (fluxbox-1.3.7.tar.bz2) = c3dfa1e8b204c4874ba372af05402b7a277bb1ebac2e7cc15c92c608ea26bdf7
 SHA512 (fluxbox-1.3.7.tar.bz2) = c40cc765f5d542210e18dca21b98b97a048c6685b605a68e2c64f4e886329f4e6d3a3a7e76b3ca0ce488242f38d0ee2a4d6dfebc9ce97d37c68f84c3948aac8c
@@ -13,5 +13,5 @@ SHA1 (patch-bj) = baf714907cce1f71e69f85
 SHA1 (patch-bk) = 73e6356712495d3a8bc8a39b21d2991e3748576a
 SHA1 (patch-data_keys) = 79820ca4fd89227e24ae71bb1278f49b3930af85
 SHA1 (patch-src_FbTk_Font.cc) = ae68bbcee78bc58c1021012e5dd4f138394f2956
-SHA1 (patch-src_fluxbox.cc) = a652d685cd80896b45bfa7b2dfd5e98b2561e326
+SHA1 (patch-src_fluxbox.cc) = 3385e2eea72c5d5a2e6e078df6b5788818317e27
 SHA1 (patch-util_fluxbox-remote.cc) = fefe10464f4c83ac32ea34ccc3fd8418c90d4ceb

Index: pkgsrc/wm/fluxbox/patches/patch-src_fluxbox.cc
diff -u pkgsrc/wm/fluxbox/patches/patch-src_fluxbox.cc:1.1 pkgsrc/wm/fluxbox/patches/patch-src_fluxbox.cc:1.2
--- pkgsrc/wm/fluxbox/patches/patch-src_fluxbox.cc:1.1  Wed Feb 22 12:20:51 2017
+++ pkgsrc/wm/fluxbox/patches/patch-src_fluxbox.cc      Sun May 10 23:01:44 2026
@@ -1,8 +1,27 @@
-$NetBSD: patch-src_fluxbox.cc,v 1.1 2017/02/22 12:20:51 wiz Exp $
+$NetBSD: patch-src_fluxbox.cc,v 1.2 2026/05/10 23:01:44 gutteridge Exp $
 
---- src/fluxbox.cc.orig        2015-02-08 10:44:45.000000000 +0000
+Fix builds with the SunPro compiler.
+
+Apply upstream patch to fix handling of monitor power cycling.
+https://github.com/fluxbox/fluxbox/commit/36f99b92464abd389d815dbf29a65d740b8145c6
+
+--- src/fluxbox.cc.orig        2015-02-08 10:44:45.377187009 +0000
 +++ src/fluxbox.cc
-@@ -1045,7 +1045,7 @@ void Fluxbox::saveWindowSearchGroup(Wind
+@@ -798,7 +798,12 @@ void Fluxbox::handleEvent(XEvent * const e) {
+     default: {
+ 
+ #if defined(HAVE_RANDR) || defined(HAVE_RANDR1_2)
+-        if (e->type == s_randr_event_type) {
++        bool is_randr_event = (e->type == s_randr_event_type);
++#ifdef RRNotify
++        is_randr_event = is_randr_event ||
++                         (e->type == s_randr_event_type + RRNotify);
++#endif
++        if (is_randr_event) {
+ #ifdef HAVE_RANDR1_2
+             XRRUpdateConfiguration(e);
+ #endif
+@@ -1045,7 +1050,7 @@ void Fluxbox::saveGroupSearch(Window window, WinClient
  }
  
  void Fluxbox::saveGroupSearch(Window window, WinClient *data) {