GNU bug report logs - #70466
[PATCH] gnu: Add libdecor.

Previous Next

Package: guix-patches;

Reported by: aurtzy <aurtzy <at> gmail.com>

Date: Fri, 19 Apr 2024 02:30:04 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

To reply to this bug, email your comments to 70466 AT debbugs.gnu.org.
There is no need to reopen the bug first.

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#70466; Package guix-patches. (Fri, 19 Apr 2024 02:30:04 GMT) Full text and rfc822 format available.

Acknowledgement sent to aurtzy <aurtzy <at> gmail.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Fri, 19 Apr 2024 02:30:05 GMT) Full text and rfc822 format available.

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

From: aurtzy <aurtzy <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: john.kehayias <at> protonmail.com, aurtzy <aurtzy <at> gmail.com>
Subject: [PATCH] gnu: Add libdecor.
Date: Thu, 18 Apr 2024 22:10:56 -0400
* gnu/packages/xorg.scm (libdecor): New variable.

Change-Id: Ic8d8886a55ae344fafbe16288a1180c89fa36af1
---

Is this a reasonable location for libdecor?  I had trouble deciding between
(gnu packages xorg) and (gnu packages xdisorg), but even then I wasn't sure if
it belonged in either.

 gnu/packages/xorg.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 81d8462761..4fd4c3eece 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -38,6 +38,8 @@
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke <at> gnu.org>
 ;;; Copyright © 2023, 2024 John Kehayias <john.kehayias <at> protonmail.com>
 ;;; Copyright © 2023, 2024 Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
+;;; Copyright © 2022 Samuel Culpepper <sculpepper <at> newstore.com>
+;;; Copyright © 2024 aurtzy <aurtzy <at> gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -74,6 +76,7 @@ (define-module (gnu packages xorg)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages cmake)
   #:use-module (gnu packages cups)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages emacs)
@@ -6773,3 +6776,35 @@ (define-public setroot
 syntax without its image viewing capabilities.  It supports multiple monitors
 and can restore previously set wallpapers and options.")
     (license license:gpl3+)))
