[PATCH] gnu: Add libdecor.

  • Done
  • quality assurance status badge
Details
3 participants
  • aurtzy
  • John Kehayias
  • Ludovic Courtès
Owner
unassigned
Submitted by
aurtzy
Severity
normal

Debbugs page

A
A
aurtzy wrote on 18 Apr 19:10 -0700
(address . guix-patches@gnu.org)
01e46762faf0b74581d07a365c65157354081f84.1713492642.git.aurtzy@gmail.com
* 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(+)

Toggle diff (61 lines)
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@gnu.org>
;;; Copyright © 2023, 2024 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2023, 2024 Kaelyn Takata <kaelyn.alexi@protonmail.com>
+;;; Copyright © 2022 Samuel Culpepper <sculpepper@newstore.com>
+;;; Copyright © 2024 aurtzy <aurtzy@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
J
J
John Kehayias wrote on 19 Apr 09:10 -0700
(name . aurtzy)(address . aurtzy@gmail.com)(address . 70466@debbugs.gnu.org)
87il0djptp.fsf@protonmail.com
Hello,

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

Toggle quote (10 lines)
> * 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).

Toggle quote (13 lines)
> 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@gnu.org>
> ;;; Copyright © 2023, 2024 John Kehayias <john.kehayias@protonmail.com>
> ;;; Copyright © 2023, 2024 Kaelyn Takata <kaelyn.alexi@protonmail.com>
> +;;; Copyright © 2022 Samuel Culpepper <sculpepper@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.)

Toggle quote (34 lines)
> +;;; Copyright © 2024 aurtzy <aurtzy@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.

Toggle quote (18 lines)
> + (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
A
A
aurtzy wrote on 20 Apr 03:12 -0700
[PATCH v2] gnu: Add libdecor.
(address . 70466@debbugs.gnu.org)
72015ff750152dddde60f4c3ea994de388a5477f.1713590018.git.aurtzy@gmail.com
* gnu/packages/freedesktop.scm (libdecor): New variable.

Change-Id: Ic8d8886a55ae344fafbe16288a1180c89fa36af1
---

Hi John,

Toggle quote (14 lines)
> > * 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.

Toggle quote (16 lines)
> > 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@gnu.org>
> > ;;; Copyright © 2023, 2024 John Kehayias <john.kehayias@protonmail.com>
> > ;;; Copyright © 2023, 2024 Kaelyn Takata <kaelyn.alexi@protonmail.com>
> > +;;; Copyright © 2022 Samuel Culpepper <sculpepper@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

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

Adjusted!

Toggle quote (7 lines)
> 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(+)

Toggle diff (52 lines)
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@gmail.com>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2022 Samuel Culpepper <sculpepper@newstore.com>
+;;; Copyright © 2024 aurtzy <aurtzy@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
L
L
Ludovic Courtès wrote on 29 Apr 15:02 -0700
(name . aurtzy)(address . aurtzy@gmail.com)
87edanzv2g.fsf@gnu.org
Hi,

aurtzy <aurtzy@gmail.com> skribis:

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

Applied. Thanks aurtzy & John!

Ludo’.
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 70466@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 70466
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch