[bug#49702] [PATCH] gnu: Add swaylock-effects

[bug#49702] [PATCH] gnu: Add swaylock-effects

[phodina via Guix-patches via]

---
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 920a7cbb3e..b214e2a31c 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -45,6 +45,7 @@
 ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2021 qblade <qblade@protonmail.com>
 ;;; Copyright © 2021 lasnesne <lasnesne@lagunposprasihopre.org>
+;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -82,6 +83,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages build-tools) ;for meson-0.55
   #:use-module (gnu packages calendar)
+  #:use-module (gnu packages commencement) ; for gcc>9
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
@@ -1578,6 +1580,29 @@ modules for building a Wayland compositor.")
     (description "Swaylock is a screen locking utility for Wayland compositors.")
     (license license:expat))) ; MIT license

+(define-public swaylock-effects
+(package (inherit swaylock)
+  (name "swaylock-effects")
+  ;; Upstream v1.6-3 released on 16/11/2020
+  (version "5cb9579faaf5662b111f5722311b701eff1c1d00")
+  (source (origin
+            (method git-fetch)
+            (uri (git-reference
+                  (url "https://github.com/mortie/swaylock-effects")
+                  (commit version)))
+            (sha256
+             (base32
+              "036dkhfqgk7g9vbr5pxgrs66h5fz0rwdsc67i1w51aa9v01r35ca"))))
+  ; Requires gcc>=9 see the issue here
+  ; https://github.com/mortie/swaylock-effects/issues/26
+  (native-inputs `(("gcc-toolchain", gcc-toolchain-9)
+                   ,@(package-native-inputs swaylock)))
+  (synopsis (string-append (package-synopsis swaylock) " with fancy effects"))
+  (description "Swaylock-effects is a fork of swaylock which adds built-in
+screenshots and image manipulation effects like blurring. It's inspired by
+i3lock-color, although the feature sets aren't perfectly overlapping.")
+  (home-page "https://github.com/mortie/swaylock-effects")))
+
 (define-public swaybg
   (package
     (name "swaybg")
--
2.31.1

[bug#49702] Patch status

[phodina via Guix-patches via]

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

Hi!

Is there anything to be fixed in order to upstream this patch?

Sent with [ProtonMail](https://protonmail.com/) Secure Email.

[-- Attachment #2: Type: text/html, Size: 385 bytes --]

[bug#49702] [PATCH] gnu: Add swaylock-effects

[Liliana Marie Prikler]

Hi,

Am Freitag, den 23.07.2021, 03:06 +0000 schrieb phodina:
> ---
> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index 920a7cbb3e..b214e2a31c 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
> @@ -45,6 +45,7 @@
>  ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
>  ;;; Copyright © 2021 qblade <qblade@protonmail.com>
>  ;;; Copyright © 2021 lasnesne <lasnesne@lagunposprasihopre.org>
> +;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -82,6 +83,7 @@
>    #:use-module (gnu packages bison)
>    #:use-module (gnu packages build-tools) ;for meson-0.55
>    #:use-module (gnu packages calendar)
> +  #:use-module (gnu packages commencement) ; for gcc>9
>    #:use-module (gnu packages datastructures)
>    #:use-module (gnu packages docbook)
>    #:use-module (gnu packages documentation)
> @@ -1578,6 +1580,29 @@ modules for building a Wayland compositor.")
>      (description "Swaylock is a screen locking utility for Wayland
> compositors.")
>      (license license:expat))) ; MIT license
> 
> +(define-public swaylock-effects
> +(package (inherit swaylock)
> +  (name "swaylock-effects")
> +  ;; Upstream v1.6-3 released on 16/11/2020
> +  (version "5cb9579faaf5662b111f5722311b701eff1c1d00")
> +  (source (origin
> +            (method git-fetch)
> +            (uri (git-reference
> +                  (url "https://github.com/mortie/swaylock-effects")
> +                  (commit version)))
> +            (sha256
> +             (base32
> +              "036dkhfqgk7g9vbr5pxgrs66h5fz0rwdsc67i1w51aa9v01r35ca"
> ))))
> +  ; Requires gcc>=9 see the issue here
> +  ; https://github.com/mortie/swaylock-effects/issues/26
> +  (native-inputs `(("gcc-toolchain", gcc-toolchain-9)
> +                   ,@(package-native-inputs swaylock)))
We don't typically use gcc-toolchain as package input, but rather gcc
itself.  gcc-toolchain exists so that users can spawn an environment in
which gcc just works™.
> +  (synopsis (string-append (package-synopsis swaylock) " with fancy
> effects"))
Synopsis should be a simple string.
> +  (description "Swaylock-effects is a fork of swaylock which adds
> built-in
> +screenshots and image manipulation effects like blurring. It's
> inspired by
> +i3lock-color, although the feature sets aren't perfectly
> overlapping.")
It is preferable to describe software in its own terms rather than
other software.  What about "Swaylock-effects is a fork of swaylock
with additional features, such as the ability to take a screenshot as
the background image, display a clock or apply image manipulation
techniques to the background image."?
> +  (home-page "https://github.com/mortie/swaylock-effects")))
> +
>  (define-public swaybg
>    (package
>      (name "swaybg")
> --
> 2.31.1
> 

[bug#49702] [PATCH v2] gnu: Add swaylock-effects.

[phodina via Guix-patches via]

Hi Liliana,

thanks for the inputs!

--8<---------------cut here---------------start------------->8--

* gnu/packages/wm.scm (swaylock-effects): New variable.

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 957c5a0d5a..f5f9583fa3 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -83,6 +83,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages build-tools) ;for meson-0.55
   #:use-module (gnu packages calendar)
+  #:use-module (gnu packages commencement) ; for gcc>9
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
@@ -1617,6 +1618,30 @@ modules for building a Wayland compositor.")
     (description "Swaylock is a screen locking utility for Wayland compositors.")
     (license license:expat))) ; MIT license

+(define-public swaylock-effects
+  (package (inherit swaylock)
+           (name "swaylock-effects")
+           ;; Upstream v1.6-3 released on 16/11/2020
+           (version "5cb9579faaf5662b111f5722311b701eff1c1d00")
+           (source (origin
+                     (method git-fetch)
+                     (uri (git-reference
+                           (url "https://github.com/mortie/swaylock-effects")
+                           (commit version)))
+                     (file-name (git-file-name name version))
+                     (sha256
+                      (base32
+                       "036dkhfqgk7g9vbr5pxgrs66h5fz0rwdsc67i1w51aa9v01r35ca"))))
+           ; Requires gcc>=9 see the issue here
+           ; https://github.com/mortie/swaylock-effects/issues/26
+           (native-inputs `(("gcc", gcc-9)
+                            ,@(package-native-inputs swaylock)))
+           (synopsis "Screen locking utility for Wayland compositors with effects")
+           (description "@code{Swaylock-effects} is a fork of swaylock with additional
+features, such as the ability to take a screenshot as the background image,
+display a clock or apply image manipulation techniques to the background image.")
+           (home-page "https://github.com/mortie/swaylock-effects")))
+
 (define-public swaybg
   (package
     (name "swaybg")
--
2.32.0

[bug#49702] [PATCH v2] gnu: Add swaylock-effects.

[Liliana Marie Prikler]

Hi,

Am Samstag, den 18.09.2021, 12:14 +0000 schrieb phodina:
> Hi Liliana,
> 
> thanks for the inputs!
> 
> --8<---------------cut here---------------start------------->8--
> 
> * gnu/packages/wm.scm (swaylock-effects): New variable.
> 
> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index 957c5a0d5a..f5f9583fa3 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
> @@ -83,6 +83,7 @@
>    #:use-module (gnu packages bison)
>    #:use-module (gnu packages build-tools) ;for meson-0.55
>    #:use-module (gnu packages calendar)
> +  #:use-module (gnu packages commencement) ; for gcc>9
>    #:use-module (gnu packages datastructures)
>    #:use-module (gnu packages docbook)
>    #:use-module (gnu packages documentation)
> @@ -1617,6 +1618,30 @@ modules for building a Wayland compositor.")
>      (description "Swaylock is a screen locking utility for Wayland
> compositors.")
>      (license license:expat))) ; MIT license
> 
> +(define-public swaylock-effects
> +  (package (inherit swaylock)
> +           (name "swaylock-effects")
> +           ;; Upstream v1.6-3 released on 16/11/2020
> +           (version "5cb9579faaf5662b111f5722311b701eff1c1d00")
2020 isn't that far in the past.  More importantly, if you do use
random commits, please follow the (git-version) scheme.
> +           (source (origin
> +                     (method git-fetch)
> +                     (uri (git-reference
> +                           (url "
> https://github.com/mortie/swaylock-effects")
> +                           (commit version)))
> +                     (file-name (git-file-name name version))
> +                     (sha256
> +                      (base32
> +                       "036dkhfqgk7g9vbr5pxgrs66h5fz0rwdsc67i1w51aa9
> v01r35ca"))))
> +           ; Requires gcc>=9 see the issue here
> +           ; https://github.com/mortie/swaylock-effects/issues/26
> +           (native-inputs `(("gcc", gcc-9)
> +                            ,@(package-native-inputs swaylock)))
> +           (synopsis "Screen locking utility for Wayland compositors
> with effects")
> +           (description "@code{Swaylock-effects} is a fork of
> swaylock with additional
> +features, such as the ability to take a screenshot as the background
> image,
> +display a clock or apply image manipulation techniques to the
> background image.")
Assuming swaylock-effects is a command (is it?), @command{swaylock-
effects} would be the correct first word here.
> +           (home-page "https://github.com/mortie/swaylock-effects"))
> )
> +
>  (define-public swaybg
>    (package
>      (name "swaybg")
> --
> 2.32.0

[bug#49702] [PATCH v3] gnu: Add swaylock-effects.

[phodina via Guix-patches via]

* gnu/packages/wm.scm (swaylock-effects): New variable.

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 957c5a0d5a..1cc68388b8 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -83,6 +83,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages build-tools) ;for meson-0.55
   #:use-module (gnu packages calendar)
+  #:use-module (gnu packages commencement) ; for gcc>9
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
@@ -1617,6 +1618,31 @@ modules for building a Wayland compositor.")
     (description "Swaylock is a screen locking utility for Wayland compositors.")
     (license license:expat))) ; MIT license

+(define-public swaylock-effects
+  (let ((commit "5cb9579faaf5662b111f5722311b701eff1c1d00")
+        (revision "1"))
+    (package (inherit swaylock)
+             (name "swaylock-effects")
+             (version commit)
+             (source (origin
+                       (method git-fetch)
+                       (uri (git-reference
+                             (url "https://github.com/mortie/swaylock-effects")
+                             (commit version)))
+                       (file-name (git-file-name name version))
+                       (sha256
+                        (base32
+                         "036dkhfqgk7g9vbr5pxgrs66h5fz0rwdsc67i1w51aa9v01r35ca"))))
+             ; Requires gcc>=9 see the issue here
+             ; https://github.com/mortie/swaylock-effects/issues/26
+             (native-inputs `(("gcc", gcc-9)
+                              ,@(package-native-inputs swaylock)))
+             (synopsis "Screen locking utility for Wayland compositors with effects")
+             (description "@code{Swaylock-effects} is a fork of swaylock with additional
+features, such as the ability to take a screenshot as the background image,
+display a clock or apply image manipulation techniques to the background image.")
+             (home-page "https://github.com/mortie/swaylock-effects"))))
+
 (define-public swaybg
   (package
     (name "swaybg")
--
2.32.0

[bug#49702] [PATCH v3] gnu: Add swaylock-effects.

[Liliana Marie Prikler]

Pushed with the following changes:

Am Samstag, den 18.09.2021, 12:52 +0000 schrieb phodina:
> * gnu/packages/wm.scm (swaylock-effects): New variable.
> 
> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index 957c5a0d5a..1cc68388b8 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
> @@ -83,6 +83,7 @@
>    #:use-module (gnu packages bison)
>    #:use-module (gnu packages build-tools) ;for meson-0.55
>    #:use-module (gnu packages calendar)
> +  #:use-module (gnu packages commencement) ; for gcc>9
Dropped, wouldn't be needed as (gnu packages gcc) is already imported.
>    #:use-module (gnu packages datastructures)
>    #:use-module (gnu packages docbook)
>    #:use-module (gnu packages documentation)
> @@ -1617,6 +1618,31 @@ modules for building a Wayland compositor.")
>      (description "Swaylock is a screen locking utility for Wayland
> compositors.")
>      (license license:expat))) ; MIT license
> 
> +(define-public swaylock-effects
> +  (let ((commit "5cb9579faaf5662b111f5722311b701eff1c1d00")
> +        (revision "1"))
> +    (package (inherit swaylock)
> +             (name "swaylock-effects")
> +             (version commit)
Used git-version.
> +             (source (origin
> +                       (method git-fetch)
> +                       (uri (git-reference
> +                             (url "
> https://github.com/mortie/swaylock-effects")
> +                             (commit version)))
Used commit.
> +                       (file-name (git-file-name name version))
> +                       (sha256
> +                        (base32
> +                         "036dkhfqgk7g9vbr5pxgrs66h5fz0rwdsc67i1w51a
> a9v01r35ca"))))
> +             ; Requires gcc>=9 see the issue here
> +             ; https://github.com/mortie/swaylock-effects/issues/26
> +             (native-inputs `(("gcc", gcc-9)
> +                              ,@(package-native-inputs swaylock)))
Dropped, instead configured and patched to not use SSE or mtune=native
for the sake of reproducible builds.
> +             (synopsis "Screen locking utility for Wayland
> compositors with effects")
> +             (description "@code{Swaylock-effects} is a fork of
> swaylock with additional
> +features, such as the ability to take a screenshot as the background
> image,
> +display a clock or apply image manipulation techniques to the
> background image.")
> +             (home-page "https://github.com/mortie/swaylock-effects"
> ))))
Indentation fixed.

Thanks

[bug#49702] [PATCH v3] gnu: Add swaylock-effects.

[phodina via Guix-patches via]

Hi,

I'm just going through my open tickets and this one seems to be already merged in commit 511dc6877e0664d83fd800cc601fa94c231a0d0f.

Could you please confirm and close the ticket?

bug#49702: [PATCH v3] gnu: Add swaylock-effects.

[Liliana Marie Prikler]

Am Samstag, den 30.10.2021, 21:26 +0000 schrieb phodina:
> Hi,
> 
> I'm just going through my open tickets and this one seems to be
> already merged in commit 511dc6877e0664d83fd800cc601fa94c231a0d0f.
> 
> Could you please confirm and close the ticket?
Indeed, I CC'd the wrong address when I pushed it.