From 5b8a85431dd746eb975d70fe31aeb05609946d80 Mon Sep 17 00:00:00 2001 From: Kei Yamashita Date: Tue, 3 May 2016 12:04:38 -0400 Subject: gnu: Rename redeclipse package to red-eclipse. * gnu/packages/games.scm (redeclipse): Rename to... (red-eclipse): ...this. Signed-off-by: Andreas Enge --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 34998cea28..52a7f9b73e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2133,7 +2133,7 @@ (define-public redeclipse ("weapons" "1ghn6nfcnd5lyl8dnj22csldvf9hrb32wjzpab4sjjz3iyv0zmr3") ("wicked" "0q9badvg6ix5rhl05s83kw2v6a49jpnbkqk4ls89qahaddfagi8g")))) (package - (name "redeclipse") + (name "red-eclipse") (version "1.5.3") (source (origin (method url-fetch) -- cgit v1.2.3 From 5ef819cc01126fd28938ec5d148ae4c1a3f6a912 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 3 May 2016 21:25:31 +0200 Subject: gnu: redeclipse: Rename to red-eclipse. * gnu/packages/games.scm (redeclipse): Rename to... (red-eclipse): ...this. This is a follow-up to commit 5b8a85431dd746eb975d70fe31aeb05609946d80, which changed only the name field of the package. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 52a7f9b73e..55bffe9539 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2097,7 +2097,7 @@ (define-public powwow http://lavachat.symlynx.com/unix/") (license license:gpl2+))) -(define-public redeclipse +(define-public red-eclipse (let ((data-sources '(("acerspyro" "0gxxr6nbac918b49x1cp72nw951hqm5m4iyi2shb1612ly384w8q") ("actors" "1jq9q82m6nx07nwpb5cnpdcwa33jrcgg0j2yir8zk6zpnxdmp0il") -- cgit v1.2.3 From aa206271cf369250f347be50b5a0733d95b30d4e Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Thu, 5 May 2016 18:25:45 -0500 Subject: gnu: wesnoth: Update to 1.12.5. * gnu/packages/games.scm (wesnoth): Update to 1.12.5. Signed-off-by: Leo Famulari --- gnu/packages/games.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 55bffe9539..a298f03512 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2016 Nils Gillmann ;;; Copyright © 2016 Albin Söderqvist ;;; Copyright © 2016 Kei Yamashita +;;; Copyright © 2016 Alex Griffin ;;; ;;; This file is part of GNU Guix. ;;; @@ -1021,14 +1022,14 @@ (define-public gnujump (define-public wesnoth (package (name "wesnoth") - (version "1.12.4") + (version "1.12.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/wesnoth/" name "-" version ".tar.bz2")) (sha256 (base32 - "19qyylylaljhk45lk2ja0xp7cx9iy4hx07l65zkg20a2v9h50lmz")))) + "07d8ms9ayswg2g530p0zwmz3d77zv68l6nmc718iq9sbv90av6jr")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From cf60e76a9503156a8c1047fa446525b28842f7e8 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 11 May 2016 18:24:53 +0200 Subject: gnu: libxkbcommon: Move to (gnu packages xdisorg). * gnu/packages/qt.scm (libxkbcommon): Move to... * gnu/packages/xdisorg.scm (libxkbcommon): ... here. New variable. * gnu/packages/wm.scm, gnu/packages/gnome.scm, gnu/packages/games.scm: Adjust accordingly. --- gnu/packages/games.scm | 1 + gnu/packages/gnome.scm | 1 - gnu/packages/qt.scm | 38 -------------------------------------- gnu/packages/wm.scm | 1 - gnu/packages/xdisorg.scm | 42 ++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 41 insertions(+), 42 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a298f03512..75f926edce 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -93,6 +93,7 @@ (define-module (gnu packages games) #: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/gnome.scm b/gnu/packages/gnome.scm index 0fd1d5bb29..5169368562 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -93,7 +93,6 @@ (define-module (gnu packages gnome) #:use-module (gnu packages xml) #:use-module (gnu packages geeqie) #:use-module (gnu packages gl) - #:use-module (gnu packages qt) ; for libxkbcommon #:use-module (gnu packages compression) #:use-module (gnu packages texlive) #:use-module (gnu packages tls) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 7b2be4f4e9..097ec06d2a 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -56,44 +56,6 @@ (define-module (gnu packages qt) #: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/wm.scm b/gnu/packages/wm.scm index 694db4794a..1a0529c640 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -37,7 +37,6 @@ (define-module (gnu packages wm) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages qt) #:use-module (gnu packages asciidoc) #:use-module (gnu packages xml) #:use-module (gnu packages m4) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 126e997673..e69e6d98d4 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -54,8 +54,8 @@ (define-module (gnu packages xdisorg) #: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 @@ (define-public xclip 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") -- cgit v1.2.3