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

Previous Next

Package: guix-patches;

Reported by: phodina <phodina <at> protonmail.com>

Date: Fri, 23 Jul 2021 03:07:02 UTC

Severity: normal

Tags: patch

Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 49702 in the body.
You can then email your comments to 49702 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#49702; Package guix-patches. (Fri, 23 Jul 2021 03:07:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to phodina <phodina <at> protonmail.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Fri, 23 Jul 2021 03:07:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: phodina <phodina <at> protonmail.com>
To: "guix-patches <at> gnu.org" <guix-patches <at> gnu.org>
Subject: [PATCH] gnu: Add swaylock-effects
Date: Fri, 23 Jul 2021 03:06:22 +0000
---
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 <at> gmail.com>
 ;;; Copyright © 2021 qblade <qblade <at> protonmail.com>
 ;;; Copyright © 2021 lasnesne <lasnesne <at> lagunposprasihopre.org>
+;;; Copyright © 2021 Petr Hodina <phodina <at> 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




Information forwarded to guix-patches <at> gnu.org:
bug#49702; Package guix-patches. (Sat, 18 Sep 2021 08:05:02 GMT) Full text and rfc822 format available.

Message #8 received at 49702 <at> debbugs.gnu.org (full text, mbox):

From: phodina <phodina <at> protonmail.com>
To: "49702 <at> debbugs.gnu.org" <49702 <at> debbugs.gnu.org>
Subject: Patch status
Date: Sat, 18 Sep 2021 08:04:01 +0000
[Message part 1 (text/plain, inline)]
Hi!

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

Sent with [ProtonMail](https://protonmail.com/) Secure Email.
[Message part 2 (text/html, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#49702; Package guix-patches. (Sat, 18 Sep 2021 11:04:02 GMT) Full text and rfc822 format available.

Message #11 received at 49702 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: phodina <phodina <at> protonmail.com>, 49702 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: Add swaylock-effects
Date: Sat, 18 Sep 2021 13:03:05 +0200
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 <at> gmail.com>
>  ;;; Copyright © 2021 qblade <qblade <at> protonmail.com>
>  ;;; Copyright © 2021 lasnesne <lasnesne <at> lagunposprasihopre.org>
> +;;; Copyright © 2021 Petr Hodina <phodina <at> 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
> 





Information forwarded to guix-patches <at> gnu.org:
bug#49702; Package guix-patches. (Sat, 18 Sep 2021 12:15:02 GMT) Full text and rfc822 format available.

Message #14 received at 49702 <at> debbugs.gnu.org (full text, mbox):

From: phodina <phodina <at> protonmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 49702 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: Add swaylock-effects.
Date: Sat, 18 Sep 2021 12:14:09 +0000
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




Information forwarded to guix-patches <at> gnu.org:
bug#49702; Package guix-patches. (Sat, 18 Sep 2021 12:18:01 GMT) Full text and rfc822 format available.

Message #17 received at 49702 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: phodina <phodina <at> protonmail.com>
Cc: 49702 <at> debbugs.gnu.org
Subject: Re: [PATCH v2] gnu: Add swaylock-effects.
Date: Sat, 18 Sep 2021 14:17:35 +0200
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





Information forwarded to guix-patches <at> gnu.org:
bug#49702; Package guix-patches. (Sat, 18 Sep 2021 12:53:01 GMT) Full text and rfc822 format available.

Message #20 received at 49702 <at> debbugs.gnu.org (full text, mbox):

From: phodina <phodina <at> protonmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 49702 <at> debbugs.gnu.org
Subject: [PATCH v3] gnu: Add swaylock-effects.
Date: Sat, 18 Sep 2021 12:52:47 +0000
* 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




Information forwarded to guix-patches <at> gnu.org:
bug#49702; Package guix-patches. (Sat, 18 Sep 2021 13:31:02 GMT) Full text and rfc822 format available.

Message #23 received at 49702 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: phodina <phodina <at> protonmail.com>
Cc: 49702 <at> debbugs.gnu.org
Subject: Re: [PATCH v3] gnu: Add swaylock-effects.
Date: Sat, 18 Sep 2021 15:29:55 +0200
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





Information forwarded to guix-patches <at> gnu.org:
bug#49702; Package guix-patches. (Sat, 30 Oct 2021 21:27:01 GMT) Full text and rfc822 format available.

Message #26 received at 49702 <at> debbugs.gnu.org (full text, mbox):

From: phodina <phodina <at> protonmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 49702 <at> debbugs.gnu.org
Subject: Re: [PATCH v3] gnu: Add swaylock-effects.
Date: Sat, 30 Oct 2021 21:26:05 +0000
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?




Reply sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
You have taken responsibility. (Sat, 30 Oct 2021 21:36:01 GMT) Full text and rfc822 format available.

Notification sent to phodina <phodina <at> protonmail.com>:
bug acknowledged by developer. (Sat, 30 Oct 2021 21:36:02 GMT) Full text and rfc822 format available.

Message #31 received at 49702-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: phodina <phodina <at> protonmail.com>
Cc: 49702-done <at> debbugs.gnu.org
Subject: Re: [PATCH v3] gnu: Add swaylock-effects.
Date: Sat, 30 Oct 2021 23:35:31 +0200
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.





bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sun, 28 Nov 2021 12:24:03 GMT) Full text and rfc822 format available.

This bug report was last modified 2 years and 122 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.