pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/picom
Module Name: pkgsrc
Committed By: nia
Date: Thu Nov 19 11:03:04 UTC 2020
Modified Files:
pkgsrc/x11/picom: Makefile distinfo
Added Files:
pkgsrc/x11/picom/patches: patch-src_c2.c patch-src_config.c
patch-src_dbus.c patch-src_string__utils.h
Removed Files:
pkgsrc/x11/picom/patches: patch-src_backend_gl_gl__common.c
patch-src_compiler.h patch-src_utils.h
Log Message:
picom: Update to 8.2
This is a bug fix release of picom
Fixes assertion failures related to WIN_FLAGS_SHADOW_STALE, see #479
write-pid-path in configuration file now accepted, see #492
Pid files are now deleted during shutdown, see #492
Build fixes for certain platforms, see #501, #502
Thanks to @tryone144, @jialeens, and @niacat
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/picom/Makefile pkgsrc/x11/picom/distinfo
cvs rdiff -u -r1.3 -r0 \
pkgsrc/x11/picom/patches/patch-src_backend_gl_gl__common.c
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/picom/patches/patch-src_c2.c \
pkgsrc/x11/picom/patches/patch-src_config.c \
pkgsrc/x11/picom/patches/patch-src_dbus.c \
pkgsrc/x11/picom/patches/patch-src_string__utils.h
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/picom/patches/patch-src_compiler.h \
pkgsrc/x11/picom/patches/patch-src_utils.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/picom/Makefile
diff -u pkgsrc/x11/picom/Makefile:1.4 pkgsrc/x11/picom/Makefile:1.5
--- pkgsrc/x11/picom/Makefile:1.4 Sat Oct 3 09:23:41 2020
+++ pkgsrc/x11/picom/Makefile Thu Nov 19 11:03:04 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2020/10/03 09:23:41 nia Exp $
+# $NetBSD: Makefile,v 1.5 2020/11/19 11:03:04 nia Exp $
-DISTNAME= picom-8.1
+DISTNAME= picom-8.2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=yshui/}
GITHUB_TAG= v${PKGVERSION_NOREV}
Index: pkgsrc/x11/picom/distinfo
diff -u pkgsrc/x11/picom/distinfo:1.4 pkgsrc/x11/picom/distinfo:1.5
--- pkgsrc/x11/picom/distinfo:1.4 Sat Oct 3 09:23:41 2020
+++ pkgsrc/x11/picom/distinfo Thu Nov 19 11:03:04 2020
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.4 2020/10/03 09:23:41 nia Exp $
+$NetBSD: distinfo,v 1.5 2020/11/19 11:03:04 nia Exp $
-SHA1 (picom-8.1.tar.gz) = 16dc443d77f171af15b4748578327127e16eb4fc
-RMD160 (picom-8.1.tar.gz) = 420d44e3f33a2fd727ad6dd2794cf6cb82d7baf9
-SHA512 (picom-8.1.tar.gz) = d1d0428e5761db6820c775c07b966b5fec6a9e9d049ba9f555eb49721f855a018df7242ef61e29c0ea003644b20e1bb733ddf668053a8d4040240e98707fa4d3
-Size (picom-8.1.tar.gz) = 242262 bytes
-SHA1 (patch-src_backend_gl_gl__common.c) = fac2914b6a5b61a6a3c51117ce65eb632923fd83
-SHA1 (patch-src_compiler.h) = 6d659359b70528bd5e6bdd98479502ebd4881976
-SHA1 (patch-src_utils.h) = 31f422592b5f9d232d26f437808b64dc2fb4c0f2
+SHA1 (picom-8.2.tar.gz) = c07ba3f3016a1a333054a26be540262daa4ec854
+RMD160 (picom-8.2.tar.gz) = 976cc0b70cdc30e5e8a3c343694b94f67f3fbd9c
+SHA512 (picom-8.2.tar.gz) = bdc6675e73a211075ee0df2b056342cabb19ad27fd73586f5216886f503cd994536845eb866f371e07a8dc0404346c67b899a14830e9b7cbc9c01cbd782f36b1
+Size (picom-8.2.tar.gz) = 242653 bytes
+SHA1 (patch-src_c2.c) = ef49d0b02691b495b625423c832c603852045a73
+SHA1 (patch-src_config.c) = ffffb13adcf2e6767813fdaade83793d074f4cf5
+SHA1 (patch-src_dbus.c) = 191ff5f507b882bac219174a89d887fd6aaf231a
+SHA1 (patch-src_string__utils.h) = 90f8fefb9ce4cc14049e494b49041e48bd9d82d6
Added files:
Index: pkgsrc/x11/picom/patches/patch-src_c2.c
diff -u /dev/null pkgsrc/x11/picom/patches/patch-src_c2.c:1.1
--- /dev/null Thu Nov 19 11:03:04 2020
+++ pkgsrc/x11/picom/patches/patch-src_c2.c Thu Nov 19 11:03:04 2020
@@ -0,0 +1,69 @@
+$NetBSD: patch-src_c2.c,v 1.1 2020/11/19 11:03:04 nia Exp $
+
+Arguments to ctype functions must be unsigned char.
+
+--- src/c2.c.orig 2020-10-24 08:44:12.000000000 +0000
++++ src/c2.c
+@@ -240,7 +240,7 @@ static inline int strcmp_wd(const char *
+ return ret;
+
+ char c = src[strlen(needle)];
+- if (isalnum(c) || '_' == c)
++ if (isalnum((unsigned char)c) || '_' == c)
+ return 1;
+ else
+ return 0;
+@@ -386,7 +386,7 @@ c2_lptr_t *c2_parse(c2_lptr_t **pcondlst
+ // TODO Not a very good macro
+ #define C2H_SKIP_SPACES() \
+ { \
+- while (isspace(pattern[offset])) \
++ while (isspace((unsigned char)pattern[offset])) \
+ ++offset; \
+ }
+
+@@ -430,7 +430,7 @@ static int c2_parse_grp(const char *patt
+ assert(elei <= 2);
+
+ // Jump over spaces
+- if (isspace(pattern[offset]))
++ if (isspace((unsigned char)pattern[offset]))
+ continue;
+
+ // Handle end of group
+@@ -578,7 +578,7 @@ static int c2_parse_target(const char *p
+
+ // Copy target name out
+ int tgtlen = 0;
+- for (; pattern[offset] && (isalnum(pattern[offset]) || '_' == pattern[offset]);
++ for (; pattern[offset] && (isalnum((unsigned char)pattern[offset]) || '_' == pattern[offset]);
+ ++offset) {
+ ++tgtlen;
+ }
+@@ -825,7 +825,7 @@ static int c2_parse_pattern(const char *
+ pleaf->ptntype = C2_L_PTINT;
+ offset = to_int_checked(endptr - pattern);
+ // Make sure we are stopping at the end of a word
+- if (isalnum(pattern[offset])) {
++ if (isalnum((unsigned char)pattern[offset])) {
+ c2_error("Trailing characters after a numeric pattern.");
+ }
+ } else {
+@@ -834,7 +834,7 @@ static int c2_parse_pattern(const char *
+ char delim = '\0';
+
+ // String flags
+- if (tolower(pattern[offset]) == 'r') {
++ if (tolower((unsigned char)pattern[offset]) == 'r') {
+ raw = true;
+ ++offset;
+ C2H_SKIP_SPACES();
+@@ -1033,7 +1033,7 @@ static bool c2_l_postprocess(session_t *
+ // Warn about lower case characters in target name
+ if (pleaf->predef == C2_L_PUNDEFINED) {
+ for (const char *pc = pleaf->tgt; *pc; ++pc) {
+- if (islower(*pc)) {
++ if (islower((unsigned char)*pc)) {
+ log_warn("Lowercase character in target name \"%s\".",
+ pleaf->tgt);
+ break;
Index: pkgsrc/x11/picom/patches/patch-src_config.c
diff -u /dev/null pkgsrc/x11/picom/patches/patch-src_config.c:1.1
--- /dev/null Thu Nov 19 11:03:04 2020
+++ pkgsrc/x11/picom/patches/patch-src_config.c Thu Nov 19 11:03:04 2020
@@ -0,0 +1,51 @@
+$NetBSD: patch-src_config.c,v 1.1 2020/11/19 11:03:04 nia Exp $
+
+Arguments to ctype functions must be unsigned char.
+
+--- src/config.c.orig 2020-10-24 08:44:12.000000000 +0000
++++ src/config.c
+@@ -33,7 +33,7 @@ bool parse_long(const char *s, long *des
+ log_error("Invalid number: %s", s);
+ return false;
+ }
+- while (isspace(*endptr))
++ while (isspace((unsigned char)*endptr))
+ ++endptr;
+ if (*endptr) {
+ log_error("Trailing characters: %s", s);
+@@ -74,7 +74,7 @@ const char *parse_readnum(const char *sr
+ log_error("No number found: %s", src);
+ return src;
+ }
+- while (*pc && (isspace(*pc) || *pc == ',')) {
++ while (*pc && (isspace((unsigned char)*pc) || *pc == ',')) {
+ ++pc;
+ }
+ *dest = val;
+@@ -154,7 +154,7 @@ conv *parse_blur_kern(const char *src, c
+
+ // Detect trailing characters
+ for (; *pc && *pc != ';'; pc++) {
+- if (!isspace(*pc) && *pc != ',') {
++ if (!isspace((unsigned char)*pc) && *pc != ',') {
+ // TODO isspace is locale aware, be careful
+ log_error("Trailing characters in blur kernel string.");
+ goto err2;
+@@ -164,7 +164,7 @@ conv *parse_blur_kern(const char *src, c
+ // Jump over spaces after ';'
+ if (*pc == ';') {
+ pc++;
+- while (*pc && isspace(*pc)) {
++ while (*pc && isspace((unsigned char)*pc)) {
+ ++pc;
+ }
+ }
+@@ -418,7 +418,7 @@ bool parse_rule_opacity(c2_lptr_t **res,
+ }
+
+ // Skip over spaces
+- while (*endptr && isspace(*endptr))
++ while (*endptr && isspace((unsigned char)*endptr))
+ ++endptr;
+ if (':' != *endptr) {
+ log_error("Opacity terminator not found: %s", src);
Index: pkgsrc/x11/picom/patches/patch-src_dbus.c
diff -u /dev/null pkgsrc/x11/picom/patches/patch-src_dbus.c:1.1
--- /dev/null Thu Nov 19 11:03:04 2020
+++ pkgsrc/x11/picom/patches/patch-src_dbus.c Thu Nov 19 11:03:04 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_dbus.c,v 1.1 2020/11/19 11:03:04 nia Exp $
+
+Arguments to ctype functions must be unsigned char.
+
+--- src/dbus.c.orig 2020-10-24 08:44:12.000000000 +0000
++++ src/dbus.c
+@@ -129,7 +129,7 @@ bool cdbus_init(session_t *ps, const cha
+ // underscore
+ char *tmp = service + strlen(CDBUS_SERVICE_NAME) + 1;
+ while (*tmp) {
+- if (!isalnum(*tmp)) {
++ if (!isalnum((unsigned char)*tmp)) {
+ *tmp = '_';
+ }
+ tmp++;
Index: pkgsrc/x11/picom/patches/patch-src_string__utils.h
diff -u /dev/null pkgsrc/x11/picom/patches/patch-src_string__utils.h:1.1
--- /dev/null Thu Nov 19 11:03:04 2020
+++ pkgsrc/x11/picom/patches/patch-src_string__utils.h Thu Nov 19 11:03:04 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_string__utils.h,v 1.1 2020/11/19 11:03:04 nia Exp $
+
+Arguments to ctype functions must be unsigned char.
+
+--- src/string_utils.h.orig 2020-10-24 08:44:12.000000000 +0000
++++ src/string_utils.h
+@@ -37,7 +37,7 @@ static inline int uitostr(unsigned int n
+ static inline const char *skip_space_const(const char *src) {
+ if (!src)
+ return NULL;
+- while (*src && isspace(*src))
++ while (*src && isspace((unsigned char)*src))
+ src++;
+ return src;
+ }
+@@ -45,7 +45,7 @@ static inline const char *skip_space_con
+ static inline char *skip_space_mut(char *src) {
+ if (!src)
+ return NULL;
+- while (*src && isspace(*src))
++ while (*src && isspace((unsigned char)*src))
+ src++;
+ return src;
+ }
Home |
Main Index |
Thread Index |
Old Index