swc: Update to 0.0.0.20200228

Fixes the server-side decoration protocol implementation, and upstreams
a fix for Qt5.

Applications supporting the protocol (e.g. Qt apps) will no longer display
client-side decorations.

4 files changed, 8 insertions, 78 deletions

diff --git a/wm/swc/Makefile b/wm/swc/Makefile
index 28130567b41..bd29cb3c01a 100644
--- a/wm/swc/Makefile
+++ b/wm/swc/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2020/03/08 16:48:18 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2020/03/15 16:15:23 nia Exp $
 
-DISTNAME=	swc-0.0.0.20200222
-PKGREVISION=	3
+DISTNAME=	swc-0.0.0.20200228
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_GITHUB:=michaelforney/}
 GITHUB_PROJECT=	swc
-GITHUB_TAG=	b5b7214bed4d30ff52afa5e9668c9f4162caf30a
+GITHUB_TAG=	86b45d5701e509660650facdad4f7bef8f4f5362
 
 MAINTAINER=	nia@NetBSD.org
 HOMEPAGE=	https://github.com/michaelforney/swc
diff --git a/wm/swc/distinfo b/wm/swc/distinfo
index 03d2ef8d677..7a2a4b970fe 100644
--- a/wm/swc/distinfo
+++ b/wm/swc/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2020/02/24 14:23:53 nia Exp $
+$NetBSD: distinfo,v 1.9 2020/03/15 16:15:23 nia Exp $
 
-SHA1 (swc-0.0.0.20200222-b5b7214bed4d30ff52afa5e9668c9f4162caf30a.tar.gz) = e0d26a9475d28bd25b7a6485e53bd52fcb8c9d70
-RMD160 (swc-0.0.0.20200222-b5b7214bed4d30ff52afa5e9668c9f4162caf30a.tar.gz) = 22dc677900007ce99fc9df1c32008ea50b1b1875
-SHA512 (swc-0.0.0.20200222-b5b7214bed4d30ff52afa5e9668c9f4162caf30a.tar.gz) = ed63c38a039f6662440095ecc2a2bf467388cd7fc3eaa56f496673a1acc3e91cbe6237d5e89401b37378fe4f65834cc917db73240a69775ad2f174f57f53af39
-Size (swc-0.0.0.20200222-b5b7214bed4d30ff52afa5e9668c9f4162caf30a.tar.gz) = 88300 bytes
+SHA1 (swc-0.0.0.20200228-86b45d5701e509660650facdad4f7bef8f4f5362.tar.gz) = e7aab86b60ad3ed7cc56a300470809712879dd80
+RMD160 (swc-0.0.0.20200228-86b45d5701e509660650facdad4f7bef8f4f5362.tar.gz) = 76cab24143201555a9de08b10a7e92b39c772f8d
+SHA512 (swc-0.0.0.20200228-86b45d5701e509660650facdad4f7bef8f4f5362.tar.gz) = 069f368415820f7cef93b4cb6482b073a24250777ec9c27182a339b63dd86081a55e42fbbf2a1152a64de524113657ab57b2c9ede373c48c95d00d3135f7733a
+Size (swc-0.0.0.20200228-86b45d5701e509660650facdad4f7bef8f4f5362.tar.gz) = 88361 bytes
 SHA1 (patch-libswc_surface.c) = 755f60197d5df6d8b7a5817ce6958e1e43abe9f2
 SHA1 (patch-libswc_swc.c) = 89b812a219bf59df08729baacb763e170f263625
diff --git a/wm/swc/patches/patch-libswc_surface.c b/wm/swc/patches/patch-libswc_surface.c
deleted file mode 100644
index 30169504ab1..00000000000
--- a/wm/swc/patches/patch-libswc_surface.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-libswc_surface.c,v 1.2 2020/02/24 14:23:53 nia Exp $
-
-Don't error if the transformation type is "normal".
-
-https://github.com/michaelforney/swc/pull/57
-
---- libswc/surface.c.orig	2020-02-22 10:04:33.000000000 +0000
-+++ libswc/surface.c
-@@ -268,7 +268,10 @@ commit(struct wl_client *client, struct 
- static void
- set_buffer_transform(struct wl_client *client, struct wl_resource *surface, int32_t transform)
- {
--	wl_resource_post_error(surface, WL_SURFACE_ERROR_INVALID_TRANSFORM, "buffer transform not supported");
-+	if (transform != WL_OUTPUT_TRANSFORM_NORMAL) {
-+		wl_resource_post_error(surface, WL_SURFACE_ERROR_INVALID_TRANSFORM,
-+					"buffer transform %#" PRIx32 " not supported", transform);
-+	}
- }
- 
- static void
diff --git a/wm/swc/patches/patch-libswc_swc.c b/wm/swc/patches/patch-libswc_swc.c
deleted file mode 100644
index 27ebacf4d7b..00000000000
--- a/wm/swc/patches/patch-libswc_swc.c
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-libswc_swc.c,v 1.2 2020/02/24 14:23:53 nia Exp $
-
-Disable decoration managers until this is stable.
-
-Currently this causes problems quitting applications.
-
-https://github.com/michaelforney/swc/issues/58
-
---- libswc/swc.c.orig	2020-02-22 10:04:33.000000000 +0000
-+++ libswc/swc.c
-@@ -169,7 +169,7 @@ swc_initialize(struct wl_display *displa
- 		goto error10;
- 	}
- 
--	swc.xdg_decoration_manager = xdg_decoration_manager_create(display);
-+	/*swc.xdg_decoration_manager = xdg_decoration_manager_create(display);
- 	if (!swc.xdg_decoration_manager) {
- 		ERROR("Could not initialize XDG decoration manager\n");
- 		goto error11;
-@@ -179,7 +179,7 @@ swc_initialize(struct wl_display *displa
- 	if (!swc.kde_decoration_manager) {
- 		ERROR("Could not initialize KDE decoration manager\n");
- 		goto error12;
--	}
-+	}*/
- 
- 	swc.panel_manager = panel_manager_create(display);
- 	if (!swc.panel_manager) {
-@@ -192,9 +192,9 @@ swc_initialize(struct wl_display *displa
- 	return true;
- 
- error13:
--	wl_global_destroy(swc.kde_decoration_manager);
-+	/*wl_global_destroy(swc.kde_decoration_manager);*/
- error12:
--	wl_global_destroy(swc.xdg_decoration_manager);
-+	/*wl_global_destroy(swc.xdg_decoration_manager);*/
- error11:
- 	wl_global_destroy(swc.xdg_shell);
- error10:
-@@ -225,7 +225,7 @@ EXPORT void
- swc_finalize(void)
- {
- 	wl_global_destroy(swc.panel_manager);
--	wl_global_destroy(swc.xdg_decoration_manager);
-+	/*wl_global_destroy(swc.xdg_decoration_manager);*/
- 	wl_global_destroy(swc.xdg_shell);
- 	wl_global_destroy(swc.shell);
- 	seat_destroy(swc.seat);