pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/edje
Module Name: pkgsrc
Committed By: gutteridge
Date: Tue Oct 28 00:24:02 UTC 2025
Modified Files:
pkgsrc/graphics/edje: Makefile distinfo
Added Files:
pkgsrc/graphics/edje/patches: patch-src_bin_edje__cc__parse.c
patch-src_bin_edje__cc__sources.c patch-src_bin_edje__decc.c
patch-src_bin_edje__player.c patch-src_bin_epp_cpplib.c
patch-src_lib_edje__lua2.c
Log Message:
edje: patch ctype(3) issues
Noted to cause build failures on recent NetBSD (after ctype(3) changes
circa 10.99.14), when used during build by x11/elementary.
(cpplib.c has more usage I didn't patch as it looked correct from
fundamental data types applied earlier on.)
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/graphics/edje/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/edje/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/edje/patches/patch-src_bin_edje__cc__parse.c \
pkgsrc/graphics/edje/patches/patch-src_bin_edje__cc__sources.c \
pkgsrc/graphics/edje/patches/patch-src_bin_edje__decc.c \
pkgsrc/graphics/edje/patches/patch-src_bin_edje__player.c \
pkgsrc/graphics/edje/patches/patch-src_bin_epp_cpplib.c \
pkgsrc/graphics/edje/patches/patch-src_lib_edje__lua2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/edje/Makefile
diff -u pkgsrc/graphics/edje/Makefile:1.57 pkgsrc/graphics/edje/Makefile:1.58
--- pkgsrc/graphics/edje/Makefile:1.57 Sun Oct 5 19:26:01 2025
+++ pkgsrc/graphics/edje/Makefile Tue Oct 28 00:24:02 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2025/10/05 19:26:01 js Exp $
+# $NetBSD: Makefile,v 1.58 2025/10/28 00:24:02 gutteridge Exp $
DISTNAME= edje-1.7.10
-PKGREVISION= 23
+PKGREVISION= 24
CATEGORIES= graphics
MASTER_SITES= https://download.enlightenment.org/att/releases/
EXTRACT_SUFX= .tar.bz2
Index: pkgsrc/graphics/edje/distinfo
diff -u pkgsrc/graphics/edje/distinfo:1.6 pkgsrc/graphics/edje/distinfo:1.7
--- pkgsrc/graphics/edje/distinfo:1.6 Tue Oct 26 10:46:05 2021
+++ pkgsrc/graphics/edje/distinfo Tue Oct 28 00:24:02 2025
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:46:05 nia Exp $
+$NetBSD: distinfo,v 1.7 2025/10/28 00:24:02 gutteridge Exp $
BLAKE2s (edje-1.7.10.tar.bz2) = b4a097e519e51f26470a314e155844d6ae18d85a9da39081735996d5e6e5279c
SHA512 (edje-1.7.10.tar.bz2) = 222b2e1265d9083edb927994ed0afdcdd10399fccd867835e180604abde8c0d43bd94b3727f121ba159e2ca4bf870c1078a0894522ccdebe75e91e9ca9d95bec
Size (edje-1.7.10.tar.bz2) = 1120320 bytes
+SHA1 (patch-src_bin_edje__cc__parse.c) = ab09221c887709cdaff9880a43a2c69438e5e6f8
+SHA1 (patch-src_bin_edje__cc__sources.c) = 8f2eba65c50f811e9527f3aec909c222421a0429
+SHA1 (patch-src_bin_edje__decc.c) = 823ea923077a3096de1c4a070574e3b079fbbc7f
+SHA1 (patch-src_bin_edje__player.c) = 0e6eda7ef87506e132a80e8cba8bc30540dd87ca
+SHA1 (patch-src_bin_epp_cpplib.c) = 6e55edeb76dcaae60a547bcbe6d0a37bb10c0c3b
+SHA1 (patch-src_lib_edje__lua2.c) = 0387e04e9a5a1d9902f655815b1c95d896e65964
Added files:
Index: pkgsrc/graphics/edje/patches/patch-src_bin_edje__cc__parse.c
diff -u /dev/null pkgsrc/graphics/edje/patches/patch-src_bin_edje__cc__parse.c:1.1
--- /dev/null Tue Oct 28 00:24:02 2025
+++ pkgsrc/graphics/edje/patches/patch-src_bin_edje__cc__parse.c Tue Oct 28 00:24:02 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_bin_edje__cc__parse.c,v 1.1 2025/10/28 00:24:02 gutteridge Exp $
+
+Use ctype.h correctly.
+
+--- src/bin/edje_cc_parse.c.orig 2013-07-30 14:42:43.000000000 +0000
++++ src/bin/edje_cc_parse.c
+@@ -306,7 +306,7 @@ next_token(char *p, char *end, char **ne
+ {
+ if (!in_quote)
+ {
+- if (!isspace(*p))
++ if (!isspace((unsigned char)*p))
+ {
+ if (*p == '"')
+ {
+@@ -353,7 +353,7 @@ next_token(char *p, char *end, char **ne
+
+ /* check for end-of-token */
+ if (
+- (isspace(*p)) ||
++ (isspace((unsigned char)*p)) ||
+ ((*delim) && (!isdelim(*p))) ||
+ (isdelim(*p))
+ )
Index: pkgsrc/graphics/edje/patches/patch-src_bin_edje__cc__sources.c
diff -u /dev/null pkgsrc/graphics/edje/patches/patch-src_bin_edje__cc__sources.c:1.1
--- /dev/null Tue Oct 28 00:24:02 2025
+++ pkgsrc/graphics/edje/patches/patch-src_bin_edje__cc__sources.c Tue Oct 28 00:24:02 2025
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_bin_edje__cc__sources.c,v 1.1 2025/10/28 00:24:02 gutteridge Exp $
+
+Use ctype.h correctly.
+
+--- src/bin/edje_cc_sources.c.orig 2013-07-30 14:42:43.000000000 +0000
++++ src/bin/edje_cc_sources.c
+@@ -103,7 +103,7 @@ source_fetch_file(const char *fil, const
+ {
+ if (!got_hash)
+ {
+- if (!isspace(*p))
++ if (!isspace((unsigned char)*p))
+ {
+ if (*p == '#')
+ got_hash = 1;
+@@ -115,7 +115,7 @@ source_fetch_file(const char *fil, const
+
+ if (!haveinclude)
+ {
+- if (!isspace(*p))
++ if (!isspace((unsigned char)*p))
+ {
+ if (!strncmp(p, "include", 7))
+ {
+@@ -140,7 +140,7 @@ source_fetch_file(const char *fil, const
+ }
+ else
+ {
+- if (!isspace(*p))
++ if (!isspace((unsigned char)*p))
+ {
+ char end = '\0';
+
Index: pkgsrc/graphics/edje/patches/patch-src_bin_edje__decc.c
diff -u /dev/null pkgsrc/graphics/edje/patches/patch-src_bin_edje__decc.c:1.1
--- /dev/null Tue Oct 28 00:24:02 2025
+++ pkgsrc/graphics/edje/patches/patch-src_bin_edje__decc.c Tue Oct 28 00:24:02 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_bin_edje__decc.c,v 1.1 2025/10/28 00:24:02 gutteridge Exp $
+
+Use ctype.h correctly.
+
+--- src/bin/edje_decc.c.orig 2013-07-30 14:42:43.000000000 +0000
++++ src/bin/edje_decc.c
+@@ -520,7 +520,7 @@ compiler_cmd_is_sane()
+ for (ptr = c; ptr && *ptr; ptr++)
+ {
+ /* only allow [a-z][A-Z][0-9]_- */
+- if ((!isalnum(*ptr)) && (*ptr != '_') && (*ptr != '-'))
++ if ((!isalnum((unsigned char)*ptr)) && (*ptr != '_') && (*ptr != '-'))
+ {
+ return 0;
+ }
+@@ -548,7 +548,7 @@ root_filename_is_sane()
+ case '_': case '-': case '.': case '/':
+ break;
+ default:
+- if (!isalnum(*ptr))
++ if (!isalnum((unsigned char)*ptr))
+ {
+ return 0;
+ }
Index: pkgsrc/graphics/edje/patches/patch-src_bin_edje__player.c
diff -u /dev/null pkgsrc/graphics/edje/patches/patch-src_bin_edje__player.c:1.1
--- /dev/null Tue Oct 28 00:24:02 2025
+++ pkgsrc/graphics/edje/patches/patch-src_bin_edje__player.c Tue Oct 28 00:24:02 2025
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_bin_edje__player.c,v 1.1 2025/10/28 00:24:02 gutteridge Exp $
+
+Use ctype.h correctly.
+
+--- src/bin/edje_player.c.orig 2013-07-30 14:42:43.000000000 +0000
++++ src/bin/edje_player.c
+@@ -58,7 +58,7 @@ _slave_mode_tok(char **p_arg)
+ if (!*p_arg) return NULL;
+
+ s = *p_arg;
+- while (isspace(*s))
++ while (isspace((unsigned char)*s))
+ s++;
+
+ if (*s == '\0')
+@@ -80,7 +80,7 @@ _slave_mode_tok(char **p_arg)
+
+ for (e = s; *e != '\0'; e++)
+ {
+- if ((!is_quoted) && (isspace(*e)))
++ if ((!is_quoted) && (isspace((unsigned char)*e)))
+ break;
+ else if ((is_quoted) && (*e == '"'))
+ break;
+@@ -223,7 +223,7 @@ _slave_mode(void *data, Ecore_Fd_Handler
+ *p = '\0';
+ p++;
+
+- while (isspace(*p))
++ while (isspace((unsigned char)*p))
+ p++;
+ if (*p == '\0')
+ p = NULL;
+@@ -231,7 +231,7 @@ _slave_mode(void *data, Ecore_Fd_Handler
+ if (p)
+ {
+ char *q = p + strlen(p) - 1;
+- while (isspace(*q))
++ while (isspace((unsigned char)*q))
+ {
+ *q = '\0';
+ q--;
Index: pkgsrc/graphics/edje/patches/patch-src_bin_epp_cpplib.c
diff -u /dev/null pkgsrc/graphics/edje/patches/patch-src_bin_epp_cpplib.c:1.1
--- /dev/null Tue Oct 28 00:24:02 2025
+++ pkgsrc/graphics/edje/patches/patch-src_bin_epp_cpplib.c Tue Oct 28 00:24:02 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_bin_epp_cpplib.c,v 1.1 2025/10/28 00:24:02 gutteridge Exp $
+
+Use ctype.h correctly.
+
+--- src/bin/epp/cpplib.c.orig 2013-11-05 11:37:07.000000000 +0000
++++ src/bin/epp/cpplib.c
+@@ -2899,7 +2899,7 @@ macroexpand(cpp_reader * pfile, HASHNODE
+ /* Escape these chars */
+ if (c == '\"' || (in_string && c == '\\'))
+ CPP_PUTC(pfile, '\\');
+- if (isprint(c))
++ if (isprint((unsigned char)c))
+ CPP_PUTC(pfile, c);
+ else
+ {
+@@ -4840,7 +4840,7 @@ cpp_get_token(cpp_reader * pfile)
+ case '.':
+ NEWLINE_FIX;
+ c2 = PEEKC();
+- if (isdigit(c2))
++ if (isdigit((unsigned char)c2))
+ {
+ CPP_RESERVE(pfile, 2);
+ CPP_PUTC_Q(pfile, '.');
Index: pkgsrc/graphics/edje/patches/patch-src_lib_edje__lua2.c
diff -u /dev/null pkgsrc/graphics/edje/patches/patch-src_lib_edje__lua2.c:1.1
--- /dev/null Tue Oct 28 00:24:02 2025
+++ pkgsrc/graphics/edje/patches/patch-src_lib_edje__lua2.c Tue Oct 28 00:24:02 2025
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_lib_edje__lua2.c,v 1.1 2025/10/28 00:24:02 gutteridge Exp $
+
+Use ctype.h correctly.
+
+--- src/lib/edje_lua2.c.orig 2013-07-30 14:42:43.000000000 +0000
++++ src/lib/edje_lua2.c
+@@ -382,7 +382,7 @@ _elua_push_name(lua_State *L, char *q, i
+
+ // A simplistic scan through an identifier, it's wrong, but it's quick,
+ // and we don't mind that it's wrong, coz this is only internal.
+- while (isalnum((int)*q))
++ while (isalnum((unsigned char)*q))
+ q++;
+ temp = *q;
+ *q = '\0';
+@@ -422,7 +422,7 @@ _elua_scan_params(lua_State *L, int i, c
+ char *q;
+ Eina_Bool get = EINA_TRUE;
+
+- while (isspace((int)*p))
++ while (isspace((unsigned char)*p))
+ p++;
+ q = p + 1;
+ switch (*p)
+@@ -539,7 +539,7 @@ _elua_ret(lua_State *L, char *params, ..
+ char *q;
+ Eina_Bool set = EINA_TRUE;
+
+- while (isspace((int)*p))
++ while (isspace((unsigned char)*p))
+ p++;
+ q = p + 1;
+ switch (*p)
Home |
Main Index |
Thread Index |
Old Index