Attachment 252779 Details for Bug 280832 – Update to 0.9.4

[patch] Update to 0.9.4

tdom-update.patch (text/plain), 2.75 KB, created by Mikhail Teterin on 2024-08-15 16:24:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail Teterin

Created: 2024-08-15 16:24:03 UTC

Size: 2.75 KB

patch

obsolete

>diff --git a/www/tdom/Makefile b/www/tdom/Makefile
>index f1ff11c490d2..555870f45c22 100644
>--- a/www/tdom/Makefile
>+++ b/www/tdom/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	tDOM
>-PORTVERSION=	0.9.3
>-PORTREVISION=	1
>+PORTVERSION=	0.9.4
> CATEGORIES=	www
> MASTER_SITES=	http://tdom.org/downloads/
> DISTNAME=	${PORTNAME:tl}-${PORTVERSION}-src
>@@ -48,7 +47,7 @@ MAKE_ARGS+=	RANLIB_STUB=:
> 
> .if ${PORT_OPTIONS:MEBASE}
> post-patch:
>-	${REINPLACE_CMD} 's|expat\.h|bsdxml.h|g' \
>+	${REINPLACE_CMD} 's|$[</]$expat\.h|\1bsdxml.h|g' \
> 	    ${WRKSRC}/configure \
> 	    ${WRKSRC}/generic/dom.h \
> 	    ${WRKSRC}/generic/tdom.h \
>diff --git a/www/tdom/distinfo b/www/tdom/distinfo
>index b51e0060dc48..535a11f1862f 100644
>--- a/www/tdom/distinfo
>+++ b/www/tdom/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1704653401
>-SHA256 (tdom-0.9.3-src.tar.gz) = b46bcb6750283bcf41bd6f220cf06e7074752dc8b9a87a192bd81e53caad53f9
>-SIZE (tdom-0.9.3-src.tar.gz) = 1319804
>+TIMESTAMP = 1723737191
>+SHA256 (tdom-0.9.4-src.tar.gz) = f947d38cbb7978ec1510e3cf894a672a4ad18cb823b8c9bb3604934ebe4c4546
>+SIZE (tdom-0.9.4-src.tar.gz) = 1447298
>diff --git a/www/tdom/files/patch-generic-dom.h b/www/tdom/files/patch-generic-dom.h
>index 12289b8fa8a4..4b5ca5a4a46b 100644
>--- a/www/tdom/files/patch-generic-dom.h
>+++ b/www/tdom/files/patch-generic-dom.h
>@@ -1,10 +1,11 @@
>---- generic/dom.h.orig	2018-09-24 12:17:05.706742000 +0000
>-+++ generic/dom.h	2018-09-24 12:17:16.003866000 +0000
>-@@ -41,7 +41,6 @@
>+--- generic/dom.h	2018-09-24 12:17:05.706742000 +0000
>++++ generic/dom.h	2024-08-15 12:03:29.000000000 -0400
>+@@ -41,8 +41,7 @@
>  #include <string.h>
>  #include <ctype.h>
>  #include <expat.h>
> -#include <domalloc.h>
>+ #include <limits.h>
>  
>  /*
>   * tDOM provides it's own memory allocator which is optimized for
>diff --git a/www/tdom/files/patch-warnings b/www/tdom/files/patch-warnings
>new file mode 100644
>index 000000000000..3aa70de9d035
>--- /dev/null
>+++ b/www/tdom/files/patch-warnings
>@@ -0,0 +1,27 @@
>+Remove the set-but-unused variable (nHash). Pointed out by
>+clang...
>+
>+	-mi
>+
>+--- generic/domxslt.c	2024-07-25 20:20:32.000000000 -0400
>++++ generic/domxslt.c	2024-08-15 12:08:27.351920000 -0400
>+@@ -1152,5 +1152,5 @@
>+     char wrongFormat[] = "Unable to interpret format pattern.";
>+     domLength l, zl, gLen;
>+-    int i, j, k, g, nHash, nZero, fHash, fZero, isNeg;
>++    int i, j, k, g, nZero, fHash, fZero, isNeg;
>+     int prefixMinux, percentMul = 0, perMilleMul = 0;
>+     Tcl_DString  dStr, s;
>+@@ -1219,5 +1219,5 @@
>+     }
>+     prefix1[i] = '\0';
>+-    nHash = nZero = fHash = fZero = 0;
>++    nZero = fHash = fZero = 0;
>+     gLen = -2222;
>+     while (*p) {
>+@@ -1227,5 +1227,4 @@
>+                 goto xsltFormatNumberError;
>+             }
>+-            nHash++; 
>+         }
>+         else if (*p==df->zeroDigit) { nZero++; }

Flags:

mi: maintainer-approval+

Actions: View | Diff

Attachments on bug 280832: 252779