Mon Apr 4 12:55:28 2022 UTC ()
libXaw: add upstream bug report URLs

Fix CATEGORIES while here


(wiz)
diff -r1.18 -r1.19 pkgsrc/x11/libXaw/Makefile
diff -r1.15 -r1.16 pkgsrc/x11/libXaw/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/libXaw/patches/patch-src_AsciiSrc.c
diff -r1.1 -r1.2 pkgsrc/x11/libXaw/patches/patch-src_DisplayList.c
diff -r1.1 -r1.2 pkgsrc/x11/libXaw/patches/patch-src_Panner.c
diff -r1.1 -r1.2 pkgsrc/x11/libXaw/patches/patch-src_TextAction.c
diff -r1.1 -r1.2 pkgsrc/x11/libXaw/patches/patch-src_TextSink.c
diff -r1.1 -r1.2 pkgsrc/x11/libXaw/patches/patch-src_XawIm.c
cvs diff -r1.18 -r1.19 pkgsrc/x11/libXaw/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libXaw/Makefile 2022/04/04 12:42:19 1.18
+++ pkgsrc/x11/libXaw/Makefile 2022/04/04 12:55:28 1.19
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.18 2022/04/04 12:42:19 riastradh Exp $ 1# $NetBSD: Makefile,v 1.19 2022/04/04 12:55:28 wiz Exp $
2 2
3DISTNAME= libXaw-1.0.14 3DISTNAME= libXaw-1.0.14
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= graphics x11 5CATEGORIES= x11 graphics
6MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 6MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= https://xorg.freedesktop.org/ 10HOMEPAGE= https://xorg.freedesktop.org/
11COMMENT= X Athena Widgets Library from modular Xorg X11 11COMMENT= X Athena Widgets Library from modular Xorg X11
12 12
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
15PKGCONFIG_OVERRIDE+= xaw6.pc.in 15PKGCONFIG_OVERRIDE+= xaw6.pc.in
16PKGCONFIG_OVERRIDE+= xaw7.pc.in 16PKGCONFIG_OVERRIDE+= xaw7.pc.in
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18CONFIGURE_ENV+= LIB_MAN_SUFFIX=3 18CONFIGURE_ENV+= LIB_MAN_SUFFIX=3
cvs diff -r1.15 -r1.16 pkgsrc/x11/libXaw/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/libXaw/distinfo 2022/04/04 12:42:19 1.15
+++ pkgsrc/x11/libXaw/distinfo 2022/04/04 12:55:28 1.16
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.15 2022/04/04 12:42:19 riastradh Exp $ 1$NetBSD: distinfo,v 1.16 2022/04/04 12:55:28 wiz Exp $
2 2
3BLAKE2s (libXaw-1.0.14.tar.bz2) = d323174f3703ba71caafeb2a1cdfe611a036f683ab6a76d5320d93d8cd87665e 3BLAKE2s (libXaw-1.0.14.tar.bz2) = d323174f3703ba71caafeb2a1cdfe611a036f683ab6a76d5320d93d8cd87665e
4SHA512 (libXaw-1.0.14.tar.bz2) = 29d1c151369523ae6cb418e636b0b7b39ccccc35462a0b394dbeb46d5b6d780badd2eb872a55d9fbba1ee1af034e76c0463f40f8d8a7be2c336d08b3b1bf81d4 4SHA512 (libXaw-1.0.14.tar.bz2) = 29d1c151369523ae6cb418e636b0b7b39ccccc35462a0b394dbeb46d5b6d780badd2eb872a55d9fbba1ee1af034e76c0463f40f8d8a7be2c336d08b3b1bf81d4
5Size (libXaw-1.0.14.tar.bz2) = 690994 bytes 5Size (libXaw-1.0.14.tar.bz2) = 690994 bytes
6SHA1 (patch-Makefile.in) = bc701f17befebb04c0062c6c670f85f48adfaabf 6SHA1 (patch-Makefile.in) = bc701f17befebb04c0062c6c670f85f48adfaabf
7SHA1 (patch-aa) = 9fdbdf625260763fc7345421870633ed3e4b6b7b 7SHA1 (patch-aa) = 9fdbdf625260763fc7345421870633ed3e4b6b7b
8SHA1 (patch-src_AsciiSrc.c) = 068d7ffeb3dd04493332f06b9d75609b054165c1 8SHA1 (patch-src_AsciiSrc.c) = c9d1748ef7f35fc4cc6e241c486343aa16ba3d1f
9SHA1 (patch-src_DisplayList.c) = 12bf34410eb3c791ee2de0c78adfcdc1d5a55117 9SHA1 (patch-src_DisplayList.c) = dc9cb4cfb41de79345be077b04a8df692d7b38ae
10SHA1 (patch-src_Panner.c) = c9e168da7a4c4f20018d55ac9bb1b9fa0e6e363f 10SHA1 (patch-src_Panner.c) = 5dc2f93433727d54ab78387331d7b2b62a57eb9f
11SHA1 (patch-src_TextAction.c) = 458faf8dd1178f19e826e46062ccec6e725c6651 11SHA1 (patch-src_TextAction.c) = 8df88ded30ddd49f9f65616425406c8ede79e4a2
12SHA1 (patch-src_TextSink.c) = 0feee4b06d432dca348ed1356c529e2fb77af886 12SHA1 (patch-src_TextSink.c) = 738abe7bfdd1aebd6ab7d256ecad10bbb3cab309
13SHA1 (patch-src_XawIm.c) = 25f4b44ffffa2d6fe82162c73c054dc0938773fd 13SHA1 (patch-src_XawIm.c) = 290f68fe43ce0f32fb3c5c05875507f32bdf6d3a
cvs diff -r1.1 -r1.2 pkgsrc/x11/libXaw/patches/Attic/patch-src_AsciiSrc.c (expand / switch to unified diff)

