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

9 files changed, 170 insertions, 104 deletions

diff --git a/x11/picom/Makefile b/x11/picom/Makefile
index 64281355ad5..71d27253d90 100644
--- a/x11/picom/Makefile
+++ b/x11/picom/Makefile
@@ -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}
diff --git a/x11/picom/distinfo b/x11/picom/distinfo
index 1940bd3168a..52947a6e444 100644
--- a/x11/picom/distinfo
+++ b/x11/picom/distinfo
@@ -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
diff --git a/x11/picom/patches/patch-src_backend_gl_gl__common.c b/x11/picom/patches/patch-src_backend_gl_gl__common.c
deleted file mode 100644
index baec5d52c0b..00000000000
--- a/x11/picom/patches/patch-src_backend_gl_gl__common.c
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-src_backend_gl_gl__common.c,v 1.3 2020/05/02 11:42:13 tnn Exp $
-
-Parentheses are required around macro argument containing braced initializer
-list.
-memcpy(3) is a macro when using e.g. -D_FORTIFY_SOURCE=2.
-
---- src/backend/gl/gl_common.c.orig	2020-04-21 18:33:17.000000000 +0000
-+++ src/backend/gl/gl_common.c
-@@ -485,7 +485,7 @@ x_rect_to_coords(int nrects, const rect_
- 		//          ri, rx, ry, rxe, rye, rdx, rdy, rdxe, rdye);
- 
- 		memcpy(&coord[i * 16],
--		       (GLint[][2]){
-+		       ((GLint[][2]){
- 		           {vx1, vy1},
- 		           {texture_x1, texture_y1},
- 		           {vx2, vy1},
-@@ -494,11 +494,11 @@ x_rect_to_coords(int nrects, const rect_
- 		           {texture_x2, texture_y2},
- 		           {vx1, vy2},
- 		           {texture_x1, texture_y2},
--		       },
-+		       }),
- 		       sizeof(GLint[2]) * 8);
- 
- 		GLuint u = (GLuint)(i * 4);
--		memcpy(&indices[i * 6], (GLuint[]){u + 0, u + 1, u + 2, u + 2, u + 3, u + 0},
-+		memcpy(&indices[i * 6], ((GLuint[]){u + 0, u + 1, u + 2, u + 2, u + 3, u + 0}),
- 		       sizeof(GLuint) * 6);
- 	}
- }
-@@ -886,8 +886,8 @@ static void _gl_fill(backend_t *base, st
- 		GLint y1 = y_inverted ? height - rect[i].y2 : rect[i].y1,
- 		      y2 = y_inverted ? height - rect[i].y1 : rect[i].y2;
- 		memcpy(&coord[i * 8],
--		       (GLint[][2]){
--		           {rect[i].x1, y1}, {rect[i].x2, y1}, {rect[i].x2, y2}, {rect[i].x1, y2}},
-+		       ((GLint[][2]){
-+		           {rect[i].x1, y1}, {rect[i].x2, y1}, {rect[i].x2, y2}, {rect[i].x1, y2}}),
- 		       sizeof(GLint[2]) * 4);
- 		indices[i * 6 + 0] = (GLuint)i * 4 + 0;
- 		indices[i * 6 + 1] = (GLuint)i * 4 + 1;
-@@ -1383,15 +1383,15 @@ void gl_present(backend_t *base, const r
- 	for (int i = 0; i < nrects; i++) {
- 		// clang-format off
- 		memcpy(&coord[i * 8],
--		       (GLint[]){rect[i].x1, gd->height - rect[i].y2,
-+		       ((GLint[]){rect[i].x1, gd->height - rect[i].y2,
- 		                 rect[i].x2, gd->height - rect[i].y2,
- 		                 rect[i].x2, gd->height - rect[i].y1,
--		                 rect[i].x1, gd->height - rect[i].y1},
-+		                 rect[i].x1, gd->height - rect[i].y1}),
- 		       sizeof(GLint) * 8);
- 		// clang-format on
- 
- 		GLuint u = (GLuint)(i * 4);
--		memcpy(&indices[i * 6], (GLuint[]){u + 0, u + 1, u + 2, u + 2, u + 3, u + 0},
-+		memcpy(&indices[i * 6], ((GLuint[]){u + 0, u + 1, u + 2, u + 2, u + 3, u + 0}),
- 		       sizeof(GLuint) * 6);
- 	}
- 
diff --git a/x11/picom/patches/patch-src_c2.c b/x11/picom/patches/patch-src_c2.c
new file mode 100644
index 00000000000..4981915494c
--- /dev/null
+++ b/x11/picom/patches/patch-src_c2.c
@@ -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;
diff --git a/x11/picom/patches/patch-src_compiler.h b/x11/picom/patches/patch-src_compiler.h
deleted file mode 100644
index 0016295060a..00000000000
--- a/x11/picom/patches/patch-src_compiler.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_compiler.h,v 1.1 2020/05/02 11:23:05 tnn Exp $
-
-Conflicting type definition with libc popcount.
-
---- src/compiler.h.orig	2020-04-21 18:33:17.000000000 +0000
-+++ src/compiler.h
-@@ -111,6 +111,8 @@
- typedef unsigned long ulong;
- typedef unsigned int uint;
- 
-+#ifndef __NetBSD__
- static inline int popcount(uint x) {
- 	return __builtin_popcount(x);
- }
-+#endif
diff --git a/x11/picom/patches/patch-src_config.c b/x11/picom/patches/patch-src_config.c
new file mode 100644
index 00000000000..714417bf321
--- /dev/null
+++ b/x11/picom/patches/patch-src_config.c
@@ -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);
diff --git a/x11/picom/patches/patch-src_dbus.c b/x11/picom/patches/patch-src_dbus.c
new file mode 100644
index 00000000000..4e19308b40f
--- /dev/null
+++ b/x11/picom/patches/patch-src_dbus.c
@@ -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++;
diff --git a/x11/picom/patches/patch-src_string__utils.h b/x11/picom/patches/patch-src_string__utils.h
new file mode 100644
index 00000000000..8a41445c07a
--- /dev/null
+++ b/x11/picom/patches/patch-src_string__utils.h
@@ -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;
+ }
diff --git a/x11/picom/patches/patch-src_utils.h b/x11/picom/patches/patch-src_utils.h
deleted file mode 100644
index df994bee7f2..00000000000
--- a/x11/picom/patches/patch-src_utils.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_utils.h,v 1.1 2019/12/15 14:05:47 nia Exp $
-
-Conflicting type definition with libc popcountl
-
---- src/utils.h.orig	2019-11-18 21:59:30.000000000 +0000
-+++ src/utils.h
-@@ -114,9 +114,11 @@ static inline int attr_const normalize_i
- /// clamp `val` into interval [min, max]
- #define clamp(val, min, max) max2(min2(val, max), min)
- 
-+#ifndef __NetBSD__
- static inline int attr_const popcountl(unsigned long a) {
- 	return __builtin_popcountl(a);
- }
-+#endif
- 
- /**
-  * Normalize a double value to a specific range.