CVS commit: pkgsrc/wm/swc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Feb 24 14:11:17 UTC 2020

Modified Files:
        pkgsrc/wm/swc: Makefile distinfo
Added Files:
        pkgsrc/wm/swc/patches: patch-libswc_swc.c

Log Message:
swc: Disable decoration managers until these are stable.

Currently causing problems when exiting applications.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/wm/swc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/swc/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/swc/patches/patch-libswc_swc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/swc/Makefile
diff -u pkgsrc/wm/swc/Makefile:1.7 pkgsrc/wm/swc/Makefile:1.8
--- pkgsrc/wm/swc/Makefile:1.7  Mon Feb 24 12:31:20 2020
+++ pkgsrc/wm/swc/Makefile      Mon Feb 24 14:11:17 2020
@@ -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

Index: pkgsrc/wm/swc/distinfo
diff -u pkgsrc/wm/swc/distinfo:1.6 pkgsrc/wm/swc/distinfo:1.7
--- pkgsrc/wm/swc/distinfo:1.6  Mon Feb 24 12:31:20 2020
+++ pkgsrc/wm/swc/distinfo      Mon Feb 24 14:11:17 2020
@@ -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

Added files:

Index: pkgsrc/wm/swc/patches/patch-libswc_swc.c
diff -u /dev/null pkgsrc/wm/swc/patches/patch-libswc_swc.c:1.1
--- /dev/null   Mon Feb 24 14:11:17 2020
+++ pkgsrc/wm/swc/patches/patch-libswc_swc.c    Mon Feb 24 14:11:17 2020
@@ -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);