[arch-commits] Commit in mandoc/trunk (PKGBUILD fix-tbl-segfault.patch)

[Antonio Rojas]

    Date: Thursday, September 30, 2021 @ 18:59:33
  Author: arojas
Revision: 1026210

Update to 1.14.6

Modified:
  mandoc/trunk/PKGBUILD
Deleted:
  mandoc/trunk/fix-tbl-segfault.patch

------------------------+
 PKGBUILD               |   26 +++++---------------------
 fix-tbl-segfault.patch |   20 --------------------
 2 files changed, 5 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-30 18:46:33 UTC (rev 1026209)
+++ PKGBUILD	2021-09-30 18:59:33 UTC (rev 1026210)
@@ -3,8 +3,8 @@
 # Contributor: Matheus de Alcantara <matheus.de.alcantara at gmail.com>
 
 pkgname=mandoc
-pkgver=1.14.5
-pkgrel=4
+pkgver=1.14.6
+pkgrel=1
 pkgdesc='A suite of tools compiling mdoc from the OpenBSD project'
 arch=('x86_64')
 url='https://mdocml.bsd.lv/'
@@ -15,32 +15,16 @@
 source=("${url}/snapshots/${pkgname}-${pkgver}.tar.gz"
         'configure.local'
         'mandoc.service'
-        'mandoc.timer'
-        'fix-tbl-segfault.patch')
-sha256sums=('8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7'
+        'mandoc.timer')
+sha256sums=('8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c'
             '383772d5dd7c51319588ac4b63d4e7c452490568f6a3e905d118fdd6c4aa8a68'
             '2091411d5f87a3c371a5ba74b4773d1e454046446fa2cb045485979e52419bb6'
-            '74d6a02b97a17fffddcc0a3dc830e811348b1f6c6b84f867882c776d50f00ea4'
-            '12e6138be6ec2e8a34373876d8a5fce387a1d2b51a461ae20e1d98637af1d15c')
+            '74d6a02b97a17fffddcc0a3dc830e811348b1f6c6b84f867882c776d50f00ea4')
 
 prepare() {
     cd "${srcdir}"/${pkgname}-${pkgver}
 
     cp ../configure.local .
-
-    # broken script tries to execute make to get $CC, fails due to env -i
-    # see https://savannah.gnu.org/bugs/index.php?57674
-    # fixed in CVS
-    sed -i -e 's/^CC=.*/CC=cc/' ./configure
-
-    # fix segfault when formatting tables on some man pages
-    # fixed in CVS
-    patch -Np0 -i ../fix-tbl-segfault.patch
-
-    # remove useless duplicate global variables
-    # broken with gcc 10 -fno-common, unused
-    # fixed in CVS
-    sed -i -e '/^int dummy;$/d' ./compat_*.c
 }
 
 build() {

Deleted: fix-tbl-segfault.patch
===================================================================
--- fix-tbl-segfault.patch	2021-09-30 18:46:33 UTC (rev 1026209)
+++ fix-tbl-segfault.patch	2021-09-30 18:59:33 UTC (rev 1026210)
@@ -1,20 +0,0 @@
---- tbl_term.c	2020-08-18 12:35:27.290953791 +0200
-+++ tbl_term.c	2020-08-18 12:35:23.450952148 +0200
-@@ -626,7 +626,7 @@
- 
- 		lw = cpp == NULL || cpn == NULL ||
- 		    (cpn->pos != TBL_CELL_DOWN &&
--		     (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
-+		     (dpn == NULL || dpn->pos == TBL_DATA_NONE || strcmp(dpn->string, "\\^") != 0))
- 		    ? hw : 0;
- 		tbl_direct_border(tp, BHORIZ * lw,
- 		    col->width + col->spacing / 2);
-@@ -670,7 +670,7 @@
- 
- 		rw = cpp == NULL || cpn == NULL ||
- 		    (cpn->pos != TBL_CELL_DOWN &&
--		     (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
-+		     (dpn == NULL || dpn->pos == TBL_DATA_NONE || strcmp(dpn->string, "\\^") != 0))
- 		    ? hw : 0;
- 
- 		/* The line crossing at the end of this column. */