From mboxrd@z Thu Jan 1 00:00:00 1970 From: Danny Milosavljevic Subject: [PATCH v2] move libxkbcommon from "gnu/packages/qt.scm" to "gnu/packages/xdisorg.scm" Date: Sat, 7 May 2016 13:09:21 +0200 Message-ID: <20160507130921.25c90c55@scratchpost.org> References: <20160507124737.20b49035@scratchpost.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1az074-0004kH-N5 for guix-devel@gnu.org; Sat, 07 May 2016 07:09:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1az06y-00011S-Co for guix-devel@gnu.org; Sat, 07 May 2016 07:09:33 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:39211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1az06x-00011H-Sx for guix-devel@gnu.org; Sat, 07 May 2016 07:09:28 -0400 Received: from localhost (91.141.3.65.wireless.dyn.drei.com [91.141.3.65]) by dd1012.kasserver.com (Postfix) with ESMTPSA id A8C351CA069B for ; Sat, 7 May 2016 13:09:25 +0200 (CEST) In-Reply-To: <20160507124737.20b49035@scratchpost.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org 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"))))) +