+
+(define-public libdecor
+  (package
+    (name "libdecor")
+    (version "0.2.2")
+    (source
+     (origin (method git-fetch)
+             (uri (git-reference
+                   (url "https://gitlab.freedesktop.org/libdecor/libdecor")
+                   (commit version)))
+             (file-name (git-file-name name version))
+             (sha256
+              (base32
+               "05rxchwzhnkm91kcr30mavizkp25wgjlhb6lcraa456pw7vgb04q"))))
+    (build-system meson-build-system)
+    (native-inputs (list cmake
+                         pkg-config))
+    (inputs (list cairo
+                  dbus
+                  egl-wayland
+                  gtk+
+                  libglvnd
+                  libxkbcommon
+                  pango
+                  wayland
+                  wayland-protocols))
+    (home-page "https://gitlab.freedesktop.org/libdecor/libdecor")
+    (synopsis "Client-side decorations library for Wayland clients")
+    (description "libdecor is a library that can help Wayland clients draw
+window decorations for them.  It aims to provide multiple backends that
+implements the decoration drawing.")
+    (license license:expat)))

base-commit: 49f82fca4130ffcfb16aa0cf89750ab56fb99ad7
-- 
2.41.0





Information forwarded to guix-patches <at> gnu.org:
bug#70466; Package guix-patches. (Fri, 19 Apr 2024 16:13:05 GMT) Full text and rfc822 format available.

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

From: John Kehayias <john.kehayias <at> protonmail.com>
To: aurtzy <aurtzy <at> gmail.com>
Cc: 70466 <at> debbugs.gnu.org
Subject: Re: [bug#70466] [PATCH] gnu: Add libdecor.
Date: Fri, 19 Apr 2024 16:10:46 +0000
Hello,

On Thu, Apr 18, 2024 at 10:10 PM, aurtzy wrote:

> * gnu/packages/xorg.scm (libdecor): New variable.
>
> Change-Id: Ic8d8886a55ae344fafbe16288a1180c89fa36af1
> ---
>
> Is this a reasonable location for libdecor?  I had trouble deciding between
> (gnu packages xorg) and (gnu packages xdisorg), but even then I wasn't sure if
> it belonged in either.
>

I'm not expert, but maybe in freedesktop? Since that is where wayland
is, for example (and this is a freedesktop project, though not sure that
maps for all).

>  gnu/packages/xorg.scm | 35 +++++++++++++++++++++++++++++++++++
>  1 file changed, 35 insertions(+)
>
> diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
> index 81d8462761..4fd4c3eece 100644
> --- a/gnu/packages/xorg.scm
> +++ b/gnu/packages/xorg.scm
> @@ -38,6 +38,8 @@
>  ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke <at> gnu.org>
>  ;;; Copyright © 2023, 2024 John Kehayias <john.kehayias <at> protonmail.com>
>  ;;; Copyright © 2023, 2024 Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
> +;;; Copyright © 2022 Samuel Culpepper <sculpepper <at> newstore.com>

Who is this for? Did this come from another channel/previous patch then?
(Not a problem and giving credit is, of course, correct! Just wondering.)

> +;;; Copyright © 2024 aurtzy <aurtzy <at> gmail.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -74,6 +76,7 @@ (define-module (gnu packages xorg)
>    #:use-module (gnu packages bash)
>    #:use-module (gnu packages bison)
>    #:use-module (gnu packages check)
> +  #:use-module (gnu packages cmake)
>    #:use-module (gnu packages cups)
>    #:use-module (gnu packages compression)
>    #:use-module (gnu packages emacs)
> @@ -6773,3 +6776,35 @@ (define-public setroot
>  syntax without its image viewing capabilities.  It supports multiple monitors
>  and can restore previously set wallpapers and options.")
>      (license license:gpl3+)))
> +
> +(define-public libdecor
> +  (package
> +    (name "libdecor")
> +    (version "0.2.2")
> +    (source
> +     (origin (method git-fetch)
> +             (uri (git-reference
> +                   (url "https://gitlab.freedesktop.org/libdecor/libdecor")
> +                   (commit version)))
> +             (file-name (git-file-name name version))
> +             (sha256
> +              (base32
> +               "05rxchwzhnkm91kcr30mavizkp25wgjlhb6lcraa456pw7vgb04q"))))
> +    (build-system meson-build-system)
> +    (native-inputs (list cmake
> +                         pkg-config))

Minor nit: this should be one line.

> +    (inputs (list cairo
> +                  dbus
> +                  egl-wayland
> +                  gtk+
> +                  libglvnd
> +                  libxkbcommon
> +                  pango
> +                  wayland
> +                  wayland-protocols))
> +    (home-page "https://gitlab.freedesktop.org/libdecor/libdecor")
> +    (synopsis "Client-side decorations library for Wayland clients")
> +    (description "libdecor is a library that can help Wayland clients draw
> +window decorations for them.  It aims to provide multiple backends that
> +implements the decoration drawing.")
> +    (license license:expat)))
>
> base-commit: 49f82fca4130ffcfb16aa0cf89750ab56fb99ad7

Otherwise LGTM, just want to confirm the extra copyright line. You can
send an update putting this in freedesktop if you agree and fixing the
native-inputs line, or I can do it when pushing.

Thanks!
John





Information forwarded to guix-patches <at> gnu.org:
bug#70466; Package guix-patches. (Sat, 20 Apr 2024 10:19:01 GMT) Full text and rfc822 format available.

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

From: aurtzy <aurtzy <at> gmail.com>
To: 70466 <at> debbugs.gnu.org
Cc: john.kehayias <at> protonmail.com, aurtzy <aurtzy <at> gmail.com>
Subject: [PATCH v2] gnu: Add libdecor.
Date: Sat, 20 Apr 2024 06:12:17 -0400
* gnu/packages/freedesktop.scm (libdecor): New variable.

Change-Id: Ic8d8886a55ae344fafbe16288a1180c89fa36af1
---

Hi John,

> > * gnu/packages/xorg.scm (libdecor): New variable.
> >
> > Change-Id: Ic8d8886a55ae344fafbe16288a1180c89fa36af1
> > ---
> >
> > Is this a reasonable location for libdecor?  I had trouble deciding between
> > (gnu packages xorg) and (gnu packages xdisorg), but even then I wasn't sure if
> > it belonged in either.
> >
> 
> I'm not expert, but maybe in freedesktop? Since that is where wayland
> is, for example (and this is a freedesktop project, though not sure that
> maps for all).

I think it makes sense; moved to freedesktop.

> >  gnu/packages/xorg.scm | 35 +++++++++++++++++++++++++++++++++++
> >  1 file changed, 35 insertions(+)
> >
> > diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
> > index 81d8462761..4fd4c3eece 100644
> > --- a/gnu/packages/xorg.scm
> > +++ b/gnu/packages/xorg.scm
> > @@ -38,6 +38,8 @@
> >  ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke <at> gnu.org>
> >  ;;; Copyright © 2023, 2024 John Kehayias <john.kehayias <at> protonmail.com>
> >  ;;; Copyright © 2023, 2024 Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
> > +;;; Copyright © 2022 Samuel Culpepper <sculpepper <at> newstore.com>
> 
> Who is this for? Did this come from another channel/previous patch then?
> (Not a problem and giving credit is, of course, correct! Just wondering.)

Woops, should have explained that - yes, the original libdecor definition was
found here: https://github.com/Admicos/minecraft-wayland/issues/18

> > +    (native-inputs (list cmake
> > +                         pkg-config))
> 
> Minor nit: this should be one line.

Adjusted!

> Otherwise LGTM, just want to confirm the extra copyright line. You can
> send an update putting this in freedesktop if you agree and fixing the
> native-inputs line, or I can do it when pushing.
> 
> Thanks!
> John

Cheers,

aurtzy

 gnu/packages/freedesktop.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 339297c087..081269ebaf 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -35,6 +35,8 @@
 ;;; Copyright © 2023 Alex Devaure <ajadevaure <at> gmail.com>
 ;;; Copyright © 2023 Bruno Victal <mirai <at> makinata.eu>
 ;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2022 Samuel Culpepper <sculpepper <at> newstore.com>
+;;; Copyright © 2024 aurtzy <aurtzy <at> gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3234,3 +3236,34 @@ (define-public waypipe
      "Waypipe is a proxy for Wayland clients, with the aim of
 supporting behavior like @samp{ssh -X}.")
     (license license:expat)))
+
+(define-public libdecor
+  (package
+    (name "libdecor")
+    (version "0.2.2")
+    (source
+     (origin (method git-fetch)
+             (uri (git-reference
+                   (url "https://gitlab.freedesktop.org/libdecor/libdecor")
+                   (commit version)))
+             (file-name (git-file-name name version))
+             (sha256
+              (base32
+               "05rxchwzhnkm91kcr30mavizkp25wgjlhb6lcraa456pw7vgb04q"))))
+    (build-system meson-build-system)
+    (native-inputs (list cmake pkg-config))
+    (inputs (list cairo
+                  dbus
+                  egl-wayland
+                  gtk+
+                  libglvnd
+                  libxkbcommon
+                  pango
+                  wayland
+                  wayland-protocols))
+    (home-page "https://gitlab.freedesktop.org/libdecor/libdecor")
+    (synopsis "Client-side decorations library for Wayland clients")
+    (description "libdecor is a library that can help Wayland clients draw
+window decorations for them.  It aims to provide multiple backends that
+implements the decoration drawing.")
+    (license license:expat)))

base-commit: 0797fff8b8b3feb1e421aad170b4c12a87091663
-- 
2.41.0





Reply sent to Ludovic Courtès <ludo <at> gnu.org>:
You have taken responsibility. (Mon, 29 Apr 2024 22:04:02 GMT) Full text and rfc822 format available.

Notification sent to aurtzy <aurtzy <at> gmail.com>:
bug acknowledged by developer. (Mon, 29 Apr 2024 22:04:02 GMT) Full text and rfc822 format available.

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: aurtzy <aurtzy <at> gmail.com>
Cc: john.kehayias <at> protonmail.com, 70466-done <at> debbugs.gnu.org
Subject: Re: [bug#70466] [PATCH v2] gnu: Add libdecor.
Date: Tue, 30 Apr 2024 00:02:31 +0200
Hi,

aurtzy <aurtzy <at> gmail.com> skribis:

> * gnu/packages/freedesktop.scm (libdecor): New variable.
>
> Change-Id: Ic8d8886a55ae344fafbe16288a1180c89fa36af1

Applied.  Thanks aurtzy & John!

Ludo’.




This bug report was last modified 4 days ago.

Previous Next


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