summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
Diffstat (limited to 'wm')
-rw-r--r--wm/swc/Makefile4
-rw-r--r--wm/swc/distinfo3
-rw-r--r--wm/swc/patches/patch-libswc_swc.c47
3 files changed, 51 insertions, 3 deletions
diff --git a/wm/swc/Makefile b/wm/swc/Makefile
index 918be1a06f0..9bbb8edffb4 100644
--- a/wm/swc/Makefile
+++ b/wm/swc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2020/02/24 12:31:20 nia Exp $
+# $NetBSD: Makefile,v 1.8 2020/02/24 14:11:17 nia Exp $
DISTNAME= swc-0.0.0.20200222
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= wm
MASTER_SITES= ${MASTER_SITE_GITHUB:=michaelforney/}
GITHUB_PROJECT= swc
diff --git a/wm/swc/distinfo b/wm/swc/distinfo
index 95b1a7b798a..8b337a2e03b 100644
--- a/wm/swc/distinfo
+++ b/wm/swc/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2020/02/24 12:31:20 nia Exp $
+$NetBSD: distinfo,v 1.7 2020/02/24 14:11:17 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 (patch-libswc_surface.c) = 8b0d373acd8f56f433857e96256757d95b5760ba
+SHA1 (patch-libswc_swc.c) = 5ca6df4a2a301da46bc811cdb0a09a2368e961ba
diff --git a/wm/swc/patches/patch-libswc_swc.c b/wm/swc/patches/patch-libswc_swc.c
new file mode 100644
index 00000000000..cc33be2c6c1
--- /dev/null
+++ b/wm/swc/patches/patch-libswc_swc.c
@@ -0,0 +1,47 @@
+$NetBSD: patch-libswc_swc.c,v 1.1 2020/02/24 14:11:17 nia Exp $
+
+Disable decoration managers until this is stable.
+
+Currently this causes problems quitting applications.
+
+--- 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);