From b0a033c44d513450b607d372dc47481cd57f4a77 Mon Sep 17 00:00:00 2001 From: jbeich Date: Mon, 21 Dec 2020 21:39:46 +0000 Subject: [PATCH] x11-fonts/fcft: apply upstream crashfix $ fnott & $ notify-send "this is the summary" "this is the body" $ fnottctl quit Assertion failed: (fcCacheChains[i] == NULL), function FcCacheFini, file fccache.c, line 807. (lldb) bt * thread #1, name = 'fnott', stop reason = signal SIGABRT * frame #0: 0x00000008005eb30a libc.so.7`__sys_thr_kill at thr_kill.S:4 frame #1: 0x0000000800556ff4 libc.so.7`__raise(s=6) at raise.c:52:10 frame #2: 0x0000000800616be9 libc.so.7`abort at abort.c:67:8 frame #3: 0x0000000800537b91 libc.so.7`__assert(func=, file=, line=, failedexpr=) at assert.c:51:2 frame #4: 0x0000000800922b94 libfontconfig.so.1`FcCacheFini at fccache.c:807:6 frame #5: 0x000000080093eafd libfontconfig.so.1`IA__FcFini at fcinit.c:205:5 frame #6: 0x0000000800434989 libfcft.so.3`fini at fcft.c:233:5 frame #7: 0x0000000800247906 ld-elf.so.1`objlist_call_fini(list=, root=, lockstate=) at rtld.c:2761:4 frame #8: 0x00000008002401c9 ld-elf.so.1`rtld_exit at rtld.c:3148:5 frame #9: 0x00000008006170ae libc.so.7`__cxa_finalize(dso=) at atexit.c:240:5 frame #10: 0x0000000800617711 libc.so.7`exit(status=0) at exit.c:74:2 frame #11: 0x000000000020c866 fnott`_start(ap=, cleanup=) at crt1_c.c:75:2 git-svn-id: svn+ssh://svn.freebsd.org/ports/head@558862 35697150-7ecd-e111-bb59-0022644237b5 --- x11-fonts/fcft/Makefile | 5 +++++ x11-fonts/fcft/distinfo | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/x11-fonts/fcft/Makefile b/x11-fonts/fcft/Makefile index bac263796d8f3..cdf6005c46e4a 100644 --- a/x11-fonts/fcft/Makefile +++ b/x11-fonts/fcft/Makefile @@ -2,9 +2,14 @@ PORTNAME= fcft DISTVERSION= 2.3.2 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= https://codeberg.org/dnkl/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ +PATCH_SITES= https://codeberg.org/dnkl/${PORTNAME}/commit/ +PATCHFILES+= 0b330d7ff91f.patch:-p1 # avoid patch conflict +PATCHFILES+= e30e9f295b79.patch:-p1 # fnottctl quit crashfix + MAINTAINER= jbeich@FreeBSD.org COMMENT= Simple library for font loading and glyph rasterization diff --git a/x11-fonts/fcft/distinfo b/x11-fonts/fcft/distinfo index 862608255a984..9e0e1d169a3a7 100644 --- a/x11-fonts/fcft/distinfo +++ b/x11-fonts/fcft/distinfo @@ -1,3 +1,7 @@ TIMESTAMP = 1608296676 SHA256 (fcft-2.3.2.tar.gz) = 726fdebb1d29bc40c665015666fd9037981c0b4d0ba3ecafa1994053091e7fa8 SIZE (fcft-2.3.2.tar.gz) = 313133 +SHA256 (0b330d7ff91f.patch) = c3ac993323e189622157f46ae3fdac7a7df22365e15e11f5c68cbbc333262963 +SIZE (0b330d7ff91f.patch) = 821 +SHA256 (e30e9f295b79.patch) = ce5b1031ff07b842aaa418be7dc5e90947ffbb482ce7e709e471d13deee8dd46 +SIZE (e30e9f295b79.patch) = 1624