From 54d8d0fef1a0224f118dbfad8fceece06d322eab Mon Sep 17 00:00:00 2001 From: John Darrington Date: Fri, 2 Dec 2016 17:25:34 +0100 Subject: gnu: Patch libxt's default search path. * gnu/packages/patches/libxt-guix-search-paths.patch: New file. * gnu/packages/xorg.scm (libxt) [source]: Add patch. --- gnu/packages/xorg.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3930d21617..c3df6ad323 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5304,7 +5304,8 @@ draggable titlebars and borders.") ".tar.bz2")) (sha256 (base32 - "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6")))) + "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6")) + (patches (search-patches "libxt-guix-search-paths.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;2 MiB of man pages + XML -- cgit v1.2.3 From 5e107b22df2cc42cc0e4601a20a3f6749865adb7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Dec 2016 02:08:51 +0100 Subject: gnu: libxpm: Update to 3.5.12. * gnu/packages/xorg.scm (libxpm): Update to 3.5.12. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c3df6ad323..e6ee0c06a2 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1458,7 +1458,7 @@ treat it as part of their software base when porting.") (define-public libxpm (package (name "libxpm") - (version "3.5.11") + (version "3.5.12") (source (origin (method url-fetch) @@ -1468,7 +1468,7 @@ treat it as part of their software base when porting.") ".tar.bz2")) (sha256 (base32 - "07041q4k8m4nirzl7lrqn8by2zylx0xvh6n0za301qqs3njszgf5")))) + "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 5dc8dd07b0c966842bfb984482df40892dc1c2ae Mon Sep 17 00:00:00 2001 From: John Darrington Date: Wed, 11 Jan 2017 21:11:00 +0100 Subject: gnu: xfontsel: Simplify definition. * gnu/packages/xorg.scm (%app-defaults-dir): New variable. (xfontsel): Remove wrapper. --- gnu/packages/xorg.scm | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e6ee0c06a2..556b9f4baf 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 David Craven -;;; Copyright © 2016 John Darrington +;;; Copyright © 2016, 2017 John Darrington ;;; ;;; This file is part of GNU Guix. ;;; @@ -335,6 +335,7 @@ provided.") (license (license:x11-style "file://dri3proto.h" "See 'dri3proto.h' in the distribution.")))) +(define %app-defaults-dir "/lib/X11/app-defaults") (define-public editres (package @@ -3982,23 +3983,9 @@ protocol.") "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p")))) (build-system gnu-build-system) (arguments - ;; By default, it tries to install XFontSel file in - ;; "/gnu/store//share/X11/app-defaults": it defines this - ;; directory from 'libxt' (using 'pkg-config'). To put this file - ;; inside output dir and to use it properly, we need to configure - ;; --with-appdefaultdir and to wrap 'xfontsel' binary. - (let ((app-defaults-dir "/share/X11/app-defaults")) - `(#:configure-flags - (list (string-append "--with-appdefaultdir=" - %output ,app-defaults-dir)) - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-xfontsel - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/xfontsel") - `("XAPPLRESDIR" = - (,(string-append out ,app-defaults-dir))))))))))) + `(#:configure-flags + (list (string-append "--with-appdefaultdir=" + %output ,%app-defaults-dir)))) (inputs `(("libx11" ,libx11) ("libxaw" ,libxaw) -- cgit v1.2.3 From 73ae4e69a1abc9008a6986864021c6584eaf4a21 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Wed, 11 Jan 2017 21:12:54 +0100 Subject: gnu: editres: Use %app-defaults-dir. * gnu/packages/xorg.scm (editres): Replace string literal with %app-defaults-dir. --- gnu/packages/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 556b9f4baf..16eb344d87 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -355,7 +355,7 @@ provided.") (arguments `(#:configure-flags (list (string-append "--with-appdefaultdir=" - %output "/lib/X11/app-defaults")))) + %output ,%app-defaults-dir)))) (inputs `(("libxaw" ,libxaw) ("libxmu" ,libxmu) -- cgit v1.2.3 From 5aae77e44b6a4cc905ad41e32299260458453470 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Wed, 11 Jan 2017 21:27:50 +0100 Subject: gnu: xfd: Remove wrapper. * gnu/packages/xorg.scm (xfd): Remove wrapper. --- gnu/packages/xorg.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 16eb344d87..45ff4c97ea 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4015,19 +4015,9 @@ Font Description (XLFD) full name for a font.") "0n97iqqap9wyxjan2n520vh4rrf5bc0apsw2k9py94dqzci258y1")))) (build-system gnu-build-system) (arguments - ;; The same 'app-defaults' problem as with 'xfontsel' package. - (let ((app-defaults-dir "/share/X11/app-defaults")) `(#:configure-flags (list (string-append "--with-appdefaultdir=" - %output ,app-defaults-dir)) - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-xfd - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/xfd") - `("XAPPLRESDIR" = - (,(string-append out ,app-defaults-dir))))))))))) + %output ,%app-defaults-dir)))) (inputs `(("fontconfig" ,fontconfig) ("libx11" ,libx11) -- cgit v1.2.3 From 97fedab17d4acfa05969ddd9faf98a11d27a4743 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Thu, 12 Jan 2017 10:19:12 +0100 Subject: gnu: xfig: Remove wrapper and clean up implementation. * gnu/packages/xorg.scm (%app-defaults-dir): Make public. * gnu/packages/xfig.scm (xfig)[attributes]: Remove wrapper and set the XAPPLOADDIR in the Imakefile instead. --- gnu/packages/xfig.scm | 14 +++++--------- gnu/packages/xorg.scm | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 27d9cf9ab3..ad1b432abd 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -65,6 +65,8 @@ (let ((imake (assoc-ref inputs "imake")) (out (assoc-ref outputs "out"))) (substitute* "Imakefile" + (("XCOMM XAPPLOADDIR = /home/user/xfig *") + (string-append "XAPPLOADDIR = " out %app-defaults-dir)) (("XCOMM (BINDIR = )[[:graph:]]*" _ front) (string-append front out "/bin")) (("(PNGLIBDIR = )[[:graph:]]*" _ front) @@ -98,7 +100,8 @@ (("(MANPATH = )[[:graph:]]*" _ front) (string-append front out "/share/man")) (("(CONFDIR = )([[:graph:]]*)" _ front default) - (string-append front out default)))))) + (string-append front out default)))) + #t)) (add-after 'install 'install/libs (lambda _ @@ -118,14 +121,7 @@ (dump-port in out) (close-pipe in) (close-port out))) - (zero? (system* "make" "install.doc"))))) - (add-after - 'install 'wrap-xfig - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/xfig") - `("XAPPLRESDIR" suffix - (,(string-append out "/etc/X11/app-defaults")))))))))) + (zero? (system* "make" "install.doc")))))))) (home-page "http://xfig.org/") (synopsis "Interactive drawing tool") (description diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 45ff4c97ea..fe607e2632 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -335,7 +335,7 @@ provided.") (license (license:x11-style "file://dri3proto.h" "See 'dri3proto.h' in the distribution.")))) -(define %app-defaults-dir "/lib/X11/app-defaults") +(define-public %app-defaults-dir "/lib/X11/app-defaults") (define-public editres (package -- cgit v1.2.3 From f50fff693bdfbb71fea7ac9ee7dcef0eb9fb77bc Mon Sep 17 00:00:00 2001 From: John Darrington Date: Thu, 12 Jan 2017 20:21:37 +0100 Subject: gnu: Add xmessage. * gnu/packages/xorg.scm (xmessage): New variable. --- gnu/packages/xorg.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index fe607e2632..ac35a8c179 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5594,6 +5594,37 @@ user-friendly mechanism to start the X server.") Intrinsics (Xt) Library.") (license license:x11))) +(define-public xmessage + (package + (name "xmessage") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/" name "-" + version + ".tar.gz")) + (sha256 + (base32 + "1jmcac1xbwplbxfl75sr6w3zqhx1khpdzlqippjsr31cjp1rjc48")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "--with-appdefaultdir=" + %output ,%app-defaults-dir)))) + (inputs + `(("libxaw" ,libxaw))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://www.x.org/wiki/") + (synopsis "Displays a message or query in a window") + (description + "Xmessage displays a message or query in a window. The user can click +on a button to dismiss it or can select one of several buttons +to answer a question. Xmessage can also exit after a specified time.") + (license license:x11))) + (define-public xterm (package (name "xterm") -- cgit v1.2.3 From 6ea1523ac8033c7eb353c51bef654e6934a115ec Mon Sep 17 00:00:00 2001 From: John Darrington Date: Thu, 12 Jan 2017 20:33:46 +0100 Subject: gnu: Add xmag. * gnu/packages/xorg.scm (xmag): New variable. --- gnu/packages/xorg.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ac35a8c179..fbea7072b3 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5594,6 +5594,35 @@ user-friendly mechanism to start the X server.") Intrinsics (Xt) Library.") (license license:x11))) +(define-public xmag + (package + (name "xmag") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/" name "-" + version + ".tar.gz")) + (sha256 + (base32 + "19bsg5ykal458d52v0rvdx49v54vwxwqg8q36fdcsv9p2j8yri87")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "--with-appdefaultdir=" + %output ,%app-defaults-dir)))) + (inputs + `(("libxaw" ,libxaw))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://www.x.org/wiki/") + (synopsis "Display or capture a magnified part of a X11 screen") + (description "Xmag displays and captures a magnified snapshot of a portion +of an X11 screen.") + (license license:x11))) + (define-public xmessage (package (name "xmessage") -- cgit v1.2.3 From 60bc300680e1ed9bf7e4e8d35d0557ec4e6a3253 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Thu, 12 Jan 2017 21:01:03 +0100 Subject: gnu: Add twm. * gnu/packages/xorg.scm (twm): New variable. --- gnu/packages/xorg.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index fbea7072b3..a27c431ddf 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5335,6 +5335,36 @@ draggable titlebars and borders.") Intrinsics (Xt) Library.") (license license:x11))) +(define-public twm + (package + (name "twm") + (version "1.0.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/" name "-" + version + ".tar.gz")) + (sha256 + (base32 + "1s1r00x8add3f27xjqxg6q7mwplwrb72gakbh4y6j052as25wchw")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("libxmu" ,libxmu) + ("libxext" ,libxext) + ("xproto" ,xproto))) + (native-inputs + `(("bison" ,bison) + ("pkg-config" ,pkg-config))) + (home-page "https://www.x.org/wiki/") + (synopsis "Tab Window Manager for the X Window System") + (description "Twm is a window manager for the X Window System. +It provides titlebars, shaped windows, several forms of icon management, +user-defined macro functions, click-to-type and pointer-driven +keyboard focus, and user-specified key and pointer button bindings.") + (license license:x11))) (define-public xcb-util (package -- cgit v1.2.3 From 58d222ed0b1f905aca2212a3ca892aa7ae2a78e6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 14 Jan 2017 19:31:09 +0100 Subject: gnu: xorg: Factorize Xorg font origins. * gnu/packages/xorg.scm (%xorg-font-origin): New procedure. (xorg-font-origin): New macro. (font-adobe100dpi, font-adobe75dpi, font-alias) (font-arabic-misc, font-cronyx-cyrillic, font-dec-misc) (font-isas-misc, font-micro-misc, font-misc-cyrillic) (font-misc-ethiopic, font-misc-misc, font-mutt-misc) (font-schumacher-misc, font-screen-cyrillic, font-sony-misc) (font-sun-misc, font-winitzki-cyrillic, font-xfree86-type1): Use it. --- gnu/packages/xorg.scm | 246 +++++++++++++------------------------------------- 1 file changed, 65 insertions(+), 181 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a27c431ddf..bbd02030ad 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014, 2015 Eric Bavier -;;; Copyright © 2015, 2016 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2015 Cyrill Schenkel @@ -399,21 +399,24 @@ Resources file.") (description "Xorg font encoding files.") (license license:public-domain))) +(define (%xorg-font-origin font version hash) + (origin + (method url-fetch) + (uri (string-append "mirror://xorg/individual/font/" font "-" + version ".tar.bz2")) + (sha256 hash))) + +(define-syntax-rule (xorg-font-origin font version hash) + "Expand to the 'origin' form for the given Xorg font package." + (%xorg-font-origin font version (base32 hash))) (define-public font-adobe100dpi (package (name "font-adobe100dpi") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-adobe-100dpi-" - version - ".tar.bz2")) - (sha256 - (base32 - "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j")))) + (source (xorg-font-origin + "font-adobe-100dpi" version + "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j")) (build-system gnu-build-system) (inputs `(("bdftopcf" ,bdftopcf) @@ -436,16 +439,9 @@ Resources file.") (package (name "font-adobe75dpi") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-adobe-75dpi-" - version - ".tar.bz2")) - (sha256 - (base32 - "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6")))) + (source (xorg-font-origin + "font-adobe-75dpi" version + "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6")) (build-system gnu-build-system) (inputs `(("bdftopcf" ,bdftopcf) @@ -472,16 +468,9 @@ Resources file.") (package (name "font-alias") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-alias-" - version - ".tar.bz2")) - (sha256 - (base32 - "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb")))) + (source (xorg-font-origin + name version + "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb")) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (arguments @@ -513,16 +502,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-arabic-misc") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-arabic-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah")))) + (source (xorg-font-origin + name version + "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -550,16 +532,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-cronyx-cyrillic") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-cronyx-cyrillic-" - version - ".tar.bz2")) - (sha256 - (base32 - "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf")))) + (source (xorg-font-origin + name version + "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -583,16 +558,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-dec-misc") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-dec-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1")))) + (source (xorg-font-origin + name version + "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -612,16 +580,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-isas-misc") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-isas-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q")))) + (source (xorg-font-origin + name version + "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -642,16 +603,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-micro-misc") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-micro-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws")))) + (source (xorg-font-origin + name version + "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -668,16 +622,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-misc-cyrillic") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-misc-cyrillic-" - version - ".tar.bz2")) - (sha256 - (base32 - "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4")))) + (source (xorg-font-origin + name version + "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -694,16 +641,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-misc-ethiopic") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-misc-ethiopic-" - version - ".tar.bz2")) - (sha256 - (base32 - "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk")))) + (source (xorg-font-origin + name version + "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -724,16 +664,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-misc-misc") (version "1.1.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-misc-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq")))) + (source (xorg-font-origin + name version + "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -754,16 +687,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-mutt-misc") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-mutt-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx")))) + (source (xorg-font-origin + name version + "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -780,16 +706,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-schumacher-misc") (version "1.1.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-schumacher-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74")))) + (source (xorg-font-origin + name version + "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -810,16 +729,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-screen-cyrillic") (version "1.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-screen-cyrillic-" - version - ".tar.bz2")) - (sha256 - (base32 - "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2")))) + (source (xorg-font-origin + name version + "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -836,16 +748,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-sony-misc") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-sony-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0")))) + (source (xorg-font-origin + name version + "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -862,16 +767,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-sun-misc") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-sun-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8")))) + (source (xorg-font-origin + name version + "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -911,16 +809,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-winitzki-cyrillic") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-winitzki-cyrillic-" - version - ".tar.bz2")) - (sha256 - (base32 - "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb")))) + (source (xorg-font-origin + name version + "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -937,16 +828,9 @@ For example: '6x10', '9x15bold', etc.") (package (name "font-xfree86-type1") (version "1.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/font/font-xfree86-type1-" - version - ".tar.bz2")) - (sha256 - (base32 - "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya")))) + (source (xorg-font-origin + name version + "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya")) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) -- cgit v1.2.3 From ed824a36c453c31118bb54e4d4349e5dc6907b83 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 14 Jan 2017 19:37:52 +0100 Subject: gnu: xorg: Make font packages bit-reproducible. * gnu/packages/xorg.scm (%xorg-font-origin): Add 'snippet' and 'modules' fields. --- gnu/packages/xorg.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bbd02030ad..b780d47c32 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -404,7 +404,14 @@ Resources file.") (method url-fetch) (uri (string-append "mirror://xorg/individual/font/" font "-" version ".tar.bz2")) - (sha256 hash))) + (sha256 hash) + (modules '((guix build utils))) + (snippet + ;; Do not include timestamps in '.pcf.gz' files. + '(substitute* "Makefile.in" + (("^COMPRESS = (.*)$" _ rest) + (string-append "COMPRESS = " (string-trim-right rest) + " --no-name\n")))))) (define-syntax-rule (xorg-font-origin font version hash) "Expand to the 'origin' form for the given Xorg font package." -- cgit v1.2.3 From 76400ca5943813b255cff2b36b4dee43c0491e3f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jan 2017 18:05:40 +0100 Subject: gnu: xf86-video-tdfx: Update to 1.4.7. * gnu/packages/xorg.scm (xf86-video-tdfx): Update to 1.4.7. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b780d47c32..39c3e783a0 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3221,7 +3221,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.") (define-public xf86-video-tdfx (package (name "xf86-video-tdfx") - (version "1.4.6") + (version "1.4.7") (source (origin (method url-fetch) @@ -3231,7 +3231,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.") ".tar.bz2")) (sha256 (base32 - "0dvdrhyn1iv6rr85v1c52s1gl0j1qrxgv7x0r7qn3ba0gj38i2is")))) + "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xf86driproto" ,xf86driproto) -- cgit v1.2.3 From 798dd616e3ea784ba986e30bbcbababa660239cb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jan 2017 18:08:35 +0100 Subject: gnu: xf86-video-sis: Update to 0.10.9. * gnu/packages/xorg.scm (xf86-video-sis): Update to 0.10.9. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 39c3e783a0..3945030951 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3144,7 +3144,7 @@ Xorg X server.") (define-public xf86-video-sis (package (name "xf86-video-sis") - (version "0.10.8") + (version "0.10.9") (source (origin (method url-fetch) @@ -3154,7 +3154,7 @@ Xorg X server.") ".tar.bz2")) (sha256 (base32 - "1znkqwdyd6am23xbsfjzamq125j5rrylg5mzqky4scv9gxbz5wy8")))) + "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xf86dgaproto" ,xf86dgaproto) -- cgit v1.2.3 From c2a970582efe69f9dc0e5057321c01ff736941bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jan 2017 18:10:04 +0100 Subject: gnu: xf86-video-mga: Update to 1.6.5. * gnu/packages/xorg.scm (xf86-video-mga): Update to 1.6.5. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3945030951..bc857635df 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2850,7 +2850,7 @@ the same level of support for generic VGA or 8514/A adapters.") (define-public xf86-video-mga (package (name "xf86-video-mga") - (version "1.6.4") + (version "1.6.5") (source (origin (method url-fetch) @@ -2860,7 +2860,7 @@ the same level of support for generic VGA or 8514/A adapters.") ".tar.bz2")) (sha256 (base32 - "0kyl8w99arviv27pc349zsy2vinnm7mdpy34vr9nzisicw5nkij8")))) + "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xf86driproto" ,xf86driproto) -- cgit v1.2.3 From 3a50b71298c52047941e7d5092b09206995b0438 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jan 2017 18:11:42 +0100 Subject: gnu: xf86-video-siliconmotion: Update to 1.7.9. * gnu/packages/xorg.scm (xf86-video-siliconmotion): Update to 1.7.9. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bc857635df..87bf91409c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3119,7 +3119,7 @@ This driver is intended for ATI Rage 128 based cards.") (define-public xf86-video-siliconmotion (package (name "xf86-video-siliconmotion") - (version "1.7.8") + (version "1.7.9") (source (origin (method url-fetch) @@ -3129,7 +3129,7 @@ This driver is intended for ATI Rage 128 based cards.") ".tar.bz2")) (sha256 (base32 - "1sqv0y31mi4zmh9yaxqpzg7p8y2z01j6qys433hb8n4yznllkm79")))) + "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From f733e603452c46640e57b1a0de34ecef324e5711 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jan 2017 18:13:21 +0100 Subject: gnu: xf86-video-nv: Update to 2.1.21. * gnu/packages/xorg.scm (xf86-video-nv): Update to 2.1.21. [source]: Remove upstreamed patch. * gnu/packages/patches/xf86-video-nv-remove-mibstore.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/xf86-video-nv-remove-mibstore.patch | 72 ---------------------- gnu/packages/xorg.scm | 5 +- 3 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-nv-remove-mibstore.patch (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 7e816f79af..acaf3936ab 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -948,7 +948,6 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-intel-compat-api.patch \ %D%/packages/patches/xf86-video-intel-glibc-2.20.patch \ %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \ - %D%/packages/patches/xf86-video-nv-remove-mibstore.patch \ %D%/packages/patches/xf86-video-tga-remove-mibstore.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-session-fix-xflock4.patch \ diff --git a/gnu/packages/patches/xf86-video-nv-remove-mibstore.patch b/gnu/packages/patches/xf86-video-nv-remove-mibstore.patch deleted file mode 100644 index 48588ed0e4..0000000000 --- a/gnu/packages/patches/xf86-video-nv-remove-mibstore.patch +++ /dev/null @@ -1,72 +0,0 @@ -Removes references to mibstore.h and miInitializeBackingStore, which -have been removed from xorg-server. Zack Rusin -wrote: "It was a noop for at least 5 years and it has been removed." -See: http://patches.openembedded.org/patch/46133/ - -diff -ru xf86-video-nv-2.1.20.orig/src/g80_driver.c xf86-video-nv-2.1.20/src/g80_driver.c ---- xf86-video-nv-2.1.20.orig/src/g80_driver.c 2012-07-17 02:47:02.000000000 -0400 -+++ xf86-video-nv-2.1.20/src/g80_driver.c 2014-12-17 10:11:42.197579082 -0500 -@@ -34,7 +34,6 @@ - #include - #endif - #include --#include - #include - #include - #include -@@ -833,7 +832,6 @@ - } - } - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - -diff -ru xf86-video-nv-2.1.20.orig/src/nv_driver.c xf86-video-nv-2.1.20/src/nv_driver.c ---- xf86-video-nv-2.1.20.orig/src/nv_driver.c 2012-07-17 02:47:02.000000000 -0400 -+++ xf86-video-nv-2.1.20/src/nv_driver.c 2014-12-17 10:11:39.037563413 -0500 -@@ -2550,7 +2550,6 @@ - if (!pNv->NoAccel) - NVAccelInit(pScreen); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - -diff -ru xf86-video-nv-2.1.20.orig/src/nv_include.h xf86-video-nv-2.1.20/src/nv_include.h ---- xf86-video-nv-2.1.20.orig/src/nv_include.h 2012-07-17 02:48:19.000000000 -0400 -+++ xf86-video-nv-2.1.20/src/nv_include.h 2014-12-17 10:11:22.089479372 -0500 -@@ -24,9 +24,6 @@ - /* All drivers initialising the SW cursor need this */ - #include "mipointer.h" - --/* All drivers implementing backing store need this */ --#include "mibstore.h" -- - #include "micmap.h" - - #include "xf86DDC.h" -diff -ru xf86-video-nv-2.1.20.orig/src/riva_driver.c xf86-video-nv-2.1.20/src/riva_driver.c ---- xf86-video-nv-2.1.20.orig/src/riva_driver.c 2012-07-17 02:47:02.000000000 -0400 -+++ xf86-video-nv-2.1.20/src/riva_driver.c 2014-12-17 10:11:31.101524060 -0500 -@@ -1168,7 +1168,6 @@ - if (!pRiva->NoAccel) - RivaAccelInit(pScreen); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - -diff -ru xf86-video-nv-2.1.20.orig/src/riva_include.h xf86-video-nv-2.1.20/src/riva_include.h ---- xf86-video-nv-2.1.20.orig/src/riva_include.h 2012-07-17 02:48:45.000000000 -0400 -+++ xf86-video-nv-2.1.20/src/riva_include.h 2014-12-17 10:11:12.229430478 -0500 -@@ -22,9 +22,6 @@ - /* All drivers initialising the SW cursor need this */ - #include "mipointer.h" - --/* All drivers implementing backing store need this */ --#include "mibstore.h" -- - #include "micmap.h" - - #include "xf86DDC.h" diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 87bf91409c..3c8adc9e37 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2953,7 +2953,7 @@ kernel mode setting (KMS).") (define-public xf86-video-nv (package (name "xf86-video-nv") - (version "2.1.20") + (version "2.1.21") (source (origin (method url-fetch) @@ -2963,8 +2963,7 @@ kernel mode setting (KMS).") ".tar.bz2")) (sha256 (base32 - "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3")) - (patches (search-patches "xf86-video-nv-remove-mibstore.patch")))) + "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From a0029fda3bd6f8e5cd3b66aba583e4d863f1cac1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jan 2017 18:19:49 +0100 Subject: gnu: xf86-video-glint: Update to 1.2.9. * gnu/packages/xorg.scm (xf86-video-glint): Update to 1.2.9. [source]: Remove upstreamed patch. * gnu/packages/patches/xf86-video-glint-remove-mibstore.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/xf86-video-glint-remove-mibstore.patch | 24 ---------------------- gnu/packages/xorg.scm | 5 ++--- 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-glint-remove-mibstore.patch (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/local.mk b/gnu/local.mk index acaf3936ab..24dcd03fd4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -943,7 +943,6 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ %D%/packages/patches/xf86-video-ast-remove-mibstore.patch \ %D%/packages/patches/xf86-video-geode-glibc-2.20.patch \ - %D%/packages/patches/xf86-video-glint-remove-mibstore.patch \ %D%/packages/patches/xf86-video-i128-remove-mibstore.patch \ %D%/packages/patches/xf86-video-intel-compat-api.patch \ %D%/packages/patches/xf86-video-intel-glibc-2.20.patch \ diff --git a/gnu/packages/patches/xf86-video-glint-remove-mibstore.patch b/gnu/packages/patches/xf86-video-glint-remove-mibstore.patch deleted file mode 100644 index 969ed7e41e..0000000000 --- a/gnu/packages/patches/xf86-video-glint-remove-mibstore.patch +++ /dev/null @@ -1,24 +0,0 @@ -Removes references to mibstore.h and miInitializeBackingStore, which -have been removed from xorg-server. Zack Rusin -wrote: "It was a noop for at least 5 years and it has been removed." -See: http://patches.openembedded.org/patch/46133/ - ---- xf86-video-glint-1.2.8/src/glint_driver.c.~1~ 2012-07-15 22:50:47.000000000 -0400 -+++ xf86-video-glint-1.2.8/src/glint_driver.c 2014-12-19 00:42:39.162714279 -0500 -@@ -52,8 +52,6 @@ - #include "compiler.h" - #include "mipointer.h" - --#include "mibstore.h" -- - #include "pm3_regs.h" - #include "glint_regs.h" - #include "IBM.h" -@@ -2904,7 +2902,6 @@ - } - } - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3c8adc9e37..1a551084bd 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2720,7 +2720,7 @@ compositing. Both support Xv overlay and dynamic rotation with XRandR.") (define-public xf86-video-glint (package (name "xf86-video-glint") - (version "1.2.8") + (version "1.2.9") (source (origin (method url-fetch) @@ -2730,8 +2730,7 @@ compositing. Both support Xv overlay and dynamic rotation with XRandR.") ".tar.bz2")) (sha256 (base32 - "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5")) - (patches (search-patches "xf86-video-glint-remove-mibstore.patch")))) + "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45")))) (build-system gnu-build-system) (inputs `(("xf86dgaproto" ,xf86dgaproto) ("xorg-server" ,xorg-server))) -- cgit v1.2.3 From 619ff9329d223e6d6576e2103ae2056a7dcd8f2b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jan 2017 18:22:12 +0100 Subject: gnu: xf86-video-trident: Update to 1.3.8. * gnu/packages/xorg.scm (xf86-video-trident): Update to 1.3.8. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 1a551084bd..15d14c5706 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3272,7 +3272,7 @@ X server.") (define-public xf86-video-trident (package (name "xf86-video-trident") - (version "1.3.7") + (version "1.3.8") (source (origin (method url-fetch) @@ -3282,7 +3282,7 @@ X server.") ".tar.bz2")) (sha256 (base32 - "1bhkwic2acq9za4yz4bwj338cwv5mdrgr2qmgkhlj3bscbg1imgc")))) + "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy")))) (build-system gnu-build-system) (inputs `(("xf86dgaproto" ,xf86dgaproto) ("xorg-server" ,xorg-server))) -- cgit v1.2.3 From a354c7d8b4a176548a30dd2332364cc3037bd7f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jan 2017 18:23:53 +0100 Subject: gnu: xf86-video-savage: Update to 2.3.9. * gnu/packages/xorg.scm (xf86-video-savage): Update to 2.3.9. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 15d14c5706..02328b6d27 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3091,7 +3091,7 @@ This driver is intended for ATI Rage 128 based cards.") (define-public xf86-video-savage (package (name "xf86-video-savage") - (version "2.3.8") + (version "2.3.9") (source (origin (method url-fetch) @@ -3101,7 +3101,7 @@ This driver is intended for ATI Rage 128 based cards.") ".tar.bz2")) (sha256 (base32 - "0qzshncynjdmyhavhqw4x5ha3gwbygi0zbsy158fpg1jcnla9kpx")))) + "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xf86driproto" ,xf86driproto) -- cgit v1.2.3 From e19b0bd1573f83e36cee0a1d05d3617de9a0e00b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jan 2017 18:25:55 +0100 Subject: gnu: xf86-video-r128: Update to 6.10.2. * gnu/packages/xorg.scm (xf86-video-r128): Update to 6.10.2. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 02328b6d27..022d92b57b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3064,7 +3064,7 @@ This driver is intended for the spice qxl virtio device.") (define-public xf86-video-r128 (package (name "xf86-video-r128") - (version "6.10.1") + (version "6.10.2") (source (origin (method url-fetch) @@ -3074,7 +3074,7 @@ This driver is intended for the spice qxl virtio device.") ".tar.bz2")) (sha256 (base32 - "1sp4glyyj23rs77vgffmn0mar5h504a86701nzvi56qwhd4yzgsy")))) + "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xf86driproto" ,xf86driproto) -- cgit v1.2.3 From 0d53d55ccad50e335e3d3255a5540adc726afd6e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jan 2017 18:28:35 +0100 Subject: gnu: xf86-input-evdev: Update to 2.10.5. * gnu/packages/xorg.scm (xf86-input-evdev): Update to 2.10.5. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 022d92b57b..b67634731b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2317,7 +2317,7 @@ devices, thus making direct access unnecessary.") (define-public xf86-input-evdev (package (name "xf86-input-evdev") - (version "2.10.4") + (version "2.10.5") (source (origin (method url-fetch) @@ -2327,7 +2327,7 @@ devices, thus making direct access unnecessary.") ".tar.bz2")) (sha256 (base32 - "1hhc97k1qmgs85fp8p2i3gq4p18azlczbvklv33w19p1phzs1xmv")))) + "03dphgwjaxxyys8axc1kyysp6xvy9bjxicsdrhi2jvdgbchadnly")))) (build-system gnu-build-system) (inputs `(("udev" ,eudev) -- cgit v1.2.3