Sun Jan 16 20:10:50 2022 UTC ()
fluxbox: add an upstream patch to fix a segfault


(gutteridge)
diff -r1.73 -r1.74 pkgsrc/wm/fluxbox/Makefile
diff -r1.39 -r1.40 pkgsrc/wm/fluxbox/distinfo
diff -r0 -r1.1 pkgsrc/wm/fluxbox/patches/patch-src_FbTk_Font.cc
cvs diff -r1.73 -r1.74 pkgsrc/wm/fluxbox/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/fluxbox/Makefile 2022/01/07 17:32:12 1.73
+++ pkgsrc/wm/fluxbox/Makefile 2022/01/16 20:10:50 1.74
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.73 2022/01/07 17:32:12 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.74 2022/01/16 20:10:50 gutteridge Exp $
2 2
3DISTNAME= fluxbox-1.3.7 3DISTNAME= fluxbox-1.3.7
4PKGREVISION= 6 4PKGREVISION= 7
5CATEGORIES= wm x11 5CATEGORIES= wm x11
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= sborrill@NetBSD.org 9MAINTAINER= sborrill@NetBSD.org
10HOMEPAGE= http://fluxbox.sourceforge.net/ 10HOMEPAGE= http://fluxbox.sourceforge.net/
11COMMENT= Window Manager for X based on Blackbox 11COMMENT= Window Manager for X based on Blackbox
12LICENSE= mit 12LICENSE= mit
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
17USE_LIBTOOL= YES 17USE_LIBTOOL= YES
cvs diff -r1.39 -r1.40 pkgsrc/wm/fluxbox/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/fluxbox/distinfo 2022/01/07 17:32:12 1.39
+++ pkgsrc/wm/fluxbox/distinfo 2022/01/16 20:10:50 1.40
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: distinfo,v 1.39 2022/01/07 17:32:12 gutteridge Exp $ 1$NetBSD: distinfo,v 1.40 2022/01/16 20:10:50 gutteridge Exp $
2 2
3BLAKE2s (fluxbox-1.3.7.tar.bz2) = c3dfa1e8b204c4874ba372af05402b7a277bb1ebac2e7cc15c92c608ea26bdf7 3BLAKE2s (fluxbox-1.3.7.tar.bz2) = c3dfa1e8b204c4874ba372af05402b7a277bb1ebac2e7cc15c92c608ea26bdf7
4SHA512 (fluxbox-1.3.7.tar.bz2) = c40cc765f5d542210e18dca21b98b97a048c6685b605a68e2c64f4e886329f4e6d3a3a7e76b3ca0ce488242f38d0ee2a4d6dfebc9ce97d37c68f84c3948aac8c 4SHA512 (fluxbox-1.3.7.tar.bz2) = c40cc765f5d542210e18dca21b98b97a048c6685b605a68e2c64f4e886329f4e6d3a3a7e76b3ca0ce488242f38d0ee2a4d6dfebc9ce97d37c68f84c3948aac8c
5Size (fluxbox-1.3.7.tar.bz2) = 911098 bytes 5Size (fluxbox-1.3.7.tar.bz2) = 911098 bytes
6SHA1 (patch-aa) = e237a1b172c95fe5f251ab8795ed63c1888be83b 6SHA1 (patch-aa) = e237a1b172c95fe5f251ab8795ed63c1888be83b
7SHA1 (patch-af) = 871c9ce0bdfecda2c4180bd33b21186111ddecac 7SHA1 (patch-af) = 871c9ce0bdfecda2c4180bd33b21186111ddecac
8SHA1 (patch-bd) = 75532deb83a0f7e8c91f43acb0299d46d69496ba 8SHA1 (patch-bd) = 75532deb83a0f7e8c91f43acb0299d46d69496ba
9SHA1 (patch-be) = 0c8c0cfa12bbfeca28d76b12b488777b589bb43a 9SHA1 (patch-be) = 0c8c0cfa12bbfeca28d76b12b488777b589bb43a
10SHA1 (patch-bf) = 7da25f4e9a0e738da7c24264a91e6ab036d5acf2 10SHA1 (patch-bf) = 7da25f4e9a0e738da7c24264a91e6ab036d5acf2
11SHA1 (patch-bg) = 8f4decdb2ff611dcc1af64145801fac35f83e25a 11SHA1 (patch-bg) = 8f4decdb2ff611dcc1af64145801fac35f83e25a
12SHA1 (patch-bj) = baf714907cce1f71e69f85c80d8f98efeeeaf86f 12SHA1 (patch-bj) = baf714907cce1f71e69f85c80d8f98efeeeaf86f
13SHA1 (patch-bk) = ae0c9857dd0cd203c8ae3f4bf5a0c7126cf48c92 13SHA1 (patch-bk) = ae0c9857dd0cd203c8ae3f4bf5a0c7126cf48c92
14SHA1 (patch-data_keys) = 79820ca4fd89227e24ae71bb1278f49b3930af85 14SHA1 (patch-data_keys) = 79820ca4fd89227e24ae71bb1278f49b3930af85
 15SHA1 (patch-src_FbTk_Font.cc) = ae68bbcee78bc58c1021012e5dd4f138394f2956
15SHA1 (patch-src_fluxbox.cc) = a652d685cd80896b45bfa7b2dfd5e98b2561e326 16SHA1 (patch-src_fluxbox.cc) = a652d685cd80896b45bfa7b2dfd5e98b2561e326
16SHA1 (patch-util_fluxbox-remote.cc) = fa2389ad36f41a6080a43ad1755cd5ad904a27cf 17SHA1 (patch-util_fluxbox-remote.cc) = fa2389ad36f41a6080a43ad1755cd5ad904a27cf
File Added: pkgsrc/wm/fluxbox/patches/patch-src_FbTk_Font.cc
$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;