CVS commit: pkgsrc/wm/fluxbox

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun Jan 16 20:10:50 UTC 2022

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

Log Message:
fluxbox: add an upstream patch to fix a segfault


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/wm/fluxbox/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/wm/fluxbox/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/fluxbox/patches/patch-src_FbTk_Font.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.73 pkgsrc/wm/fluxbox/Makefile:1.74
--- pkgsrc/wm/fluxbox/Makefile:1.73     Fri Jan  7 17:32:12 2022
+++ pkgsrc/wm/fluxbox/Makefile  Sun Jan 16 20:10:50 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2022/01/07 17:32:12 gutteridge Exp $
+# $NetBSD: Makefile,v 1.74 2022/01/16 20:10:50 gutteridge Exp $
 
 DISTNAME=      fluxbox-1.3.7
-PKGREVISION=   6
+PKGREVISION=   7
 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.39 pkgsrc/wm/fluxbox/distinfo:1.40
--- pkgsrc/wm/fluxbox/distinfo:1.39     Fri Jan  7 17:32:12 2022
+++ pkgsrc/wm/fluxbox/distinfo  Sun Jan 16 20:10:50 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2022/01/07 17:32:12 gutteridge Exp $
+$NetBSD: distinfo,v 1.40 2022/01/16 20:10:50 gutteridge Exp $
 
 BLAKE2s (fluxbox-1.3.7.tar.bz2) = c3dfa1e8b204c4874ba372af05402b7a277bb1ebac2e7cc15c92c608ea26bdf7
 SHA512 (fluxbox-1.3.7.tar.bz2) = c40cc765f5d542210e18dca21b98b97a048c6685b605a68e2c64f4e886329f4e6d3a3a7e76b3ca0ce488242f38d0ee2a4d6dfebc9ce97d37c68f84c3948aac8c
@@ -12,5 +12,6 @@ SHA1 (patch-bg) = 8f4decdb2ff611dcc1af64
 SHA1 (patch-bj) = baf714907cce1f71e69f85c80d8f98efeeeaf86f
 SHA1 (patch-bk) = ae0c9857dd0cd203c8ae3f4bf5a0c7126cf48c92
 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

Added files:

Index: pkgsrc/wm/fluxbox/patches/patch-src_FbTk_Font.cc
diff -u /dev/null pkgsrc/wm/fluxbox/patches/patch-src_FbTk_Font.cc:1.1
--- /dev/null   Sun Jan 16 20:10:50 2022
+++ pkgsrc/wm/fluxbox/patches/patch-src_FbTk_Font.cc    Sun Jan 16 20:10:50 2022
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_FbTk_Font.cc,v 1.1 2022/01/16 20:10:50 gutteridge Exp $
+
+Do not segfault when fonts cannot be found.
+https://github.com/fluxbox/fluxbox/commit/43ae328658518a4ee1b3bf363f8865234c64a674
+
+--- src/FbTk/Font.cc.orig      2015-02-08 10:44:45.357187009 +0000
++++ src/FbTk/Font.cc
+@@ -43,6 +43,7 @@
+ #include <map>
+ #include <typeinfo>
+ #include <langinfo.h>
++#include <iostream>
+ 
+ #ifdef HAVE_SETLOCALE
+ #include <locale.h>
+@@ -231,6 +232,9 @@ bool Font::load(const string &name) {
+             m_fontstr = name;
+             resetEffects(*this);
+             return true;
++        } else {
++            std::cerr << "Couldn't initialize fonts. Check your fontconfig installation.\n";
++            exit(1);
+         }
+ 
+         delete tmp_font;