[bug#70780] [PATCH] gnu: kanshi: Update to 1.6.0.

[bug#70780] [PATCH] gnu: kanshi: Update to 1.6.0.

[Wilko Meyer]

* gnu/packages/wm.scm (kanshi): Update to 1.6.0.

Change-Id: I2be95e7452f708c970f235a149695df69c22b33e
---
 gnu/packages/wm.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index f2cb77f5bf..16e45a5504 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2350,7 +2350,7 @@ (define-public mako
 (define-public kanshi
   (package
     (name "kanshi")
-    (version "1.5.1")
+    (version "1.6.0")
     (source
      (origin
        (method git-fetch)
@@ -2359,7 +2359,7 @@ (define-public kanshi
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1mc2zcqsv79y7682nwi1gn8p751zwflm9zirl98v2q2kvx334k8a"))))
+        (base32 "10ym28xkxbs6nkjk3clb680815606c42vagbshd9qs9cvc8zncra"))))
     (build-system meson-build-system)
     (inputs (list wayland))
     (native-inputs (list pkg-config scdoc))

base-commit: da9f509b0300f1b6b979c68a52d8669f9bcb89a7
-- 
2.41.0

[bug#70780] [PATCH v2 1/2] gnu: kanshi: Update to 1.6.0.

[Wilko Meyer]

* gnu/packages/wm.scm (kanshi): Update to 1.6.0.
  [native-inputs]: Add libscfg.

Change-Id: I2be95e7452f708c970f235a149695df69c22b33e
---
 gnu/packages/wm.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index b5e9dca524..45d4427e51 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2303,7 +2303,7 @@ (define-public mako
 (define-public kanshi
   (package
     (name "kanshi")
-    (version "1.5.1")
+    (version "1.6.0")
     (source
      (origin
        (method git-fetch)
@@ -2312,10 +2312,10 @@ (define-public kanshi
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1mc2zcqsv79y7682nwi1gn8p751zwflm9zirl98v2q2kvx334k8a"))))
+        (base32 "10ym28xkxbs6nkjk3clb680815606c42vagbshd9qs9cvc8zncra"))))
     (build-system meson-build-system)
     (inputs (list wayland))
-    (native-inputs (list pkg-config scdoc))
+    (native-inputs (list pkg-config scdoc libscfg))
     (home-page "https://wayland.emersion.fr/kanshi")
     (synopsis "Hotswappable output profiles for Wayland")
     (description "Kanshi allows you to define output profiles that are

base-commit: 65e8472a4b6fc6f66871ba0dad518b7d4c63595e
prerequisite-patch-id: 14a3699912e44b1691d1c6440a5b32dd1710c12f
prerequisite-patch-id: 04942fc34d1c5c6a9ce4ce6e05174e6549e91848
prerequisite-patch-id: a835acb4f4a9924b7b747c5ea4482657dc6b1e1c
prerequisite-patch-id: 90e83f7c3e2dec237c8906c32fe80dfb5b9e9ae7
prerequisite-patch-id: 23d3dd9849a2f28c229b8a611a1f8861528c04c9
prerequisite-patch-id: 4fd1c465e6bf5e606fc7bb1b9e00bf01053cc11e
prerequisite-patch-id: 5ea7d6802c4ef2abf7f12b7d61f3df3ba39f8989
prerequisite-patch-id: 7dc520c358c10211da55318e5a0c77d36f89eb8a
-- 
2.41.0

[bug#70780] [PATCH v2 2/2] gnu: Add libscfg.

[Wilko Meyer]

* gnu/packages/serialization.scm (libscfg): New variable.
* gnu/packages/serialization.scm: Add copyright.

Change-Id: I0096745f2971799bd0c9955cddeed24f0846f075
---
 gnu/packages/serialization.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 331fae80cf..be1410255a 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -19,6 +19,7 @@
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2024 Paul A. Patience <paul@apatience.com>
 ;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -420,6 +421,25 @@ (define-public lua5.2-libmpack
     (inputs
      `(("lua" ,lua-5.2)))))
 
+(define-public libscfg
+  (package
+    (name "libscfg")
+    (version "0.1.1")
+    (home-page "https://git.sr.ht/~emersion/libscfg")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.sr.ht/~emersion/libscfg")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1b1ps7wba4anm3x1yndnd730dwl6rdz3zwjgxmsyq31fnjrjydv9"))))
+    (build-system meson-build-system)
+    (synopsis "A C library for scfg")
+    (description "This package provides a C library for scfg.")
+    (license license:expat)))
+
 (define-public libyaml
   (package
     (name "libyaml")
-- 
2.41.0

[bug#70780] [PATCH v2 2/2] gnu: Add libscfg.

[Ludovic Courtès]

Hi,

Wilko Meyer <w@wmeyer.eu> skribis:

> * gnu/packages/serialization.scm (libscfg): New variable.
> * gnu/packages/serialization.scm: Add copyright.

The second line is unnecessary.

> +    (synopsis "A C library for scfg")
> +    (description "This package provides a C library for scfg.")

Please run ‘guix lint’ (it’ll complain about the synopsis) and check out
<https://guix.gnu.org/manual/devel/en/html_node/Synopses-and-Descriptions.html>.
:-)

Could yoiu send updated patches addressing this?  Also, please make sure
the libscfg patch comes first in the series.

Thanks in advance!

Ludo’.

[bug#70780] [PATCH v2 2/2] gnu: Add libscfg.

[Wilko Meyer]

Hi Ludo,

Ludovic Courtès <ludo@gnu.org> writes:
> Could yoiu send updated patches addressing this?  Also, please make sure
> the libscfg patch comes first in the series.

I've send in a v2 addressing these things a few moments ago, thanks for
reviewing this patch series (hope I got everything right this time)!

-- 
Kind regards,

Wilko Meyer
w@wmeyer.eu

[bug#70780] [PATCH v2 1/2] gnu: Add libscfg.

[Wilko Meyer]

* gnu/packages/serialization.scm (libscfg): New variable.

Change-Id: I0096745f2971799bd0c9955cddeed24f0846f075
---
 gnu/packages/serialization.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 23959ebc4f..a72e7e4658 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -19,6 +19,7 @@
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2024 Paul A. Patience <paul@apatience.com>
 ;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -420,6 +421,25 @@ (define-public lua5.2-libmpack
     (inputs
      `(("lua" ,lua-5.2)))))
 
+(define-public libscfg
+  (package
+    (name "libscfg")
+    (version "0.1.1")
+    (home-page "https://git.sr.ht/~emersion/libscfg")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.sr.ht/~emersion/libscfg")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1b1ps7wba4anm3x1yndnd730dwl6rdz3zwjgxmsyq31fnjrjydv9"))))
+    (build-system meson-build-system)
+    (synopsis "Scfg library written in C")
+    (description "This package provides a C library for scfg.")
+    (license license:expat)))
+
 (define-public libyaml
   (package
     (name "libyaml")
-- 
2.41.0

[bug#70780] [PATCH v2 2/2] gnu: kanshi: Update to 1.6.0.

[Wilko Meyer]

* gnu/packages/wm.scm (kanshi): Update to 1.6.0.
  [native-inputs]: Add libscfg.

Change-Id: I2be95e7452f708c970f235a149695df69c22b33e
---
 gnu/packages/wm.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 316caf5fa5..05fbf897bc 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2357,7 +2357,7 @@ (define-public mako
 (define-public kanshi
   (package
     (name "kanshi")
-    (version "1.5.1")
+    (version "1.6.0")
     (source
      (origin
        (method git-fetch)
@@ -2366,10 +2366,10 @@ (define-public kanshi
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1mc2zcqsv79y7682nwi1gn8p751zwflm9zirl98v2q2kvx334k8a"))))
+        (base32 "10ym28xkxbs6nkjk3clb680815606c42vagbshd9qs9cvc8zncra"))))
     (build-system meson-build-system)
     (inputs (list wayland))
-    (native-inputs (list pkg-config scdoc))
+    (native-inputs (list pkg-config scdoc libscfg))
     (home-page "https://wayland.emersion.fr/kanshi")
     (synopsis "Hotswappable output profiles for Wayland")
     (description "Kanshi allows you to define output profiles that are
-- 
2.41.0

bug#70780: [PATCH v2 1/2] gnu: Add libscfg.

[Ludovic Courtès]

Hi,

Wilko Meyer <w@wmeyer.eu> skribis:

> * gnu/packages/serialization.scm (libscfg): New variable.
>
> Change-Id: I0096745f2971799bd0c9955cddeed24f0846f075

[...]

> +    (description "This package provides a C library for scfg.")

I tweaked this to clarify what “scfg” is.

> * gnu/packages/wm.scm (kanshi): Update to 1.6.0.
>   [native-inputs]: Add libscfg.
>
> Change-Id: I2be95e7452f708c970f235a149695df69c22b33e

Applied, thanks!

Ludo’.