* [PATCH] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"
@ 2016-05-07 10:47 Danny Milosavljevic
2016-05-07 11:09 ` [PATCH v2] " Danny Milosavljevic
0 siblings, 1 reply; 8+ messages in thread
From: Danny Milosavljevic @ 2016-05-07 10:47 UTC (permalink / raw)
To: guix-devel
Hi,
since I ran into a problem with circular dependencies (qt -> gtk -> qt) while trying to package "rofi", I propose to move libxkbcommon to "gnu/packages/xdisorg.scm".
I also removed the "qt" import from xdisorg since it just pulled in libxkbcommon via that - and that's now local.
The package definition itself is unchanged.
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 55bffe9..87c64b7 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -92,6 +92,7 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages tcl)
#:use-module (gnu packages fribidi)
+ #:use-module (gnu packages xdisorg)
#:use-module (guix build-system trivial)
#:use-module (guix build-system gnu)
#:use-module (guix build-system haskell)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 7b2be4f..097ec06 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -56,44 +56,6 @@
#:use-module (gnu packages xorg)
#:use-module (gnu packages xml))
-(define-public libxkbcommon
- (package
- (name "libxkbcommon")
- (version "0.5.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://xkbcommon.org/download/" name "-"
- version ".tar.xz"))
- (sha256
- (base32
- "176ii5dn2wh74q48sd8ac37ljlvgvp5f506glr96z6ibfhj7igch"))))
- (build-system gnu-build-system)
- (inputs
- `(("libx11" ,libx11)
- ("libxcb" ,libxcb)
- ("xkeyboard-config" ,xkeyboard-config)))
- (native-inputs
- `(("bison" ,bison)
- ("pkg-config" ,pkg-config)))
- (arguments
- `(#:configure-flags
- (list (string-append "--with-xkb-config-root="
- (assoc-ref %build-inputs "xkeyboard-config")
- "/share/X11/xkb")
- (string-append "--with-x-locale-root="
- (assoc-ref %build-inputs "libx11")
- "/share/X11/locale"))))
- (home-page "http://xkbcommon.org/")
- (synopsis "Library to handle keyboard descriptions")
- (description "Xkbcommon is a library to handle keyboard descriptions,
-including loading them from disk, parsing them and handling their
-state. It is mainly meant for client toolkits, window systems, and other
-system applications; currently that includes Wayland, kmscon, GTK+, Qt,
-Clutter, and more. Despite the name, it is not currently used by anything
-X11 (yet).")
- (license (x11-style "file://COPYING"
- "See 'COPYING' in the distribution."))))
-
(define-public qt
(package
(name "qt")
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 126e997..c5316be 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -54,8 +54,8 @@
#:use-module (gnu packages guile)
#:use-module (gnu packages xml)
#:use-module (gnu packages gtk)
- #:use-module (gnu packages qt)
- #:use-module (gnu packages xorg))
+ #:use-module (gnu packages xorg)
+ #:use-module (gnu packages bison))
;; packages outside the x.org system proper
@@ -869,3 +869,41 @@ demos. It also acts as a nice screen locker.")
(string-append
"http://metadata.ftp-master.debian.org/changelogs/"
"/main/x/xscreensaver/xscreensaver_5.34-2_copyright")))))
+
+(define-public libxkbcommon
+ (package
+ (name "libxkbcommon")
+ (version "0.5.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://xkbcommon.org/download/" name "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "176ii5dn2wh74q48sd8ac37ljlvgvp5f506glr96z6ibfhj7igch"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("libx11" ,libx11)
+ ("libxcb" ,libxcb)
+ ("xkeyboard-config" ,xkeyboard-config)))
+ (native-inputs
+ `(("bison" ,bison)
+ ("pkg-config" ,pkg-config)))
+ (arguments
+ `(#:configure-flags
+ (list (string-append "--with-xkb-config-root="
+ (assoc-ref %build-inputs "xkeyboard-config")
+ "/share/X11/xkb")
+ (string-append "--with-x-locale-root="
+ (assoc-ref %build-inputs "libx11")
+ "/share/X11/locale"))))
+ (home-page "http://xkbcommon.org/")
+ (synopsis "Library to handle keyboard descriptions")
+ (description "Xkbcommon is a library to handle keyboard descriptions,
+including loading them from disk, parsing them and handling their
+state. It is mainly meant for client toolkits, window systems, and other
+system applications; currently that includes Wayland, kmscon, GTK+, Qt,
+Clutter, and more. Despite the name, it is not currently used by anything
+X11 (yet).")
+ (license (license:x11-style "file://COPYING"
+ "See 'COPYING' in the distribution."))))
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"
2016-05-07 10:47 [PATCH] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm" Danny Milosavljevic
@ 2016-05-07 11:09 ` Danny Milosavljevic
2016-05-11 16:31 ` Ludovic Courtès
2016-05-11 16:32 ` Ludovic Courtès
0 siblings, 2 replies; 8+ messages in thread
From: Danny Milosavljevic @ 2016-05-07 11:09 UTC (permalink / raw)
To: guix-devel
Here's a version with a nicer commit message and which is putting libxkbcommon closer to the top of the destination file.
* gnu/packages/qt.scm: Move "libxkbcommon" code to ...
* gnu/packages/xdisorg.scm: ... here and remove "qt" dependecy from here.
* gnu/packages/games.scm: import "libxkbcommon" from new location.
---
b/gnu/packages/games.scm | 1 +
b/gnu/packages/qt.scm | 38 --------------------------------------
b/gnu/packages/xdisorg.scm | 42 ++++++++++++++++++++++++++++++++++++++++--
3 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 55bffe9..87c64b7 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -92,6 +92,7 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages tcl)
#:use-module (gnu packages fribidi)
+ #:use-module (gnu packages xdisorg)
#:use-module (guix build-system trivial)
#:use-module (guix build-system gnu)
#:use-module (guix build-system haskell)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 7b2be4f..097ec06 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -56,44 +56,6 @@
#:use-module (gnu packages xorg)
#:use-module (gnu packages xml))
-(define-public libxkbcommon
- (package
- (name "libxkbcommon")
- (version "0.5.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://xkbcommon.org/download/" name "-"
- version ".tar.xz"))
- (sha256
- (base32
- "176ii5dn2wh74q48sd8ac37ljlvgvp5f506glr96z6ibfhj7igch"))))
- (build-system gnu-build-system)
- (inputs
- `(("libx11" ,libx11)
- ("libxcb" ,libxcb)
- ("xkeyboard-config" ,xkeyboard-config)))
- (native-inputs
- `(("bison" ,bison)
- ("pkg-config" ,pkg-config)))
- (arguments
- `(#:configure-flags
- (list (string-append "--with-xkb-config-root="
- (assoc-ref %build-inputs "xkeyboard-config")
- "/share/X11/xkb")
- (string-append "--with-x-locale-root="
- (assoc-ref %build-inputs "libx11")
- "/share/X11/locale"))))
- (home-page "http://xkbcommon.org/")
- (synopsis "Library to handle keyboard descriptions")
- (description "Xkbcommon is a library to handle keyboard descriptions,
-including loading them from disk, parsing them and handling their
-state. It is mainly meant for client toolkits, window systems, and other
-system applications; currently that includes Wayland, kmscon, GTK+, Qt,
-Clutter, and more. Despite the name, it is not currently used by anything
-X11 (yet).")
- (license (x11-style "file://COPYING"
- "See 'COPYING' in the distribution."))))
-
(define-public qt
(package
(name "qt")
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 126e997..dd51536 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -54,8 +54,8 @@
#:use-module (gnu packages guile)
#:use-module (gnu packages xml)
#:use-module (gnu packages gtk)
- #:use-module (gnu packages qt)
- #:use-module (gnu packages xorg))
+ #:use-module (gnu packages xorg)
+ #:use-module (gnu packages bison))
;; packages outside the x.org system proper
@@ -122,6 +122,44 @@ can also be used for copying files, as an alternative to sftp/scp, thus
avoiding password prompts when X11 forwarding has already been setup.")
(license license:gpl2+)))
+(define-public libxkbcommon
+ (package
+ (name "libxkbcommon")
+ (version "0.5.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "http://xkbcommon.org/download/" name "-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "176ii5dn2wh74q48sd8ac37ljlvgvp5f506glr96z6ibfhj7igch"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("libx11" ,libx11)
+ ("libxcb" ,libxcb)
+ ("xkeyboard-config" ,xkeyboard-config)))
+ (native-inputs
+ `(("bison" ,bison)
+ ("pkg-config" ,pkg-config)))
+ (arguments
+ `(#:configure-flags
+ (list (string-append "--with-xkb-config-root="
+ (assoc-ref %build-inputs "xkeyboard-config")
+ "/share/X11/xkb")
+ (string-append "--with-x-locale-root="
+ (assoc-ref %build-inputs "libx11")
+ "/share/X11/locale"))))
+ (home-page "http://xkbcommon.org/")
+ (synopsis "Library to handle keyboard descriptions")
+ (description "Xkbcommon is a library to handle keyboard descriptions,
+including loading them from disk, parsing them and handling their
+state. It is mainly meant for client toolkits, window systems, and other
+system applications; currently that includes Wayland, kmscon, GTK+, Qt,
+Clutter, and more. Despite the name, it is not currently used by anything
+X11 (yet).")
+ (license (license:x11-style "file://COPYING"
+ "See 'COPYING' in the distribution."))))
+
(define-public xdotool
(package
(name "xdotool")
@@ -869,3 +907,4 @@ demos. It also acts as a nice screen locker.")
(string-append
"http://metadata.ftp-master.debian.org/changelogs/"
"/main/x/xscreensaver/xscreensaver_5.34-2_copyright")))))
+
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"
2016-05-07 11:09 ` [PATCH v2] " Danny Milosavljevic
@ 2016-05-11 16:31 ` Ludovic Courtès
2016-05-11 16:32 ` Ludovic Courtès
1 sibling, 0 replies; 8+ messages in thread
From: Ludovic Courtès @ 2016-05-11 16:31 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: guix-devel
Danny Milosavljevic <dannym@scratchpost.org> skribis:
> Here's a version with a nicer commit message and which is putting libxkbcommon closer to the top of the destination file.
>
> * gnu/packages/qt.scm: Move "libxkbcommon" code to ...
> * gnu/packages/xdisorg.scm: ... here and remove "qt" dependecy from here.
> * gnu/packages/games.scm: import "libxkbcommon" from new location.
Thanks, applied with minor changes.
Ludo’.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"
2016-05-07 11:09 ` [PATCH v2] " Danny Milosavljevic
2016-05-11 16:31 ` Ludovic Courtès
@ 2016-05-11 16:32 ` Ludovic Courtès
2016-05-18 18:31 ` Danny Milosavljevic
1 sibling, 1 reply; 8+ messages in thread
From: Ludovic Courtès @ 2016-05-11 16:32 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: guix-devel
BTW, in the future, could you either use ‘git send-email’, or attach the
patch as produced by ‘git format-patch’ to your messages? That would
simply the workflow a bit. :-)
Ludo’.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"
2016-05-11 16:32 ` Ludovic Courtès
@ 2016-05-18 18:31 ` Danny Milosavljevic
2016-05-18 18:42 ` Eric Bavier
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Danny Milosavljevic @ 2016-05-18 18:31 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Hi Ludo,
On Wed, 11 May 2016 18:32:51 +0200
ludo@gnu.org (Ludovic Courtès) wrote:
> BTW, in the future, could you either use ‘git send-email’
$ git send-email
git: 'send-email' is not a git command. See 'git --help'.
(on GuixSD)
> or attach the patch as produced by ‘git format-patch’ to your messages?
This one seems to work.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"
2016-05-18 18:31 ` Danny Milosavljevic
@ 2016-05-18 18:42 ` Eric Bavier
2016-05-18 18:45 ` Leo Famulari
2016-05-18 18:57 ` Efraim Flashner
2 siblings, 0 replies; 8+ messages in thread
From: Eric Bavier @ 2016-05-18 18:42 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: guix-devel, Guix-devel
On 2016-05-18 13:31, Danny Milosavljevic wrote:
> Hi Ludo,
>
> On Wed, 11 May 2016 18:32:51 +0200
> ludo@gnu.org (Ludovic Courtès) wrote:
>
>> BTW, in the future, could you either use ‘git send-email’
>
> $ git send-email
> git: 'send-email' is not a git command. See 'git --help'.
>
> (on GuixSD)
Install the git package's "send-email" output:
$ guix package -i git:send-email
--
`~Eric
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"
2016-05-18 18:31 ` Danny Milosavljevic
2016-05-18 18:42 ` Eric Bavier
@ 2016-05-18 18:45 ` Leo Famulari
2016-05-18 18:57 ` Efraim Flashner
2 siblings, 0 replies; 8+ messages in thread
From: Leo Famulari @ 2016-05-18 18:45 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: guix-devel
On Wed, May 18, 2016 at 08:31:11PM +0200, Danny Milosavljevic wrote:
> $ git send-email
> git: 'send-email' is not a git command. See 'git --help'.
>
> (on GuixSD)
From `guix package --show=git`:
outputs: out send-email svn gui
So, in order to use `git send-email` on GuixSD, you must first install
it like this:
$ guix package --install git:send-email
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"
2016-05-18 18:31 ` Danny Milosavljevic
2016-05-18 18:42 ` Eric Bavier
2016-05-18 18:45 ` Leo Famulari
@ 2016-05-18 18:57 ` Efraim Flashner
2 siblings, 0 replies; 8+ messages in thread
From: Efraim Flashner @ 2016-05-18 18:57 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 710 bytes --]
On Wed, May 18, 2016 at 08:31:11PM +0200, Danny Milosavljevic wrote:
> Hi Ludo,
>
> On Wed, 11 May 2016 18:32:51 +0200
> ludo@gnu.org (Ludovic Courtès) wrote:
>
> > BTW, in the future, could you either use ‘git send-email’
>
> $ git send-email
> git: 'send-email' is not a git command. See 'git --help'.
>
> (on GuixSD)
guix package -i git:send-email
>
> > or attach the patch as produced by ‘git format-patch’ to your messages?
>
> This one seems to work.
>
--
Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-05-18 18:57 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-07 10:47 [PATCH] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm" Danny Milosavljevic
2016-05-07 11:09 ` [PATCH v2] " Danny Milosavljevic
2016-05-11 16:31 ` Ludovic Courtès
2016-05-11 16:32 ` Ludovic Courtès
2016-05-18 18:31 ` Danny Milosavljevic
2016-05-18 18:42 ` Eric Bavier
2016-05-18 18:45 ` Leo Famulari
2016-05-18 18:57 ` Efraim Flashner
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).