--- pkgsrc/x11/libXaw/patches/Attic/patch-src_AsciiSrc.c 2022/04/04 12:42:19 1.1
+++ pkgsrc/x11/libXaw/patches/Attic/patch-src_AsciiSrc.c 2022/04/04 12:55:28 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-src_AsciiSrc.c,v 1.1 2022/04/04 12:42:19 riastradh Exp $ 1$NetBSD: patch-src_AsciiSrc.c,v 1.2 2022/04/04 12:55:28 wiz Exp $
2 2
3Fix ctype(3) abuse. 3Fix ctype(3) abuse.
 4https://gitlab.freedesktop.org/xorg/lib/libxaw/-/merge_requests/11
4 5
5--- src/AsciiSrc.c.orig 2021-03-27 17:40:21.000000000 +0000 6--- src/AsciiSrc.c.orig 2021-03-27 17:40:21.000000000 +0000
6+++ src/AsciiSrc.c 7+++ src/AsciiSrc.c
7@@ -857,8 +857,8 @@ Search(Widget w, register XawTextPositio 8@@ -857,8 +857,8 @@ Search(Widget w, register XawTextPositio
8 /*CONSTCOND*/ 9 /*CONSTCOND*/
9 while (1) { 10 while (1) {
10 if (*ptr++ == c 11 if (*ptr++ == c
11- || (case_sensitive && isalpha(c) && isalpha(ptr[-1]) 12- || (case_sensitive && isalpha(c) && isalpha(ptr[-1])
12- && toupper(c) == toupper(ptr[-1]))) { 13- && toupper(c) == toupper(ptr[-1]))) {
13+ || (case_sensitive && isalpha((unsigned char)c) && isalpha((unsigned char)ptr[-1]) 14+ || (case_sensitive && isalpha((unsigned char)c) && isalpha((unsigned char)ptr[-1])
14+ && toupper((unsigned char)c) == toupper((unsigned char)ptr[-1]))) { 15+ && toupper((unsigned char)c) == toupper((unsigned char)ptr[-1]))) {
15 if (++count == text->length) 16 if (++count == text->length)
16 break; 17 break;
cvs diff -r1.1 -r1.2 pkgsrc/x11/libXaw/patches/Attic/patch-src_DisplayList.c (expand / switch to unified diff)

--- pkgsrc/x11/libXaw/patches/Attic/patch-src_DisplayList.c 2022/04/04 12:42:19 1.1
+++ pkgsrc/x11/libXaw/patches/Attic/patch-src_DisplayList.c 2022/04/04 12:55:28 1.2
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: patch-src_DisplayList.c,v 1.1 2022/04/04 12:42:19 riastradh Exp $ 1$NetBSD: patch-src_DisplayList.c,v 1.2 2022/04/04 12:55:28 wiz Exp $
2 2
3Fix ctype(3) abuse. 3Fix ctype(3) abuse.
 4https://gitlab.freedesktop.org/xorg/lib/libxaw/-/merge_requests/11
4 5
5--- src/DisplayList.c.orig 2021-03-27 17:40:21.000000000 +0000 6--- src/DisplayList.c.orig 2021-03-27 17:40:21.000000000 +0000
6+++ src/DisplayList.c 7+++ src/DisplayList.c
7@@ -1941,7 +1941,7 @@ _Xaw_Xlib_ArgsInitProc(String proc_name, 8@@ -1941,7 +1941,7 @@ _Xaw_Xlib_ArgsInitProc(String proc_name,
8 case EXPOSURES: 9 case EXPOSURES:
9 if (*num_params == 1) 10 if (*num_params == 1)
10 { 11 {
11- if (isdigit(params[0][0]) || params[0][0] == '+' || params[0][0] == '-') 12- if (isdigit(params[0][0]) || params[0][0] == '+' || params[0][0] == '-')
12+ if (isdigit((unsigned char)params[0][0]) || params[0][0] == '+' || params[0][0] == '-') 13+ if (isdigit((unsigned char)params[0][0]) || params[0][0] == '+' || params[0][0] == '-')
13 retval = (void *)read_int((char *)params[0], NULL); 14 retval = (void *)read_int((char *)params[0], NULL);
14 else if (XmuCompareISOLatin1(params[0], "true") == 0 || 15 else if (XmuCompareISOLatin1(params[0], "true") == 0 ||
15 XmuCompareISOLatin1(params[0], "on") == 0) 16 XmuCompareISOLatin1(params[0], "on") == 0)
cvs diff -r1.1 -r1.2 pkgsrc/x11/libXaw/patches/Attic/patch-src_Panner.c (expand / switch to unified diff)

--- pkgsrc/x11/libXaw/patches/Attic/patch-src_Panner.c 2022/04/04 12:42:19 1.1
+++ pkgsrc/x11/libXaw/patches/Attic/patch-src_Panner.c 2022/04/04 12:55:28 1.2
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-src_Panner.c,v 1.1 2022/04/04 12:42:19 riastradh Exp $ 1$NetBSD: patch-src_Panner.c,v 1.2 2022/04/04 12:55:28 wiz Exp $
 2
 3Fix ctype(3) use.
 4https://gitlab.freedesktop.org/xorg/lib/libxaw/-/merge_requests/11
2 5
3--- src/Panner.c.orig 2021-03-27 17:40:21.000000000 +0000 6--- src/Panner.c.orig 2021-03-27 17:40:21.000000000 +0000
4+++ src/Panner.c 7+++ src/Panner.c
5@@ -575,7 +575,7 @@ parse_page_string(String s, int pagesize 8@@ -575,7 +575,7 @@ parse_page_string(String s, int pagesize
6 /* 9 /*
7 * syntax: spaces [+-] number spaces [pc\0] spaces 10 * syntax: spaces [+-] number spaces [pc\0] spaces
8 */ 11 */
9- for (; isascii(*s) && isspace(*s); s++) /* skip white space */ 12- for (; isascii(*s) && isspace(*s); s++) /* skip white space */
10+ for (; isascii((unsigned char)*s) && isspace((unsigned char)*s); s++) /* skip white space */ 13+ for (; isascii((unsigned char)*s) && isspace((unsigned char)*s); s++) /* skip white space */
11 ; 14 ;
12  15
13 if (*s == '+' || *s == '-') { /* deal with signs */ 16 if (*s == '+' || *s == '-') { /* deal with signs */
14@@ -590,12 +590,12 @@ parse_page_string(String s, int pagesize 17@@ -590,12 +590,12 @@ parse_page_string(String s, int pagesize
cvs diff -r1.1 -r1.2 pkgsrc/x11/libXaw/patches/Attic/patch-src_TextAction.c (expand / switch to unified diff)

--- pkgsrc/x11/libXaw/patches/Attic/patch-src_TextAction.c 2022/04/04 12:42:19 1.1
+++ pkgsrc/x11/libXaw/patches/Attic/patch-src_TextAction.c 2022/04/04 12:55:28 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-src_TextAction.c,v 1.1 2022/04/04 12:42:19 riastradh Exp $ 1$NetBSD: patch-src_TextAction.c,v 1.2 2022/04/04 12:55:28 wiz Exp $
2 2
3Fix ctype(3) abuse. 3Fix ctype(3) abuse.
 4https://gitlab.freedesktop.org/xorg/lib/libxaw/-/merge_requests/11
4 5
5--- src/TextAction.c.orig 2021-03-27 17:40:21.000000000 +0000 6--- src/TextAction.c.orig 2021-03-27 17:40:21.000000000 +0000
6+++ src/TextAction.c 7+++ src/TextAction.c
7@@ -2607,7 +2607,7 @@ InsertNewLineAndIndent(Widget w, XEvent  8@@ -2607,7 +2607,7 @@ InsertNewLineAndIndent(Widget w, XEvent
8 strcpy(++ptr, line_to_ip); 9 strcpy(++ptr, line_to_ip);
9  10
10 length++; 11 length++;
11- while (length && (isspace(*ptr) || (*ptr == XawTAB))) 12- while (length && (isspace(*ptr) || (*ptr == XawTAB)))
12+ while (length && (isspace((unsigned char)*ptr) || (*ptr == XawTAB))) 13+ while (length && (isspace((unsigned char)*ptr) || (*ptr == XawTAB)))
13 ptr++, length--; 14 ptr++, length--;
14 *ptr = '\0'; 15 *ptr = '\0';
15 text.length = (int)strlen(text.ptr); 16 text.length = (int)strlen(text.ptr);
16@@ -3393,7 +3393,7 @@ Numeric(Widget w, XEvent *event, String  17@@ -3393,7 +3393,7 @@ Numeric(Widget w, XEvent *event, String
cvs diff -r1.1 -r1.2 pkgsrc/x11/libXaw/patches/Attic/patch-src_TextSink.c (expand / switch to unified diff)

--- pkgsrc/x11/libXaw/patches/Attic/patch-src_TextSink.c 2022/04/04 12:42:19 1.1
+++ pkgsrc/x11/libXaw/patches/Attic/patch-src_TextSink.c 2022/04/04 12:55:28 1.2
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: patch-src_TextSink.c,v 1.1 2022/04/04 12:42:19 riastradh Exp $ 1$NetBSD: patch-src_TextSink.c,v 1.2 2022/04/04 12:55:28 wiz Exp $
2 2
3Fix ctype(3) abuse. 3Fix ctype(3) abuse.
 4https://gitlab.freedesktop.org/xorg/lib/libxaw/-/merge_requests/11
4 5
5--- src/TextSink.c.orig 2021-03-27 17:40:21.000000000 +0000 6--- src/TextSink.c.orig 2021-03-27 17:40:21.000000000 +0000
6+++ src/TextSink.c 7+++ src/TextSink.c
7@@ -1251,7 +1251,7 @@ _XawTextSinkAddProperty(XawTextPropertyL 8@@ -1251,7 +1251,7 @@ _XawTextSinkAddProperty(XawTextPropertyL
8 weight = asterisk; 9 weight = asterisk;
9 if (property->slant != NULLQUARK) { 10 if (property->slant != NULLQUARK) {
10 slant = XrmQuarkToString(property->slant); 11 slant = XrmQuarkToString(property->slant);
11- if (toupper(*slant) != 'R') 12- if (toupper(*slant) != 'R')
12+ if (toupper((unsigned char)*slant) != 'R') 13+ if (toupper((unsigned char)*slant) != 'R')
13 slant = asterisk; /* X defaults to italics, so, don't 14 slant = asterisk; /* X defaults to italics, so, don't
14 care in resolving between `I' and `O' */ 15 care in resolving between `I' and `O' */
15 } 16 }
cvs diff -r1.1 -r1.2 pkgsrc/x11/libXaw/patches/Attic/patch-src_XawIm.c (expand / switch to unified diff)

--- pkgsrc/x11/libXaw/patches/Attic/patch-src_XawIm.c 2022/04/04 12:42:19 1.1
+++ pkgsrc/x11/libXaw/patches/Attic/patch-src_XawIm.c 2022/04/04 12:55:28 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-src_XawIm.c,v 1.1 2022/04/04 12:42:19 riastradh Exp $ 1$NetBSD: patch-src_XawIm.c,v 1.2 2022/04/04 12:55:28 wiz Exp $
2 2
3Fix ctype(3) abuse. 3Fix ctype(3) abuse.
 4https://gitlab.freedesktop.org/xorg/lib/libxaw/-/merge_requests/11
4 5
5--- src/XawIm.c.orig 2021-03-27 17:40:21.000000000 +0000 6--- src/XawIm.c.orig 2021-03-27 17:40:21.000000000 +0000
6+++ src/XawIm.c 7+++ src/XawIm.c
7@@ -472,14 +472,14 @@ OpenIM(XawVendorShellExtPart *ve) 8@@ -472,14 +472,14 @@ OpenIM(XawVendorShellExtPart *ve)
8  9
9 for(ns=s=ve->im.input_method; ns && *s;) { 10 for(ns=s=ve->im.input_method; ns && *s;) {
10 /* skip any leading blanks */ 11 /* skip any leading blanks */
11- while (*s && isspace(*s)) s++; 12- while (*s && isspace(*s)) s++;
12+ while (*s && isspace((unsigned char)*s)) s++; 13+ while (*s && isspace((unsigned char)*s)) s++;
13 if (!*s) break; 14 if (!*s) break;
14 if ((ns = end = strchr(s, ',')) == NULL) 15 if ((ns = end = strchr(s, ',')) == NULL)
15 end = s + strlen(s); 16 end = s + strlen(s);
16 /* If there is a spurious comma end can be the same as s */ 17 /* If there is a spurious comma end can be the same as s */