[PATCH] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"

[PATCH] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"

[Danny Milosavljevic]

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."))))

[PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"

[Danny Milosavljevic]

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")))))
+

Re: [PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"

[Ludovic Courtès]

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’.

Re: [PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"

[Ludovic Courtès]

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’.

Re: [PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"

[Danny Milosavljevic]

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.

Re: [PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"

[Eric Bavier]

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

Re: [PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"

[Leo Famulari]

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

Re: [PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm"

[Efraim Flashner]

[-- 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 --]