[bug#63409] [PATCH] gnu: cagebreak: Update to 2.1.2.

[bug#63409] [PATCH] gnu: cagebreak: Update to 2.1.2.

[Feng Shu]

From 4ac961551d03a84e570d7eedb51101dfdd9e49ce Mon Sep 17 00:00:00 2001
Date: Tue, 9 May 2023 15:37:49 +0800

* gnu/packages/wm.scm (cagebreak): Update to 2.1.2.
Explicitly disable tests and substitute "/usr/share/".
---
 gnu/packages/wm.scm | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index fe732e572e..28e4c04814 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2750,7 +2750,7 @@ shows a notification for the user on the screen.")
 (define-public cagebreak
   (package
     (name "cagebreak")
-    (version "2.0.1")
+    (version "2.1.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2759,16 +2759,21 @@ shows a notification for the user on the screen.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0fxfmxl7p63l07lqb83q5lx16hm0rixcidghx00gp08x2yrgr4x9"))))
+                "09ky8wili3ym8qi4dasckdcdcvn4g6ak08dg0yccnwmnlwxiyps6"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags '("-Dxwayland=true")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-data-dir
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "meson.build"
-               (("/etc/") (string-append (assoc-ref outputs "out") "/etc"))))))))
+     (list
+      #:configure-flags #~(list "-Dxwayland=true")
+      ;; XXX: Running cagebreak tests need more tools, such as: clang-format,
+      ;; shellcheck, git, gnupg ...
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-data-dir
+            (lambda _
+              (substitute* '("cagebreak.c" "meson.build")
+                (("/etc/") (string-append #$output "/etc/"))
+                (("/usr/share/") (string-append #$output "/usr/share/"))))))))
     (native-inputs (list pandoc pkg-config))
     (inputs (list libevdev pango wlroots))
     (home-page "https://github.com/project-repo/cagebreak")
-- 
2.30.2

[bug#63409] Subject: [PATCH] gnu: Add labwc.

[Feng Shu]

From aba920372c247046088a34bdd20b514ba8706786 Mon Sep 17 00:00:00 2001
Date: Wed, 10 May 2023 10:38:48 +0800

* gnu/packages/wm.scm (labwc): New variable.
---
 gnu/packages/wm.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 28e4c04814..954f0d3971 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -112,6 +112,7 @@
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gettext)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gperf)
@@ -2808,6 +2809,48 @@ for wayland conceptually based on the X11 window manager
 read and write, and compatible with JSON.")
     (license license:bsd-2)))
 
+(define-public labwc
+  (package
+    (name "labwc")
+    (version "0.6.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/labwc/labwc")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1zbgj8r8ppvqnz2imh6f825f2lvsqpiqfa0r5g5r4nsvadiipivp"))))
+    (build-system meson-build-system)
+    (native-inputs
+     (list pkg-config gettext-minimal))
+    (inputs
+     (list cairo
+           glib
+           libxcb
+           libxml2
+           pango
+           scdoc
+           wlroots))
+    (home-page "https://labwc.github.io")
+    (synopsis "Labwc is a wlroots-based window-stacking compositor for wayland")
+    (description
+     "Labwc is light-weight and independent with a focus on simply stacking
+windows well and rendering some window decorations, it is inspired by openbox.
+It takes a no-bling/frills approach and says no to features such as icons
+(except window buttons), animations, decorative gradients and any other
+options not required to reasonably render common themes.  It relies on clients
+for panels, screenshots, wallpapers and so on to create a full desktop
+environment.
+
+Labwc tries to stay in keeping with wlroots and sway in terms of general
+approach and coding style.
+
+Labwc has no reliance on any particular Desktop Environment, Desktop Shell or
+session.  Nor does it depend on any UI toolkits such as Qt or GTK.")
+    (license license:gpl2)))
+
 (define-public hikari
   (package
     (name "hikari")
-- 
2.30.2

[bug#63409] [PATCH] gnu: cagebreak: Update to 2.1.2.

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 272 bytes --]

Hi,

Feng Shu <tumashu@163.com> skribis:

>>From aba920372c247046088a34bdd20b514ba8706786 Mon Sep 17 00:00:00 2001
> Date: Wed, 10 May 2023 10:38:48 +0800
>
> * gnu/packages/wm.scm (labwc): New variable.

Applied with the changes below.

Thanks!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1297 bytes --]

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 2fcb54883f..4360f3722b 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2822,20 +2822,19 @@ (define-public labwc
                 "1zbgj8r8ppvqnz2imh6f825f2lvsqpiqfa0r5g5r4nsvadiipivp"))))
     (build-system meson-build-system)
     (native-inputs
-     (list pkg-config gettext-minimal))
+     (list pkg-config gettext-minimal scdoc))
     (inputs
      (list cairo
            glib
            libxcb
            libxml2
            pango
-           scdoc
            wlroots))
     (home-page "https://labwc.github.io")
-    (synopsis "Labwc is a wlroots-based window-stacking compositor for wayland")
+    (synopsis "Window-stacking compositor for Wayland")
     (description
-     "Labwc is light-weight and independent with a focus on simply stacking
-windows well and rendering some window decorations, it is inspired by openbox.
+     "Labwc is lightweight and independent with a focus on simply stacking
+windows well and rendering some window decorations, it is inspired by Openbox.
 It takes a no-bling/frills approach and says no to features such as icons
 (except window buttons), animations, decorative gradients and any other
 options not required to reasonably render common themes.  It relies on clients

bug#63409: [PATCH] gnu: cagebreak: Update to 2.1.2.

[Ludovic Courtès]

Feng Shu <tumashu@163.com> skribis:

>>From 4ac961551d03a84e570d7eedb51101dfdd9e49ce Mon Sep 17 00:00:00 2001
> Date: Tue, 9 May 2023 15:37:49 +0800
>
> * gnu/packages/wm.scm (cagebreak): Update to 2.1.2.
> Explicitly disable tests and substitute "/usr/share/".

Applied as well!