[bug#36073] [PATCH 0/5] Update sway window manager and related utilities.

[bug#36073] [PATCH 0/5] Update sway window manager and related utilities.

[Stefan Stefanović]

Hello.

This series will update sway window manager and related utilities.

The last patch will add swaybg version 1.0, because it was split away
from the sway package in the new version (1.1.1).

[bug#36073] [PATCH 1/5] gnu: wlroots: Update to 0.6.0.

[Stefan Stefanović]

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



[-- Attachment #2: 0001-gnu-wlroots-Update-to-0.6.0.patch --]
[-- Type: text/x-patch, Size: 1238 bytes --]

From 6b84991345120f74095f9de323d72f94cf62913a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Stefanovi=C4=87?= <stefanx2ovic@gmail.com>
Date: Mon, 3 Jun 2019 18:19:07 +0200
Subject: [PATCH 1/5] gnu: wlroots: Update to 0.6.0.

* gnu/packages/wm.scm (wlroots): Update to 0.6.0.
---
 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 01c30c8198..cc953f2db2 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1140,7 +1140,7 @@ functionality to display information about the most commonly used services.")
 (define-public wlroots
   (package
     (name "wlroots")
-    (version "0.5.0")
+    (version "0.6.0")
     (source
      (origin
        (method git-fetch)
@@ -1149,7 +1149,7 @@ functionality to display information about the most commonly used services.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1phiidyddzgaxy4gbqwmykxn0y8za6y5mp66l9dpd9i6fml153yq"))))
+        (base32 "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags '("-Dlogind-provider=elogind")
-- 
2.21.0

[bug#36073] [PATCH 2/5] gnu: sway: Update to 1.1.1.

[Stefan Stefanović]

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



[-- Attachment #2: 0002-gnu-sway-Update-to-1.1.1.patch --]
[-- Type: text/x-patch, Size: 1118 bytes --]

From 3b8aab9770f6cf0cdf4374ebadbeeacdc581534c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Stefanovi=C4=87?= <stefanx2ovic@gmail.com>
Date: Mon, 3 Jun 2019 18:21:33 +0200
Subject: [PATCH 2/5] gnu: sway: Update to 1.1.1.

* gnu/packages/wm.scm (sway): Update to 1.1.1.
---
 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 cc953f2db2..5ca4075366 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1185,7 +1185,7 @@ modules for building a Wayland compositor.")
 (define-public sway
   (package
     (name "sway")
-    (version "1.0")
+    (version "1.1.1")
     (source
      (origin
        (method git-fetch)
@@ -1194,7 +1194,7 @@ modules for building a Wayland compositor.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "09cndc2nl39d3l7g5634xp0pxcz60pvc5277mfw89r22mh0j78rx"))))
+        (base32 "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
-- 
2.21.0

[bug#36073] [PATCH 3/5] gnu: swayidle: Update to 1.3.

[Stefan Stefanović]

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



[-- Attachment #2: 0003-gnu-swayidle-Update-to-1.3.patch --]
[-- Type: text/x-patch, Size: 1182 bytes --]

From 3d6fb9941f1f71e226b8fccfa35c6b4cdf8e10b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Stefanovi=C4=87?= <stefanx2ovic@gmail.com>
Date: Mon, 3 Jun 2019 18:22:44 +0200
Subject: [PATCH 3/5] gnu: swayidle: Update to 1.3.

* gnu/packages/wm.scm (swayidle): Update to 1.3.
---
 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 5ca4075366..23282dbbc5 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1231,7 +1231,7 @@ modules for building a Wayland compositor.")
 (define-public swayidle
   (package
     (name "swayidle")
-    (version "1.2")
+    (version "1.3")
     (source
      (origin
        (method git-fetch)
@@ -1240,7 +1240,7 @@ modules for building a Wayland compositor.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0b65flajwn2i6k2kdxxgw25w7ikzzmm595f4j5x1wac1rb0yah9w"))))
+        (base32 "04agcbhc473jkk7npb40i94ny8naykxzpjcw2lvl05kxv65y5d9v"))))
     (build-system meson-build-system)
     (inputs `(("wayland" ,wayland)))
     (native-inputs `(("pkg-config" ,pkg-config)
-- 
2.21.0

[bug#36073] [PATCH 4/5] gnu: swaylock: Update to 1.4.

[Stefan Stefanović]

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



[-- Attachment #2: 0004-gnu-swaylock-Update-to-1.4.patch --]
[-- Type: text/x-patch, Size: 1169 bytes --]

From c0b7fdb691902ab989b8e52d76b711eaf8d7121c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Stefanovi=C4=87?= <stefanx2ovic@gmail.com>
Date: Mon, 3 Jun 2019 18:24:37 +0200
Subject: [PATCH 4/5] gnu: swaylock: Update to 1.4.

* gnu/packages/wm.scm (swaylock): Update to 1.4.
---
 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 23282dbbc5..1e26830763 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1254,7 +1254,7 @@ modules for building a Wayland compositor.")
 (define-public swaylock
   (package
     (name "swaylock")
-    (version "1.3")
+    (version "1.4")
     (source
      (origin
        (method git-fetch)
@@ -1263,7 +1263,7 @@ modules for building a Wayland compositor.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "093nv1y9wyg48rfxhd36qdljjry57v1vkzrlc38mkf6zvsq8j7wb"))))
+        (base32 "1ii9ql1mxkk2z69dv6bg1x22nl3a46iww764wqjiv78x08xpk982"))))
     (build-system meson-build-system)
     (inputs `(("cairo" ,cairo)
               ("gdk-pixbuf" ,gdk-pixbuf)
-- 
2.21.0

[bug#36073] [PATCH 5/5] gnu: Add swaybg.

[Stefan Stefanović]

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



[-- Attachment #2: 0005-gnu-Add-swaybg.patch --]
[-- Type: text/x-patch, Size: 1740 bytes --]

From 11e7519be79a3bc363b3accb6a359f8a3fa35f42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Stefanovi=C4=87?= <stefanx2ovic@gmail.com>
Date: Mon, 3 Jun 2019 18:27:21 +0200
Subject: [PATCH 5/5] gnu: Add swaybg.

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

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 1e26830763..f0589e98f1 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1279,3 +1279,29 @@ modules for building a Wayland compositor.")
     (synopsis "Screen locking utility for Wayland compositors")
     (description "Swaylock is a screen locking utility for Wayland compositors.")
     (license license:expat))) ; MIT license
+
+(define-public swaybg
+  (package
+    (name "swaybg")
+    (version "1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/swaywm/swaybg.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1lmqz5bmig90gq2m7lwf02d2g7z4hzf8fhqz78c8vk92c6p4xwbc"))))
+    (build-system meson-build-system)
+    (inputs `(("cairo" ,cairo)
+              ("gdk-pixbuf" ,gdk-pixbuf)
+              ("wayland" ,wayland)))
+    (native-inputs `(("git" ,git)
+                     ("pkg-config" ,pkg-config)
+                     ("scdoc" ,scdoc)
+                     ("wayland-protocols" ,wayland-protocols)))
+    (home-page "https://github.com/swaywm/sway")
+    (synopsis "Screen wallpaper utility for Wayland compositors")
+    (description "Swaybg is a wallpaper utility for Wayland compositors.")
+    (license license:expat))) ; MIT license
-- 
2.21.0

bug#36073: [PATCH 0/5] Update sway window manager and related utilities.

[Rutger Helling]

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

LGTM, thanks! I've pushed your patches.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]

[bug#36073] [PATCH 2/5] gnu: sway: Update to 1.1.1.

[Meiyo Peng]

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

Hi Stefan,

Thank you for your work on sway.

There is one minor issue.  In sway's release note:

#+begin_quote
  swaybg is now distributed as a standalone program which is compatible
  with many Wayland compositors. Unlike the other sway clients which have
  been split into separate projects, however, swaybg is a required
  dependency of sway. Packagers are encouraged to configure it as such
  when updating sway for their distribution.
#+end_quote

The author states that swaybg is now a standalone program but it should
be treated as a required dependency of sway.  So we should add swaybg
into sway's propagated-inputs.


--
Meiyo Peng
https://www.pengmeiyu.com/



[-- Attachment #2: 0001-gnu-sway-Propagate-swaybg.patch --]
[-- Type: text/x-patch, Size: 1413 bytes --]

From 1d24d0ceb27050821208e5dca109dd073d9d0b58 Mon Sep 17 00:00:00 2001
From: Meiyo Peng <meiyo@riseup.net>
Date: Sun, 9 Jun 2019 16:15:50 +0800
Subject: [PATCH 1/2] gnu: sway: Propagate swaybg.

* gnu/packages/wm.scm (sway)[propagated-inputs]: Add swaybg.
---
 gnu/packages/wm.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index f0589e98f1..089e083e8b 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -17,7 +17,7 @@
 ;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
-;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
+;;; Copyright © 2018, 2019 Meiyo Peng <meiyo@riseup.net>
 ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
 ;;;
@@ -1223,6 +1223,7 @@ modules for building a Wayland compositor.")
                      ("pkg-config" ,pkg-config)
                      ("scdoc" ,scdoc)
                      ("wayland-protocols" ,wayland-protocols)))
+    (propagated-inputs `(("swaybg" ,swaybg)))
     (home-page "https://github.com/swaywm/sway")
     (synopsis "Wayland compositor compatible with i3")
     (description "Sway is a i3-compatible Wayland compositor.")
-- 
2.22.0

[bug#36073] [PATCH 3/5] gnu: swayidle: Update to 1.3.

[Meiyo Peng]

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

Hi Stefan,

swayidle 1.3 requires elogind/systemd for lock/unlock signal support.


--
Meiyo Peng
https://www.pengmeiyu.com/



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-swayidle-Add-elogind-support.patch --]
[-- Type: text/x-patch, Size: 1073 bytes --]

From 36c53079895c5b5b0bb801e2c5ca96803b4acb08 Mon Sep 17 00:00:00 2001
From: Meiyo Peng <meiyo@riseup.net>
Date: Sun, 9 Jun 2019 18:10:20 +0800
Subject: [PATCH 2/2] gnu: swayidle: Add elogind support.

* gnu/packages/wm.scm (swayidle)[arguments]: Add #:configure-flags.
  [inputs]: Add elogind.
---
 gnu/packages/wm.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 089e083e8b..5bfc7cbd8d 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1243,7 +1243,10 @@ modules for building a Wayland compositor.")
        (sha256
         (base32 "04agcbhc473jkk7npb40i94ny8naykxzpjcw2lvl05kxv65y5d9v"))))
     (build-system meson-build-system)
-    (inputs `(("wayland" ,wayland)))
+    (arguments
+     `(#:configure-flags '("-Dlogind-provider=elogind")))
+    (inputs `(("elogind" ,elogind)
+              ("wayland" ,wayland)))
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("scdoc" ,scdoc)
                      ("wayland-protocols" ,wayland-protocols)))
-- 
2.22.0

[bug#36073] [PATCH 2/5] gnu: sway: Update to 1.1.1.

[Tobias Geerinckx-Rice]

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

Meiyo,

Meiyo Peng wrote:
> The author states that swaybg is now a standalone program but it 
> should
> be treated as a required dependency of sway.  So we should add 
> swaybg
> into sway's propagated-inputs.

I don't quite see the connection between these two sentences…  Why 
propagated?

Kind regards,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#36073] [PATCH 2/5] gnu: sway: Update to 1.1.1.

[Meiyo Peng]

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

Hi Tobias,

Tobias Geerinckx-Rice writes:

> Meiyo Peng wrote:
>> The author states that swaybg is now a standalone program but it should
>> be treated as a required dependency of sway.  So we should add swaybg
>> into sway's propagated-inputs.
>
> I don't quite see the connection between these two sentences…  Why propagated?

"output" is a built-in command of sway.  Lack of swaybg breaks this
command:

#+begin_src conf
  output "*" background ~/Pictures/wallpaper.jpg fill
#+end_src

I somehow forgot the Guix way to solve this problem is to hardcode the
path to /gnu/store/*-swaybg-*/bin/swaybg.  Silly me.  And thank you for
your remind.

See the new attachment.  Thanks.


--
Meiyo Peng
https://www.pengmeiyu.com/


[-- Attachment #2: 0001-gnu-sway-Hardcode-path-to-swaybg.patch --]
[-- Type: text/x-patch, Size: 2016 bytes --]

From 92ea5e8bade96f6f9a19c76de35fa54bfd2ff84f Mon Sep 17 00:00:00 2001
From: Meiyo Peng <meiyo@riseup.net>
Date: Sun, 9 Jun 2019 16:15:50 +0800
Subject: [PATCH] gnu: sway: Hardcode path to swaybg.

* gnu/packages/wm.scm (sway)[arguments]: Hardcode path to swaybg.
  [inputs]: Add swaybg.
---
 gnu/packages/wm.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index f0589e98f1..eac17e0837 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -17,7 +17,7 @@
 ;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
-;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
+;;; Copyright © 2018, 2019 Meiyo Peng <meiyo@riseup.net>
 ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
 ;;;
@@ -1201,6 +1201,12 @@ modules for building a Wayland compositor.")
        (modify-phases %standard-phases
          (add-before 'configure 'hardcode-paths
            (lambda* (#:key inputs #:allow-other-keys)
+             ;; Hardcode path to swaybg.
+             (substitute* "sway/config.c"
+               (("strdup..swaybg..")
+                (string-append "strdup(\"" (assoc-ref inputs "swaybg")
+                               "/bin/swaybg\")")))
+             ;; Hardcode path to scdoc.
              (substitute* "meson.build"
                (("scdoc.get_pkgconfig_variable..scdoc..")
                 (string-append "'" (assoc-ref inputs "scdoc")
@@ -1214,6 +1220,7 @@ modules for building a Wayland compositor.")
               ("libinput" ,libinput)
               ("libxkbcommon" ,libxkbcommon)
               ("pango" ,pango)
+              ("swaybg" ,swaybg)
               ("wayland" ,wayland)
               ("wlroots" ,wlroots)))
     (native-inputs `(("git" ,git)
-- 
2.22.0

[bug#36073] [PATCH 2/5] gnu: sway: Update to 1.1.1.

[Marius Bakke]

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

Meiyo Peng <meiyo@riseup.net> writes:

> Hi Tobias,
>
> Tobias Geerinckx-Rice writes:
>
>> Meiyo Peng wrote:
>>> The author states that swaybg is now a standalone program but it should
>>> be treated as a required dependency of sway.  So we should add swaybg
>>> into sway's propagated-inputs.
>>
>> I don't quite see the connection between these two sentences…  Why propagated?
>
> "output" is a built-in command of sway.  Lack of swaybg breaks this
> command:
>
> #+begin_src conf
>   output "*" background ~/Pictures/wallpaper.jpg fill
> #+end_src
>
> I somehow forgot the Guix way to solve this problem is to hardcode the
> path to /gnu/store/*-swaybg-*/bin/swaybg.  Silly me.  And thank you for
> your remind.
>
> See the new attachment.  Thanks.

Pushed as e23b6a68008321179508d55780f9725cf649c610, thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#36073] [PATCH 3/5] gnu: swayidle: Update to 1.3.

[Marius Bakke]

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

Meiyo Peng <meiyo@riseup.net> writes:
>
> From 36c53079895c5b5b0bb801e2c5ca96803b4acb08 Mon Sep 17 00:00:00 2001
> From: Meiyo Peng <meiyo@riseup.net>
> Date: Sun, 9 Jun 2019 18:10:20 +0800
> Subject: [PATCH 2/2] gnu: swayidle: Add elogind support.
>
> * gnu/packages/wm.scm (swayidle)[arguments]: Add #:configure-flags.
>   [inputs]: Add elogind.

Heh, somehow did not see this patch when applying the previous one...
Pushed as ddd401d28fb09f1f8ce96f2fc24226887a812412, thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]