diff options
| author | gutteridge <gutteridge@pkgsrc.org> | 2022-01-16 20:10:50 +0000 |
|---|---|---|
| committer | gutteridge <gutteridge@pkgsrc.org> | 2022-01-16 20:10:50 +0000 |
| commit | ef5eb7a2fe85a6696aecef747d8a48af7d965566 (patch) | |
| tree | b0f3132e2181f2d32ca70e4d80ecb6eff955b9e7 /wm/fluxbox | |
| parent | 66acec489b83d933fa2584f7f59bde54d64ef635 (diff) | |
| download | pkgsrc-ef5eb7a2fe85a6696aecef747d8a48af7d965566.tar.gz | |
fluxbox: add an upstream patch to fix a segfault
Diffstat (limited to 'wm/fluxbox')
| -rw-r--r-- | wm/fluxbox/Makefile | 4 | ||||
| -rw-r--r-- | wm/fluxbox/distinfo | 3 | ||||
| -rw-r--r-- | wm/fluxbox/patches/patch-src_FbTk_Font.cc | 25 |
3 files changed, 29 insertions, 3 deletions
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile index ffbba0e3402..77382d1e1fb 100644 --- a/wm/fluxbox/Makefile +++ b/wm/fluxbox/Makefile @@ -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 diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo index 80ba84b3c2d..26e77729886 100644 --- a/wm/fluxbox/distinfo +++ b/wm/fluxbox/distinfo @@ -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) = 8f4decdb2ff611dcc1af64145801fac35f83e25a 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 diff --git a/wm/fluxbox/patches/patch-src_FbTk_Font.cc b/wm/fluxbox/patches/patch-src_FbTk_Font.cc new file mode 100644 index 00000000000..7851b896167 --- /dev/null +++ b/wm/fluxbox/patches/patch-src_FbTk_Font.cc @@ -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; |