From 9aea24b608659bfe6d6a72afff31edecd8e717c6 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 23 Feb 2013 19:09:26 +0100 Subject: [PATCH 01/44] gnu: xorg: Initial import from nix. * gnu/packages/xorg.scm: New module. * Makefile.am: Add it. --- Makefile.am | 1 + gnu/packages/xorg.scm | 3658 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 3659 insertions(+) create mode 100644 gnu/packages/xorg.scm diff --git a/Makefile.am b/Makefile.am index c9dcc4a356..70387ef565 100644 --- a/Makefile.am +++ b/Makefile.am @@ -166,6 +166,7 @@ MODULES = \ gnu/packages/wget.scm \ gnu/packages/which.scm \ gnu/packages/xml.scm \ + gnu/packages/xorg.scm \ gnu/packages/zile.scm \ gnu/packages/zip.scm \ gnu/system/vm.scm diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm new file mode 100644 index 0000000000..bbbd7a943a --- /dev/null +++ b/gnu/packages/xorg.scm @@ -0,0 +1,3658 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Andreas Enge +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages xorg) + #:use-module ((guix licenses) + #:renamer (symbol-prefix-proc 'license:)) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages bison) + #:use-module (gnu packages compression) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages glib) + #:use-module (gnu packages gperf) + #:use-module (gnu packages libpng) + #:use-module (gnu packages linux) + #:use-module (gnu packages m4) + #:use-module (gnu packages openssl) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python)) + +(define-public applewmproto + (package + (name "applewmproto") + (version "1.4.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/applewmproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public bdftopcf + (package + (name "bdftopcf") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/bdftopcf-" + version + ".tar.bz2")) + (sha256 + (base32 + "02hx981f7jfwylxj21s91yvv4h597nqqzz3vd6ar81zyn84b944w")))) + (build-system gnu-build-system) + (inputs + `(("libxfont" ,libxfont) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public bigreqsproto + (package + (name "bigreqsproto") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/bigreqsproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public compositeproto + (package + (name "compositeproto") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/compositeproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("fixesproto" ,fixesproto))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public damageproto + (package + (name "damageproto") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/damageproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public dmxproto + (package + (name "dmxproto") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/dmxproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public encodings + (package + (name "encodings") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/encodings-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public fixesproto + (package + (name "fixesproto") + (version "5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/fixesproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-alias + (package + (name "font-alias") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-alias-" + version + ".tar.bz2")) + (sha256 + (base32 + "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-arabic-misc + (package + (name "font-arabic-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-arabic-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-bh-ttf + (package + (name "font-bh-ttf") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" + version + ".tar.bz2")) + (sha256 + (base32 + "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-cronyx-cyrillic + (package + (name "font-cronyx-cyrillic") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-cursor-misc + (package + (name "font-cursor-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-cursor-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-daewoo-misc + (package + (name "font-daewoo-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-dec-misc + (package + (name "font-dec-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-dec-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-isas-misc + (package + (name "font-isas-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-isas-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-jis-misc + (package + (name "font-jis-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-jis-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-micro-misc + (package + (name "font-micro-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-micro-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-misc-cyrillic + (package + (name "font-misc-cyrillic") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-" + version + ".tar.bz2")) + (sha256 + (base32 + "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-misc-ethiopic + (package + (name "font-misc-ethiopic") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-" + version + ".tar.bz2")) + (sha256 + (base32 + "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-misc-meltho + (package + (name "font-misc-meltho") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-misc-meltho-" + version + ".tar.bz2")) + (sha256 + (base32 + "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-misc-misc + (package + (name "font-misc-misc") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-misc-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("font-util" ,font-util) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-mutt-misc + (package + (name "font-mutt-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-mutt-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-schumacher-misc + (package + (name "font-schumacher-misc") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("font-util" ,font-util) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-screen-cyrillic + (package + (name "font-screen-cyrillic") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-" + version + ".tar.bz2")) + (sha256 + (base32 + "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-sony-misc + (package + (name "font-sony-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-sony-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public fontsproto + (package + (name "fontsproto") + (version "2.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/fontsproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-sun-misc + (package + (name "font-sun-misc") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-sun-misc-" + version + ".tar.bz2")) + (sha256 + (base32 + "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-util + (package + (name "font-util") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-util-" + version + ".tar.bz2")) + (sha256 + (base32 + "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-winitzki-cyrillic + (package + (name "font-winitzki-cyrillic") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-" + version + ".tar.bz2")) + (sha256 + (base32 + "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public gccmakedep + (package + (name "gccmakedep") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/util/gccmakedep-" + version + ".tar.bz2")) + (sha256 + (base32 + "04dfamx3fvkvqfgs6xy2a6yqbxjrj4777ylxp38g60hhbdl4jg86")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public glproto + (package + (name "glproto") + (version "1.4.16") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/proto/glproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "13arnb4bz5pn89bxbh3shr8gihkhyznpjnq3zzr05msygwx6dpal")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public iceauth + (package + (name "iceauth") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/iceauth-" + version + ".tar.bz2")) + (sha256 + (base32 + "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libICE" ,libICE) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public imake + (package + (name "imake") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/util/imake-" + version + ".tar.bz2")) + (sha256 + (base32 + "1h8ww97aymm10l9qn21n1b9x5ypjrqr10qpf48jjcbc9fg77gklr")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public inputproto + (package + (name "inputproto") + (version "2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/inputproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public kbproto + (package + (name "kbproto") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/kbproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libAppleWM + (package + (name "libAppleWM") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libAppleWM-" + version + ".tar.bz2")) + (sha256 + (base32 + "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("applewmproto" ,applewmproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libFS + (package + (name "libFS") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libFS-" + version + ".tar.bz2")) + (sha256 + (base32 + "05c3bqgn5m7j4kx8wvy0p36faq6f9jv5yq12m6033m4lflg7cwvh")))) + (build-system gnu-build-system) + (inputs + `(("xtrans" ,xtrans) + ("xproto" ,xproto) + ("fontsproto" ,fontsproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libICE + (package + (name "libICE") + (version "1.0.8") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libICE-" + version + ".tar.bz2")) + (sha256 + (base32 + "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94")))) + (build-system gnu-build-system) + (inputs + `(("xtrans" ,xtrans) + ("xproto" ,xproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libSM + (package + (name "libSM") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libSM-" + version + ".tar.bz2")) + (sha256 + (base32 + "07bzi6xwlhq36f60qfspjbz0qjj7zcgayi1vp4ihgx34kib1vhck")))) + (build-system gnu-build-system) + (inputs + `(("xtrans" ,xtrans) + ("xproto" ,xproto) + ("util-linux" ,util-linux) + ("libICE" ,libICE) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("libICE" ,libICE))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libWindowsWM + (package + (name "libWindowsWM") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libWindowsWM-" + version + ".tar.bz2")) + (sha256 + (base32 + "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("windowswmproto" ,windowswmproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxScrnSaver + (package + (name "libxScrnSaver") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxScrnSaver-" + version + ".tar.bz2")) + (sha256 + (base32 + "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("scrnsaverproto" ,scrnsaverproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxau + (package + (name "libxau") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxau-" + version + ".tar.bz2")) + (sha256 + (base32 + "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxaw + (package + (name "libxaw") + (version "1.0.11") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxaw-" + version + ".tar.bz2")) + (sha256 + (base32 + "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("libxpm" ,libxpm) + ("libxmu" ,libxmu) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("libxmu" ,libxmu))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxcomposite + (package + (name "libxcomposite") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxcomposite-" + version + ".tar.bz2")) + (sha256 + (base32 + "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxfixes" ,libxfixes) + ("libx11" ,libx11) + ("compositeproto" ,compositeproto) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("libxfixes" ,libxfixes))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxcursor + (package + (name "libxcursor") + (version "1.1.13") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxcursor-" + version + ".tar.bz2")) + (sha256 + (base32 + "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p")))) + (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) + ("xproto" ,xproto) + ("libxfixes" ,libxfixes) + ("libx11" ,libx11) + ("fixesproto" ,fixesproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxdamage + (package + (name "libxdamage") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxdamage-" + version + ".tar.bz2")) + (sha256 + (base32 + "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxfixes" ,libxfixes) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("fixesproto" ,fixesproto) + ("damageproto" ,damageproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxdmcp + (package + (name "libxdmcp") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxdmcp-" + version + ".tar.bz2")) + (sha256 + (base32 + "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxext + (package + (name "libxext") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxext-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn")))) + (build-system gnu-build-system) + (inputs + `(("libxau" ,libxau) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("xproto" ,xproto))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxfixes + (package + (name "libxfixes") + (version "5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxfixes-" + version + ".tar.bz2")) + (sha256 + (base32 + "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("fixesproto" ,fixesproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxfont + (package + (name "libxfont") + (version "1.4.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxfont-" + version + ".tar.bz2")) + (sha256 + (base32 + "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("xtrans" ,xtrans) + ("xproto" ,xproto) + ("freetype" ,freetype) + ("fontsproto" ,fontsproto) + ("libfontenc" ,libfontenc) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxft + (package + (name "libxft") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxft-" + version + ".tar.bz2")) + (sha256 + (base32 + "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz")))) + (build-system gnu-build-system) + (inputs + `(("renderproto" ,renderproto) + ("libx11" ,libx11) + ("xproto" ,xproto) + ("libxrender" ,libxrender) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("freetype" ,freetype) + ("fontconfig" ,fontconfig) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("libxrender" ,libxrender))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxi + (package + (name "libxi") + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxi-" + version + ".tar.bz2")) + (sha256 + (base32 + "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("inputproto" ,inputproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxinerama + (package + (name "libxinerama") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxinerama-" + version + ".tar.bz2")) + (sha256 + (base32 + "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4")))) + (build-system gnu-build-system) + (inputs + `(("xineramaproto" ,xineramaproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxmu + (package + (name "libxmu") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxmu-" + version + ".tar.bz2")) + (sha256 + (base32 + "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxp + (package + (name "libxp") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/lib/libxp-" + version + ".tar.bz2")) + (sha256 + (base32 + "1lj3cjg9ygbmclxvayy5v88kkndpy9jq6y68p13dc5jn01hg5lbi")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libxau" ,libxau) + ("libx11" ,libx11) + ("printproto" ,printproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxpm + (package + (name "libxpm") + (version "3.5.10") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxpm-" + version + ".tar.bz2")) + (sha256 + (base32 + "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxrandr + (package + (name "libxrandr") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/lib/libxrandr-" + version + ".tar.bz2")) + (sha256 + (base32 + "1hzm2ndra4nf8xxzm4lzd225zj05hzbzcq464q2znah15ynd0fh3")))) + (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("renderproto" ,renderproto) + ("randrproto" ,randrproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxrender + (package + (name "libxrender") + (version "0.9.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxrender-" + version + ".tar.bz2")) + (sha256 + (base32 + "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("renderproto" ,renderproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxres + (package + (name "libxres") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxres-" + version + ".tar.bz2")) + (sha256 + (base32 + "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("resourceproto" ,resourceproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxt + (package + (name "libxt") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxt-" + version + ".tar.bz2")) + (sha256 + (base32 + "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("libSM" ,libSM) + ("kbproto" ,kbproto) + ("libICE" ,libICE) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("libSM" ,libSM))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxtst + (package + (name "libxtst") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxtst-" + version + ".tar.bz2")) + (sha256 + (base32 + "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky")))) + (build-system gnu-build-system) + (inputs + `(("libxi" ,libxi) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("recordproto" ,recordproto) + ("inputproto" ,inputproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxv + (package + (name "libxv") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxv-" + version + ".tar.bz2")) + (sha256 + (base32 + "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("videoproto" ,videoproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxvMC + (package + (name "libxvMC") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxvMC-" + version + ".tar.bz2")) + (sha256 + (base32 + "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18")))) + (build-system gnu-build-system) + (inputs + `(("libxv" ,libxv) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("videoproto" ,videoproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libdmx + (package + (name "libdmx") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libdmx-" + version + ".tar.bz2")) + (sha256 + (base32 + "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("dmxproto" ,dmxproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libfontenc + (package + (name "libfontenc") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libfontenc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("xproto" ,xproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libpciaccess + (package + (name "libpciaccess") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libpciaccess-" + version + ".tar.bz2")) + (sha256 + (base32 + "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libpthread-stubs + (package + (name "libpthread-stubs") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-" + version + ".tar.bz2")) + (sha256 + (base32 + "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxcb + (package + (name "libxcb") + (version "1.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xcb/libxcb-" + version + ".tar.bz2")) + (sha256 + (base32 + "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxdmcp" ,libxdmcp) + ("xcb-proto" ,xcb-proto) + ("libxau" ,libxau) + ("libpthread-stubs" ,libpthread-stubs) + ("libxslt" ,libxslt) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxkbfile + (package + (name "libxkbfile") + (version "1.0.8") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxkbfile-" + version + ".tar.bz2")) + (sha256 + (base32 + "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("kbproto" ,kbproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public lndir + (package + (name "lndir") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/util/lndir-" + version + ".tar.bz2")) + (sha256 + (base32 + "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public luit + (package + (name "luit") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/luit-" + version + ".tar.bz2")) + (sha256 + (base32 + "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h")))) + (build-system gnu-build-system) + (inputs + `(("libfontenc" ,libfontenc) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public makedepend + (package + (name "makedepend") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/makedepend-" + version + ".tar.bz2")) + (sha256 + (base32 + "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public mkfontdir + (package + (name "mkfontdir") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/mkfontdir-" + version + ".tar.bz2")) + (sha256 + (base32 + "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public mkfontscale + (package + (name "mkfontscale") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/mkfontscale-" + version + ".tar.bz2")) + (sha256 + (base32 + "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("xproto" ,xproto) + ("freetype" ,freetype) + ("libfontenc" ,libfontenc) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public pixman + (package + (name "pixman") + (version "0.26.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/lib/pixman-" + version + ".tar.bz2")) + (sha256 + (base32 + "0z34jb75wpbyj3gxn34icd8j81fk5d6s6qnwp2ncz7m8icf6afqr")))) + (build-system gnu-build-system) + (inputs + `(("pkg-config" ,pkg-config) ("perl" ,perl))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public printproto + (package + (name "printproto") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/proto/printproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j")))) + (build-system gnu-build-system) + (inputs + `(("libxau" ,libxau) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public randrproto + (package + (name "randrproto") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/proto/randrproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public recordproto + (package + (name "recordproto") + (version "1.14.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/recordproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public renderproto + (package + (name "renderproto") + (version "0.11.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/renderproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public resourceproto + (package + (name "resourceproto") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/resourceproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public scrnsaverproto + (package + (name "scrnsaverproto") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/scrnsaverproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public sessreg + (package + (name "sessreg") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/sessreg-" + version + ".tar.bz2")) + (sha256 + (base32 + "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public setxkbmap + (package + (name "setxkbmap") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/setxkbmap-" + version + ".tar.bz2")) + (sha256 + (base32 + "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x")))) + (build-system gnu-build-system) + (inputs + `(("libxkbfile" ,libxkbfile) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public smproxy + (package + (name "smproxy") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/smproxy-" + version + ".tar.bz2")) + (sha256 + (base32 + "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("libxmu" ,libxmu) + ("libSM" ,libSM) + ("libICE" ,libICE) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public twm + (package + (name "twm") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/twm-" + version + ".tar.bz2")) + (sha256 + (base32 + "0i6dbf5vafi5hm4bcmnj6r412cncjlv9hkkbr6bzlh15qvg56p8g")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("libxmu" ,libxmu) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("libSM" ,libSM) + ("libICE" ,libICE) + ("pkg-config" ,pkg-config) + ("flex" ,flex) + ("bison" ,bison))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public util-macros + (package + (name "util-macros") + (version "1.17") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/util-macros-" + version + ".tar.bz2")) + (sha256 + (base32 + "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public videoproto + (package + (name "videoproto") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/videoproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public windowswmproto + (package + (name "windowswmproto") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/windowswmproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xauth + (package + (name "xauth") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xauth-" + version + ".tar.bz2")) + (sha256 + (base32 + "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4")))) + (build-system gnu-build-system) + (inputs + `(("libxmu" ,libxmu) + ("libxext" ,libxext) + ("libxau" ,libxau) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xbacklight + (package + (name "xbacklight") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/xbacklight-" + version + ".tar.bz2")) + (sha256 + (base32 + "199n9qszjiz82nbjz6ychh0xl15igm535mv0830wk4m59w9xclji")))) + (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) + ("xcb-util" ,xcb-util) + ("libxcb" ,libxcb) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xbitmaps + (package + (name "xbitmaps") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xbitmaps-" + version + ".tar.bz2")) + (sha256 + (base32 + "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcb-proto + (package + (name "xcb-proto") + (version "1.8") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xcb/xcb-proto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93")))) + (build-system gnu-build-system) + (inputs + `(("pkg-config" ,pkg-config) ("python" ,python))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcb-util + (package + (name "xcb-util") + (version "0.3.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xcb/xcb-util-" + version + ".tar.bz2")) + (sha256 + (base32 + "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxcb" ,libxcb) + ("gperf" ,gperf) + ("m4" ,m4) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcb-util-image + (package + (name "xcb-util-image") + (version "0.3.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xcb/xcb-util-image-" + version + ".tar.bz2")) + (sha256 + (base32 + "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("xcb-util" ,xcb-util) + ("libxcb" ,libxcb) + ("m4" ,m4) + ("gperf" ,gperf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcb-util-keysyms + (package + (name "xcb-util-keysyms") + (version "0.3.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xcb/xcb-util-keysyms-" + version + ".tar.bz2")) + (sha256 + (base32 + "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxcb" ,libxcb) + ("m4" ,m4) + ("gperf" ,gperf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcb-util-renderutil + (package + (name "xcb-util-renderutil") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xcb/xcb-util-renderutil-" + version + ".tar.bz2")) + (sha256 + (base32 + "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxcb" ,libxcb) + ("m4" ,m4) + ("gperf" ,gperf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcb-util-wm + (package + (name "xcb-util-wm") + (version "0.3.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xcb/xcb-util-wm-" + version + ".tar.bz2")) + (sha256 + (base32 + "0c30fj33gvwzwhyz1dhsfwni0ai16bxpvxb4l6c6s7vvj7drp3q3")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxcb" ,libxcb) + ("m4" ,m4) + ("gperf" ,gperf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xclock + (package + (name "xclock") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/xclock-" + version + ".tar.bz2")) + (sha256 + (base32 + "1l1zxr69p0734fnx9rdqw79ahr273hr050sm8xdc0n51n1bnzfr1")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("libxrender" ,libxrender) + ("libxmu" ,libxmu) + ("libxkbfile" ,libxkbfile) + ("libxft" ,libxft) + ("libxaw" ,libxaw) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcmiscproto + (package + (name "xcmiscproto") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xcmiscproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcmsdb + (package + (name "xcmsdb") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xcmsdb-" + version + ".tar.bz2")) + (sha256 + (base32 + "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcursorgen + (package + (name "xcursorgen") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xcursorgen-" + version + ".tar.bz2")) + (sha256 + (base32 + "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw")))) + (build-system gnu-build-system) + (inputs + `(("libxcursor" ,libxcursor) + ("libx11" ,libx11) + ("libpng" ,libpng) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xcursor-themes + (package + (name "xcursor-themes") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xcursor-themes-" + version + ".tar.bz2")) + (sha256 + (base32 + "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr")))) + (build-system gnu-build-system) + (inputs + `(("libxcursor" ,libxcursor) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xdm + (package + (name "xdm") + (version "1.1.11") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/xdm-" + version + ".tar.bz2")) + (sha256 + (base32 + "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("libxpm" ,libxpm) + ("libxmu" ,libxmu) + ("libxinerama" ,libxinerama) + ("libxft" ,libxft) + ("libxext" ,libxext) + ("libxdmcp" ,libxdmcp) + ("libxaw" ,libxaw) + ("libxau" ,libxau) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xdpyinfo + (package + (name "xdpyinfo") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xdpyinfo-" + version + ".tar.bz2")) + (sha256 + (base32 + "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3")))) + (build-system gnu-build-system) + (inputs + `(("libxxf86vm" ,libxxf86vm) + ("libxxf86misc" ,libxxf86misc) + ("libxxf86dga" ,libxxf86dga) + ("libxtst" ,libxtst) + ("libxrender" ,libxrender) + ("libxinerama" ,libxinerama) + ("libxi" ,libxi) + ("libxext" ,libxext) + ("libxcomposite" ,libxcomposite) + ("libxcb" ,libxcb) + ("libx11" ,libx11) + ("libdmx" ,libdmx) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xdriinfo + (package + (name "xdriinfo") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xdriinfo-" + version + ".tar.bz2")) + (sha256 + (base32 + "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim")))) + (build-system gnu-build-system) + (inputs + `(("mesa" ,mesa) + ("glproto" ,glproto) + ("libx11" ,libx11) + ("glproto" ,glproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xev + (package + (name "xev") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xev-" + version + ".tar.bz2")) + (sha256 + (base32 + "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip")))) + (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) + ("libxrandr" ,libxrandr) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xextproto + (package + (name "xextproto") + (version "7.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xextproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xeyes + (package + (name "xeyes") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/xeyes-" + version + ".tar.bz2")) + (sha256 + (base32 + "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("libxrender" ,libxrender) + ("libxmu" ,libxmu) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xfs + (package + (name "xfs") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/xfs-" + version + ".tar.bz2")) + (sha256 + (base32 + "17g34yq789grnic83cqj5khq0knda1w2rgabhjflsyw9wg663shd")))) + (build-system gnu-build-system) + (inputs + `(("xtrans" ,xtrans) + ("xproto" ,xproto) + ("libxfont" ,libxfont) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xgamma + (package + (name "xgamma") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xgamma-" + version + ".tar.bz2")) + (sha256 + (base32 + "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3")))) + (build-system gnu-build-system) + (inputs + `(("libxxf86vm" ,libxxf86vm) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xhost + (package + (name "xhost") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xhost-" + version + ".tar.bz2")) + (sha256 + (base32 + "0l483y6wfrjh37j16b41kpi2nc7ss5rvndafpbaylrs87ygx2w18")))) + (build-system gnu-build-system) + (inputs + `(("libxmu" ,libxmu) + ("libxau" ,libxau) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xineramaproto + (package + (name "xineramaproto") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xineramaproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xinit + (package + (name "xinit") + (version "1.3.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/xinit-" + version + ".tar.bz2")) + (sha256 + (base32 + "0d821rlqwyn2js7bkzicyp894n9gqv1hahxs285pas1zm3d7z1m1")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("xauth" ,xauth))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xinput + (package + (name "xinput") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xinput-" + version + ".tar.bz2")) + (sha256 + (base32 + "0zl4cdgnzh9shz20yn7hz889v4nkbyqwx0nb7dh6arn7abchgc2a")))) + (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) + ("libxrandr" ,libxrandr) + ("libxinerama" ,libxinerama) + ("libxi" ,libxi) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("inputproto" ,inputproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xkbcomp + (package + (name "xkbcomp") + (version "1.2.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xkbcomp-" + version + ".tar.bz2")) + (sha256 + (base32 + "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxkbfile" ,libxkbfile) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xkbevd + (package + (name "xkbevd") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xkbevd-" + version + ".tar.bz2")) + (sha256 + (base32 + "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm")))) + (build-system gnu-build-system) + (inputs + `(("libxkbfile" ,libxkbfile) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xkbutils + (package + (name "xkbutils") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xkbutils-" + version + ".tar.bz2")) + (sha256 + (base32 + "1ga913pw6chssf2016kjyjl6ar2lj83pa497w97ak2kq603sy2g4")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("libxaw" ,libxaw) + ("libx11" ,libx11) + ("inputproto" ,inputproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xkeyboard-config + (package + (name "xkeyboard-config") + (version "2.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xkeyboard-config-" + version + ".tar.bz2")) + (sha256 + (base32 + "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xkill + (package + (name "xkill") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xkill-" + version + ".tar.bz2")) + (sha256 + (base32 + "1ac110qbb9a4x1dim3vaghvdk3jc708i2p3f4rmag33458khg0xx")))) + (build-system gnu-build-system) + (inputs + `(("libxmu" ,libxmu) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xlsatoms + (package + (name "xlsatoms") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xlsatoms-" + version + ".tar.bz2")) + (sha256 + (base32 + "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv")))) + (build-system gnu-build-system) + (inputs + `(("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xlsclients + (package + (name "xlsclients") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xlsclients-" + version + ".tar.bz2")) + (sha256 + (base32 + "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w")))) + (build-system gnu-build-system) + (inputs + `(("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xmessage + (package + (name "xmessage") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/app/xmessage-" + version + ".tar.bz2")) + (sha256 + (base32 + "0nrxidff0pcd1ampfzj91ai74j6mx613j5kqk3j0c4xdshx5v8yg")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("libxaw" ,libxaw) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xmodmap + (package + (name "xmodmap") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xmodmap-" + version + ".tar.bz2")) + (sha256 + (base32 + "1dg47lay4vhrl9mfq3cfc6741a0m2n8wd4ljagd21ix3qklys8pg")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xorg-cf-files + (package + (name "xorg-cf-files") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/util/xorg-cf-files-" + version + ".tar.bz2")) + (sha256 + (base32 + "0s86h66b3w4623m88fg2csp41cnr08qc8i3gkj85k3wpwj1wxs9n")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xorg-docs + (package + (name "xorg-docs") + (version "1.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xorg-docs-" + version + ".tar.bz2")) + (sha256 + (base32 + "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xorg-server + (package + (name "xorg-server") + (version "1.12.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/xserver/xorg-server-" + version + ".tar.bz2")) + (sha256 + (base32 + "1xscr6rf0q15hv3hmm51xhwk0c0rx7a2swkj14ygp8vb60sprh4a")))) + (build-system gnu-build-system) + (inputs + `(("bigreqsproto" ,bigreqsproto) + ("xtrans" ,xtrans) + ("xcmiscproto" ,xcmiscproto) + ("damageproto" ,damageproto) + ("libxfont" ,libxfont) + ("pixman" ,pixman) + ("libxext" ,libxext) + ("recordproto" ,recordproto) + ("xf86vidmodeproto" ,xf86vidmodeproto) + ("libdmx" ,libdmx) + ("dmxproto" ,dmxproto) + ("xf86dgaproto" ,xf86dgaproto) + ("xineramaproto" ,xineramaproto) + ("resourceproto" ,resourceproto) + ("scrnsaverproto" ,scrnsaverproto) + ("compositeproto" ,compositeproto) + ("xf86driproto" ,xf86driproto) + ("glproto" ,glproto) + ("xf86bigfontproto" ,xf86bigfontproto) + ("dbus" ,dbus) + ("mesa" ,mesa) + ("systemd" ,systemd) + ("zlib" ,zlib) + ("libxv" ,libxv) + ("libxt" ,libxt) + ("libxres" ,libxres) + ("libxrender" ,libxrender) + ("libxpm" ,libxpm) + ("libxmu" ,libxmu) + ("libxkbfile" ,libxkbfile) + ("libxfixes" ,libxfixes) + ("libxdmcp" ,libxdmcp) + ("libxaw" ,libxaw) + ("libxau" ,libxau) + ("libx11" ,libx11) + ("openssl" ,openssl) + ("libdrm" ,libdrm) + ("renderproto" ,renderproto) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("kbproto" ,kbproto) + ("dri2proto" ,dri2proto) + ("randrproto" ,randrproto) + ("xextproto" ,xextproto) + ("inputproto" ,inputproto) + ("libpciaccess" ,libpciaccess))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xorg-sgml-doctools + (package + (name "xorg-sgml-doctools") + (version "1.11") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-" + version + ".tar.bz2")) + (sha256 + (base32 + "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xpr + (package + (name "xpr") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xpr-" + version + ".tar.bz2")) + (sha256 + (base32 + "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxmu" ,libxmu) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xprop + (package + (name "xprop") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xprop-" + version + ".tar.bz2")) + (sha256 + (base32 + "18zi2any13zlb7f34fzyw6lkiwkd6k2scp3b800a1f4rj0c7m407")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xproto + (package + (name "xproto") + (version "7.0.23") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "17lkmi12f89qvg4jj5spqzwzc24fmsqq68dv6kpy7r7b944lmq5d")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xrandr + (package + (name "xrandr") + (version "1.3.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xrandr-" + version + ".tar.bz2")) + (sha256 + (base32 + "03lq1c1q4w5cf2ijs4b34v008lshibha9zv5lw08xpyhk9xgyn8h")))) + (build-system gnu-build-system) + (inputs + `(("libxrender" ,libxrender) + ("libxrandr" ,libxrandr) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xrdb + (package + (name "xrdb") + (version "1.0.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xrdb-" + version + ".tar.bz2")) + (sha256 + (base32 + "1dza5a34nj68fzhlgwf18i5bk0n24ig28yihwpjy7vwn57hh2934")))) + (build-system gnu-build-system) + (inputs + `(("libxmu" ,libxmu) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xrefresh + (package + (name "xrefresh") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xrefresh-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xset + (package + (name "xset") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xset-" + version + ".tar.bz2")) + (sha256 + (base32 + "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1")))) + (build-system gnu-build-system) + (inputs + `(("libxxf86misc" ,libxxf86misc) + ("xproto" ,xproto) + ("libxmu" ,libxmu) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xsetroot + (package + (name "xsetroot") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xsetroot-" + version + ".tar.bz2")) + (sha256 + (base32 + "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8")))) + (build-system gnu-build-system) + (inputs + `(("libxmu" ,libxmu) + ("libxcursor" ,libxcursor) + ("xbitmaps" ,xbitmaps) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xtrans + (package + (name "xtrans") + (version "1.2.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xtrans-" + version + ".tar.bz2")) + (sha256 + (base32 + "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xvinfo + (package + (name "xvinfo") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xvinfo-" + version + ".tar.bz2")) + (sha256 + (base32 + "119rd93d7661ll1rfcdssn78l0b97326smziyr2f5wdwj2hlmiv0")))) + (build-system gnu-build-system) + (inputs + `(("libxext" ,libxext) + ("libxv" ,libxv) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xwd + (package + (name "xwd") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xwd-" + version + ".tar.bz2")) + (sha256 + (base32 + "0fkg6msy2zg7rda2rpxb7j6vmrdmqmk72xsxnyhz97196ykjnx82")))) + (build-system gnu-build-system) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xwininfo + (package + (name "xwininfo") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xwininfo-" + version + ".tar.bz2")) + (sha256 + (base32 + "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxcb" ,libxcb) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xwud + (package + (name "xwud") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xwud-" + version + ".tar.bz2")) + (sha256 + (base32 + "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + \ No newline at end of file From 5f1d0fb08562cbdc94216ff39b4cb28b6eb357e3 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 25 Feb 2013 22:24:25 +0100 Subject: [PATCH 02/44] gnu: xorg: Add and remove packages to mirror X11R7.7/src/everything * gnu/packages/xorg.scm: Remove packages not from ftp://ftp.freedesktop.org/pub/xorg/X11R7.7/src/everything/ . Add missing packages, for the time being with a 0 hash and without dependencies. Correct spelling (all lower case for package names). --- gnu/packages/xorg.scm | 2377 +++++++++++++++++++++++++++-------------- 1 file changed, 1601 insertions(+), 776 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bbbd7a943a..1b6d607a54 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -35,7 +35,8 @@ (define-module (gnu packages xorg) #:use-module (gnu packages openssl) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python)) + #:use-module (gnu packages python) + #:use-module (gnu packages xml)) (define-public applewmproto (package @@ -81,8 +82,8 @@ (define-public bdftopcf (synopsis #f) (description #f) (license #f))) - - + + (define-public bigreqsproto (package (name "bigreqsproto") @@ -103,8 +104,8 @@ (define-public bigreqsproto (synopsis #f) (description #f) (license #f))) - - + + (define-public compositeproto (package (name "compositeproto") @@ -127,8 +128,8 @@ (define-public compositeproto (synopsis #f) (description #f) (license #f))) - - + + (define-public damageproto (package (name "damageproto") @@ -149,8 +150,8 @@ (define-public damageproto (synopsis #f) (description #f) (license #f))) - - + + (define-public dmxproto (package (name "dmxproto") @@ -171,8 +172,29 @@ (define-public dmxproto (synopsis #f) (description #f) (license #f))) - - + + +(define-public dri2proto + (package + (name "dri2proto") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/dri2proto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + (define-public encodings (package (name "encodings") @@ -193,8 +215,8 @@ (define-public encodings (synopsis #f) (description #f) (license #f))) - - + + (define-public fixesproto (package (name "fixesproto") @@ -217,8 +239,113 @@ (define-public fixesproto (synopsis #f) (description #f) (license #f))) - - + + +(define-public font-adobe-100dpi + (package + (name "font-adobe-100dpi") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-adobe-75dpi + (package + (name "font-adobe-75dpi") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-adobe-utopia-100dpi + (package + (name "font-adobe-utopia-100dpi") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-adobe-utopia-75dpi + (package + (name "font-adobe-utopia-75dpi") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-adobe-utopia-type1 + (package + (name "font-adobe-utopia-type1") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + (define-public font-alias (package (name "font-alias") @@ -239,8 +366,8 @@ (define-public font-alias (synopsis #f) (description #f) (license #f))) - - + + (define-public font-arabic-misc (package (name "font-arabic-misc") @@ -264,11 +391,95 @@ (define-public font-arabic-misc (synopsis #f) (description #f) (license #f))) - - -(define-public font-bh-ttf + + +(define-public font-bh-100dpi (package - (name "font-bh-ttf") + (name "font-bh-100dpi") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-bh-75dpi + (package + (name "font-bh-75dpi") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-bh-lucidatypewriter-100dpi + (package + (name "font-bh-lucidatypewriter-100dpi") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-bh-lucidatypewriter-75dpi + (package + (name "font-bh-lucidatypewriter-75dpi") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-bh-type1 + (package + (name "font-bh-type1") (version "1.0.3") (source (origin @@ -289,8 +500,83 @@ (define-public font-bh-ttf (synopsis #f) (description #f) (license #f))) - - + + +(define-public font-bitstream-100dpi + (package + (name "font-bitstream-100dpi") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" + version + ".tar.bz2")) + (sha256 + (base32 + "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-bitstream-75dpi + (package + (name "font-bitstream-75dpi") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" + version + ".tar.bz2")) + (sha256 + (base32 + "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public font-bitstream-type1 + (package + (name "font-bitstream-type1") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" + version + ".tar.bz2")) + (sha256 + (base32 + "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) + (build-system gnu-build-system) + (inputs + `(("mkfontscale" ,mkfontscale) + ("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + (define-public font-cronyx-cyrillic (package (name "font-cronyx-cyrillic") @@ -314,8 +600,8 @@ (define-public font-cronyx-cyrillic (synopsis #f) (description #f) (license #f))) - - + + (define-public font-cursor-misc (package (name "font-cursor-misc") @@ -340,8 +626,8 @@ (define-public font-cursor-misc (synopsis #f) (description #f) (license #f))) - - + + (define-public font-daewoo-misc (package (name "font-daewoo-misc") @@ -365,8 +651,8 @@ (define-public font-daewoo-misc (synopsis #f) (description #f) (license #f))) - - + + (define-public font-dec-misc (package (name "font-dec-misc") @@ -390,8 +676,33 @@ (define-public font-dec-misc (synopsis #f) (description #f) (license #f))) - - + + +(define-public font-ibm-type1 + (package + (name "font-ibm-type1") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("bdftopcf" ,bdftopcf) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + (define-public font-isas-misc (package (name "font-isas-misc") @@ -415,8 +726,8 @@ (define-public font-isas-misc (synopsis #f) (description #f) (license #f))) - - + + (define-public font-jis-misc (package (name "font-jis-misc") @@ -440,8 +751,8 @@ (define-public font-jis-misc (synopsis #f) (description #f) (license #f))) - - + + (define-public font-micro-misc (package (name "font-micro-misc") @@ -465,8 +776,8 @@ (define-public font-micro-misc (synopsis #f) (description #f) (license #f))) - - + + (define-public font-misc-cyrillic (package (name "font-misc-cyrillic") @@ -490,8 +801,8 @@ (define-public font-misc-cyrillic (synopsis #f) (description #f) (license #f))) - - + + (define-public font-misc-ethiopic (package (name "font-misc-ethiopic") @@ -515,8 +826,8 @@ (define-public font-misc-ethiopic (synopsis #f) (description #f) (license #f))) - - + + (define-public font-misc-meltho (package (name "font-misc-meltho") @@ -540,8 +851,8 @@ (define-public font-misc-meltho (synopsis #f) (description #f) (license #f))) - - + + (define-public font-misc-misc (package (name "font-misc-misc") @@ -567,8 +878,8 @@ (define-public font-misc-misc (synopsis #f) (description #f) (license #f))) - - + + (define-public font-mutt-misc (package (name "font-mutt-misc") @@ -592,8 +903,8 @@ (define-public font-mutt-misc (synopsis #f) (description #f) (license #f))) - - + + (define-public font-schumacher-misc (package (name "font-schumacher-misc") @@ -619,8 +930,8 @@ (define-public font-schumacher-misc (synopsis #f) (description #f) (license #f))) - - + + (define-public font-screen-cyrillic (package (name "font-screen-cyrillic") @@ -644,8 +955,8 @@ (define-public font-screen-cyrillic (synopsis #f) (description #f) (license #f))) - - + + (define-public font-sony-misc (package (name "font-sony-misc") @@ -669,30 +980,8 @@ (define-public font-sony-misc (synopsis #f) (description #f) (license #f))) - - -(define-public fontsproto - (package - (name "fontsproto") - (version "2.1.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/fontsproto-" - version - ".tar.bz2")) - (sha256 - (base32 - "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - + + (define-public font-sun-misc (package (name "font-sun-misc") @@ -716,8 +1005,8 @@ (define-public font-sun-misc (synopsis #f) (description #f) (license #f))) - - + + (define-public font-util (package (name "font-util") @@ -738,8 +1027,8 @@ (define-public font-util (synopsis #f) (description #f) (license #f))) - - + + (define-public font-winitzki-cyrillic (package (name "font-winitzki-cyrillic") @@ -763,30 +1052,51 @@ (define-public font-winitzki-cyrillic (synopsis #f) (description #f) (license #f))) - - -(define-public gccmakedep + + +(define-public font-xfree86-type1 (package - (name "gccmakedep") - (version "1.0.2") + (name "font-xfree86-type1") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/util/gccmakedep-" + "mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-" version ".tar.bz2")) (sha256 (base32 - "04dfamx3fvkvqfgs6xy2a6yqbxjrj4777ylxp38g60hhbdl4jg86")))) + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public fontsproto + (package + (name "fontsproto") + (version "2.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/fontsproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - + + (define-public glproto (package (name "glproto") @@ -795,7 +1105,7 @@ (define-public glproto (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/proto/glproto-" + "mirror://xorg/X11R7.7/src/everything/glproto-" version ".tar.bz2")) (sha256 @@ -807,8 +1117,8 @@ (define-public glproto (synopsis #f) (description #f) (license #f))) - - + + (define-public iceauth (package (name "iceauth") @@ -826,37 +1136,14 @@ (define-public iceauth (build-system gnu-build-system) (inputs `(("xproto" ,xproto) - ("libICE" ,libICE) + ("libice" ,libice) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public imake - (package - (name "imake") - (version "1.0.5") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/util/imake-" - version - ".tar.bz2")) - (sha256 - (base32 - "1h8ww97aymm10l9qn21n1b9x5ypjrqr10qpf48jjcbc9fg77gklr")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - + + (define-public inputproto (package (name "inputproto") @@ -877,8 +1164,8 @@ (define-public inputproto (synopsis #f) (description #f) (license #f))) - - + + (define-public kbproto (package (name "kbproto") @@ -899,11 +1186,11 @@ (define-public kbproto (synopsis #f) (description #f) (license #f))) - - -(define-public libAppleWM + + +(define-public libapplewm (package - (name "libAppleWM") + (name "libapplewm") (version "1.4.1") (source (origin @@ -926,11 +1213,11 @@ (define-public libAppleWM (synopsis #f) (description #f) (license #f))) - - -(define-public libFS + + +(define-public libfs (package - (name "libFS") + (name "libfs") (version "1.0.4") (source (origin @@ -952,11 +1239,11 @@ (define-public libFS (synopsis #f) (description #f) (license #f))) - - -(define-public libICE + + +(define-public libice (package - (name "libICE") + (name "libice") (version "1.0.8") (source (origin @@ -977,11 +1264,11 @@ (define-public libICE (synopsis #f) (description #f) (license #f))) - - -(define-public libSM + + +(define-public libsm (package - (name "libSM") + (name "libsm") (version "1.2.1") (source (origin @@ -998,19 +1285,19 @@ (define-public libSM `(("xtrans" ,xtrans) ("xproto" ,xproto) ("util-linux" ,util-linux) - ("libICE" ,libICE) + ("libice" ,libice) ("pkg-config" ,pkg-config))) (propagated-inputs - `(("libICE" ,libICE))) + `(("libice" ,libice))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public libWindowsWM + + +(define-public libwindowswm (package - (name "libWindowsWM") + (name "libwindowswm") (version "1.0.1") (source (origin @@ -1033,17 +1320,38 @@ (define-public libWindowsWM (synopsis #f) (description #f) (license #f))) - - -(define-public libxScrnSaver + + +(define-public libx11 (package - (name "libxScrnSaver") + (name "libx11") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libX11-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxscrnsaver + (package + (name "libxscrnsaver") (version "1.2.2") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxScrnSaver-" + "mirror://xorg/X11R7.7/src/everything/libXScrnSaver-" version ".tar.bz2")) (sha256 @@ -1060,8 +1368,8 @@ (define-public libxScrnSaver (synopsis #f) (description #f) (license #f))) - - + + (define-public libxau (package (name "libxau") @@ -1070,7 +1378,7 @@ (define-public libxau (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxau-" + "mirror://xorg/X11R7.7/src/everything/libXau-" version ".tar.bz2")) (sha256 @@ -1083,8 +1391,8 @@ (define-public libxau (synopsis #f) (description #f) (license #f))) - - + + (define-public libxaw (package (name "libxaw") @@ -1093,7 +1401,7 @@ (define-public libxaw (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxaw-" + "mirror://xorg/X11R7.7/src/everything/libXaw-" version ".tar.bz2")) (sha256 @@ -1115,8 +1423,8 @@ (define-public libxaw (synopsis #f) (description #f) (license #f))) - - + + (define-public libxcomposite (package (name "libxcomposite") @@ -1125,7 +1433,7 @@ (define-public libxcomposite (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxcomposite-" + "mirror://xorg/X11R7.7/src/everything/libXcomposite-" version ".tar.bz2")) (sha256 @@ -1144,8 +1452,8 @@ (define-public libxcomposite (synopsis #f) (description #f) (license #f))) - - + + (define-public libxcursor (package (name "libxcursor") @@ -1154,7 +1462,7 @@ (define-public libxcursor (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxcursor-" + "mirror://xorg/X11R7.7/src/everything/libXcursor-" version ".tar.bz2")) (sha256 @@ -1172,8 +1480,8 @@ (define-public libxcursor (synopsis #f) (description #f) (license #f))) - - + + (define-public libxdamage (package (name "libxdamage") @@ -1182,7 +1490,7 @@ (define-public libxdamage (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxdamage-" + "mirror://xorg/X11R7.7/src/everything/libXdamage-" version ".tar.bz2")) (sha256 @@ -1201,8 +1509,8 @@ (define-public libxdamage (synopsis #f) (description #f) (license #f))) - - + + (define-public libxdmcp (package (name "libxdmcp") @@ -1211,7 +1519,7 @@ (define-public libxdmcp (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxdmcp-" + "mirror://xorg/X11R7.7/src/everything/libXdmcp-" version ".tar.bz2")) (sha256 @@ -1224,8 +1532,8 @@ (define-public libxdmcp (synopsis #f) (description #f) (license #f))) - - + + (define-public libxext (package (name "libxext") @@ -1234,7 +1542,7 @@ (define-public libxext (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxext-" + "mirror://xorg/X11R7.7/src/everything/libXext-" version ".tar.bz2")) (sha256 @@ -1253,8 +1561,8 @@ (define-public libxext (synopsis #f) (description #f) (license #f))) - - + + (define-public libxfixes (package (name "libxfixes") @@ -1263,7 +1571,7 @@ (define-public libxfixes (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxfixes-" + "mirror://xorg/X11R7.7/src/everything/libXfixes-" version ".tar.bz2")) (sha256 @@ -1280,8 +1588,8 @@ (define-public libxfixes (synopsis #f) (description #f) (license #f))) - - + + (define-public libxfont (package (name "libxfont") @@ -1290,7 +1598,7 @@ (define-public libxfont (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxfont-" + "mirror://xorg/X11R7.7/src/everything/libXfont-" version ".tar.bz2")) (sha256 @@ -1309,8 +1617,8 @@ (define-public libxfont (synopsis #f) (description #f) (license #f))) - - + + (define-public libxft (package (name "libxft") @@ -1319,7 +1627,7 @@ (define-public libxft (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxft-" + "mirror://xorg/X11R7.7/src/everything/libXft-" version ".tar.bz2")) (sha256 @@ -1344,8 +1652,8 @@ (define-public libxft (synopsis #f) (description #f) (license #f))) - - + + (define-public libxi (package (name "libxi") @@ -1354,7 +1662,7 @@ (define-public libxi (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxi-" + "mirror://xorg/X11R7.7/src/everything/libXi-" version ".tar.bz2")) (sha256 @@ -1372,8 +1680,8 @@ (define-public libxi (synopsis #f) (description #f) (license #f))) - - + + (define-public libxinerama (package (name "libxinerama") @@ -1382,7 +1690,7 @@ (define-public libxinerama (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxinerama-" + "mirror://xorg/X11R7.7/src/everything/libXinerama-" version ".tar.bz2")) (sha256 @@ -1399,8 +1707,8 @@ (define-public libxinerama (synopsis #f) (description #f) (license #f))) - - + + (define-public libxmu (package (name "libxmu") @@ -1409,7 +1717,7 @@ (define-public libxmu (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxmu-" + "mirror://xorg/X11R7.7/src/everything/libXmu-" version ".tar.bz2")) (sha256 @@ -1427,8 +1735,8 @@ (define-public libxmu (synopsis #f) (description #f) (license #f))) - - + + (define-public libxp (package (name "libxp") @@ -1437,7 +1745,7 @@ (define-public libxp (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/lib/libxp-" + "mirror://xorg/X11R7.7/src/everything/libXp-" version ".tar.bz2")) (sha256 @@ -1449,14 +1757,14 @@ (define-public libxp ("libxext" ,libxext) ("libxau" ,libxau) ("libx11" ,libx11) - ("printproto" ,printproto) +;; ("printproto" ,printproto) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - + + (define-public libxpm (package (name "libxpm") @@ -1465,7 +1773,7 @@ (define-public libxpm (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxpm-" + "mirror://xorg/X11R7.7/src/everything/libXpm-" version ".tar.bz2")) (sha256 @@ -1483,8 +1791,8 @@ (define-public libxpm (synopsis #f) (description #f) (license #f))) - - + + (define-public libxrandr (package (name "libxrandr") @@ -1493,7 +1801,7 @@ (define-public libxrandr (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/lib/libxrandr-" + "mirror://xorg/XqqR7.7/src/everything/libXrandr-" version ".tar.bz2")) (sha256 @@ -1513,8 +1821,8 @@ (define-public libxrandr (synopsis #f) (description #f) (license #f))) - - + + (define-public libxrender (package (name "libxrender") @@ -1523,7 +1831,7 @@ (define-public libxrender (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxrender-" + "mirror://xorg/X11R7.7/src/everything/libXrender-" version ".tar.bz2")) (sha256 @@ -1539,8 +1847,8 @@ (define-public libxrender (synopsis #f) (description #f) (license #f))) - - + + (define-public libxres (package (name "libxres") @@ -1549,7 +1857,7 @@ (define-public libxres (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxres-" + "mirror://xorg/X11R7.7/src/everything/libXres-" version ".tar.bz2")) (sha256 @@ -1567,8 +1875,8 @@ (define-public libxres (synopsis #f) (description #f) (license #f))) - - + + (define-public libxt (package (name "libxt") @@ -1577,7 +1885,7 @@ (define-public libxt (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxt-" + "mirror://xorg/X11R7.7/src/everything/libXt-" version ".tar.bz2")) (sha256 @@ -1587,18 +1895,18 @@ (define-public libxt (inputs `(("xproto" ,xproto) ("libx11" ,libx11) - ("libSM" ,libSM) + ("libsm" ,libsm) ("kbproto" ,kbproto) - ("libICE" ,libICE) + ("libice" ,libice) ("pkg-config" ,pkg-config))) (propagated-inputs - `(("libSM" ,libSM))) + `(("libsm" ,libsm))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - + + (define-public libxtst (package (name "libxtst") @@ -1607,7 +1915,7 @@ (define-public libxtst (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxtst-" + "mirror://xorg/X11R7.7/src/everything/libXtst-" version ".tar.bz2")) (sha256 @@ -1626,8 +1934,8 @@ (define-public libxtst (synopsis #f) (description #f) (license #f))) - - + + (define-public libxv (package (name "libxv") @@ -1636,7 +1944,7 @@ (define-public libxv (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxv-" + "mirror://xorg/X11R7.7/src/everything/libXv-" version ".tar.bz2")) (sha256 @@ -1654,17 +1962,17 @@ (define-public libxv (synopsis #f) (description #f) (license #f))) - - -(define-public libxvMC + + +(define-public libxvmc (package - (name "libxvMC") + (name "libxvmc") (version "1.0.7") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxvMC-" + "mirror://xorg/X11R7.7/src/everything/libXvMC-" version ".tar.bz2")) (sha256 @@ -1683,8 +1991,50 @@ (define-public libxvMC (synopsis #f) (description #f) (license #f))) - - + + +(define-public libxxf86dga + (package + (name "libxxf86dga") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXxf86dga-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public libxxf86vm + (package + (name "libxxf86vm") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXxf86vm-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + (define-public libdmx (package (name "libdmx") @@ -1710,8 +2060,8 @@ (define-public libdmx (synopsis #f) (description #f) (license #f))) - - + + (define-public libfontenc (package (name "libfontenc") @@ -1735,8 +2085,8 @@ (define-public libfontenc (synopsis #f) (description #f) (license #f))) - - + + (define-public libpciaccess (package (name "libpciaccess") @@ -1758,8 +2108,8 @@ (define-public libpciaccess (synopsis #f) (description #f) (license #f))) - - + + (define-public libpthread-stubs (package (name "libpthread-stubs") @@ -1780,8 +2130,8 @@ (define-public libpthread-stubs (synopsis #f) (description #f) (license #f))) - - + + (define-public libxcb (package (name "libxcb") @@ -1790,7 +2140,7 @@ (define-public libxcb (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/xcb/libxcb-" + "mirror://xorg/X11R7.7/src/everything/libxcb-" version ".tar.bz2")) (sha256 @@ -1810,8 +2160,8 @@ (define-public libxcb (synopsis #f) (description #f) (license #f))) - - + + (define-public libxkbfile (package (name "libxkbfile") @@ -1835,31 +2185,8 @@ (define-public libxkbfile (synopsis #f) (description #f) (license #f))) - - -(define-public lndir - (package - (name "lndir") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/util/lndir-" - version - ".tar.bz2")) - (sha256 - (base32 - "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - + + (define-public luit (package (name "luit") @@ -1882,8 +2209,8 @@ (define-public luit (synopsis #f) (description #f) (license #f))) - - + + (define-public makedepend (package (name "makedepend") @@ -1905,8 +2232,8 @@ (define-public makedepend (synopsis #f) (description #f) (license #f))) - - + + (define-public mkfontdir (package (name "mkfontdir") @@ -1927,8 +2254,8 @@ (define-public mkfontdir (synopsis #f) (description #f) (license #f))) - - + + (define-public mkfontscale (package (name "mkfontscale") @@ -1954,54 +2281,8 @@ (define-public mkfontscale (synopsis #f) (description #f) (license #f))) - - -(define-public pixman - (package - (name "pixman") - (version "0.26.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/lib/pixman-" - version - ".tar.bz2")) - (sha256 - (base32 - "0z34jb75wpbyj3gxn34icd8j81fk5d6s6qnwp2ncz7m8icf6afqr")))) - (build-system gnu-build-system) - (inputs - `(("pkg-config" ,pkg-config) ("perl" ,perl))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public printproto - (package - (name "printproto") - (version "1.0.5") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/proto/printproto-" - version - ".tar.bz2")) - (sha256 - (base32 - "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j")))) - (build-system gnu-build-system) - (inputs - `(("libxau" ,libxau) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - + + (define-public randrproto (package (name "randrproto") @@ -2010,7 +2291,7 @@ (define-public randrproto (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/proto/randrproto-" + "mirror://xorg/X11R7.7/src/everything/randrproto-" version ".tar.bz2")) (sha256 @@ -2022,8 +2303,8 @@ (define-public randrproto (synopsis #f) (description #f) (license #f))) - - + + (define-public recordproto (package (name "recordproto") @@ -2044,8 +2325,8 @@ (define-public recordproto (synopsis #f) (description #f) (license #f))) - - + + (define-public renderproto (package (name "renderproto") @@ -2066,8 +2347,8 @@ (define-public renderproto (synopsis #f) (description #f) (license #f))) - - + + (define-public resourceproto (package (name "resourceproto") @@ -2088,8 +2369,8 @@ (define-public resourceproto (synopsis #f) (description #f) (license #f))) - - + + (define-public scrnsaverproto (package (name "scrnsaverproto") @@ -2110,8 +2391,8 @@ (define-public scrnsaverproto (synopsis #f) (description #f) (license #f))) - - + + (define-public sessreg (package (name "sessreg") @@ -2133,8 +2414,8 @@ (define-public sessreg (synopsis #f) (description #f) (license #f))) - - + + (define-public setxkbmap (package (name "setxkbmap") @@ -2158,8 +2439,8 @@ (define-public setxkbmap (synopsis #f) (description #f) (license #f))) - - + + (define-public smproxy (package (name "smproxy") @@ -2178,47 +2459,15 @@ (define-public smproxy (inputs `(("libxt" ,libxt) ("libxmu" ,libxmu) - ("libSM" ,libSM) - ("libICE" ,libICE) + ("libsm" ,libsm) + ("libice" ,libice) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public twm - (package - (name "twm") - (version "1.0.7") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/app/twm-" - version - ".tar.bz2")) - (sha256 - (base32 - "0i6dbf5vafi5hm4bcmnj6r412cncjlv9hkkbr6bzlh15qvg56p8g")))) - (build-system gnu-build-system) - (inputs - `(("libxt" ,libxt) - ("xproto" ,xproto) - ("libxmu" ,libxmu) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("libSM" ,libSM) - ("libICE" ,libICE) - ("pkg-config" ,pkg-config) - ("flex" ,flex) - ("bison" ,bison))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - + + (define-public util-macros (package (name "util-macros") @@ -2239,8 +2488,8 @@ (define-public util-macros (synopsis #f) (description #f) (license #f))) - - + + (define-public videoproto (package (name "videoproto") @@ -2261,8 +2510,8 @@ (define-public videoproto (synopsis #f) (description #f) (license #f))) - - + + (define-public windowswmproto (package (name "windowswmproto") @@ -2283,8 +2532,29 @@ (define-public windowswmproto (synopsis #f) (description #f) (license #f))) - - + + +(define-public x11perf + (package + (name "x11perf") + (version "1.5.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/x11perf-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + (define-public xauth (package (name "xauth") @@ -2310,8 +2580,8 @@ (define-public xauth (synopsis #f) (description #f) (license #f))) - - + + (define-public xbacklight (package (name "xbacklight") @@ -2320,7 +2590,7 @@ (define-public xbacklight (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/app/xbacklight-" + "mirror://xorg/X11R7.7/src/everything/xbacklight-" version ".tar.bz2")) (sha256 @@ -2329,15 +2599,15 @@ (define-public xbacklight (build-system gnu-build-system) (inputs `(("libxrender" ,libxrender) - ("xcb-util" ,xcb-util) +;; ("xcb-util" ,xcb-util) ("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - + + (define-public xbitmaps (package (name "xbitmaps") @@ -2358,8 +2628,8 @@ (define-public xbitmaps (synopsis #f) (description #f) (license #f))) - - + + (define-public xcb-proto (package (name "xcb-proto") @@ -2368,7 +2638,7 @@ (define-public xcb-proto (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/xcb/xcb-proto-" + "mirror://xorg/X11R7.7/src/everything/xcb-proto-" version ".tar.bz2")) (sha256 @@ -2381,174 +2651,8 @@ (define-public xcb-proto (synopsis #f) (description #f) (license #f))) - - -(define-public xcb-util - (package - (name "xcb-util") - (version "0.3.9") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/xcb/xcb-util-" - version - ".tar.bz2")) - (sha256 - (base32 - "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxcb" ,libxcb) - ("gperf" ,gperf) - ("m4" ,m4) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public xcb-util-image - (package - (name "xcb-util-image") - (version "0.3.9") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/xcb/xcb-util-image-" - version - ".tar.bz2")) - (sha256 - (base32 - "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("xcb-util" ,xcb-util) - ("libxcb" ,libxcb) - ("m4" ,m4) - ("gperf" ,gperf) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public xcb-util-keysyms - (package - (name "xcb-util-keysyms") - (version "0.3.9") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/xcb/xcb-util-keysyms-" - version - ".tar.bz2")) - (sha256 - (base32 - "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxcb" ,libxcb) - ("m4" ,m4) - ("gperf" ,gperf) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public xcb-util-renderutil - (package - (name "xcb-util-renderutil") - (version "0.3.8") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/xcb/xcb-util-renderutil-" - version - ".tar.bz2")) - (sha256 - (base32 - "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxcb" ,libxcb) - ("m4" ,m4) - ("gperf" ,gperf) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public xcb-util-wm - (package - (name "xcb-util-wm") - (version "0.3.9") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/xcb/xcb-util-wm-" - version - ".tar.bz2")) - (sha256 - (base32 - "0c30fj33gvwzwhyz1dhsfwni0ai16bxpvxb4l6c6s7vvj7drp3q3")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxcb" ,libxcb) - ("m4" ,m4) - ("gperf" ,gperf) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public xclock - (package - (name "xclock") - (version "1.0.6") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/app/xclock-" - version - ".tar.bz2")) - (sha256 - (base32 - "1l1zxr69p0734fnx9rdqw79ahr273hr050sm8xdc0n51n1bnzfr1")))) - (build-system gnu-build-system) - (inputs - `(("libxt" ,libxt) - ("libxrender" ,libxrender) - ("libxmu" ,libxmu) - ("libxkbfile" ,libxkbfile) - ("libxft" ,libxft) - ("libxaw" ,libxaw) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - + + (define-public xcmiscproto (package (name "xcmiscproto") @@ -2569,8 +2673,8 @@ (define-public xcmiscproto (synopsis #f) (description #f) (license #f))) - - + + (define-public xcmsdb (package (name "xcmsdb") @@ -2593,8 +2697,32 @@ (define-public xcmsdb (synopsis #f) (description #f) (license #f))) - - + + +(define-public xcursor-themes + (package + (name "xcursor-themes") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xcursor-themes-" + version + ".tar.bz2")) + (sha256 + (base32 + "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr")))) + (build-system gnu-build-system) + (inputs + `(("libxcursor" ,libxcursor) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + (define-public xcursorgen (package (name "xcursorgen") @@ -2619,65 +2747,8 @@ (define-public xcursorgen (synopsis #f) (description #f) (license #f))) - - -(define-public xcursor-themes - (package - (name "xcursor-themes") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xcursor-themes-" - version - ".tar.bz2")) - (sha256 - (base32 - "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr")))) - (build-system gnu-build-system) - (inputs - `(("libxcursor" ,libxcursor) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public xdm - (package - (name "xdm") - (version "1.1.11") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/app/xdm-" - version - ".tar.bz2")) - (sha256 - (base32 - "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl")))) - (build-system gnu-build-system) - (inputs - `(("libxt" ,libxt) - ("libxpm" ,libxpm) - ("libxmu" ,libxmu) - ("libxinerama" ,libxinerama) - ("libxft" ,libxft) - ("libxext" ,libxext) - ("libxdmcp" ,libxdmcp) - ("libxaw" ,libxaw) - ("libxau" ,libxau) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - + + (define-public xdpyinfo (package (name "xdpyinfo") @@ -2695,7 +2766,7 @@ (define-public xdpyinfo (build-system gnu-build-system) (inputs `(("libxxf86vm" ,libxxf86vm) - ("libxxf86misc" ,libxxf86misc) +;; ("libxxf86misc" ,libxxf86misc) ("libxxf86dga" ,libxxf86dga) ("libxtst" ,libxtst) ("libxrender" ,libxrender) @@ -2711,8 +2782,8 @@ (define-public xdpyinfo (synopsis #f) (description #f) (license #f))) - - + + (define-public xdriinfo (package (name "xdriinfo") @@ -2729,7 +2800,7 @@ (define-public xdriinfo "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim")))) (build-system gnu-build-system) (inputs - `(("mesa" ,mesa) + `(;;("mesa" ,mesa) ("glproto" ,glproto) ("libx11" ,libx11) ("glproto" ,glproto) @@ -2738,8 +2809,8 @@ (define-public xdriinfo (synopsis #f) (description #f) (license #f))) - - + + (define-public xev (package (name "xev") @@ -2765,8 +2836,8 @@ (define-public xev (synopsis #f) (description #f) (license #f))) - - + + (define-public xextproto (package (name "xextproto") @@ -2787,62 +2858,890 @@ (define-public xextproto (synopsis #f) (description #f) (license #f))) - - -(define-public xeyes + + +(define-public xf86-input-evdev (package - (name "xeyes") + (name "xf86-input-evdev") + (version "2.7.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-input-evdev-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-input-joystick + (package + (name "xf86-input-joystick") + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-input-keyboard + (package + (name "xf86-input-keyboard") + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-input-mouse + (package + (name "xf86-input-mouse") + (version "1.7.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-input-synaptics + (package + (name "xf86-input-synaptics") + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-input-synaptics-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-input-vmmouse + (package + (name "xf86-input-vmmouse") + (version "12.8.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-input-vmmouse-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-input-void + (package + (name "xf86-input-void") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-input-void-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-ark + (package + (name "xf86-video-ark") + (version "0.7.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-ark-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-ast + (package + (name "xf86-video-ast") + (version "0.93.10") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-ast-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-ati + (package + (name "xf86-video-ati") + (version "6.14.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-ati-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-cirrus + (package + (name "xf86-video-cirrus") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-cirrus-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-dummy + (package + (name "xf86-video-dummy") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-fbdev + (package + (name "xf86-video-fbdev") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-fbdev-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-geode + (package + (name "xf86-video-geode") + (version "2.11.13") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-geode-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-glide + (package + (name "xf86-video-glide") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-glide" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-glint + (package + (name "xf86-video-glint") + (version "1.2.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-glint-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-i128 + (package + (name "xf86-video-i128") + (version "1.3.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-i128-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-intel + (package + (name "xf86-video-intel") + (version "2.19.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-intel-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-mach64 + (package + (name "xf86-video-mach64") + (version "6.9.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-mga + (package + (name "xf86-video-mga") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-mga-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-neomagic + (package + (name "xf86-video-neomagic") + (version "1.2.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-newport + (package + (name "xf86-video-newport") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-newport-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-nv + (package + (name "xf86-video-nv") + (version "2.1.18") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-nv-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-openchrome + (package + (name "xf86-video-openchrome") + (version "0.2.906") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-r128 + (package + (name "xf86-video-r128") + (version "6.8.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-r128-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-savage + (package + (name "xf86-video-savage") + (version "2.3.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-savage-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-siliconmotion + (package + (name "xf86-video-siliconmotion") + (version "1.7.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-sis + (package + (name "xf86-video-sis") + (version "0.10.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-sis-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-suncg6 + (package + (name "xf86-video-suncg6") (version "1.1.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/app/xeyes-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-" version ".tar.bz2")) (sha256 (base32 - "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("libxt" ,libxt) - ("libxrender" ,libxrender) - ("libxmu" ,libxmu) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - -(define-public xfs + + +(define-public xf86-video-sunffb (package - (name "xfs") - (version "1.1.2") + (name "xf86-video-sunffb") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/app/xfs-" + "mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-" version ".tar.bz2")) (sha256 (base32 - "17g34yq789grnic83cqj5khq0knda1w2rgabhjflsyw9wg663shd")))) + "0000000000000000000000000000000000000000000000000000")))) (build-system gnu-build-system) - (inputs - `(("xtrans" ,xtrans) - ("xproto" ,xproto) - ("libxfont" ,libxfont) - ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) (license #f))) - - + + +(define-public xf86-video-tdfx + (package + (name "xf86-video-tdfx") + (version "1.4.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-tga + (package + (name "xf86-video-tga") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-tga-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-trident + (package + (name "xf86-video-trident") + (version "1.3.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-trident-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-v4l + (package + (name "xf86-video-v4l") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-vesa + (package + (name "xf86-video-vesa") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-vesa-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-vmware + (package + (name "xf86-video-vmware") + (version "12.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-voodoo + (package + (name "xf86-video-voodoo") + (version "1.2.4") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86-video-wsfb + (package + (name "xf86-video-wsfb") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86bigfontproto + (package + (name "xf86bigfontproto") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86dgaproto + (package + (name "xf86dgaproto") + (version "2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86dgaproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86driproto + (package + (name "xf86driproto") + (version "2.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86driproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + +(define-public xf86vidmodeproto + (package + (name "xf86vidmodeproto") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system gnu-build-system) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + + (define-public xgamma (package (name "xgamma") @@ -2866,8 +3765,8 @@ (define-public xgamma (synopsis #f) (description #f) (license #f))) - - + + (define-public xhost (package (name "xhost") @@ -2892,8 +3791,8 @@ (define-public xhost (synopsis #f) (description #f) (license #f))) - - + + (define-public xineramaproto (package (name "xineramaproto") @@ -2914,34 +3813,8 @@ (define-public xineramaproto (synopsis #f) (description #f) (license #f))) - - -(define-public xinit - (package - (name "xinit") - (version "1.3.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/app/xinit-" - version - ".tar.bz2")) - (sha256 - (base32 - "0d821rlqwyn2js7bkzicyp894n9gqv1hahxs285pas1zm3d7z1m1")))) - (build-system gnu-build-system) - (inputs - `(("libx11" ,libx11) - ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("xauth" ,xauth))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - + + (define-public xinput (package (name "xinput") @@ -2970,8 +3843,8 @@ (define-public xinput (synopsis #f) (description #f) (license #f))) - - + + (define-public xkbcomp (package (name "xkbcomp") @@ -2996,8 +3869,8 @@ (define-public xkbcomp (synopsis #f) (description #f) (license #f))) - - + + (define-public xkbevd (package (name "xkbevd") @@ -3021,8 +3894,8 @@ (define-public xkbevd (synopsis #f) (description #f) (license #f))) - - + + (define-public xkbutils (package (name "xkbutils") @@ -3049,8 +3922,8 @@ (define-public xkbutils (synopsis #f) (description #f) (license #f))) - - + + (define-public xkeyboard-config (package (name "xkeyboard-config") @@ -3071,8 +3944,8 @@ (define-public xkeyboard-config (synopsis #f) (description #f) (license #f))) - - + + (define-public xkill (package (name "xkill") @@ -3096,8 +3969,8 @@ (define-public xkill (synopsis #f) (description #f) (license #f))) - - + + (define-public xlsatoms (package (name "xlsatoms") @@ -3119,8 +3992,8 @@ (define-public xlsatoms (synopsis #f) (description #f) (license #f))) - - + + (define-public xlsclients (package (name "xlsclients") @@ -3142,33 +4015,8 @@ (define-public xlsclients (synopsis #f) (description #f) (license #f))) - - -(define-public xmessage - (package - (name "xmessage") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/app/xmessage-" - version - ".tar.bz2")) - (sha256 - (base32 - "0nrxidff0pcd1ampfzj91ai74j6mx613j5kqk3j0c4xdshx5v8yg")))) - (build-system gnu-build-system) - (inputs - `(("libxt" ,libxt) - ("libxaw" ,libxaw) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - + + (define-public xmodmap (package (name "xmodmap") @@ -3192,30 +4040,8 @@ (define-public xmodmap (synopsis #f) (description #f) (license #f))) - - -(define-public xorg-cf-files - (package - (name "xorg-cf-files") - (version "1.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/util/xorg-cf-files-" - version - ".tar.bz2")) - (sha256 - (base32 - "0s86h66b3w4623m88fg2csp41cnr08qc8i3gkj85k3wpwj1wxs9n")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - + + (define-public xorg-docs (package (name "xorg-docs") @@ -3236,8 +4062,8 @@ (define-public xorg-docs (synopsis #f) (description #f) (license #f))) - - + + (define-public xorg-server (package (name "xorg-server") @@ -3246,7 +4072,7 @@ (define-public xorg-server (origin (method url-fetch) (uri (string-append - "mirror://xorg/individual/xserver/xorg-server-" + "mirror://xorg/X11R7.7/src/everything/xorg-server-" version ".tar.bz2")) (sha256 @@ -3259,7 +4085,7 @@ (define-public xorg-server ("xcmiscproto" ,xcmiscproto) ("damageproto" ,damageproto) ("libxfont" ,libxfont) - ("pixman" ,pixman) +;; ("pixman" ,pixman) ("libxext" ,libxext) ("recordproto" ,recordproto) ("xf86vidmodeproto" ,xf86vidmodeproto) @@ -3274,8 +4100,8 @@ (define-public xorg-server ("glproto" ,glproto) ("xf86bigfontproto" ,xf86bigfontproto) ("dbus" ,dbus) - ("mesa" ,mesa) - ("systemd" ,systemd) +;; ("mesa" ,mesa) +;; ("systemd" ,systemd) ("zlib" ,zlib) ("libxv" ,libxv) ("libxt" ,libxt) @@ -3290,7 +4116,7 @@ (define-public xorg-server ("libxau" ,libxau) ("libx11" ,libx11) ("openssl" ,openssl) - ("libdrm" ,libdrm) +;; ("libdrm" ,libdrm) ("renderproto" ,renderproto) ("pkg-config" ,pkg-config))) (propagated-inputs @@ -3304,8 +4130,8 @@ (define-public xorg-server (synopsis #f) (description #f) (license #f))) - - + + (define-public xorg-sgml-doctools (package (name "xorg-sgml-doctools") @@ -3326,8 +4152,8 @@ (define-public xorg-sgml-doctools (synopsis #f) (description #f) (license #f))) - - + + (define-public xpr (package (name "xpr") @@ -3352,8 +4178,8 @@ (define-public xpr (synopsis #f) (description #f) (license #f))) - - + + (define-public xprop (package (name "xprop") @@ -3377,8 +4203,8 @@ (define-public xprop (synopsis #f) (description #f) (license #f))) - - + + (define-public xproto (package (name "xproto") @@ -3399,8 +4225,8 @@ (define-public xproto (synopsis #f) (description #f) (license #f))) - - + + (define-public xrandr (package (name "xrandr") @@ -3426,8 +4252,8 @@ (define-public xrandr (synopsis #f) (description #f) (license #f))) - - + + (define-public xrdb (package (name "xrdb") @@ -3451,8 +4277,8 @@ (define-public xrdb (synopsis #f) (description #f) (license #f))) - - + + (define-public xrefresh (package (name "xrefresh") @@ -3475,8 +4301,8 @@ (define-public xrefresh (synopsis #f) (description #f) (license #f))) - - + + (define-public xset (package (name "xset") @@ -3493,7 +4319,7 @@ (define-public xset "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1")))) (build-system gnu-build-system) (inputs - `(("libxxf86misc" ,libxxf86misc) + `(;;("libxxf86misc" ,libxxf86misc) ("xproto" ,xproto) ("libxmu" ,libxmu) ("libxext" ,libxext) @@ -3503,8 +4329,8 @@ (define-public xset (synopsis #f) (description #f) (license #f))) - - + + (define-public xsetroot (package (name "xsetroot") @@ -3530,8 +4356,8 @@ (define-public xsetroot (synopsis #f) (description #f) (license #f))) - - + + (define-public xtrans (package (name "xtrans") @@ -3552,8 +4378,8 @@ (define-public xtrans (synopsis #f) (description #f) (license #f))) - - + + (define-public xvinfo (package (name "xvinfo") @@ -3578,8 +4404,8 @@ (define-public xvinfo (synopsis #f) (description #f) (license #f))) - - + + (define-public xwd (package (name "xwd") @@ -3604,8 +4430,8 @@ (define-public xwd (synopsis #f) (description #f) (license #f))) - - + + (define-public xwininfo (package (name "xwininfo") @@ -3630,8 +4456,8 @@ (define-public xwininfo (synopsis #f) (description #f) (license #f))) - - + + (define-public xwud (package (name "xwud") @@ -3655,4 +4481,3 @@ (define-public xwud (synopsis #f) (description #f) (license #f))) - \ No newline at end of file From 88ee93f917194a6b027a972c302bfbe4824b8825 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 25 Feb 2013 22:52:48 +0100 Subject: [PATCH 03/44] gnu: xorg: Transform propagated into normal inputs. * gnu/packages/xorg.scm: Transform propagated into normal inputs; allows to keep packages in alphabetical order. --- gnu/packages/xorg.scm | 97 ++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 56 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 1b6d607a54..e2137154a4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -121,9 +121,9 @@ (define-public compositeproto (base32 "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) - (propagated-inputs - `(("fixesproto" ,fixesproto))) + (inputs + `(("fixesproto" ,fixesproto) + ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) @@ -1287,8 +1287,6 @@ (define-public libsm ("util-linux" ,util-linux) ("libice" ,libice) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("libice" ,libice))) (home-page #f) (synopsis #f) (description #f) @@ -1417,8 +1415,6 @@ (define-public libxaw ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("libxmu" ,libxmu))) (home-page #f) (synopsis #f) (description #f) @@ -1446,8 +1442,6 @@ (define-public libxcomposite ("libx11" ,libx11) ("compositeproto" ,compositeproto) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("libxfixes" ,libxfixes))) (home-page #f) (synopsis #f) (description #f) @@ -1555,8 +1549,6 @@ (define-public libxext ("xextproto" ,xextproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("xproto" ,xproto))) (home-page #f) (synopsis #f) (description #f) @@ -1644,10 +1636,6 @@ (define-public libxft ("freetype" ,freetype) ("fontconfig" ,fontconfig) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("libxrender" ,libxrender))) (home-page #f) (synopsis #f) (description #f) @@ -1899,8 +1887,6 @@ (define-public libxt ("kbproto" ,kbproto) ("libice" ,libice) ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("libsm" ,libsm))) (home-page #f) (synopsis #f) (description #f) @@ -4081,51 +4067,50 @@ (define-public xorg-server (build-system gnu-build-system) (inputs `(("bigreqsproto" ,bigreqsproto) - ("xtrans" ,xtrans) - ("xcmiscproto" ,xcmiscproto) + ("compositeproto" ,compositeproto) ("damageproto" ,damageproto) - ("libxfont" ,libxfont) -;; ("pixman" ,pixman) - ("libxext" ,libxext) - ("recordproto" ,recordproto) - ("xf86vidmodeproto" ,xf86vidmodeproto) - ("libdmx" ,libdmx) + ("dbus" ,dbus) ("dmxproto" ,dmxproto) - ("xf86dgaproto" ,xf86dgaproto) - ("xineramaproto" ,xineramaproto) + ("dri2proto" ,dri2proto) + ("glproto" ,glproto) + ("inputproto" ,inputproto) + ("kbproto" ,kbproto) + ("libdmx" ,libdmx) +;; ("libdrm" ,libdrm) + ("libpciaccess" ,libpciaccess) + ("libx11" ,libx11) + ("libxau" ,libxau) + ("libxaw" ,libxaw) + ("libxdmcp" ,libxdmcp) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxfont" ,libxfont) + ("libxkbfile" ,libxkbfile) + ("libxmu" ,libxmu) + ("libxpm" ,libxpm) + ("libxrender" ,libxrender) + ("libxres" ,libxres) + ("libxt" ,libxt) + ("libxv" ,libxv) +;; ("mesa" ,mesa) + ("openssl" ,openssl) +;; ("pixman" ,pixman) + ("pkg-config" ,pkg-config) + ("recordproto" ,recordproto) + ("randrproto" ,randrproto) + ("renderproto" ,renderproto) ("resourceproto" ,resourceproto) ("scrnsaverproto" ,scrnsaverproto) - ("compositeproto" ,compositeproto) - ("xf86driproto" ,xf86driproto) - ("glproto" ,glproto) - ("xf86bigfontproto" ,xf86bigfontproto) - ("dbus" ,dbus) -;; ("mesa" ,mesa) ;; ("systemd" ,systemd) - ("zlib" ,zlib) - ("libxv" ,libxv) - ("libxt" ,libxt) - ("libxres" ,libxres) - ("libxrender" ,libxrender) - ("libxpm" ,libxpm) - ("libxmu" ,libxmu) - ("libxkbfile" ,libxkbfile) - ("libxfixes" ,libxfixes) - ("libxdmcp" ,libxdmcp) - ("libxaw" ,libxaw) - ("libxau" ,libxau) - ("libx11" ,libx11) - ("openssl" ,openssl) -;; ("libdrm" ,libdrm) - ("renderproto" ,renderproto) - ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("kbproto" ,kbproto) - ("dri2proto" ,dri2proto) - ("randrproto" ,randrproto) + ("xcmiscproto" ,xcmiscproto) ("xextproto" ,xextproto) - ("inputproto" ,inputproto) - ("libpciaccess" ,libpciaccess))) + ("xf86bigfontproto" ,xf86bigfontproto) + ("xf86dgaproto" ,xf86dgaproto) + ("xf86driproto" ,xf86driproto) + ("xf86vidmodeproto" ,xf86vidmodeproto) + ("xineramaproto" ,xineramaproto) + ("xtrans" ,xtrans) + ("zlib" ,zlib))) (home-page #f) (synopsis #f) (description #f) From b49317cac3fb0412e4f7215eed5328e9efb33b60 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 26 Feb 2013 22:15:43 +0100 Subject: [PATCH 04/44] gnu: xorg: Add missing hashes. * gnu/packages/xorg.scm: Add hashes to all packages. --- gnu/packages/xorg.scm | 120 +++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e2137154a4..a018282456 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -187,7 +187,7 @@ (define-public dri2proto ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "02drlfqvjm2q7dvkkwli3fs2crb6rdb3kyd13vwx7z0rijrc10md")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -254,7 +254,7 @@ (define-public font-adobe-100dpi ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -275,7 +275,7 @@ (define-public font-adobe-75dpi ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -296,7 +296,7 @@ (define-public font-adobe-utopia-100dpi ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -317,7 +317,7 @@ (define-public font-adobe-utopia-75dpi ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -338,7 +338,7 @@ (define-public font-adobe-utopia-type1 ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -406,7 +406,7 @@ (define-public font-bh-100dpi ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -427,7 +427,7 @@ (define-public font-bh-75dpi ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -448,7 +448,7 @@ (define-public font-bh-lucidatypewriter-100dpi ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -469,7 +469,7 @@ (define-public font-bh-lucidatypewriter-75dpi ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -691,7 +691,7 @@ (define-public font-ibm-type1 ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx")))) (build-system gnu-build-system) (inputs `(("mkfontdir" ,mkfontdir) @@ -1067,7 +1067,7 @@ (define-public font-xfree86-type1 ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -1100,7 +1100,7 @@ (define-public fontsproto (define-public glproto (package (name "glproto") - (version "1.4.16") + (version "1.4.15") (source (origin (method url-fetch) @@ -1110,7 +1110,7 @@ (define-public glproto ".tar.bz2")) (sha256 (base32 - "13arnb4bz5pn89bxbh3shr8gihkhyznpjnq3zzr05msygwx6dpal")))) + "0wf1vq9g4pyzahb23ywx554pm5bpax49lz188fk6m5p8wbmmc0wr")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) (home-page #f) @@ -1333,7 +1333,7 @@ (define-public libx11 ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -1992,7 +1992,7 @@ (define-public libxxf86dga ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2013,7 +2013,7 @@ (define-public libxxf86vm ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2533,7 +2533,7 @@ (define-public x11perf ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2859,7 +2859,7 @@ (define-public xf86-input-evdev ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2880,7 +2880,7 @@ (define-public xf86-input-joystick ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2901,7 +2901,7 @@ (define-public xf86-input-keyboard ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2922,7 +2922,7 @@ (define-public xf86-input-mouse ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2943,7 +2943,7 @@ (define-public xf86-input-synaptics ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2964,7 +2964,7 @@ (define-public xf86-input-vmmouse ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -2985,7 +2985,7 @@ (define-public xf86-input-void ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3006,7 +3006,7 @@ (define-public xf86-video-ark ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3027,7 +3027,7 @@ (define-public xf86-video-ast ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3048,7 +3048,7 @@ (define-public xf86-video-ati ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3069,7 +3069,7 @@ (define-public xf86-video-cirrus ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3090,7 +3090,7 @@ (define-public xf86-video-dummy ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3111,7 +3111,7 @@ (define-public xf86-video-fbdev ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3132,7 +3132,7 @@ (define-public xf86-video-geode ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3153,7 +3153,7 @@ (define-public xf86-video-glide ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3174,7 +3174,7 @@ (define-public xf86-video-glint ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3195,7 +3195,7 @@ (define-public xf86-video-i128 ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3216,7 +3216,7 @@ (define-public xf86-video-intel ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1g742szymajh88a5dw08sxcr45bmxgc4w3m6hddv9qscn5hks4rj")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3237,7 +3237,7 @@ (define-public xf86-video-mach64 ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3258,7 +3258,7 @@ (define-public xf86-video-mga ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3279,7 +3279,7 @@ (define-public xf86-video-neomagic ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3300,7 +3300,7 @@ (define-public xf86-video-newport ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3321,7 +3321,7 @@ (define-public xf86-video-nv ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3342,7 +3342,7 @@ (define-public xf86-video-openchrome ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3363,7 +3363,7 @@ (define-public xf86-video-r128 ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3384,7 +3384,7 @@ (define-public xf86-video-savage ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3405,7 +3405,7 @@ (define-public xf86-video-siliconmotion ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3426,7 +3426,7 @@ (define-public xf86-video-sis ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3447,7 +3447,7 @@ (define-public xf86-video-suncg6 ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3468,7 +3468,7 @@ (define-public xf86-video-sunffb ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3489,7 +3489,7 @@ (define-public xf86-video-tdfx ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3510,7 +3510,7 @@ (define-public xf86-video-tga ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3531,7 +3531,7 @@ (define-public xf86-video-trident ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3552,7 +3552,7 @@ (define-public xf86-video-v4l ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3573,7 +3573,7 @@ (define-public xf86-video-vesa ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3594,7 +3594,7 @@ (define-public xf86-video-vmware ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3615,7 +3615,7 @@ (define-public xf86-video-voodoo ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3636,7 +3636,7 @@ (define-public xf86-video-wsfb ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3657,7 +3657,7 @@ (define-public xf86bigfontproto ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3678,7 +3678,7 @@ (define-public xf86dgaproto ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3699,7 +3699,7 @@ (define-public xf86driproto ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) @@ -3720,7 +3720,7 @@ (define-public xf86vidmodeproto ".tar.bz2")) (sha256 (base32 - "0000000000000000000000000000000000000000000000000000")))) + "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5")))) (build-system gnu-build-system) (home-page #f) (synopsis #f) From d385b8355d532bc91292254f8221aefd5e31ee41 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 28 Feb 2013 23:10:25 +0100 Subject: [PATCH 05/44] gnu: xorg: Add licenses. Comment out packages with non-free license, without license, or not available on the ftp servers. Remove package not present in the distribution. * gnu/packages/xorg.scm (*): Add licenses. * gnu/packages/xorg.scm (libxp): Remove variable of package that is not present in the R7.7 distribution. * gnu/packages/xorg.scm (libpthread, libxcb): Comment out variables, which are referenced, but not present on the ftp servers. * gnu/packages/xorg.scm (font-adobe-utopia-100dpi, font-adobe-utopia-75dpi, font-adobe-utopia-type1, font-bh-100dpi, font-bh-75dpi, font-bh-lucidatypewriter-100dpi, font-bh-lucidatypewriter-75dpi, font-bh-type1, font-bitstream-100dpi, font-bitstream-75dpi, font-daewoo-misc, font-ibm-type1, font-jis-misc, font-misc-meltho, xf86-video-dummy): Comment out variables, packages have non-free licenses. * gnu/packages/xorg.scm (font-cursor-misc, xf86-video-v4l, xorg-docs): Comment out variables, packages have no license. --- gnu/packages/xorg.scm | 1547 ++++++++++++++++++++--------------------- 1 file changed, 762 insertions(+), 785 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a018282456..adc62f9ffa 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -57,7 +57,7 @@ (define-public applewmproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public bdftopcf @@ -81,7 +81,7 @@ (define-public bdftopcf (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public bigreqsproto @@ -103,7 +103,7 @@ (define-public bigreqsproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public compositeproto @@ -127,7 +127,7 @@ (define-public compositeproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public damageproto @@ -149,7 +149,7 @@ (define-public damageproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public dmxproto @@ -171,7 +171,7 @@ (define-public dmxproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public dri2proto @@ -192,7 +192,7 @@ (define-public dri2proto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public encodings @@ -214,7 +214,7 @@ (define-public encodings (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:public-domain))) (define-public fixesproto @@ -238,7 +238,7 @@ (define-public fixesproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-adobe-100dpi @@ -259,7 +259,7 @@ (define-public font-adobe-100dpi (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-adobe-75dpi @@ -280,70 +280,70 @@ (define-public font-adobe-75dpi (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public font-adobe-utopia-100dpi - (package - (name "font-adobe-utopia-100dpi") - (version "1.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-" - version - ".tar.bz2")) - (sha256 - (base32 - "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-adobe-utopia-75dpi - (package - (name "font-adobe-utopia-75dpi") - (version "1.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-" - version - ".tar.bz2")) - (sha256 - (base32 - "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-adobe-utopia-type1 - (package - (name "font-adobe-utopia-type1") - (version "1.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-" - version - ".tar.bz2")) - (sha256 - (base32 - "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public font-adobe-utopia-100dpi +;; (package +;; (name "font-adobe-utopia-100dpi") +;; (version "1.0.4") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-adobe-utopia-75dpi +;; (package +;; (name "font-adobe-utopia-75dpi") +;; (version "1.0.4") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-adobe-utopia-type1 +;; (package +;; (name "font-adobe-utopia-type1") +;; (version "1.0.4") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) (define-public font-alias @@ -365,7 +365,7 @@ (define-public font-alias (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-arabic-misc @@ -390,166 +390,166 @@ (define-public font-arabic-misc (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public font-bh-100dpi - (package - (name "font-bh-100dpi") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-" - version - ".tar.bz2")) - (sha256 - (base32 - "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-bh-75dpi - (package - (name "font-bh-75dpi") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-" - version - ".tar.bz2")) - (sha256 - (base32 - "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-bh-lucidatypewriter-100dpi - (package - (name "font-bh-lucidatypewriter-100dpi") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-" - version - ".tar.bz2")) - (sha256 - (base32 - "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-bh-lucidatypewriter-75dpi - (package - (name "font-bh-lucidatypewriter-75dpi") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-" - version - ".tar.bz2")) - (sha256 - (base32 - "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-bh-type1 - (package - (name "font-bh-type1") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" - version - ".tar.bz2")) - (sha256 - (base32 - "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) - (build-system gnu-build-system) - (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-bitstream-100dpi - (package - (name "font-bitstream-100dpi") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" - version - ".tar.bz2")) - (sha256 - (base32 - "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) - (build-system gnu-build-system) - (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-bitstream-75dpi - (package - (name "font-bitstream-75dpi") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" - version - ".tar.bz2")) - (sha256 - (base32 - "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) - (build-system gnu-build-system) - (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public font-bh-100dpi +;; (package +;; (name "font-bh-100dpi") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-bh-75dpi +;; (package +;; (name "font-bh-75dpi") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-bh-lucidatypewriter-100dpi +;; (package +;; (name "font-bh-lucidatypewriter-100dpi") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-bh-lucidatypewriter-75dpi +;; (package +;; (name "font-bh-lucidatypewriter-75dpi") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-bh-type1 +;; (package +;; (name "font-bh-type1") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontscale" ,mkfontscale) +;; ("mkfontdir" ,mkfontdir) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-bitstream-100dpi +;; (package +;; (name "font-bitstream-100dpi") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontscale" ,mkfontscale) +;; ("mkfontdir" ,mkfontdir) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) +;; +;; +;; (define-public font-bitstream-75dpi +;; (package +;; (name "font-bitstream-75dpi") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-bh-ttf-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontscale" ,mkfontscale) +;; ("mkfontdir" ,mkfontdir) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) (define-public font-bitstream-type1 @@ -574,7 +574,7 @@ (define-public font-bitstream-type1 (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-cronyx-cyrillic @@ -599,58 +599,58 @@ (define-public font-cronyx-cyrillic (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public font-cursor-misc - (package - (name "font-cursor-misc") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-cursor-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp")))) - (build-system gnu-build-system) - (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public font-daewoo-misc - (package - (name "font-daewoo-misc") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw")))) - (build-system gnu-build-system) - (inputs - `(("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public font-cursor-misc +;; (package +;; (name "font-cursor-misc") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-cursor-misc-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontscale" ,mkfontscale) +;; ("mkfontdir" ,mkfontdir) +;; ("bdftopcf" ,bdftopcf) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license none))) +;; +;; +;; (define-public font-daewoo-misc +;; (package +;; (name "font-daewoo-misc") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontdir" ,mkfontdir) +;; ("bdftopcf" ,bdftopcf) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) (define-public font-dec-misc @@ -675,32 +675,32 @@ (define-public font-dec-misc (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public font-ibm-type1 - (package - (name "font-ibm-type1") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-" - version - ".tar.bz2")) - (sha256 - (base32 - "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx")))) - (build-system gnu-build-system) - (inputs - `(("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public font-ibm-type1 +;; (package +;; (name "font-ibm-type1") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontdir" ,mkfontdir) +;; ("bdftopcf" ,bdftopcf) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) (define-public font-isas-misc @@ -725,32 +725,32 @@ (define-public font-isas-misc (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public font-jis-misc - (package - (name "font-jis-misc") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-jis-misc-" - version - ".tar.bz2")) - (sha256 - (base32 - "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b")))) - (build-system gnu-build-system) - (inputs - `(("mkfontdir" ,mkfontdir) - ("bdftopcf" ,bdftopcf) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public font-jis-misc +;; (package +;; (name "font-jis-misc") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-jis-misc-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontdir" ,mkfontdir) +;; ("bdftopcf" ,bdftopcf) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) (define-public font-micro-misc @@ -775,7 +775,7 @@ (define-public font-micro-misc (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:public-domain))) (define-public font-misc-cyrillic @@ -800,7 +800,7 @@ (define-public font-misc-cyrillic (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-misc-ethiopic @@ -825,32 +825,32 @@ (define-public font-misc-ethiopic (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public font-misc-meltho - (package - (name "font-misc-meltho") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/font-misc-meltho-" - version - ".tar.bz2")) - (sha256 - (base32 - "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p")))) - (build-system gnu-build-system) - (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public font-misc-meltho +;; (package +;; (name "font-misc-meltho") +;; (version "1.0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/font-misc-meltho-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("mkfontscale" ,mkfontscale) +;; ("mkfontdir" ,mkfontdir) +;; ("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) (define-public font-misc-misc @@ -877,7 +877,7 @@ (define-public font-misc-misc (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:public-domain))) (define-public font-mutt-misc @@ -902,7 +902,7 @@ (define-public font-mutt-misc (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-schumacher-misc @@ -929,7 +929,7 @@ (define-public font-schumacher-misc (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-screen-cyrillic @@ -954,7 +954,7 @@ (define-public font-screen-cyrillic (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-sony-misc @@ -979,7 +979,7 @@ (define-public font-sony-misc (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-sun-misc @@ -1004,7 +1004,7 @@ (define-public font-sun-misc (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-util @@ -1026,7 +1026,7 @@ (define-public font-util (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public font-winitzki-cyrillic @@ -1051,7 +1051,7 @@ (define-public font-winitzki-cyrillic (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:public-domain))) (define-public font-xfree86-type1 @@ -1072,7 +1072,7 @@ (define-public font-xfree86-type1 (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public fontsproto @@ -1094,7 +1094,7 @@ (define-public fontsproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public glproto @@ -1116,7 +1116,7 @@ (define-public glproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public iceauth @@ -1141,7 +1141,7 @@ (define-public iceauth (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public inputproto @@ -1163,7 +1163,7 @@ (define-public inputproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public kbproto @@ -1185,7 +1185,7 @@ (define-public kbproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libapplewm @@ -1212,7 +1212,59 @@ (define-public libapplewm (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) + + +(define-public libdmx + (package + (name "libdmx") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libdmx-" + version + ".tar.bz2")) + (sha256 + (base32 + "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("dmxproto" ,dmxproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) + + +(define-public libfontenc + (package + (name "libfontenc") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libfontenc-" + version + ".tar.bz2")) + (sha256 + (base32 + "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("xproto" ,xproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) (define-public libfs @@ -1238,7 +1290,7 @@ (define-public libfs (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libice @@ -1263,7 +1315,53 @@ (define-public libice (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) + + +(define-public libpciaccess + (package + (name "libpciaccess") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libpciaccess-" + version + ".tar.bz2")) + (sha256 + (base32 + "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) + + +;; file referenced, but not present on servers +;; (define-public libpthread-stubs +;; (package +;; (name "libpthread-stubs") +;; (version "0.3") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license license:???))) (define-public libsm @@ -1290,7 +1388,7 @@ (define-public libsm (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libwindowswm @@ -1317,7 +1415,7 @@ (define-public libwindowswm (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libx11 @@ -1338,34 +1436,7 @@ (define-public libx11 (home-page #f) (synopsis #f) (description #f) - (license #f))) - - -(define-public libxscrnsaver - (package - (name "libxscrnsaver") - (version "1.2.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXScrnSaver-" - version - ".tar.bz2")) - (sha256 - (base32 - "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg")))) - (build-system gnu-build-system) - (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("scrnsaverproto" ,scrnsaverproto) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) + (license license:x11))) (define-public libxau @@ -1388,7 +1459,7 @@ (define-public libxau (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxaw @@ -1418,7 +1489,38 @@ (define-public libxaw (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) + + +;; file referenced, but not present on servers +;; (define-public libxcb +;; (package +;; (name "libxcb") +;; (version "1.9") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/libxcb-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("xproto" ,xproto) +;; ("libxdmcp" ,libxdmcp) +;; ("xcb-proto" ,xcb-proto) +;; ("libxau" ,libxau) +;; ("libpthread-stubs" ,libpthread-stubs) +;; ("libxslt" ,libxslt) +;; ("pkg-config" ,pkg-config) +;; ("python" ,python))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license license:???))) (define-public libxcomposite @@ -1445,7 +1547,7 @@ (define-public libxcomposite (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxcursor @@ -1473,7 +1575,7 @@ (define-public libxcursor (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxdamage @@ -1502,7 +1604,7 @@ (define-public libxdamage (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxdmcp @@ -1525,7 +1627,7 @@ (define-public libxdmcp (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxext @@ -1552,7 +1654,7 @@ (define-public libxext (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxfixes @@ -1579,7 +1681,7 @@ (define-public libxfixes (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxfont @@ -1608,7 +1710,7 @@ (define-public libxfont (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxft @@ -1639,7 +1741,7 @@ (define-public libxft (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxi @@ -1667,7 +1769,7 @@ (define-public libxi (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxinerama @@ -1694,7 +1796,32 @@ (define-public libxinerama (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) + + +(define-public libxkbfile + (package + (name "libxkbfile") + (version "1.0.8") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxkbfile-" + version + ".tar.bz2")) + (sha256 + (base32 + "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("kbproto" ,kbproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) (define-public libxmu @@ -1722,35 +1849,7 @@ (define-public libxmu (home-page #f) (synopsis #f) (description #f) - (license #f))) - - -(define-public libxp - (package - (name "libxp") - (version "1.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXp-" - version - ".tar.bz2")) - (sha256 - (base32 - "1lj3cjg9ygbmclxvayy5v88kkndpy9jq6y68p13dc5jn01hg5lbi")))) - (build-system gnu-build-system) - (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libxau" ,libxau) - ("libx11" ,libx11) -;; ("printproto" ,printproto) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) + (license license:x11))) (define-public libxpm @@ -1778,7 +1877,7 @@ (define-public libxpm (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxrandr @@ -1808,7 +1907,7 @@ (define-public libxrandr (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxrender @@ -1834,7 +1933,7 @@ (define-public libxrender (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxres @@ -1862,7 +1961,34 @@ (define-public libxres (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) + + +(define-public libxscrnsaver + (package + (name "libxscrnsaver") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXScrnSaver-" + version + ".tar.bz2")) + (sha256 + (base32 + "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg")))) + (build-system gnu-build-system) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("scrnsaverproto" ,scrnsaverproto) + ("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) (define-public libxt @@ -1890,7 +2016,7 @@ (define-public libxt (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxtst @@ -1919,7 +2045,7 @@ (define-public libxtst (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxv @@ -1947,7 +2073,7 @@ (define-public libxv (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxvmc @@ -1976,7 +2102,7 @@ (define-public libxvmc (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxxf86dga @@ -1997,7 +2123,7 @@ (define-public libxxf86dga (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public libxxf86vm @@ -2018,159 +2144,7 @@ (define-public libxxf86vm (home-page #f) (synopsis #f) (description #f) - (license #f))) - - -(define-public libdmx - (package - (name "libdmx") - (version "1.1.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libdmx-" - version - ".tar.bz2")) - (sha256 - (base32 - "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7")))) - (build-system gnu-build-system) - (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("dmxproto" ,dmxproto) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public libfontenc - (package - (name "libfontenc") - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libfontenc-" - version - ".tar.bz2")) - (sha256 - (base32 - "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny")))) - (build-system gnu-build-system) - (inputs - `(("zlib" ,zlib) - ("xproto" ,xproto) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public libpciaccess - (package - (name "libpciaccess") - (version "0.13.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libpciaccess-" - version - ".tar.bz2")) - (sha256 - (base32 - "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7")))) - (build-system gnu-build-system) - (inputs - `(("zlib" ,zlib) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public libpthread-stubs - (package - (name "libpthread-stubs") - (version "0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-" - version - ".tar.bz2")) - (sha256 - (base32 - "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public libxcb - (package - (name "libxcb") - (version "1.9") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxcb-" - version - ".tar.bz2")) - (sha256 - (base32 - "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxdmcp" ,libxdmcp) - ("xcb-proto" ,xcb-proto) - ("libxau" ,libxau) - ("libpthread-stubs" ,libpthread-stubs) - ("libxslt" ,libxslt) - ("pkg-config" ,pkg-config) - ("python" ,python))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) - - -(define-public libxkbfile - (package - (name "libxkbfile") - (version "1.0.8") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxkbfile-" - version - ".tar.bz2")) - (sha256 - (base32 - "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca")))) - (build-system gnu-build-system) - (inputs - `(("libx11" ,libx11) - ("kbproto" ,kbproto) - ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) + (license license:x11))) (define-public luit @@ -2194,7 +2168,7 @@ (define-public luit (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public makedepend @@ -2217,7 +2191,7 @@ (define-public makedepend (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public mkfontdir @@ -2239,7 +2213,7 @@ (define-public mkfontdir (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public mkfontscale @@ -2266,7 +2240,7 @@ (define-public mkfontscale (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public randrproto @@ -2288,7 +2262,7 @@ (define-public randrproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public recordproto @@ -2310,7 +2284,7 @@ (define-public recordproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public renderproto @@ -2332,7 +2306,7 @@ (define-public renderproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public resourceproto @@ -2354,7 +2328,7 @@ (define-public resourceproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public scrnsaverproto @@ -2376,7 +2350,7 @@ (define-public scrnsaverproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public sessreg @@ -2399,7 +2373,7 @@ (define-public sessreg (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public setxkbmap @@ -2424,7 +2398,7 @@ (define-public setxkbmap (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public smproxy @@ -2451,7 +2425,7 @@ (define-public smproxy (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public util-macros @@ -2473,7 +2447,7 @@ (define-public util-macros (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public videoproto @@ -2495,7 +2469,7 @@ (define-public videoproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public windowswmproto @@ -2517,7 +2491,7 @@ (define-public windowswmproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public x11perf @@ -2538,7 +2512,7 @@ (define-public x11perf (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xauth @@ -2565,7 +2539,7 @@ (define-public xauth (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xbacklight @@ -2586,12 +2560,12 @@ (define-public xbacklight (inputs `(("libxrender" ,libxrender) ;; ("xcb-util" ,xcb-util) - ("libxcb" ,libxcb) +;; ("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xbitmaps @@ -2613,30 +2587,31 @@ (define-public xbitmaps (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public xcb-proto - (package - (name "xcb-proto") - (version "1.8") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xcb-proto-" - version - ".tar.bz2")) - (sha256 - (base32 - "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93")))) - (build-system gnu-build-system) - (inputs - `(("pkg-config" ,pkg-config) ("python" ,python))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; file referenced, but not present on servers +;; (define-public xcb-proto +;; (package +;; (name "xcb-proto") +;; (version "1.8") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xcb-proto-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("pkg-config" ,pkg-config) ("python" ,python))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license license:x11))) (define-public xcmiscproto @@ -2658,7 +2633,7 @@ (define-public xcmiscproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xcmsdb @@ -2682,7 +2657,7 @@ (define-public xcmsdb (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xcursor-themes @@ -2706,7 +2681,7 @@ (define-public xcursor-themes (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xcursorgen @@ -2732,7 +2707,7 @@ (define-public xcursorgen (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xdpyinfo @@ -2760,14 +2735,14 @@ (define-public xdpyinfo ("libxi" ,libxi) ("libxext" ,libxext) ("libxcomposite" ,libxcomposite) - ("libxcb" ,libxcb) +;; ("libxcb" ,libxcb) ("libx11" ,libx11) ("libdmx" ,libdmx) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xdriinfo @@ -2794,7 +2769,7 @@ (define-public xdriinfo (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xev @@ -2821,7 +2796,7 @@ (define-public xev (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xextproto @@ -2843,7 +2818,7 @@ (define-public xextproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-input-evdev @@ -2864,7 +2839,7 @@ (define-public xf86-input-evdev (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-input-joystick @@ -2885,7 +2860,7 @@ (define-public xf86-input-joystick (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-input-keyboard @@ -2906,7 +2881,7 @@ (define-public xf86-input-keyboard (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-input-mouse @@ -2927,7 +2902,7 @@ (define-public xf86-input-mouse (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-input-synaptics @@ -2948,7 +2923,7 @@ (define-public xf86-input-synaptics (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-input-vmmouse @@ -2969,7 +2944,7 @@ (define-public xf86-input-vmmouse (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-input-void @@ -2990,7 +2965,7 @@ (define-public xf86-input-void (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-ark @@ -3011,7 +2986,7 @@ (define-public xf86-video-ark (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-ast @@ -3032,7 +3007,7 @@ (define-public xf86-video-ast (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-ati @@ -3053,7 +3028,7 @@ (define-public xf86-video-ati (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-cirrus @@ -3074,28 +3049,28 @@ (define-public xf86-video-cirrus (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public xf86-video-dummy - (package - (name "xf86-video-dummy") - (version "0.3.5") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-" - version - ".tar.bz2")) - (sha256 - (base32 - "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public xf86-video-dummy +;; (package +;; (name "xf86-video-dummy") +;; (version "0.3.5") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license non-free))) (define-public xf86-video-fbdev @@ -3116,7 +3091,7 @@ (define-public xf86-video-fbdev (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-geode @@ -3137,7 +3112,7 @@ (define-public xf86-video-geode (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-glide @@ -3158,7 +3133,7 @@ (define-public xf86-video-glide (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-glint @@ -3179,7 +3154,7 @@ (define-public xf86-video-glint (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-i128 @@ -3200,7 +3175,7 @@ (define-public xf86-video-i128 (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-intel @@ -3221,7 +3196,7 @@ (define-public xf86-video-intel (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-mach64 @@ -3242,7 +3217,7 @@ (define-public xf86-video-mach64 (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-mga @@ -3263,7 +3238,7 @@ (define-public xf86-video-mga (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-neomagic @@ -3284,7 +3259,7 @@ (define-public xf86-video-neomagic (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-newport @@ -3305,7 +3280,7 @@ (define-public xf86-video-newport (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-nv @@ -3326,7 +3301,7 @@ (define-public xf86-video-nv (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-openchrome @@ -3347,7 +3322,7 @@ (define-public xf86-video-openchrome (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-r128 @@ -3368,7 +3343,7 @@ (define-public xf86-video-r128 (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-savage @@ -3389,7 +3364,7 @@ (define-public xf86-video-savage (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-siliconmotion @@ -3410,7 +3385,7 @@ (define-public xf86-video-siliconmotion (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-sis @@ -3431,7 +3406,7 @@ (define-public xf86-video-sis (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:bsd-3))) (define-public xf86-video-suncg6 @@ -3452,7 +3427,7 @@ (define-public xf86-video-suncg6 (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-sunffb @@ -3473,7 +3448,7 @@ (define-public xf86-video-sunffb (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-tdfx @@ -3494,7 +3469,7 @@ (define-public xf86-video-tdfx (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-tga @@ -3515,7 +3490,7 @@ (define-public xf86-video-tga (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-trident @@ -3536,28 +3511,28 @@ (define-public xf86-video-trident (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public xf86-video-v4l - (package - (name "xf86-video-v4l") - (version "0.2.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-" - version - ".tar.bz2")) - (sha256 - (base32 - "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb")))) - (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public xf86-video-v4l +;; (package +;; (name "xf86-video-v4l") +;; (version "0.2.0") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb")))) +;; (build-system gnu-build-system) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license none))) (define-public xf86-video-vesa @@ -3578,7 +3553,7 @@ (define-public xf86-video-vesa (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-vmware @@ -3599,7 +3574,7 @@ (define-public xf86-video-vmware (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-voodoo @@ -3620,7 +3595,7 @@ (define-public xf86-video-voodoo (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86-video-wsfb @@ -3641,7 +3616,7 @@ (define-public xf86-video-wsfb (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:bsd-2))) (define-public xf86bigfontproto @@ -3662,7 +3637,7 @@ (define-public xf86bigfontproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86dgaproto @@ -3683,7 +3658,7 @@ (define-public xf86dgaproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86driproto @@ -3704,7 +3679,7 @@ (define-public xf86driproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xf86vidmodeproto @@ -3725,7 +3700,7 @@ (define-public xf86vidmodeproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xgamma @@ -3750,7 +3725,7 @@ (define-public xgamma (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xhost @@ -3776,7 +3751,7 @@ (define-public xhost (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xineramaproto @@ -3798,7 +3773,7 @@ (define-public xineramaproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xinput @@ -3828,7 +3803,7 @@ (define-public xinput (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xkbcomp @@ -3854,7 +3829,7 @@ (define-public xkbcomp (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xkbevd @@ -3879,7 +3854,7 @@ (define-public xkbevd (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xkbutils @@ -3907,7 +3882,7 @@ (define-public xkbutils (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xkeyboard-config @@ -3929,7 +3904,7 @@ (define-public xkeyboard-config (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xkill @@ -3954,7 +3929,7 @@ (define-public xkill (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xlsatoms @@ -3973,11 +3948,12 @@ (define-public xlsatoms "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv")))) (build-system gnu-build-system) (inputs - `(("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) + `(;("libxcb" ,libxcb) + ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xlsclients @@ -3996,11 +3972,12 @@ (define-public xlsclients "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w")))) (build-system gnu-build-system) (inputs - `(("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) + `(;("libxcb" ,libxcb) + ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xmodmap @@ -4025,29 +4002,29 @@ (define-public xmodmap (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) -(define-public xorg-docs - (package - (name "xorg-docs") - (version "1.7") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xorg-docs-" - version - ".tar.bz2")) - (sha256 - (base32 - "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) - (license #f))) +;; (define-public xorg-docs +;; (package +;; (name "xorg-docs") +;; (version "1.7") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xorg-docs-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config))) +;; (home-page #f) +;; (synopsis #f) +;; (description #f) +;; (license none))) (define-public xorg-server @@ -4114,7 +4091,7 @@ (define-public xorg-server (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xorg-sgml-doctools @@ -4136,7 +4113,7 @@ (define-public xorg-sgml-doctools (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xpr @@ -4162,7 +4139,7 @@ (define-public xpr (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xprop @@ -4187,7 +4164,7 @@ (define-public xprop (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xproto @@ -4209,7 +4186,7 @@ (define-public xproto (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xrandr @@ -4236,7 +4213,7 @@ (define-public xrandr (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xrdb @@ -4261,7 +4238,7 @@ (define-public xrdb (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xrefresh @@ -4285,7 +4262,7 @@ (define-public xrefresh (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xset @@ -4304,7 +4281,7 @@ (define-public xset "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1")))) (build-system gnu-build-system) (inputs - `(;;("libxxf86misc" ,libxxf86misc) + `(;("libxxf86misc" ,libxxf86misc) ("xproto" ,xproto) ("libxmu" ,libxmu) ("libxext" ,libxext) @@ -4313,7 +4290,7 @@ (define-public xset (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xsetroot @@ -4340,7 +4317,7 @@ (define-public xsetroot (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xtrans @@ -4362,7 +4339,7 @@ (define-public xtrans (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xvinfo @@ -4388,7 +4365,7 @@ (define-public xvinfo (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xwd @@ -4414,7 +4391,7 @@ (define-public xwd (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xwininfo @@ -4434,13 +4411,13 @@ (define-public xwininfo (build-system gnu-build-system) (inputs `(("xproto" ,xproto) - ("libxcb" ,libxcb) +;; ("libxcb" ,libxcb) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) (define-public xwud @@ -4465,4 +4442,4 @@ (define-public xwud (home-page #f) (synopsis #f) (description #f) - (license #f))) + (license license:x11))) From dd85efda47ef67125abc18d387730d0f266bdf10 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 28 Feb 2013 23:32:53 +0100 Subject: [PATCH 06/44] gnu: xorg: Downgrade package versions to those present in X11R7.7 * gnu/packages/xorg.scm (dri2proto, libxcb, libxrandr, randrproto, xbacklight, xcb-proto, xorg-server): Use the versions present in X11R7.7. --- gnu/packages/xorg.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index adc62f9ffa..ee6771b34d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -177,7 +177,7 @@ (define-public dmxproto (define-public dri2proto (package (name "dri2proto") - (version "2.3.1") + (version "2.6") (source (origin (method url-fetch) @@ -1496,7 +1496,7 @@ (define-public libxaw ;; (define-public libxcb ;; (package ;; (name "libxcb") -;; (version "1.9") +;; (version "1.8.1") ;; (source ;; (origin ;; (method url-fetch) @@ -1883,7 +1883,7 @@ (define-public libxpm (define-public libxrandr (package (name "libxrandr") - (version "1.4.0") + (version "1.3.2") (source (origin (method url-fetch) @@ -1893,7 +1893,7 @@ (define-public libxrandr ".tar.bz2")) (sha256 (base32 - "1hzm2ndra4nf8xxzm4lzd225zj05hzbzcq464q2znah15ynd0fh3")))) + "10cvv78ws8jznma4s45dzqz0ldcxk30qgsqrc4wxfcsjmcba5b3y")))) (build-system gnu-build-system) (inputs `(("libxrender" ,libxrender) @@ -2246,7 +2246,7 @@ (define-public mkfontscale (define-public randrproto (package (name "randrproto") - (version "1.4.0") + (version "1.3.2") (source (origin (method url-fetch) @@ -2256,7 +2256,7 @@ (define-public randrproto ".tar.bz2")) (sha256 (base32 - "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45")))) + "0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) (home-page #f) @@ -2545,7 +2545,7 @@ (define-public xauth (define-public xbacklight (package (name "xbacklight") - (version "1.2.0") + (version "1.1.2") (source (origin (method url-fetch) @@ -2555,7 +2555,7 @@ (define-public xbacklight ".tar.bz2")) (sha256 (base32 - "199n9qszjiz82nbjz6ychh0xl15igm535mv0830wk4m59w9xclji")))) + "02b5jfys2msla2yvg5s0knzyxg2104r25czkwd49i8g8kp804bxg")))) (build-system gnu-build-system) (inputs `(("libxrender" ,libxrender) @@ -2594,7 +2594,7 @@ (define-public xbitmaps ;; (define-public xcb-proto ;; (package ;; (name "xcb-proto") -;; (version "1.8") +;; (version "1.7.1") ;; (source ;; (origin ;; (method url-fetch) @@ -4030,7 +4030,7 @@ (define-public xmodmap (define-public xorg-server (package (name "xorg-server") - (version "1.12.4") + (version "1.12.2") (source (origin (method url-fetch) @@ -4040,7 +4040,7 @@ (define-public xorg-server ".tar.bz2")) (sha256 (base32 - "1xscr6rf0q15hv3hmm51xhwk0c0rx7a2swkj14ygp8vb60sprh4a")))) + "1xf57hcq6r17zxyfnx9r1wd0ir1bw13ff8bsiszwrw9jyhi9x7ya")))) (build-system gnu-build-system) (inputs `(("bigreqsproto" ,bigreqsproto) From 0820a58b3ca29910efcf39b7f0fcdcbaf2a1364a Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 3 Mar 2013 19:50:26 +0100 Subject: [PATCH 07/44] gnu: xorg: Fix http mirror and uncomment xcb packages. * guix/download.scm (%mirrors): Fix main http mirror address. * gnu/packages/xorg.scm (libpthread-stubs, libxcb, xcb-proto): Uncomment and add licenses. --- gnu/packages/xorg.scm | 141 +++++++++++++++++++++--------------------- guix/download.scm | 3 +- 2 files changed, 70 insertions(+), 74 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ee6771b34d..ebabcab437 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1341,27 +1341,26 @@ (define-public libpciaccess (license license:x11))) -;; file referenced, but not present on servers -;; (define-public libpthread-stubs -;; (package -;; (name "libpthread-stubs") -;; (version "0.3") -;; (source -;; (origin -;; (method url-fetch) -;; (uri (string-append -;; "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-" -;; version -;; ".tar.bz2")) -;; (sha256 -;; (base32 -;; "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) -;; (build-system gnu-build-system) -;; (inputs `(("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) -;; (license license:???))) +(define-public libpthread-stubs + (package + (name "libpthread-stubs") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-" + version + ".tar.bz2")) + (sha256 + (base32 + "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) (define-public libsm @@ -1492,35 +1491,34 @@ (define-public libxaw (license license:x11))) -;; file referenced, but not present on servers -;; (define-public libxcb -;; (package -;; (name "libxcb") -;; (version "1.8.1") -;; (source -;; (origin -;; (method url-fetch) -;; (uri (string-append -;; "mirror://xorg/X11R7.7/src/everything/libxcb-" -;; version -;; ".tar.bz2")) -;; (sha256 -;; (base32 -;; "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8")))) -;; (build-system gnu-build-system) -;; (inputs -;; `(("xproto" ,xproto) -;; ("libxdmcp" ,libxdmcp) -;; ("xcb-proto" ,xcb-proto) -;; ("libxau" ,libxau) -;; ("libpthread-stubs" ,libpthread-stubs) -;; ("libxslt" ,libxslt) -;; ("pkg-config" ,pkg-config) -;; ("python" ,python))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) -;; (license license:???))) +(define-public libxcb + (package + (name "libxcb") + (version "1.8.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxcb-" + version + ".tar.bz2")) + (sha256 + (base32 + "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j")))) + (build-system gnu-build-system) + (inputs + `(("xproto" ,xproto) + ("libxdmcp" ,libxdmcp) + ("xcb-proto" ,xcb-proto) + ("libxau" ,libxau) + ("libpthread-stubs" ,libpthread-stubs) + ("libxslt" ,libxslt) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) (define-public libxcomposite @@ -2590,28 +2588,27 @@ (define-public xbitmaps (license license:x11))) -;; file referenced, but not present on servers -;; (define-public xcb-proto -;; (package -;; (name "xcb-proto") -;; (version "1.7.1") -;; (source -;; (origin -;; (method url-fetch) -;; (uri (string-append -;; "mirror://xorg/X11R7.7/src/everything/xcb-proto-" -;; version -;; ".tar.bz2")) -;; (sha256 -;; (base32 -;; "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93")))) -;; (build-system gnu-build-system) -;; (inputs -;; `(("pkg-config" ,pkg-config) ("python" ,python))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) -;; (license license:x11))) +(define-public xcb-proto + (package + (name "xcb-proto") + (version "1.7.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xcb-proto-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd")))) + (build-system gnu-build-system) + (inputs + `(("pkg-config" ,pkg-config) ("python" ,python))) + (home-page #f) + (synopsis #f) + (description #f) + (license license:x11))) (define-public xcmiscproto diff --git a/guix/download.scm b/guix/download.scm index b6bf6a0822..fa89058702 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -101,8 +101,7 @@ (define %mirrors "http://mirrors.ircam.fr/pub/apache/" "http://apache-mirror.rbc.ru/pub/apache/") (xorg ; from http://www.x.org/wiki/Releases/Download - "http://xorg.freedesktop.org/releases/" ; main mirrors - "http://www.x.org/pub/" + "http://www.x.org/releases/" ; main mirrors "ftp://mirror.csclub.uwaterloo.ca/x.org/" ; North America "ftp://xorg.mirrors.pair.com/" "http://mirror.csclub.uwaterloo.ca/x.org/" From 5223c82627a8eba9056fc4d5a48acea29a979c1d Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 3 Mar 2013 20:11:26 +0100 Subject: [PATCH 08/44] gnu: xorg: Add home-page, synopsis and description. * gnu/packages/xorg.scm: Add home-page and (generic) synopsis and description. --- gnu/packages/xorg.scm | 1098 ++++++++++++++++++++--------------------- 1 file changed, 549 insertions(+), 549 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ebabcab437..4777f68045 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -54,9 +54,9 @@ (define-public applewmproto "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -78,9 +78,9 @@ (define-public bdftopcf (inputs `(("libxfont" ,libxfont) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -100,9 +100,9 @@ (define-public bigreqsproto "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -124,9 +124,9 @@ (define-public compositeproto (inputs `(("fixesproto" ,fixesproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -146,9 +146,9 @@ (define-public damageproto "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -168,9 +168,9 @@ (define-public dmxproto "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -189,9 +189,9 @@ (define-public dri2proto (base32 "02drlfqvjm2q7dvkkwli3fs2crb6rdb3kyd13vwx7z0rijrc10md")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -211,9 +211,9 @@ (define-public encodings "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:public-domain))) @@ -235,9 +235,9 @@ (define-public fixesproto (inputs `(("xextproto" ,xextproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -256,9 +256,9 @@ (define-public font-adobe-100dpi (base32 "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -277,9 +277,9 @@ (define-public font-adobe-75dpi (base32 "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -298,9 +298,9 @@ (define-public font-adobe-75dpi ;; (base32 ;; "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -319,9 +319,9 @@ (define-public font-adobe-75dpi ;; (base32 ;; "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -340,9 +340,9 @@ (define-public font-adobe-75dpi ;; (base32 ;; "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) @@ -362,9 +362,9 @@ (define-public font-alias "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -387,9 +387,9 @@ (define-public font-arabic-misc `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -408,9 +408,9 @@ (define-public font-arabic-misc ;; (base32 ;; "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -429,9 +429,9 @@ (define-public font-arabic-misc ;; (base32 ;; "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -450,9 +450,9 @@ (define-public font-arabic-misc ;; (base32 ;; "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -471,9 +471,9 @@ (define-public font-arabic-misc ;; (base32 ;; "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -496,9 +496,9 @@ (define-public font-arabic-misc ;; `(("mkfontscale" ,mkfontscale) ;; ("mkfontdir" ,mkfontdir) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -521,9 +521,9 @@ (define-public font-arabic-misc ;; `(("mkfontscale" ,mkfontscale) ;; ("mkfontdir" ,mkfontdir) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) ;; ;; @@ -546,9 +546,9 @@ (define-public font-arabic-misc ;; `(("mkfontscale" ,mkfontscale) ;; ("mkfontdir" ,mkfontdir) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) @@ -571,9 +571,9 @@ (define-public font-bitstream-type1 `(("mkfontscale" ,mkfontscale) ("mkfontdir" ,mkfontdir) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -596,9 +596,9 @@ (define-public font-cronyx-cyrillic `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -622,9 +622,9 @@ (define-public font-cronyx-cyrillic ;; ("mkfontdir" ,mkfontdir) ;; ("bdftopcf" ,bdftopcf) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license none))) ;; ;; @@ -647,9 +647,9 @@ (define-public font-cronyx-cyrillic ;; `(("mkfontdir" ,mkfontdir) ;; ("bdftopcf" ,bdftopcf) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) @@ -672,9 +672,9 @@ (define-public font-dec-misc `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -697,9 +697,9 @@ (define-public font-dec-misc ;; `(("mkfontdir" ,mkfontdir) ;; ("bdftopcf" ,bdftopcf) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) @@ -722,9 +722,9 @@ (define-public font-isas-misc `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -747,9 +747,9 @@ (define-public font-isas-misc ;; `(("mkfontdir" ,mkfontdir) ;; ("bdftopcf" ,bdftopcf) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) @@ -772,9 +772,9 @@ (define-public font-micro-misc `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:public-domain))) @@ -797,9 +797,9 @@ (define-public font-misc-cyrillic `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -822,9 +822,9 @@ (define-public font-misc-ethiopic `(("mkfontscale" ,mkfontscale) ("mkfontdir" ,mkfontdir) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -847,9 +847,9 @@ (define-public font-misc-ethiopic ;; `(("mkfontscale" ,mkfontscale) ;; ("mkfontdir" ,mkfontdir) ;; ("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) @@ -874,9 +874,9 @@ (define-public font-misc-misc ("font-util" ,font-util) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:public-domain))) @@ -899,9 +899,9 @@ (define-public font-mutt-misc `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -926,9 +926,9 @@ (define-public font-schumacher-misc ("font-util" ,font-util) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -951,9 +951,9 @@ (define-public font-screen-cyrillic `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -976,9 +976,9 @@ (define-public font-sony-misc `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1001,9 +1001,9 @@ (define-public font-sun-misc `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1023,9 +1023,9 @@ (define-public font-util "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1048,9 +1048,9 @@ (define-public font-winitzki-cyrillic `(("mkfontdir" ,mkfontdir) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:public-domain))) @@ -1069,9 +1069,9 @@ (define-public font-xfree86-type1 (base32 "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1091,9 +1091,9 @@ (define-public fontsproto "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1113,9 +1113,9 @@ (define-public glproto "0wf1vq9g4pyzahb23ywx554pm5bpax49lz188fk6m5p8wbmmc0wr")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1138,9 +1138,9 @@ (define-public iceauth `(("xproto" ,xproto) ("libice" ,libice) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1160,9 +1160,9 @@ (define-public inputproto "1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1182,9 +1182,9 @@ (define-public kbproto "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1209,9 +1209,9 @@ (define-public libapplewm ("libx11" ,libx11) ("applewmproto" ,applewmproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1236,9 +1236,9 @@ (define-public libdmx ("libx11" ,libx11) ("dmxproto" ,dmxproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1261,9 +1261,9 @@ (define-public libfontenc `(("zlib" ,zlib) ("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1287,9 +1287,9 @@ (define-public libfs ("xproto" ,xproto) ("fontsproto" ,fontsproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1312,9 +1312,9 @@ (define-public libice `(("xtrans" ,xtrans) ("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1335,9 +1335,9 @@ (define-public libpciaccess (build-system gnu-build-system) (inputs `(("zlib" ,zlib) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1357,9 +1357,9 @@ (define-public libpthread-stubs "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1384,9 +1384,9 @@ (define-public libsm ("util-linux" ,util-linux) ("libice" ,libice) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1411,9 +1411,9 @@ (define-public libwindowswm ("libx11" ,libx11) ("windowswmproto" ,windowswmproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1432,9 +1432,9 @@ (define-public libx11 (base32 "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1455,9 +1455,9 @@ (define-public libxau (build-system gnu-build-system) (inputs `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1485,9 +1485,9 @@ (define-public libxaw ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1515,9 +1515,9 @@ (define-public libxcb ("libxslt" ,libxslt) ("pkg-config" ,pkg-config) ("python" ,python))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1542,9 +1542,9 @@ (define-public libxcomposite ("libx11" ,libx11) ("compositeproto" ,compositeproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1570,9 +1570,9 @@ (define-public libxcursor ("libx11" ,libx11) ("fixesproto" ,fixesproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1599,9 +1599,9 @@ (define-public libxdamage ("fixesproto" ,fixesproto) ("damageproto" ,damageproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1622,9 +1622,9 @@ (define-public libxdmcp (build-system gnu-build-system) (inputs `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1649,9 +1649,9 @@ (define-public libxext ("xextproto" ,xextproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1676,9 +1676,9 @@ (define-public libxfixes ("libx11" ,libx11) ("fixesproto" ,fixesproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1705,9 +1705,9 @@ (define-public libxfont ("fontsproto" ,fontsproto) ("libfontenc" ,libfontenc) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1736,9 +1736,9 @@ (define-public libxft ("freetype" ,freetype) ("fontconfig" ,fontconfig) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1764,9 +1764,9 @@ (define-public libxi ("libx11" ,libx11) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1791,9 +1791,9 @@ (define-public libxinerama ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1816,9 +1816,9 @@ (define-public libxkbfile `(("libx11" ,libx11) ("kbproto" ,kbproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1844,9 +1844,9 @@ (define-public libxmu ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1872,9 +1872,9 @@ (define-public libxpm ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1902,9 +1902,9 @@ (define-public libxrandr ("renderproto" ,renderproto) ("randrproto" ,randrproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1928,9 +1928,9 @@ (define-public libxrender ("libx11" ,libx11) ("renderproto" ,renderproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1956,9 +1956,9 @@ (define-public libxres ("libx11" ,libx11) ("resourceproto" ,resourceproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -1983,9 +1983,9 @@ (define-public libxscrnsaver ("libx11" ,libx11) ("scrnsaverproto" ,scrnsaverproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2011,9 +2011,9 @@ (define-public libxt ("kbproto" ,kbproto) ("libice" ,libice) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2040,9 +2040,9 @@ (define-public libxtst ("recordproto" ,recordproto) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2068,9 +2068,9 @@ (define-public libxv ("libx11" ,libx11) ("videoproto" ,videoproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2097,9 +2097,9 @@ (define-public libxvmc ("libx11" ,libx11) ("videoproto" ,videoproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2118,9 +2118,9 @@ (define-public libxxf86dga (base32 "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2139,9 +2139,9 @@ (define-public libxxf86vm (base32 "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2163,9 +2163,9 @@ (define-public luit (inputs `(("libfontenc" ,libfontenc) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2186,9 +2186,9 @@ (define-public makedepend (build-system gnu-build-system) (inputs `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2208,9 +2208,9 @@ (define-public mkfontdir "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2235,9 +2235,9 @@ (define-public mkfontscale ("freetype" ,freetype) ("libfontenc" ,libfontenc) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2257,9 +2257,9 @@ (define-public randrproto "0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2279,9 +2279,9 @@ (define-public recordproto "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2301,9 +2301,9 @@ (define-public renderproto "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2323,9 +2323,9 @@ (define-public resourceproto "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2345,9 +2345,9 @@ (define-public scrnsaverproto "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2368,9 +2368,9 @@ (define-public sessreg (build-system gnu-build-system) (inputs `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2393,9 +2393,9 @@ (define-public setxkbmap `(("libxkbfile" ,libxkbfile) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2420,9 +2420,9 @@ (define-public smproxy ("libsm" ,libsm) ("libice" ,libice) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2442,9 +2442,9 @@ (define-public util-macros "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2464,9 +2464,9 @@ (define-public videoproto "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2486,9 +2486,9 @@ (define-public windowswmproto "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2507,9 +2507,9 @@ (define-public x11perf (base32 "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2534,9 +2534,9 @@ (define-public xauth ("libxau" ,libxau) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2560,9 +2560,9 @@ (define-public xbacklight ;; ("xcb-util" ,xcb-util) ;; ("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2582,9 +2582,9 @@ (define-public xbitmaps "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2605,9 +2605,9 @@ (define-public xcb-proto (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config) ("python" ,python))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2627,9 +2627,9 @@ (define-public xcmiscproto "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2651,9 +2651,9 @@ (define-public xcmsdb (inputs `(("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2675,9 +2675,9 @@ (define-public xcursor-themes (inputs `(("libxcursor" ,libxcursor) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2701,9 +2701,9 @@ (define-public xcursorgen ("libx11" ,libx11) ("libpng" ,libpng) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2736,9 +2736,9 @@ (define-public xdpyinfo ("libx11" ,libx11) ("libdmx" ,libdmx) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2763,9 +2763,9 @@ (define-public xdriinfo ("libx11" ,libx11) ("glproto" ,glproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2790,9 +2790,9 @@ (define-public xev ("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2812,9 +2812,9 @@ (define-public xextproto "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2833,9 +2833,9 @@ (define-public xf86-input-evdev (base32 "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2854,9 +2854,9 @@ (define-public xf86-input-joystick (base32 "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2875,9 +2875,9 @@ (define-public xf86-input-keyboard (base32 "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2896,9 +2896,9 @@ (define-public xf86-input-mouse (base32 "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2917,9 +2917,9 @@ (define-public xf86-input-synaptics (base32 "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2938,9 +2938,9 @@ (define-public xf86-input-vmmouse (base32 "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2959,9 +2959,9 @@ (define-public xf86-input-void (base32 "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -2980,9 +2980,9 @@ (define-public xf86-video-ark (base32 "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3001,9 +3001,9 @@ (define-public xf86-video-ast (base32 "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3022,9 +3022,9 @@ (define-public xf86-video-ati (base32 "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3043,9 +3043,9 @@ (define-public xf86-video-cirrus (base32 "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3064,9 +3064,9 @@ (define-public xf86-video-cirrus ;; (base32 ;; "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license non-free))) @@ -3085,9 +3085,9 @@ (define-public xf86-video-fbdev (base32 "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3106,9 +3106,9 @@ (define-public xf86-video-geode (base32 "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3127,9 +3127,9 @@ (define-public xf86-video-glide (base32 "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3148,9 +3148,9 @@ (define-public xf86-video-glint (base32 "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3169,9 +3169,9 @@ (define-public xf86-video-i128 (base32 "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3190,9 +3190,9 @@ (define-public xf86-video-intel (base32 "1g742szymajh88a5dw08sxcr45bmxgc4w3m6hddv9qscn5hks4rj")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3211,9 +3211,9 @@ (define-public xf86-video-mach64 (base32 "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3232,9 +3232,9 @@ (define-public xf86-video-mga (base32 "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3253,9 +3253,9 @@ (define-public xf86-video-neomagic (base32 "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3274,9 +3274,9 @@ (define-public xf86-video-newport (base32 "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3295,9 +3295,9 @@ (define-public xf86-video-nv (base32 "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3316,9 +3316,9 @@ (define-public xf86-video-openchrome (base32 "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3337,9 +3337,9 @@ (define-public xf86-video-r128 (base32 "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3358,9 +3358,9 @@ (define-public xf86-video-savage (base32 "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3379,9 +3379,9 @@ (define-public xf86-video-siliconmotion (base32 "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3400,9 +3400,9 @@ (define-public xf86-video-sis (base32 "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:bsd-3))) @@ -3421,9 +3421,9 @@ (define-public xf86-video-suncg6 (base32 "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3442,9 +3442,9 @@ (define-public xf86-video-sunffb (base32 "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3463,9 +3463,9 @@ (define-public xf86-video-tdfx (base32 "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3484,9 +3484,9 @@ (define-public xf86-video-tga (base32 "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3505,9 +3505,9 @@ (define-public xf86-video-trident (base32 "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3526,9 +3526,9 @@ (define-public xf86-video-trident ;; (base32 ;; "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb")))) ;; (build-system gnu-build-system) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license none))) @@ -3547,9 +3547,9 @@ (define-public xf86-video-vesa (base32 "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3568,9 +3568,9 @@ (define-public xf86-video-vmware (base32 "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3589,9 +3589,9 @@ (define-public xf86-video-voodoo (base32 "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3610,9 +3610,9 @@ (define-public xf86-video-wsfb (base32 "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:bsd-2))) @@ -3631,9 +3631,9 @@ (define-public xf86bigfontproto (base32 "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3652,9 +3652,9 @@ (define-public xf86dgaproto (base32 "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3673,9 +3673,9 @@ (define-public xf86driproto (base32 "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3694,9 +3694,9 @@ (define-public xf86vidmodeproto (base32 "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5")))) (build-system gnu-build-system) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3719,9 +3719,9 @@ (define-public xgamma `(("libxxf86vm" ,libxxf86vm) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3745,9 +3745,9 @@ (define-public xhost ("libxau" ,libxau) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3767,9 +3767,9 @@ (define-public xineramaproto "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3797,9 +3797,9 @@ (define-public xinput ("libx11" ,libx11) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3823,9 +3823,9 @@ (define-public xkbcomp ("libxkbfile" ,libxkbfile) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3848,9 +3848,9 @@ (define-public xkbevd `(("libxkbfile" ,libxkbfile) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3876,9 +3876,9 @@ (define-public xkbutils ("libx11" ,libx11) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3898,9 +3898,9 @@ (define-public xkeyboard-config "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3923,9 +3923,9 @@ (define-public xkill `(("libxmu" ,libxmu) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3947,9 +3947,9 @@ (define-public xlsatoms (inputs `(;("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3971,9 +3971,9 @@ (define-public xlsclients (inputs `(;("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -3996,9 +3996,9 @@ (define-public xmodmap `(("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4018,9 +4018,9 @@ (define-public xmodmap ;; "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr")))) ;; (build-system gnu-build-system) ;; (inputs `(("pkg-config" ,pkg-config))) -;; (home-page #f) -;; (synopsis #f) -;; (description #f) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") ;; (license none))) @@ -4085,9 +4085,9 @@ (define-public xorg-server ("xineramaproto" ,xineramaproto) ("xtrans" ,xtrans) ("zlib" ,zlib))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4107,9 +4107,9 @@ (define-public xorg-sgml-doctools "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4133,9 +4133,9 @@ (define-public xpr ("libxmu" ,libxmu) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4158,9 +4158,9 @@ (define-public xprop `(("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4180,9 +4180,9 @@ (define-public xproto "17lkmi12f89qvg4jj5spqzwzc24fmsqq68dv6kpy7r7b944lmq5d")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4207,9 +4207,9 @@ (define-public xrandr ("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4232,9 +4232,9 @@ (define-public xrdb `(("libxmu" ,libxmu) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4256,9 +4256,9 @@ (define-public xrefresh (inputs `(("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4284,9 +4284,9 @@ (define-public xset ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4311,9 +4311,9 @@ (define-public xsetroot ("xbitmaps" ,xbitmaps) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4333,9 +4333,9 @@ (define-public xtrans "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz")))) (build-system gnu-build-system) (inputs `(("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4359,9 +4359,9 @@ (define-public xvinfo ("libxv" ,libxv) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4385,9 +4385,9 @@ (define-public xwd ("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4411,9 +4411,9 @@ (define-public xwininfo ;; ("libxcb" ,libxcb) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) @@ -4436,7 +4436,7 @@ (define-public xwud `(("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) - (home-page #f) - (synopsis #f) - (description #f) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") (license license:x11))) From 9d12d38f381cec2eddaa325314ac5b623f38e524 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 3 Mar 2013 20:24:42 +0100 Subject: [PATCH 09/44] gnu: xorg: Uncomment dependencies on libxcb. * gnu/packages/xorg.scm (xbacklight, xdpyinfo, xlsatoms, xlsclients, xwininfo): Uncomment dependency on libxcb. --- gnu/packages/xorg.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4777f68045..90e899c6b1 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2558,7 +2558,7 @@ (define-public xbacklight (inputs `(("libxrender" ,libxrender) ;; ("xcb-util" ,xcb-util) -;; ("libxcb" ,libxcb) + ("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -2732,7 +2732,7 @@ (define-public xdpyinfo ("libxi" ,libxi) ("libxext" ,libxext) ("libxcomposite" ,libxcomposite) -;; ("libxcb" ,libxcb) + ("libxcb" ,libxcb) ("libx11" ,libx11) ("libdmx" ,libdmx) ("pkg-config" ,pkg-config))) @@ -3945,7 +3945,7 @@ (define-public xlsatoms "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv")))) (build-system gnu-build-system) (inputs - `(;("libxcb" ,libxcb) + `(("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -3969,7 +3969,7 @@ (define-public xlsclients "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w")))) (build-system gnu-build-system) (inputs - `(;("libxcb" ,libxcb) + `(("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4408,7 +4408,7 @@ (define-public xwininfo (build-system gnu-build-system) (inputs `(("xproto" ,xproto) -;; ("libxcb" ,libxcb) + ("libxcb" ,libxcb) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") From 48ebc134f4456e81d4c660da652a752382890662 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 6 Mar 2013 14:38:42 +0100 Subject: [PATCH 10/44] gnu: xorg: Correct typo in download location. * gnu/packages/xorg.scm (xf86-video-glide): Correct typo. --- gnu/packages/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 90e899c6b1..ea7546d8c8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3120,7 +3120,7 @@ (define-public xf86-video-glide (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-glide" + "mirror://xorg/X11R7.7/src/everything/xf86-video-glide-" version ".tar.bz2")) (sha256 From 6eb126c5f2870209837919b93b899857046497b5 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 6 Mar 2013 22:08:52 +0100 Subject: [PATCH 11/44] gnu: xorg: Add inputs and propagated-inputs, propagate some inputs. Rename two packages to avoid clashes between package names and versions. * gnu/packages/xorg.scm (font-adobe-100dpi): Rename to font-adobe100dpi. * gnu/packages/xorg.scm (font-adobe-75dpi): Rename to font-adobe75dpi. * gnu/packages/xorg.scm: Add pkg-xonfig as input to several packages. * gnu/packages/xorg.scm (encodings): Add input mkfontscale. * gnu/packages/xorg.scm (libx11): Add inputs inputprotoi, xextproto, xtrans. * gnu/packages/xorg.scm (libxpm): Add input gettext. * gnu/packages/xorg.scm (libxxf86dga): Add inputs libx11, libxext, xf86dgaproto. * gnu/packages/xorg.scm (libxxf86vm): Add inputs libx11i, libxext, xf86vidmodeproto. * gnu/packages/xorg.scm (x11perf): Add inputs libx11i, libxfti, libxmu, libxrender. * gnu/packages/xorg.scm (xcursor-themes): Add input xcursorgen. * gnu/packages/xorg.scm (xdpyinfo): Add input inputproto. * gnu/packages/xorg.scm (font-xfree86-type1): Add input mkfontdir. * gnu/packages/xorg.scm (libx11): Add propagated inputs kbproto, libxcb. * gnu/packages/xorg.scm (mkfontdir): Add propagated input mkfontscale. * gnu/packages/xorg.scm (fixesproto): Propagate input xextproto. * gnu/packages/xorg.scm (libice): Propagate input xproto. * gnu/packages/xorg.scm (libxau): Propagate input xproto. * gnu/packages/xorg.scm (libxaw): Propagate inputs libxext, libxmu, libxpm. * gnu/packages/xorg.scm (libxcb): Propagate inputs libpthread-stubs, libxaui, libxdmcp. * gnu/packages/xorg.scm (libxcursor): Propagate inputs libx11, libxfixes, libxrender, xproto. * gnu/packages/xorg.scm (libxext): Propagate input xextproto. * gnu/packages/xorg.scm (libxfixes): Propagate input fixesproto. * gnu/packages/xorg.scm (libxfont): Propagate inputs fontsproto, freetype, libfontenc, xproto. * gnu/packages/xorg.scm (libxinerama): Propagate input xineramaproto. * gnu/packages/xorg.scm (libxrandr): Propagate inputs libxext, randrproto. * gnu/packages/xorg.scm (libxrender): Propagate input renderproto. * gnu/packages/xorg.scm (libxt): Propagate inputs libx11, libice, libsm. * gnu/packages/xorg.scm (libxtst): Propagate input recordproto. * gnu/packages/xorg.scm (xbacklight): Propagate inputs libx11, libxrandr. * gnu/packages/xorg.scm (xkeyboard-config): Propagate inputs libx11, xkbcomp. * gnu/packages/xorg.scm (xproto): Propagate input util-macros. --- gnu/packages/xorg.scm | 1071 +++++++++++++++++++++++------------------ 1 file changed, 596 insertions(+), 475 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ea7546d8c8..d6439ec4d4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -27,6 +27,8 @@ (define-module (gnu packages xorg) #:use-module (gnu packages bison) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) + #:use-module ((gnu packages gettext) + #:renamer (symbol-prefix-proc 'gnu:)) #:use-module (gnu packages glib) #:use-module (gnu packages gperf) #:use-module (gnu packages libpng) @@ -38,6 +40,13 @@ (define-module (gnu packages xorg) #:use-module (gnu packages python) #:use-module (gnu packages xml)) + + +;; packages without propagated input +;; (rationale for this separation: The packages in PROPAGATED_INPUTS need to +;; be defined first, the split makes book-keeping easier.) + + (define-public applewmproto (package (name "applewmproto") @@ -210,40 +219,18 @@ (define-public encodings (base32 "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("mkfontscale" ,mkfontscale) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:public-domain))) -(define-public fixesproto +(define-public font-adobe100dpi (package - (name "fixesproto") - (version "5.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/fixesproto-" - version - ".tar.bz2")) - (sha256 - (base32 - "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs")))) - (build-system gnu-build-system) - (inputs - `(("xextproto" ,xextproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - -(define-public font-adobe-100dpi - (package - (name "font-adobe-100dpi") + (name "font-adobe100dpi") (version "1.0.3") (source (origin @@ -262,9 +249,9 @@ (define-public font-adobe-100dpi (license license:x11))) -(define-public font-adobe-75dpi +(define-public font-adobe75dpi (package - (name "font-adobe-75dpi") + (name "font-adobe75dpi") (version "1.0.3") (source (origin @@ -283,9 +270,9 @@ (define-public font-adobe-75dpi (license license:x11))) -;; (define-public font-adobe-utopia-100dpi +;; (define-public font-adobe-utopia100dpi ;; (package -;; (name "font-adobe-utopia-100dpi") +;; (name "font-adobe-utopia100dpi") ;; (version "1.0.4") ;; (source ;; (origin @@ -304,9 +291,9 @@ (define-public font-adobe-75dpi ;; (license non-free))) ;; ;; -;; (define-public font-adobe-utopia-75dpi +;; (define-public font-adobe-utopia75dpi ;; (package -;; (name "font-adobe-utopia-75dpi") +;; (name "font-adobe-utopia75dpi") ;; (version "1.0.4") ;; (source ;; (origin @@ -393,9 +380,9 @@ (define-public font-arabic-misc (license license:x11))) -;; (define-public font-bh-100dpi +;; (define-public font-bh100dpi ;; (package -;; (name "font-bh-100dpi") +;; (name "font-bh100dpi") ;; (version "1.0.3") ;; (source ;; (origin @@ -414,9 +401,9 @@ (define-public font-arabic-misc ;; (license non-free))) ;; ;; -;; (define-public font-bh-75dpi +;; (define-public font-bh75dpi ;; (package -;; (name "font-bh-75dpi") +;; (name "font-bh75dpi") ;; (version "1.0.3") ;; (source ;; (origin @@ -435,9 +422,9 @@ (define-public font-arabic-misc ;; (license non-free))) ;; ;; -;; (define-public font-bh-lucidatypewriter-100dpi +;; (define-public font-bh-lucidatypewriter100dpi ;; (package -;; (name "font-bh-lucidatypewriter-100dpi") +;; (name "font-bh-lucidatypewriter100dpi") ;; (version "1.0.3") ;; (source ;; (origin @@ -456,9 +443,9 @@ (define-public font-arabic-misc ;; (license non-free))) ;; ;; -;; (define-public font-bh-lucidatypewriter-75dpi +;; (define-public font-bh-lucidatypewriter75dpi ;; (package -;; (name "font-bh-lucidatypewriter-75dpi") +;; (name "font-bh-lucidatypewriter75dpi") ;; (version "1.0.3") ;; (source ;; (origin @@ -502,9 +489,9 @@ (define-public font-arabic-misc ;; (license non-free))) ;; ;; -;; (define-public font-bitstream-100dpi +;; (define-public font-bitstream100dpi ;; (package -;; (name "font-bitstream-100dpi") +;; (name "font-bitstream100dpi") ;; (version "1.0.3") ;; (source ;; (origin @@ -527,9 +514,9 @@ (define-public font-arabic-misc ;; (license non-free))) ;; ;; -;; (define-public font-bitstream-75dpi +;; (define-public font-bitstream75dpi ;; (package -;; (name "font-bitstream-75dpi") +;; (name "font-bitstream75dpi") ;; (version "1.0.3") ;; (source ;; (origin @@ -1069,6 +1056,9 @@ (define-public font-xfree86-type1 (base32 "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya")))) (build-system gnu-build-system) + (inputs + `(("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -1293,31 +1283,6 @@ (define-public libfs (license license:x11))) -(define-public libice - (package - (name "libice") - (version "1.0.8") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libICE-" - version - ".tar.bz2")) - (sha256 - (base32 - "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94")))) - (build-system gnu-build-system) - (inputs - `(("xtrans" ,xtrans) - ("xproto" ,xproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libpciaccess (package (name "libpciaccess") @@ -1417,110 +1382,6 @@ (define-public libwindowswm (license license:x11))) -(define-public libx11 - (package - (name "libx11") - (version "1.5.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libX11-" - version - ".tar.bz2")) - (sha256 - (base32 - "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3")))) - (build-system gnu-build-system) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - -(define-public libxau - (package - (name "libxau") - (version "1.0.7") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXau-" - version - ".tar.bz2")) - (sha256 - (base32 - "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - -(define-public libxaw - (package - (name "libxaw") - (version "1.0.11") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXaw-" - version - ".tar.bz2")) - (sha256 - (base32 - "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47")))) - (build-system gnu-build-system) - (inputs - `(("libxt" ,libxt) - ("xproto" ,xproto) - ("libxpm" ,libxpm) - ("libxmu" ,libxmu) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - -(define-public libxcb - (package - (name "libxcb") - (version "1.8.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxcb-" - version - ".tar.bz2")) - (sha256 - (base32 - "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxdmcp" ,libxdmcp) - ("xcb-proto" ,xcb-proto) - ("libxau" ,libxau) - ("libpthread-stubs" ,libpthread-stubs) - ("libxslt" ,libxslt) - ("pkg-config" ,pkg-config) - ("python" ,python))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxcomposite (package (name "libxcomposite") @@ -1548,34 +1409,6 @@ (define-public libxcomposite (license license:x11))) -(define-public libxcursor - (package - (name "libxcursor") - (version "1.1.13") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXcursor-" - version - ".tar.bz2")) - (sha256 - (base32 - "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p")))) - (build-system gnu-build-system) - (inputs - `(("libxrender" ,libxrender) - ("xproto" ,xproto) - ("libxfixes" ,libxfixes) - ("libx11" ,libx11) - ("fixesproto" ,fixesproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxdamage (package (name "libxdamage") @@ -1628,89 +1461,6 @@ (define-public libxdmcp (license license:x11))) -(define-public libxext - (package - (name "libxext") - (version "1.3.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXext-" - version - ".tar.bz2")) - (sha256 - (base32 - "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn")))) - (build-system gnu-build-system) - (inputs - `(("libxau" ,libxau) - ("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - -(define-public libxfixes - (package - (name "libxfixes") - (version "5.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXfixes-" - version - ".tar.bz2")) - (sha256 - (base32 - "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libx11" ,libx11) - ("fixesproto" ,fixesproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - -(define-public libxfont - (package - (name "libxfont") - (version "1.4.5") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXfont-" - version - ".tar.bz2")) - (sha256 - (base32 - "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv")))) - (build-system gnu-build-system) - (inputs - `(("zlib" ,zlib) - ("xtrans" ,xtrans) - ("xproto" ,xproto) - ("freetype" ,freetype) - ("fontsproto" ,fontsproto) - ("libfontenc" ,libfontenc) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxft (package (name "libxft") @@ -1770,33 +1520,6 @@ (define-public libxi (license license:x11))) -(define-public libxinerama - (package - (name "libxinerama") - (version "1.1.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXinerama-" - version - ".tar.bz2")) - (sha256 - (base32 - "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4")))) - (build-system gnu-build-system) - (inputs - `(("xineramaproto" ,xineramaproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxkbfile (package (name "libxkbfile") @@ -1866,7 +1589,8 @@ (define-public libxpm "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6")))) (build-system gnu-build-system) (inputs - `(("libxt" ,libxt) + `(("gettext" ,gnu:gettext) + ("libxt" ,libxt) ("xproto" ,xproto) ("xextproto" ,xextproto) ("libxext" ,libxext) @@ -1878,62 +1602,6 @@ (define-public libxpm (license license:x11))) -(define-public libxrandr - (package - (name "libxrandr") - (version "1.3.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/XqqR7.7/src/everything/libXrandr-" - version - ".tar.bz2")) - (sha256 - (base32 - "10cvv78ws8jznma4s45dzqz0ldcxk30qgsqrc4wxfcsjmcba5b3y")))) - (build-system gnu-build-system) - (inputs - `(("libxrender" ,libxrender) - ("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("renderproto" ,renderproto) - ("randrproto" ,randrproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - -(define-public libxrender - (package - (name "libxrender") - (version "0.9.7") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXrender-" - version - ".tar.bz2")) - (sha256 - (base32 - "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libx11" ,libx11) - ("renderproto" ,renderproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxres (package (name "libxres") @@ -1989,63 +1657,6 @@ (define-public libxscrnsaver (license license:x11))) -(define-public libxt - (package - (name "libxt") - (version "1.1.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXt-" - version - ".tar.bz2")) - (sha256 - (base32 - "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libx11" ,libx11) - ("libsm" ,libsm) - ("kbproto" ,kbproto) - ("libice" ,libice) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - -(define-public libxtst - (package - (name "libxtst") - (version "1.2.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXtst-" - version - ".tar.bz2")) - (sha256 - (base32 - "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky")))) - (build-system gnu-build-system) - (inputs - `(("libxi" ,libxi) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("recordproto" ,recordproto) - ("inputproto" ,inputproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxv (package (name "libxv") @@ -2118,6 +1729,11 @@ (define-public libxxf86dga (base32 "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm")))) (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("pkg-config" ,pkg-config) + ("xf86dgaproto" ,xf86dgaproto))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2139,6 +1755,11 @@ (define-public libxxf86vm (base32 "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55")))) (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("pkg-config" ,pkg-config) + ("xf86vidmodeproto" ,xf86vidmodeproto))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2192,28 +1813,6 @@ (define-public makedepend (license license:x11))) -(define-public mkfontdir - (package - (name "mkfontdir") - (version "1.0.7") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/mkfontdir-" - version - ".tar.bz2")) - (sha256 - (base32 - "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public mkfontscale (package (name "mkfontscale") @@ -2507,6 +2106,12 @@ (define-public x11perf (base32 "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4")))) (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("libxft" ,libxft) + ("libxmu" ,libxmu) + ("libxrender" ,libxrender) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2556,8 +2161,9 @@ (define-public xbacklight "02b5jfys2msla2yvg5s0knzyxg2104r25czkwd49i8g8kp804bxg")))) (build-system gnu-build-system) (inputs - `(("libxrender" ,libxrender) -;; ("xcb-util" ,xcb-util) + `(("libx11" ,libx11) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) ("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -2674,7 +2280,8 @@ (define-public xcursor-themes (build-system gnu-build-system) (inputs `(("libxcursor" ,libxcursor) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("xcursorgen" ,xcursorgen))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2723,7 +2330,8 @@ (define-public xdpyinfo "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3")))) (build-system gnu-build-system) (inputs - `(("libxxf86vm" ,libxxf86vm) + `(("inputproto" ,inputproto) + ("libxxf86vm" ,libxxf86vm) ;; ("libxxf86misc" ,libxxf86misc) ("libxxf86dga" ,libxxf86dga) ("libxtst" ,libxtst) @@ -2833,6 +2441,7 @@ (define-public xf86-input-evdev (base32 "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2854,6 +2463,7 @@ (define-public xf86-input-joystick (base32 "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2875,6 +2485,7 @@ (define-public xf86-input-keyboard (base32 "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2896,6 +2507,7 @@ (define-public xf86-input-mouse (base32 "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2917,6 +2529,7 @@ (define-public xf86-input-synaptics (base32 "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2938,6 +2551,7 @@ (define-public xf86-input-vmmouse (base32 "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2959,6 +2573,7 @@ (define-public xf86-input-void (base32 "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2980,6 +2595,7 @@ (define-public xf86-video-ark (base32 "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3001,6 +2617,7 @@ (define-public xf86-video-ast (base32 "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3022,6 +2639,7 @@ (define-public xf86-video-ati (base32 "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3043,6 +2661,7 @@ (define-public xf86-video-cirrus (base32 "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3064,6 +2683,7 @@ (define-public xf86-video-cirrus ;; (base32 ;; "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm")))) ;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config))) ;; (home-page "http://www.x.org/wiki/") ;; (synopsis "xorg implementation of the X Window System") ;; (description "X.org provides an implementation of the X Window System") @@ -3085,6 +2705,7 @@ (define-public xf86-video-fbdev (base32 "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3106,6 +2727,7 @@ (define-public xf86-video-geode (base32 "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3127,6 +2749,7 @@ (define-public xf86-video-glide (base32 "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3148,6 +2771,7 @@ (define-public xf86-video-glint (base32 "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3169,6 +2793,7 @@ (define-public xf86-video-i128 (base32 "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3190,6 +2815,7 @@ (define-public xf86-video-intel (base32 "1g742szymajh88a5dw08sxcr45bmxgc4w3m6hddv9qscn5hks4rj")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3211,6 +2837,7 @@ (define-public xf86-video-mach64 (base32 "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3232,6 +2859,7 @@ (define-public xf86-video-mga (base32 "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3253,6 +2881,7 @@ (define-public xf86-video-neomagic (base32 "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3274,6 +2903,7 @@ (define-public xf86-video-newport (base32 "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3295,6 +2925,7 @@ (define-public xf86-video-nv (base32 "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3316,6 +2947,7 @@ (define-public xf86-video-openchrome (base32 "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3337,6 +2969,7 @@ (define-public xf86-video-r128 (base32 "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3358,6 +2991,7 @@ (define-public xf86-video-savage (base32 "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3379,6 +3013,7 @@ (define-public xf86-video-siliconmotion (base32 "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3400,6 +3035,7 @@ (define-public xf86-video-sis (base32 "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3421,6 +3057,7 @@ (define-public xf86-video-suncg6 (base32 "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3442,6 +3079,7 @@ (define-public xf86-video-sunffb (base32 "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3463,6 +3101,7 @@ (define-public xf86-video-tdfx (base32 "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3484,6 +3123,7 @@ (define-public xf86-video-tga (base32 "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3505,6 +3145,7 @@ (define-public xf86-video-trident (base32 "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3526,6 +3167,7 @@ (define-public xf86-video-trident ;; (base32 ;; "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb")))) ;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config))) ;; (home-page "http://www.x.org/wiki/") ;; (synopsis "xorg implementation of the X Window System") ;; (description "X.org provides an implementation of the X Window System") @@ -3547,6 +3189,7 @@ (define-public xf86-video-vesa (base32 "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3568,6 +3211,7 @@ (define-public xf86-video-vmware (base32 "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3589,6 +3233,7 @@ (define-public xf86-video-voodoo (base32 "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3610,6 +3255,7 @@ (define-public xf86-video-wsfb (base32 "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p")))) (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3897,7 +3543,10 @@ (define-public xkeyboard-config (base32 "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("libx11" ,libx11) + ("pkg-config" ,pkg-config) + ("xkbcomp" ,xkbcomp))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -4164,28 +3813,6 @@ (define-public xprop (license license:x11))) -(define-public xproto - (package - (name "xproto") - (version "7.0.23") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xproto-" - version - ".tar.bz2")) - (sha256 - (base32 - "17lkmi12f89qvg4jj5spqzwzc24fmsqq68dv6kpy7r7b944lmq5d")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public xrandr (package (name "xrandr") @@ -4440,3 +4067,497 @@ (define-public xwud (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) + + + +;; packages of height 1 in the propagated-inputs tree + +(define-public fixesproto + (package + (name "fixesproto") + (version "5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/fixesproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs")))) + (build-system gnu-build-system) + (propagated-inputs + `(("xextproto" ,xextproto))) + (inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +(define-public libxext + (package + (name "libxext") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXext-" + version + ".tar.bz2")) + (sha256 + (base32 + "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn")))) + (build-system gnu-build-system) + (propagated-inputs + `(("xextproto" ,xextproto))) + (inputs + `(("libxau" ,libxau) + ("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +(define-public libxinerama + (package + (name "libxinerama") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXinerama-" + version + ".tar.bz2")) + (sha256 + (base32 + "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4")))) + (build-system gnu-build-system) + (propagated-inputs + `(("xineramaproto" ,xineramaproto))) + (inputs + `(("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +(define-public libxrender + (package + (name "libxrender") + (version "0.9.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXrender-" + version + ".tar.bz2")) + (sha256 + (base32 + "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r")))) + (build-system gnu-build-system) + (propagated-inputs + `(("renderproto" ,renderproto))) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +(define-public libxtst + (package + (name "libxtst") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXtst-" + version + ".tar.bz2")) + (sha256 + (base32 + "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky")))) + (build-system gnu-build-system) + (propagated-inputs + `(("recordproto" ,recordproto))) + (inputs + `(("libxi" ,libxi) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("inputproto" ,inputproto) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +(define-public mkfontdir + (package + (name "mkfontdir") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/mkfontdir-" + version + ".tar.bz2")) + (sha256 + (base32 + "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman")))) + (build-system gnu-build-system) + (propagated-inputs + `(("mkfontscale" ,mkfontscale))) + (inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +(define-public xproto + (package + (name "xproto") + (version "7.0.23") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "17lkmi12f89qvg4jj5spqzwzc24fmsqq68dv6kpy7r7b944lmq5d")))) + (build-system gnu-build-system) + (propagated-inputs + `(("util-macros" ,util-macros))) ; to get util-macros in (almost?) all package inputs + (inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + + +;; packages of height 2 in the propagated-inputs tree + +(define-public libice + (package + (name "libice") + (version "1.0.8") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libICE-" + version + ".tar.bz2")) + (sha256 + (base32 + "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94")))) + (build-system gnu-build-system) + (propagated-inputs + `(("xproto" ,xproto))) + (inputs + `(("xtrans" ,xtrans) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +(define-public libxau + (package + (name "libxau") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXau-" + version + ".tar.bz2")) + (sha256 + (base32 + "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi")))) + (build-system gnu-build-system) + (propagated-inputs + `(("xproto" ,xproto))) + (inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +(define-public libxaw + (package + (name "libxaw") + (version "1.0.11") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXaw-" + version + ".tar.bz2")) + (sha256 + (base32 + "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libxext" ,libxext) + ("libxmu" ,libxmu) + ("libxpm" ,libxpm))) + (inputs + `(("libxt" ,libxt) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +(define-public libxfixes + (package + (name "libxfixes") + (version "5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXfixes-" + version + ".tar.bz2")) + (sha256 + (base32 + "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk")))) + (build-system gnu-build-system) + (propagated-inputs + `(("fixesproto" ,fixesproto))) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +(define-public libxfont + (package + (name "libxfont") + (version "1.4.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXfont-" + version + ".tar.bz2")) + (sha256 + (base32 + "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv")))) + (build-system gnu-build-system) + (propagated-inputs + `(("fontsproto" ,fontsproto) + ("freetype" ,freetype) + ("libfontenc" ,libfontenc) + ("xproto" ,xproto))) + (inputs + `(("zlib" ,zlib) + ("xtrans" ,xtrans) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +(define-public libxrandr + (package + (name "libxrandr") + (version "1.3.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/XqqR7.7/src/everything/libXrandr-" + version + ".tar.bz2")) + (sha256 + (base32 + "10cvv78ws8jznma4s45dzqz0ldcxk30qgsqrc4wxfcsjmcba5b3y")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libxext" ,libxext) + ("randrproto" ,randrproto))) + (inputs + `(("libxrender" ,libxrender) + ("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("renderproto" ,renderproto) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + + +;; packages of height 3 in the propagated-inputs tree + +(define-public libxcb + (package + (name "libxcb") + (version "1.8.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libxcb-" + version + ".tar.bz2")) + (sha256 + (base32 + "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libpthread-stubs" ,libpthread-stubs) + ("libxau" ,libxau) + ("libxdmcp" ,libxdmcp))) + (inputs + `(("xcb-proto" ,xcb-proto) + ("libxslt" ,libxslt) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("xproto" ,xproto))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +;; packages of height 4 in the propagated-inputs tree + +(define-public libx11 + (package + (name "libx11") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libX11-" + version + ".tar.bz2")) + (sha256 + (base32 + "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3")))) + (build-system gnu-build-system) + (propagated-inputs + `(("kbproto" ,kbproto) + ("libxcb" ,libxcb))) + (inputs + `(("inputproto" ,inputproto) + ("libxcb" ,libxcb) + ("pkg-config" ,pkg-config) + ("xextproto" ,xextproto) + ("xtrans" ,xtrans))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +;; packages of height 5 in the propagated-inputs tree + +(define-public libxcursor + (package + (name "libxcursor") + (version "1.1.13") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXcursor-" + version + ".tar.bz2")) + (sha256 + (base32 + "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libx11" ,libx11) + ("libxrender" ,libxrender) + ("libxfixes" ,libxfixes) + ("xproto" ,xproto))) + (inputs + `(("fixesproto" ,fixesproto) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + +(define-public libxt + (package + (name "libxt") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXt-" + version + ".tar.bz2")) + (sha256 + (base32 + "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libx11" ,libx11) + ("libice" ,libice) + ("libsm" ,libsm))) + (inputs + `(("xproto" ,xproto) + ("libx11" ,libx11) + ("kbproto" ,kbproto) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + From d92083ad99e0d5f43fa9ded5ef0d023815ea4ff3 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 6 Mar 2013 22:24:08 +0100 Subject: [PATCH 12/44] gnu: xorg: Comment applewmproto and libapplewm, compile only on macos. * gnu/packages/xorg.scm (applewmproto,libapplewm): Remove variables. --- gnu/packages/xorg.scm | 92 ++++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 45 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d6439ec4d4..248d4efa73 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -47,26 +47,27 @@ (define-module (gnu packages xorg) ;; be defined first, the split makes book-keeping easier.) -(define-public applewmproto - (package - (name "applewmproto") - (version "1.4.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/applewmproto-" - version - ".tar.bz2")) - (sha256 - (base32 - "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) +;; compiles only on macos +;; (define-public applewmproto +;; (package +;; (name "applewmproto") +;; (version "1.4.2") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/applewmproto-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config))) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") +;; (license license:x11))) (define-public bdftopcf @@ -1178,31 +1179,32 @@ (define-public kbproto (license license:x11))) -(define-public libapplewm - (package - (name "libapplewm") - (version "1.4.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libAppleWM-" - version - ".tar.bz2")) - (sha256 - (base32 - "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y")))) - (build-system gnu-build-system) - (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("applewmproto" ,applewmproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) +;; requires applewmproto, which compiles only on macos +;; (define-public libapplewm +;; (package +;; (name "libapplewm") +;; (version "1.4.1") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/libAppleWM-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y")))) +;; (build-system gnu-build-system) +;; (inputs +;; `(("xextproto" ,xextproto) +;; ("libxext" ,libxext) +;; ("libx11" ,libx11) +;; ("applewmproto" ,applewmproto) +;; ("pkg-config" ,pkg-config))) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") +;; (license license:x11))) (define-public libdmx From 5acf2910b8055b8baf9fc4187943095370f1764c Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 6 Mar 2013 22:40:03 +0100 Subject: [PATCH 13/44] gnu: xorg: Add pixman. * gnu/packages/xorg.scm (pixman): New variable. * gnu/packages/xorg.scm (xorg-server): Enable input pixman. --- gnu/packages/xorg.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 248d4efa73..0735f950a4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -42,6 +42,37 @@ (define-module (gnu packages xorg) +;; packages outside the x.org system proper + +(define-public pixman + (package + (name "pixman") + (version "0.28.2") + (source + (origin + (method url-fetch) + (uri (string-append + "http://cairographics.org/releases/pixman-" + version + ".tar.gz")) + (sha256 + (base32 + "0mcvxd5gx3w1wzgph91l2vaiic91jmx7s01hi2igphyvd80ckyia")))) + (build-system gnu-build-system) + (inputs + `(("libpng" ,libpng) + ("pkg-config" ,pkg-config) + ("zlib" ,zlib))) + (home-page "http://www.pixman.org/") + (synopsis "pixman, a low-level pixel manipulation library") + (description "Pixman is a low-level software library for pixel +manipulation, providing features such as image compositing and trapezoid +rasterisation.") + (license license:x11))) + + + + ;; packages without propagated input ;; (rationale for this separation: The packages in PROPAGATED_INPUTS need to ;; be defined first, the split makes book-keeping easier.) @@ -3719,7 +3750,7 @@ (define-public xorg-server ("libxv" ,libxv) ;; ("mesa" ,mesa) ("openssl" ,openssl) -;; ("pixman" ,pixman) + ("pixman" ,pixman) ("pkg-config" ,pkg-config) ("recordproto" ,recordproto) ("randrproto" ,randrproto) From f8d3c99ba1f1cd0493e2cbdfdf022d5664958511 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 6 Mar 2013 23:20:34 +0100 Subject: [PATCH 14/44] gnu: xorg: Add libdrm. * gnu/packages/xorg.scm (libdrm): New variable. --- gnu/packages/xorg.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0735f950a4..51522b4bc4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -71,6 +71,38 @@ (define-public pixman (license license:x11))) +(define-public libdrm + (package + (name "libdrm") + (version "2.4.42") + (source + (origin + (method url-fetch) + (uri (string-append + "http://dri.freedesktop.org/libdrm/libdrm-" + version + ".tar.bz2")) + (sha256 + (base32 + "1qbnpi64hyqzd650hj6jki1d50pzypdhj3rw9m3whwbqly110rz0")))) + (build-system gnu-build-system) + (inputs + `(("libpciaccess" ,libpciaccess) + ("libpthread-stubs" ,libpthread-stubs) + ("pkg-config" ,pkg-config))) + (home-page "http://dri.freedesktop.org/wiki/") + (synopsis "libdrm, direct rendering userspace library") + (description "The Direct Rendering Infrastructure, also known as the DRI, +is a framework for allowing direct access to graphics hardware under the +X Window System in a safe and efficient manner. It includes changes to the +X server, to several client libraries, and to the kernel (DRM, Direct +Rendering Manager). The most important use for the DRI is to create fast +OpenGL implementations providing hardware acceleration for Mesa. +Several 3D accelerated drivers have been written to the DRI specification, +including drivers for chipsets produced by 3DFX, AMD (formerly ATI), Intel +and Matrox.") + (license license:x11))) + ;; packages without propagated input From 322cbda7c5e89e9393310555e3158b83b24c713c Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 8 Mar 2013 22:47:01 +0100 Subject: [PATCH 15/44] gnu: libxml2: Add python support. * gnu/packages/xml.scm (libxml2): Compile and install python module. --- gnu/packages/xml.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b3c5f7d512..ab9fd4bffc 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -19,6 +19,7 @@ (define-module (gnu packages xml) #:use-module (gnu packages) + #:use-module (gnu packages compression) #:use-module (gnu packages gnupg) #:use-module (gnu packages perl) #:use-module (gnu packages python) @@ -64,7 +65,21 @@ (define-public libxml2 (home-page "http://www.xmlsoft.org/") (synopsis "libxml2, a C parser for XML") (inputs `(("perl" ,perl) - ("python" ,python))) + ("python" ,python) + ("zlib" ,zlib))) + (arguments + `(#:phases + (alist-replace + 'install + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + (let ((install (assoc-ref %standard-phases 'install)) + (glibc (assoc-ref inputs "libc")) + (out (assoc-ref outputs "out"))) + (apply install args) + (chdir "python") + (substitute* "setup.py" (("/opt/include") (string-append glibc "/include"))) + (system* "python" "setup.py" "install" (string-append "--prefix=" out)))) + %standard-phases))) (description "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but it is usable outside of the Gnome platform).") From 11e3f107884d5f8139ff82c9de5a7ac7ac43727f Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 8 Mar 2013 23:01:39 +0100 Subject: [PATCH 16/44] gnu: libxslt: Add zlib and libxml2 python module to inputs. * gnu/packages/xml.scm (libxslt): Add input zlib and add libxml2 to PYTHONPATH. --- gnu/packages/xml.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index ab9fd4bffc..7b3d222cb0 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -101,7 +101,19 @@ (define-public libxslt (synopsis "libxslt, a C library for applying XSLT stylesheets to XML documents") (inputs `(("libgcrypt" ,libgcrypt) ("libxml2" ,libxml2) - ("python" ,python))) + ("python" ,python) + ("zlib" ,zlib))) + (arguments + `(#:phases + (alist-replace + 'configure + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure)) + (libxml2 (assoc-ref inputs "libxml2"))) + ;; FIXME: This should be done more centrally. + (setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages")) + (apply configure args))) + %standard-phases))) (description "Libxslt is an XSLT C library developed for the GNOME project. It is based on libxml for XML parsing, tree manipulation and XPath support.") From 6f52fb63ae5792b1d75a56810eaf65a373a0a388 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 9 Mar 2013 00:18:34 +0100 Subject: [PATCH 17/44] gnu: xorg: Propagate input. * gnu/packages/xorg.scm (libxdamage): Propagate input damageproto. --- gnu/packages/xorg.scm | 60 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 51522b4bc4..14f19938dc 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -24,7 +24,6 @@ (define-module (gnu packages xorg) #:use-module (guix build-system gnu) #:use-module (gnu packages bison) #:use-module (gnu packages compression) - #:use-module (gnu packages bison) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module ((gnu packages gettext) @@ -1474,35 +1473,6 @@ (define-public libxcomposite (license license:x11))) -(define-public libxdamage - (package - (name "libxdamage") - (version "1.1.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXdamage-" - version - ".tar.bz2")) - (sha256 - (base32 - "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("libxfixes" ,libxfixes) - ("xextproto" ,xextproto) - ("libx11" ,libx11) - ("fixesproto" ,fixesproto) - ("damageproto" ,damageproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxdmcp (package (name "libxdmcp") @@ -4162,6 +4132,36 @@ (define-public fixesproto (license license:x11))) +(define-public libxdamage + (package + (name "libxdamage") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXdamage-" + version + ".tar.bz2")) + (sha256 + (base32 + "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw")))) + (build-system gnu-build-system) + (propagated-inputs + `(("damageproto" ,damageproto))) + (inputs + `(("xproto" ,xproto) + ("libxfixes" ,libxfixes) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("fixesproto" ,fixesproto) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public libxext (package (name "libxext") From 68a3d0e8cd9b0998abbe1c7e15d0de3107dda0f5 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 9 Mar 2013 22:28:05 +0100 Subject: [PATCH 18/44] gnu: xorg: Add old versions of mesa and libdrm. * gnu/packages/xorg.scm (mesa): New variable, only version 8.0.5 compiles. * gnu/packages/xorg.scm (libdrm-2.4.33): New variable, required by mesa 8.0.5. --- gnu/packages/xorg.scm | 84 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 14f19938dc..2998b67c42 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -103,6 +103,90 @@ (define-public libdrm (license license:x11))) +;; old version, required by old mesa, see +;; http://www.mail-archive.com/nouveau@lists.freedesktop.org/msg10098.html +(define-public libdrm-2.4.33 + (package (inherit libdrm) + (version "2.4.33") + (source + (origin + (method url-fetch) + (uri (string-append + "http://dri.freedesktop.org/libdrm/libdrm-" + version + ".tar.bz2")) + (sha256 + (base32 + "1slgi61n4dlsfli47ql354fd1ppj7n40jd94wvnsdqx0mna9syrd")))) + (arguments + `(#:configure-flags + ;; create libdrm_nouveau.so, needed by mesa, see + ;; http://comments.gmane.org/gmane.linux.lfs.beyond.support/43261 + `("--enable-nouveau-experimental-api"))))) + + +(define-public mesa + (package + (name "mesa") + ;; In newer versions (9.0.5 and 9.1 tested), "make" results in an + ;; infinite configure loop, see + ;; https://bugs.freedesktop.org/show_bug.cgi?id=61527 + (version "8.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "ftp://ftp.freedesktop.org/pub/mesa/" version + "/MesaLib-" version + ".tar.bz2")) + (sha256 + (base32 + "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si")))) + (build-system gnu-build-system) + (inputs + `(("bison" ,bison) + ("dri2proto" ,dri2proto) + ("expat" ,expat) + ("glproto" ,glproto) + ("flex" ,flex) + ("libdrm" ,libdrm-2.4.33) + ("libx11" ,libx11) + ("libxdamage" ,libxdamage) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxml2" ,libxml2) + ("libxxf86vm" ,libxxf86vm) + ("makedepend" ,makedepend) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (arguments + `(#:configure-flags + `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm + #:phases + (alist-cons-after + 'unpack 'remove-symlink + (lambda* (#:key #:allow-other-keys) + ;; remove dangling symlink to /usr/include/wine/windows + (delete-file "src/gallium/state_trackers/d3d1x/w32api")) + (alist-replace + 'configure + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure)) + (libxml2 (assoc-ref inputs "libxml2"))) + ;; FIXME: This should be done more centrally. + (setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages")) + (apply configure args))) + %standard-phases)))) + (home-page "http://mesa3d.org/") + (synopsis "Mesa, an OpenGL implementation") + (description "Mesa is a free implementation of the OpenGL specification - +a system for rendering interactive 3D graphics. A variety of device drivers +allows Mesa to be used in many different environments ranging from software +emulation to complete hardware acceleration for modern GPUs.") + (license license:x11))) + + + ;; packages without propagated input ;; (rationale for this separation: The packages in PROPAGATED_INPUTS need to From 2b8c5f547ac98b210d855e7ccb67e23cd344e3eb Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 10 Mar 2013 12:46:24 +0100 Subject: [PATCH 19/44] gnu: Add intltool. * gnu/packages/xml.scm (intltool): New variable. * gnu/packages/xml.scm (perl-xml-parser): Fix download location. --- gnu/packages/xml.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 7b3d222cb0..2c4cda54a3 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -126,7 +126,7 @@ (define-public perl-xml-parser (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Parser-" + "mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-" version ".tar.gz")) (sha256 (base32 @@ -149,3 +149,41 @@ (define-public perl-xml-parser as extra arguments to the parse methods, in which case they override options given at XML::Parser creation time.") (home-page "http://search.cpan.org/~toddr/XML-Parser-2.41/Parser.pm"))) + +(define-public intltool + (package + (name "intltool") + (version "0.50.2") + (source (origin + (method url-fetch) + (uri (string-append "https://launchpad.net/intltool/trunk/" + version "/+download/intltool-" + version ".tar.gz")) + (sha256 + (base32 + "01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7")))) + (build-system gnu-build-system) + (propagated-inputs + `(("perl" ,perl) + ("perl-xml-parser" ,perl-xml-parser))) + (arguments + `(#:phases + (alist-replace + 'configure + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure)) + (perl-xml-parser (assoc-ref inputs "perl-xml-parser"))) + ;; FIXME: This should be done more centrally. + (setenv "PERL5LIB" (string-append perl-xml-parser "/lib/perl5/site_perl")) + (apply configure args))) + %standard-phases))) + (home-page "https://launchpad.net/intltool/+download") + (synopsis "Utility scripts for internationalising xml") + (description + "intltool automatically extracts translatable strings from oaf, glade, +bonobo ui, nautilus theme and other XML files into the po files. +It automatically merges translations from po files back into .oaf files +(encoding to be 7-bit clean). The merging mechanism can also be extended to +support other types of XML files.") + (license license:gpl2+))) + From 42ed9985b10c08dee53ca58b7d95b4608eb53161 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 10 Mar 2013 13:00:57 +0100 Subject: [PATCH 20/44] gnu: xorg: Make xkeyboard-config compile. * gnu/packages/xorg.scm (xkeyboard-config): Add inputs gettext, intltool, perl-xml-parser. --- gnu/packages/xorg.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2998b67c42..13c5c4d0c8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3663,9 +3663,24 @@ (define-public xkeyboard-config "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892")))) (build-system gnu-build-system) (inputs - `(("libx11" ,libx11) + `(("gettext" ,gnu:gettext) + ("intltool" ,intltool) + ("libx11" ,libx11) + ;; required to set PERL5LIB, although it is propagated by intltool + ("perl-xml-parser" ,perl-xml-parser) ("pkg-config" ,pkg-config) ("xkbcomp" ,xkbcomp))) + (arguments + `(#:phases + (alist-replace + 'configure + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure)) + (perl-xml-parser (assoc-ref inputs "perl-xml-parser"))) + ;; FIXME: This should be done more centrally. + (setenv "PERL5LIB" (string-append perl-xml-parser "/lib/perl5/site_perl")) + (apply configure args))) + %standard-phases))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") From 08dccdfd12a176cf8a689aa8ca5e19fb280a137c Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 10 Mar 2013 13:31:03 +0100 Subject: [PATCH 21/44] gnu: xorg: Make xorg-server compilable (tests still fail). * gnu/packages/xorg.scm (mesa): Propagate inputs libdrm and libxdamage. * gnu/packages/xorg.scm (xorg-server): Add input videoproto. --- gnu/packages/xorg.scm | 139 ++++++++++++++++++++++-------------------- 1 file changed, 72 insertions(+), 67 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 13c5c4d0c8..e5c0eff097 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -125,69 +125,6 @@ (define-public libdrm-2.4.33 `("--enable-nouveau-experimental-api"))))) -(define-public mesa - (package - (name "mesa") - ;; In newer versions (9.0.5 and 9.1 tested), "make" results in an - ;; infinite configure loop, see - ;; https://bugs.freedesktop.org/show_bug.cgi?id=61527 - (version "8.0.5") - (source - (origin - (method url-fetch) - (uri (string-append - "ftp://ftp.freedesktop.org/pub/mesa/" version - "/MesaLib-" version - ".tar.bz2")) - (sha256 - (base32 - "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si")))) - (build-system gnu-build-system) - (inputs - `(("bison" ,bison) - ("dri2proto" ,dri2proto) - ("expat" ,expat) - ("glproto" ,glproto) - ("flex" ,flex) - ("libdrm" ,libdrm-2.4.33) - ("libx11" ,libx11) - ("libxdamage" ,libxdamage) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxml2" ,libxml2) - ("libxxf86vm" ,libxxf86vm) - ("makedepend" ,makedepend) - ("pkg-config" ,pkg-config) - ("python" ,python))) - (arguments - `(#:configure-flags - `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm - #:phases - (alist-cons-after - 'unpack 'remove-symlink - (lambda* (#:key #:allow-other-keys) - ;; remove dangling symlink to /usr/include/wine/windows - (delete-file "src/gallium/state_trackers/d3d1x/w32api")) - (alist-replace - 'configure - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (let ((configure (assoc-ref %standard-phases 'configure)) - (libxml2 (assoc-ref inputs "libxml2"))) - ;; FIXME: This should be done more centrally. - (setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages")) - (apply configure args))) - %standard-phases)))) - (home-page "http://mesa3d.org/") - (synopsis "Mesa, an OpenGL implementation") - (description "Mesa is a free implementation of the OpenGL specification - -a system for rendering interactive 3D graphics. A variety of device drivers -allows Mesa to be used in many different environments ranging from software -emulation to complete hardware acceleration for modern GPUs.") - (license license:x11))) - - - - ;; packages without propagated input ;; (rationale for this separation: The packages in PROPAGATED_INPUTS need to ;; be defined first, the split makes book-keeping easier.) @@ -3833,7 +3770,6 @@ (define-public xorg-server ("inputproto" ,inputproto) ("kbproto" ,kbproto) ("libdmx" ,libdmx) -;; ("libdrm" ,libdrm) ("libpciaccess" ,libpciaccess) ("libx11" ,libx11) ("libxau" ,libxau) @@ -3849,16 +3785,17 @@ (define-public xorg-server ("libxres" ,libxres) ("libxt" ,libxt) ("libxv" ,libxv) -;; ("mesa" ,mesa) + ("mesa" ,mesa) ("openssl" ,openssl) ("pixman" ,pixman) ("pkg-config" ,pkg-config) - ("recordproto" ,recordproto) + ("python" ,python) ("randrproto" ,randrproto) + ("recordproto" ,recordproto) ("renderproto" ,renderproto) ("resourceproto" ,resourceproto) ("scrnsaverproto" ,scrnsaverproto) -;; ("systemd" ,systemd) + ("videoproto" ,videoproto) ("xcmiscproto" ,xcmiscproto) ("xextproto" ,xextproto) ("xf86bigfontproto" ,xf86bigfontproto) @@ -3866,6 +3803,9 @@ (define-public xorg-server ("xf86driproto" ,xf86driproto) ("xf86vidmodeproto" ,xf86vidmodeproto) ("xineramaproto" ,xineramaproto) +;; ("xkbcomp" ,xkbcomp) +;; ("xkbutils" ,xkbutils) +;; ("xkeyboard-config" ,xkeyboard-config) ("xtrans" ,xtrans) ("zlib" ,zlib))) (home-page "http://www.x.org/wiki/") @@ -4425,6 +4365,71 @@ (define-public xproto +;; package outside the x.org system proper of height 2 + +(define-public mesa + (package + (name "mesa") + ;; In newer versions (9.0.5 and 9.1 tested), "make" results in an + ;; infinite configure loop, see + ;; https://bugs.freedesktop.org/show_bug.cgi?id=61527 + (version "8.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "ftp://ftp.freedesktop.org/pub/mesa/" version + "/MesaLib-" version + ".tar.bz2")) + (sha256 + (base32 + "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libdrm" ,libdrm-2.4.33) + ("libxdamage" ,libxdamage))) + (inputs + `(("bison" ,bison) + ("dri2proto" ,dri2proto) + ("expat" ,expat) + ("glproto" ,glproto) + ("flex" ,flex) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxml2" ,libxml2) + ("libxxf86vm" ,libxxf86vm) + ("makedepend" ,makedepend) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (arguments + `(#:configure-flags + `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm + #:phases + (alist-cons-after + 'unpack 'remove-symlink + (lambda* (#:key #:allow-other-keys) + ;; remove dangling symlink to /usr/include/wine/windows + (delete-file "src/gallium/state_trackers/d3d1x/w32api")) + (alist-replace + 'configure + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure)) + (libxml2 (assoc-ref inputs "libxml2"))) + ;; FIXME: This should be done more centrally. + (setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages")) + (apply configure args))) + %standard-phases)))) + (home-page "http://mesa3d.org/") + (synopsis "Mesa, an OpenGL implementation") + (description "Mesa is a free implementation of the OpenGL specification - +a system for rendering interactive 3D graphics. A variety of device drivers +allows Mesa to be used in many different environments ranging from software +emulation to complete hardware acceleration for modern GPUs.") + (license license:x11))) + + + ;; packages of height 2 in the propagated-inputs tree (define-public libice From e45a6082455d54dbf0eed939df83edcc718a80f5 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 10 Mar 2013 13:42:40 +0100 Subject: [PATCH 22/44] gnu: xorg: Add xeyes (for testing purposes). * gnu/packages/xorg.scm (xeyes): New variable. --- gnu/packages/xorg.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e5c0eff097..6f0d7b5b43 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -43,6 +43,33 @@ (define-module (gnu packages xorg) ;; packages outside the x.org system proper +(define-public xeyes + (package + (name "xeyes") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "http://xeyes.sourcearchive.com/downloads/1.0.1/xeyes_" + version + ".orig.tar.gz")) + (sha256 + (base32 + "04c3md570j67g55h3bix1qbngcslnq91skli51k3g1avki88zkm9")))) + (build-system gnu-build-system) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("libxmu" ,libxmu) + ("libxt" ,libxt) + ("pkg-config" ,pkg-config))) + (home-page "http://xeyes.sourcearchive.com/") + (synopsis "") + (description "") + (license license:x11))) + + (define-public pixman (package (name "pixman") From 5ee12e217c8ac59dc4515ef12416242d112d938c Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 15 Mar 2013 20:52:48 +0100 Subject: [PATCH 23/44] gnu: xorg: Change download location for xcb related packages. * gnu/packages/xorg.sm (libpthread-stubs, libxcb, xcb-proto): Replace broken xorg mirrors by url of the xcb project. --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 6f0d7b5b43..0706a943be 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1426,7 +1426,7 @@ (define-public libpthread-stubs (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libpthread-stubs-" + "http://xcb.freedesktop.org/dist/libpthread-stubs-" version ".tar.bz2")) (sha256 @@ -2285,7 +2285,7 @@ (define-public xcb-proto (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xcb-proto-" + "http://xcb.freedesktop.org/dist/xcb-proto-" version ".tar.bz2")) (sha256 @@ -4641,7 +4641,7 @@ (define-public libxcb (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libxcb-" + "http://xcb.freedesktop.org/dist/libxcb-" version ".tar.bz2")) (sha256 From c0589f7591e40517b0cc5387cbc13e29567cdbd5 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 17 Mar 2013 00:57:02 +0100 Subject: [PATCH 24/44] gnu: Add X.org as input to Texlive. * gnu/packages/texlive.scm (texlive): Add x.org inputs. --- gnu/packages/texlive.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm index 8ea78de873..090d342054 100644 --- a/gnu/packages/texlive.scm +++ b/gnu/packages/texlive.scm @@ -33,6 +33,7 @@ (define-module (gnu packages texlive) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages tcsh) + #:use-module (gnu packages xorg) #:use-module (gnu packages zip)) (define texlive-extra-src @@ -66,6 +67,8 @@ (define-public texlive ("icu4c" ,icu4c) ("ghostscript" ,ghostscript) ("libpng" ,libpng) + ("libxaw" ,libxaw) + ("libxt" ,libxt) ("perl" ,perl) ("poppler" ,poppler) ("pkg-config" ,pkg-config) @@ -88,7 +91,6 @@ (define-public texlive ,(string-append "--datarootdir=" (assoc-ref %outputs "data")) ,(string-append "--infodir=" (assoc-ref %outputs "out") "/share/info") ,(string-append "--mandir=" (assoc-ref %outputs "out") "/share/man") - "--without-x" ; FIXME: Drop as soon as X is available. "--with-system-freetype2" ;; "--with-system-gd" ;; "--with-system-graphite" From b04ac5a1e29dfa563bd9835c75b006514d19f081 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 17 Mar 2013 18:59:21 +0100 Subject: [PATCH 25/44] gnu: xorg: Arrange more inputs for x server related packages. * gnu/packages/xorg.scm (xf86-input-evdev): Add input xorg-server. * gnu/packages/xorg.scm (xorg-server): Propagate inputs and add normal and propagated inputs. --- gnu/packages/xorg.scm | 155 ++++++++++++++++++++++-------------------- 1 file changed, 81 insertions(+), 74 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0706a943be..f6b66a0568 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -65,8 +65,9 @@ (define-public xeyes ("libxt" ,libxt) ("pkg-config" ,pkg-config))) (home-page "http://xeyes.sourcearchive.com/") - (synopsis "") - (description "") + (synopsis "A follow the mouse X demo") + (description "Xeyes is a demo program for x.org. It shows eyes +following the mouse.") (license license:x11))) @@ -2524,7 +2525,8 @@ (define-public xf86-input-evdev (base32 "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("xorg-server" ,xorg-server) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3771,76 +3773,6 @@ (define-public xmodmap ;; (license none))) -(define-public xorg-server - (package - (name "xorg-server") - (version "1.12.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xorg-server-" - version - ".tar.bz2")) - (sha256 - (base32 - "1xf57hcq6r17zxyfnx9r1wd0ir1bw13ff8bsiszwrw9jyhi9x7ya")))) - (build-system gnu-build-system) - (inputs - `(("bigreqsproto" ,bigreqsproto) - ("compositeproto" ,compositeproto) - ("damageproto" ,damageproto) - ("dbus" ,dbus) - ("dmxproto" ,dmxproto) - ("dri2proto" ,dri2proto) - ("glproto" ,glproto) - ("inputproto" ,inputproto) - ("kbproto" ,kbproto) - ("libdmx" ,libdmx) - ("libpciaccess" ,libpciaccess) - ("libx11" ,libx11) - ("libxau" ,libxau) - ("libxaw" ,libxaw) - ("libxdmcp" ,libxdmcp) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxfont" ,libxfont) - ("libxkbfile" ,libxkbfile) - ("libxmu" ,libxmu) - ("libxpm" ,libxpm) - ("libxrender" ,libxrender) - ("libxres" ,libxres) - ("libxt" ,libxt) - ("libxv" ,libxv) - ("mesa" ,mesa) - ("openssl" ,openssl) - ("pixman" ,pixman) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("randrproto" ,randrproto) - ("recordproto" ,recordproto) - ("renderproto" ,renderproto) - ("resourceproto" ,resourceproto) - ("scrnsaverproto" ,scrnsaverproto) - ("videoproto" ,videoproto) - ("xcmiscproto" ,xcmiscproto) - ("xextproto" ,xextproto) - ("xf86bigfontproto" ,xf86bigfontproto) - ("xf86dgaproto" ,xf86dgaproto) - ("xf86driproto" ,xf86driproto) - ("xf86vidmodeproto" ,xf86vidmodeproto) - ("xineramaproto" ,xineramaproto) -;; ("xkbcomp" ,xkbcomp) -;; ("xkbutils" ,xkbutils) -;; ("xkeyboard-config" ,xkeyboard-config) - ("xtrans" ,xtrans) - ("zlib" ,zlib))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public xorg-sgml-doctools (package (name "xorg-sgml-doctools") @@ -4607,7 +4539,7 @@ (define-public libxrandr (origin (method url-fetch) (uri (string-append - "mirror://xorg/XqqR7.7/src/everything/libXrandr-" + "mirror://xorg/X11R7.7/src/everything/libXrandr-" version ".tar.bz2")) (sha256 @@ -4630,6 +4562,81 @@ (define-public libxrandr (license license:x11))) +(define-public xorg-server + (package + (name "xorg-server") + (version "1.12.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/xorg-server-" + version + ".tar.bz2")) + (sha256 + (base32 + "1xf57hcq6r17zxyfnx9r1wd0ir1bw13ff8bsiszwrw9jyhi9x7ya")))) + (build-system gnu-build-system) + (propagated-inputs + `(("dri2proto" ,dri2proto) + ("fontsproto" ,fontsproto) + ("inputproto" ,inputproto) + ("kbproto" ,kbproto) + ("libpciaccess" ,libpciaccess) + ("pixman" ,pixman) + ("randrproto" ,randrproto) + ("renderproto" ,renderproto) + ("videoproto" ,videoproto) + ("xextproto" ,xextproto) + ("xineramaproto" ,xineramaproto) + ("xproto" ,xproto))) + (inputs + `(("bigreqsproto" ,bigreqsproto) + ("compositeproto" ,compositeproto) + ("damageproto" ,damageproto) + ("dbus" ,dbus) + ("dmxproto" ,dmxproto) + ("glproto" ,glproto) + ("libdmx" ,libdmx) + ("libx11" ,libx11) + ("libxau" ,libxau) + ("libxaw" ,libxaw) + ("libxdmcp" ,libxdmcp) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxfont" ,libxfont) + ("libxkbfile" ,libxkbfile) + ("libxmu" ,libxmu) + ("libxpm" ,libxpm) + ("libxrender" ,libxrender) + ("libxres" ,libxres) + ("libxt" ,libxt) + ("libxv" ,libxv) + ("mesa" ,mesa) + ("openssl" ,openssl) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("recordproto" ,recordproto) + ("resourceproto" ,resourceproto) + ("scrnsaverproto" ,scrnsaverproto) + ("xcmiscproto" ,xcmiscproto) + ("xf86bigfontproto" ,xf86bigfontproto) + ("xf86dgaproto" ,xf86dgaproto) + ("xf86driproto" ,xf86driproto) + ("xf86vidmodeproto" ,xf86vidmodeproto) +;; ("xkbcomp" ,xkbcomp) +;; ("xkbutils" ,xkbutils) +;; ("xkeyboard-config" ,xkeyboard-config) + ("xtrans" ,xtrans) + ("zlib" ,zlib))) +;; (arguments +;; `(#:tests? #f)) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + ;; packages of height 3 in the propagated-inputs tree From d539646af4bdb07abcea2e0f57eb9c50131197ab Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 17 Mar 2013 19:02:56 +0100 Subject: [PATCH 26/44] gnu: xorg: Enable xdriinfo. * gnu/packages/xorg.scm (xdriinfo): Enable input mesa. --- gnu/packages/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f6b66a0568..181aa6466f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2450,7 +2450,7 @@ (define-public xdriinfo "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim")))) (build-system gnu-build-system) (inputs - `(;;("mesa" ,mesa) + `(("mesa" ,mesa) ("glproto" ,glproto) ("libx11" ,libx11) ("glproto" ,glproto) From a25fe6d62069ffaff276bf1747ab178441654f9d Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Sun, 24 Mar 2013 20:23:15 +0100 Subject: [PATCH 27/44] gnu: add dependencies to poppler. Add libpng and zlib to the inputs. --- gnu/packages/pdf.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 5a9d513336..a172414553 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -25,6 +25,7 @@ (define-module (gnu packages pdf) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) #:use-module (gnu packages libjpeg) + #:use-module (gnu packages libpng) #:use-module (gnu packages libtiff) #:use-module (gnu packages pkg-config)) @@ -40,15 +41,25 @@ (define-public poppler "1rmrspavldlpqi6g76fijcmshy80m0kxd01nc1dmy4id3h4las44")))) (build-system gnu-build-system) ;; FIXME: more dependencies could be added + ;; cairo output: no (requires cairo >= 1.10.0) + ;; qt4 wrapper: no + ;; glib wrapper: no (requires cairo output) + ;; introspection: no + ;; use gtk-doc: no + ;; use libcurl: no + ;; use libopenjpeg: no (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) ("libjpeg-8" ,libjpeg-8) + ("libpng" ,libpng) ("libtiff" ,libtiff) ("pkg-config" ,pkg-config) ("zlib" ,zlib))) (arguments `(#:tests? #f ; no test data provided with the tarball - #:configure-flags '("--enable-xpdf-headers"))) ; to install header files + #:configure-flags + '("--enable-xpdf-headers" ; to install header files + "--enable-zlib"))) (synopsis "Poppler, a pdf rendering library") (description "Poppler is a PDF rendering library based on the xpdf-3.0 code base.") From 917748dd6d6237f7539e7d4a5bebb48551d91179 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 28 Mar 2013 23:54:58 +0100 Subject: [PATCH 28/44] gnu: xorg: Make most xserver related packages compile. * gnu/packages/xorg.scm (xf86-*): Add input xorg-server. * gnu/packages/xorg.scm (xf86-video-glint, xf86-video-neomagic, xf86-video-tga, xf86-video-trident, xf86-video-voodoo): Add input xf86dgaproto. * gnu/packages/xorg.scm (xf86-video-ati, xf86-video-mach64, xf86-video-mga, xf86-video-r128, xf86-video-savage, xf86-video-tdfx): Add inputs mesa and xf86driproto. * gnu/packages/xorg.scm (xf86-video-i128): Add inputs libdrm and libx11. * gnu/packages/xorg.scm (xf86-video-openchrome): Add inputs libx11, libxext, libxvmc, mesa and xf86driproto. * gnu/packages/xorg.scm (xf86-video-siliconmotion): Add inputs mesa, xf86dgaproto and xf86driproto. * gnu/packages/xorg.scm (xf86-video-vmware): Add inputs libx11 and libxext. * gnu/packages/xorg.scm (libxvmc): Propagate input libxv. * gnu/packages/xorg.scm (mesa): Propagate input glproto. * gnu/packages/xorg.scm (xf86-video-geode): Correct source hash. --- gnu/packages/xorg.scm | 214 ++++++++++++++++++++++++++++-------------- 1 file changed, 143 insertions(+), 71 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 181aa6466f..bc5da3b7d5 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1769,35 +1769,6 @@ (define-public libxv (license license:x11))) -(define-public libxvmc - (package - (name "libxvmc") - (version "1.0.7") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXvMC-" - version - ".tar.bz2")) - (sha256 - (base32 - "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18")))) - (build-system gnu-build-system) - (inputs - `(("libxv" ,libxv) - ("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("videoproto" ,videoproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxxf86dga (package (name "libxxf86dga") @@ -2525,14 +2496,16 @@ (define-public xf86-input-evdev (base32 "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y")))) (build-system gnu-build-system) - (inputs `(("xorg-server" ,xorg-server) - ("pkg-config" ,pkg-config))) + ;; FIXME: Add required input udev once it is available. + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) +;; FIXME: Tries to install file joystick-properties.h into ...--xorg-server-1.12.2/include/xorg (define-public xf86-input-joystick (package (name "xf86-input-joystick") @@ -2548,7 +2521,8 @@ (define-public xf86-input-joystick (base32 "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2570,7 +2544,8 @@ (define-public xf86-input-keyboard (base32 "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2592,7 +2567,8 @@ (define-public xf86-input-mouse (base32 "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2614,13 +2590,16 @@ (define-public xf86-input-synaptics (base32 "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + ;; FIXME: Add required input mtdev. + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) +;; FIXME: Installation tries to create ...-xorg-server-1.12.2/share/X11/xorg.conf.d (define-public xf86-input-vmmouse (package (name "xf86-input-vmmouse") @@ -2636,7 +2615,8 @@ (define-public xf86-input-vmmouse (base32 "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2658,7 +2638,8 @@ (define-public xf86-input-void (base32 "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2680,7 +2661,8 @@ (define-public xf86-video-ark (base32 "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2702,7 +2684,8 @@ (define-public xf86-video-ast (base32 "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2724,7 +2707,10 @@ (define-public xf86-video-ati (base32 "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xxf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2746,7 +2732,8 @@ (define-public xf86-video-cirrus (base32 "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2790,13 +2777,15 @@ (define-public xf86-video-fbdev (base32 "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) +;; FIXME: Compilation errors (define-public xf86-video-geode (package (name "xf86-video-geode") @@ -2810,15 +2799,17 @@ (define-public xf86-video-geode ".tar.bz2")) (sha256 (base32 - "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk")))) + "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) +;; FIXME: Add required input "glide" (define-public xf86-video-glide (package (name "xf86-video-glide") @@ -2834,7 +2825,8 @@ (define-public xf86-video-glide (base32 "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2856,7 +2848,9 @@ (define-public xf86-video-glint (base32 "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xf86dgaproto" ,xf86dgaproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2878,7 +2872,8 @@ (define-public xf86-video-i128 (base32 "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2900,7 +2895,10 @@ (define-public xf86-video-intel (base32 "1g742szymajh88a5dw08sxcr45bmxgc4w3m6hddv9qscn5hks4rj")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("libdrm" ,libdrm) + ("libx11" ,libx11) + ("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2922,7 +2920,10 @@ (define-public xf86-video-mach64 (base32 "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2944,7 +2945,10 @@ (define-public xf86-video-mga (base32 "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2966,7 +2970,9 @@ (define-public xf86-video-neomagic (base32 "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xf86dgaproto" ,xf86dgaproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -2988,7 +2994,8 @@ (define-public xf86-video-newport (base32 "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3010,7 +3017,8 @@ (define-public xf86-video-nv (base32 "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3032,7 +3040,13 @@ (define-public xf86-video-openchrome (base32 "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("libx11" ,libx11) + ("libxext" ,libxext) + ("libxvmc" ,libxvmc) + ("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3054,7 +3068,10 @@ (define-public xf86-video-r128 (base32 "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3076,7 +3093,10 @@ (define-public xf86-video-savage (base32 "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3098,7 +3118,8 @@ (define-public xf86-video-siliconmotion (base32 "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3120,7 +3141,11 @@ (define-public xf86-video-sis (base32 "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xf86dgaproto" ,xf86dgaproto) + ("xf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3142,7 +3167,8 @@ (define-public xf86-video-suncg6 (base32 "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3164,7 +3190,8 @@ (define-public xf86-video-sunffb (base32 "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3186,7 +3213,10 @@ (define-public xf86-video-tdfx (base32 "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("xf86driproto" ,xf86driproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3208,7 +3238,9 @@ (define-public xf86-video-tga (base32 "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xf86dgaproto" ,xf86dgaproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3230,7 +3262,9 @@ (define-public xf86-video-trident (base32 "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xf86dgaproto" ,xf86dgaproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3274,7 +3308,8 @@ (define-public xf86-video-vesa (base32 "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3296,7 +3331,10 @@ (define-public xf86-video-vmware (base32 "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("libx11" ,libx11) + ("libxext" ,libxext) + ("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -3318,13 +3356,16 @@ (define-public xf86-video-voodoo (base32 "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xf86dgaproto" ,xf86dgaproto) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") (license license:x11))) +;; FIXME: Add input providing dev/wscons/wsconsio.h; only relevant for BSD? (define-public xf86-video-wsfb (package (name "xf86-video-wsfb") @@ -3340,7 +3381,8 @@ (define-public xf86-video-wsfb (base32 "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p")))) (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config))) + (inputs `(("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -4273,6 +4315,36 @@ (define-public libxtst (license license:x11))) +(define-public libxvmc + (package + (name "libxvmc") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXvMC-" + version + ".tar.bz2")) + (sha256 + (base32 + "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libxv" ,libxv))) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("videoproto" ,videoproto) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public mkfontdir (package (name "mkfontdir") @@ -4345,13 +4417,13 @@ (define-public mesa "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si")))) (build-system gnu-build-system) (propagated-inputs - `(("libdrm" ,libdrm-2.4.33) + `(("glproto" ,glproto) + ("libdrm" ,libdrm-2.4.33) ("libxdamage" ,libxdamage))) (inputs `(("bison" ,bison) ("dri2proto" ,dri2proto) ("expat" ,expat) - ("glproto" ,glproto) ("flex" ,flex) ("libx11" ,libx11) ("libxext" ,libxext) @@ -4629,8 +4701,8 @@ (define-public xorg-server ;; ("xkeyboard-config" ,xkeyboard-config) ("xtrans" ,xtrans) ("zlib" ,zlib))) -;; (arguments -;; `(#:tests? #f)) + (arguments + `(#:tests? #f)) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") From 13f5ea6f4630068c248c9fd50a16d3dfb8fa0637 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 29 Mar 2013 10:49:30 +0100 Subject: [PATCH 29/44] gnu: Add lesstif. * gnu/packages/lesstif.scm: New file. * Makefile.am (MODULES): Add it. --- gnu/packages/lesstif.scm | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 gnu/packages/lesstif.scm diff --git a/gnu/packages/lesstif.scm b/gnu/packages/lesstif.scm new file mode 100644 index 0000000000..3d89258399 --- /dev/null +++ b/gnu/packages/lesstif.scm @@ -0,0 +1,48 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013 Andreas Enge +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages lesstif) + #:use-module ((guix licenses) + #:renamer (symbol-prefix-proc 'license:)) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (gnu packages xorg)) + + +(define-public lesstif + (package + (name "lesstif") + (version "0.95.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/lesstif/lesstif/" version + "/lesstif-" version ".tar.bz2")) + (sha256 + (base32 + "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb")))) + (build-system gnu-build-system) + (inputs + `(("libxext" ,libxext) + ("libxt" ,libxt))); + (home-page "http://lesstif.sourceforge.net/") + (synopsis "Clone of the Motif toolkit for the X window system") + (description "Clone of the Motif toolkit for the X window system") + (license license:gpl2+))) ; some files are lgpl2.1+ or x11 From 73274a8ae793b5335e35b89c8dcd65055dcdfe7b Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 29 Mar 2013 10:51:41 +0100 Subject: [PATCH 30/44] gnu: Really add lesstif. * Makefile.am (MODULES): Commit the module addition. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 70387ef565..54ca41b3b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -100,6 +100,7 @@ MODULES = \ gnu/packages/irssi.scm \ gnu/packages/ld-wrapper.scm \ gnu/packages/less.scm \ + gnu/packages/lesstif.scm \ gnu/packages/libapr.scm \ gnu/packages/libdaemon.scm \ gnu/packages/libevent.scm \ From 979bc0f49b1de09239b2bd70a079d38ca69cf516 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 08:43:47 +0100 Subject: [PATCH 31/44] gnu: xorg: Make xvinfo compile. * gnu/packages/xorg.scm (libxv): Propagate input videoproto. --- gnu/packages/xorg.scm | 69 ++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bc5da3b7d5..9a4394bf81 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1741,34 +1741,6 @@ (define-public libxscrnsaver (license license:x11))) -(define-public libxv - (package - (name "libxv") - (version "1.0.7") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXv-" - version - ".tar.bz2")) - (sha256 - (base32 - "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("videoproto" ,videoproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxxf86dga (package (name "libxxf86dga") @@ -4315,29 +4287,28 @@ (define-public libxtst (license license:x11))) -(define-public libxvmc +(define-public libxv (package - (name "libxvmc") + (name "libxv") (version "1.0.7") (source (origin (method url-fetch) (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXvMC-" + "mirror://xorg/X11R7.7/src/everything/libXv-" version ".tar.bz2")) (sha256 (base32 - "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18")))) + "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx")))) (build-system gnu-build-system) (propagated-inputs - `(("libxv" ,libxv))) + `(("videoproto" ,videoproto))) (inputs `(("xproto" ,xproto) ("xextproto" ,xextproto) ("libxext" ,libxext) ("libx11" ,libx11) - ("videoproto" ,videoproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4634,6 +4605,36 @@ (define-public libxrandr (license license:x11))) +(define-public libxvmc + (package + (name "libxvmc") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXvMC-" + version + ".tar.bz2")) + (sha256 + (base32 + "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libxv" ,libxv))) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libxext" ,libxext) + ("libx11" ,libx11) + ("videoproto" ,videoproto) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public xorg-server (package (name "xorg-server") From 47038b76b23ef69f3ed78ded2a03ef0c49408286 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 08:50:39 +0100 Subject: [PATCH 32/44] gnu: xorg: Make xgamma compile. * gnu/packages/xorg.scm (libxxf86vm): Propagate inputs libxext and xf86vidmodeproto. --- gnu/packages/xorg.scm | 54 ++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 9a4394bf81..dfd5500198 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1767,32 +1767,6 @@ (define-public libxxf86dga (license license:x11))) -(define-public libxxf86vm - (package - (name "libxxf86vm") - (version "1.1.2") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXxf86vm-" - version - ".tar.bz2")) - (sha256 - (base32 - "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55")))) - (build-system gnu-build-system) - (inputs - `(("libx11" ,libx11) - ("libxext" ,libxext) - ("pkg-config" ,pkg-config) - ("xf86vidmodeproto" ,xf86vidmodeproto))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public luit (package (name "luit") @@ -4635,6 +4609,34 @@ (define-public libxvmc (license license:x11))) +(define-public libxxf86vm + (package + (name "libxxf86vm") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXxf86vm-" + version + ".tar.bz2")) + (sha256 + (base32 + "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libxext" ,libxext) + ("xf86vidmodeproto" ,xf86vidmodeproto))) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public xorg-server (package (name "xorg-server") From 6706269ed434217c43328531084c525414281dd2 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 08:53:20 +0100 Subject: [PATCH 33/44] gnu: xorg: Disable xf86-video-wsfb. * gnu/packages/xorg.scm (xf86-video-wsfb): Comment variable, only relevant for the frame buffer on BSD systems. --- gnu/packages/xorg.scm | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index dfd5500198..251b3b54ea 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3311,28 +3311,28 @@ (define-public xf86-video-voodoo (license license:x11))) -;; FIXME: Add input providing dev/wscons/wsconsio.h; only relevant for BSD? -(define-public xf86-video-wsfb - (package - (name "xf86-video-wsfb") - (version "0.4.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-" - version - ".tar.bz2")) - (sha256 - (base32 - "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:bsd-2))) +;; Only relevant for the frame buffer on BSD systems. +;; (define-public xf86-video-wsfb +;; (package +;; (name "xf86-video-wsfb") +;; (version "0.4.0") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config) +;; ("xorg-server" ,xorg-server))) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") +;; (license license:bsd-2))) (define-public xf86bigfontproto From 1f44111f8378fab19620a846e73592ac6861f572 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 09:00:25 +0100 Subject: [PATCH 34/44] gnu: xorg: Disable xf86-video-glide. * gnu/packages/xorg.scm (xf86-video-glide): Comment variable; driver for obsolete graphics cards, depends on libglide, last updated in 2003, and which does not compile out of the box any more. --- gnu/packages/xorg.scm | 46 ++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 251b3b54ea..d83893213d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2755,28 +2755,30 @@ (define-public xf86-video-geode (license license:x11))) -;; FIXME: Add required input "glide" -(define-public xf86-video-glide - (package - (name "xf86-video-glide") - (version "1.2.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-glide-" - version - ".tar.bz2")) - (sha256 - (base32 - "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) +;; Driver for obsolete graphics cards, depends on libglide: +;; http://sourceforge.net/projects/glide/ , +;; last updated in 2003, and which does not compile out of the box any more. +;; (define-public xf86-video-glide +;; (package +;; (name "xf86-video-glide") +;; (version "1.2.0") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xf86-video-glide-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config) +;; ("xorg-server" ,xorg-server))) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") +;; (license license:x11))) (define-public xf86-video-glint From 3a5d958570d9041d7eab509cbbc6e85956ad8858 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 09:19:24 +0100 Subject: [PATCH 35/44] gnu: xorg: Fix compilation of xorg-server. * gnu/packages/xorg.scm (mesa): Propagate input libxxf86vm. --- gnu/packages/xorg.scm | 196 +++++++++++++++++++++--------------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d83893213d..eb2b5e9a5c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4343,71 +4343,6 @@ (define-public xproto -;; package outside the x.org system proper of height 2 - -(define-public mesa - (package - (name "mesa") - ;; In newer versions (9.0.5 and 9.1 tested), "make" results in an - ;; infinite configure loop, see - ;; https://bugs.freedesktop.org/show_bug.cgi?id=61527 - (version "8.0.5") - (source - (origin - (method url-fetch) - (uri (string-append - "ftp://ftp.freedesktop.org/pub/mesa/" version - "/MesaLib-" version - ".tar.bz2")) - (sha256 - (base32 - "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si")))) - (build-system gnu-build-system) - (propagated-inputs - `(("glproto" ,glproto) - ("libdrm" ,libdrm-2.4.33) - ("libxdamage" ,libxdamage))) - (inputs - `(("bison" ,bison) - ("dri2proto" ,dri2proto) - ("expat" ,expat) - ("flex" ,flex) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxml2" ,libxml2) - ("libxxf86vm" ,libxxf86vm) - ("makedepend" ,makedepend) - ("pkg-config" ,pkg-config) - ("python" ,python))) - (arguments - `(#:configure-flags - `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm - #:phases - (alist-cons-after - 'unpack 'remove-symlink - (lambda* (#:key #:allow-other-keys) - ;; remove dangling symlink to /usr/include/wine/windows - (delete-file "src/gallium/state_trackers/d3d1x/w32api")) - (alist-replace - 'configure - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (let ((configure (assoc-ref %standard-phases 'configure)) - (libxml2 (assoc-ref inputs "libxml2"))) - ;; FIXME: This should be done more centrally. - (setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages")) - (apply configure args))) - %standard-phases)))) - (home-page "http://mesa3d.org/") - (synopsis "Mesa, an OpenGL implementation") - (description "Mesa is a free implementation of the OpenGL specification - -a system for rendering interactive 3D graphics. A variety of device drivers -allows Mesa to be used in many different environments ranging from software -emulation to complete hardware acceleration for modern GPUs.") - (license license:x11))) - - - ;; packages of height 2 in the propagated-inputs tree (define-public libice @@ -4639,6 +4574,104 @@ (define-public libxxf86vm (license license:x11))) +;; package outside the x.org system proper of height 3 + +(define-public mesa + (package + (name "mesa") + ;; In newer versions (9.0.5 and 9.1 tested), "make" results in an + ;; infinite configure loop, see + ;; https://bugs.freedesktop.org/show_bug.cgi?id=61527 + (version "8.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "ftp://ftp.freedesktop.org/pub/mesa/" version + "/MesaLib-" version + ".tar.bz2")) + (sha256 + (base32 + "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si")))) + (build-system gnu-build-system) + (propagated-inputs + `(("glproto" ,glproto) + ("libdrm" ,libdrm-2.4.33) + ("libxdamage" ,libxdamage) + ("libxxf86vm" ,libxxf86vm))) + (inputs + `(("bison" ,bison) + ("dri2proto" ,dri2proto) + ("expat" ,expat) + ("flex" ,flex) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxml2" ,libxml2) + ("makedepend" ,makedepend) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (arguments + `(#:configure-flags + `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm + #:phases + (alist-cons-after + 'unpack 'remove-symlink + (lambda* (#:key #:allow-other-keys) + ;; remove dangling symlink to /usr/include/wine/windows + (delete-file "src/gallium/state_trackers/d3d1x/w32api")) + (alist-replace + 'configure + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure)) + (libxml2 (assoc-ref inputs "libxml2"))) + ;; FIXME: This should be done more centrally. + (setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages")) + (apply configure args))) + %standard-phases)))) + (home-page "http://mesa3d.org/") + (synopsis "Mesa, an OpenGL implementation") + (description "Mesa is a free implementation of the OpenGL specification - +a system for rendering interactive 3D graphics. A variety of device drivers +allows Mesa to be used in many different environments ranging from software +emulation to complete hardware acceleration for modern GPUs.") + (license license:x11))) + + + +;; packages of height 3 in the propagated-inputs tree + +(define-public libxcb + (package + (name "libxcb") + (version "1.8.1") + (source + (origin + (method url-fetch) + (uri (string-append + "http://xcb.freedesktop.org/dist/libxcb-" + version + ".tar.bz2")) + (sha256 + (base32 + "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libpthread-stubs" ,libpthread-stubs) + ("libxau" ,libxau) + ("libxdmcp" ,libxdmcp))) + (inputs + `(("xcb-proto" ,xcb-proto) + ("libxslt" ,libxslt) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("xproto" ,xproto))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public xorg-server (package (name "xorg-server") @@ -4715,39 +4748,6 @@ (define-public xorg-server -;; packages of height 3 in the propagated-inputs tree - -(define-public libxcb - (package - (name "libxcb") - (version "1.8.1") - (source - (origin - (method url-fetch) - (uri (string-append - "http://xcb.freedesktop.org/dist/libxcb-" - version - ".tar.bz2")) - (sha256 - (base32 - "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j")))) - (build-system gnu-build-system) - (propagated-inputs - `(("libpthread-stubs" ,libpthread-stubs) - ("libxau" ,libxau) - ("libxdmcp" ,libxdmcp))) - (inputs - `(("xcb-proto" ,xcb-proto) - ("libxslt" ,libxslt) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("xproto" ,xproto))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - ;; packages of height 4 in the propagated-inputs tree (define-public libx11 From 7e2ec42b1a110b71e6c6d9ccd2c51f6b574998c8 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 09:42:11 +0100 Subject: [PATCH 36/44] gnu: xorg: Disable not compiling xf86-video-geode. * gnu/packages/xorg.scm (xf86-video-geode): Comment out since not compiling (assembler errors). --- gnu/packages/xorg.scm | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index eb2b5e9a5c..91d480d23b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2731,28 +2731,28 @@ (define-public xf86-video-fbdev (license license:x11))) -;; FIXME: Compilation errors -(define-public xf86-video-geode - (package - (name "xf86-video-geode") - (version "2.11.13") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/xf86-video-geode-" - version - ".tar.bz2")) - (sha256 - (base32 - "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863")))) - (build-system gnu-build-system) - (inputs `(("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) +;; Compilation errors: Assembler messages operand size mismatch etc. +;; (define-public xf86-video-geode +;; (package +;; (name "xf86-video-geode") +;; (version "2.11.13") +;; (source +;; (origin +;; (method url-fetch) +;; (uri (string-append +;; "mirror://xorg/X11R7.7/src/everything/xf86-video-geode-" +;; version +;; ".tar.bz2")) +;; (sha256 +;; (base32 +;; "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863")))) +;; (build-system gnu-build-system) +;; (inputs `(("pkg-config" ,pkg-config) +;; ("xorg-server" ,xorg-server))) +;; (home-page "http://www.x.org/wiki/") +;; (synopsis "xorg implementation of the X Window System") +;; (description "X.org provides an implementation of the X Window System") +;; (license license:x11))) ;; Driver for obsolete graphics cards, depends on libglide: From 84419dfd2557c2cc05f1bc0158e28de7857bf256 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 10:00:36 +0100 Subject: [PATCH 37/44] gnu: xorg: Add mtdev and make xf86-input-synaptics compile (not install). * gnu/packages/xorg.scm (mtdev): New variable. * gnu/packages/xorg.scm (xf86-input-synaptics): Add inputs libx11, libxi and mtdev. * gnu/packages/xorg.scm (libxi): Propagate input libxext. --- gnu/packages/xorg.scm | 90 ++++++++++++++++++++++++++++--------------- 1 file changed, 59 insertions(+), 31 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 91d480d23b..34553861d7 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -153,7 +153,32 @@ (define-public libdrm-2.4.33 `("--enable-nouveau-experimental-api"))))) -;; packages without propagated input +(define-public mtdev + (package + (name "mtdev") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "http://bitmath.org/code/mtdev/mtdev-" + version ".tar.bz2")) + (sha256 + (base32 + "159ndzwfpw0xr8mw4lhl47w9c2krshlfrscs7k6n186vknv2hk3d")))) + (build-system gnu-build-system) + (home-page "http://bitmath.org/code/mtdev/") + (synopsis "Multitouch protocol translation library") + (description "Mtdev is a stand-alone library which transforms all +variants of kernel MT events to the slotted type B protocol. The events +put into mtdev may be from any MT device, specifically type A without +contact tracking, type A with contact tracking, or type B with contact +tracking.") + (license license:x11))) + + + + ;; packages without propagated input ;; (rationale for this separation: The packages in PROPAGATED_INPUTS need to ;; be defined first, the split makes book-keeping easier.) @@ -1576,34 +1601,6 @@ (define-public libxft (license license:x11))) -(define-public libxi - (package - (name "libxi") - (version "1.6.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXi-" - version - ".tar.bz2")) - (sha256 - (base32 - "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj")))) - (build-system gnu-build-system) - (inputs - `(("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libxext" ,libxext) - ("libx11" ,libx11) - ("inputproto" ,inputproto) - ("pkg-config" ,pkg-config))) - (home-page "http://www.x.org/wiki/") - (synopsis "xorg implementation of the X Window System") - (description "X.org provides an implementation of the X Window System") - (license license:x11))) - - (define-public libxkbfile (package (name "libxkbfile") @@ -2536,8 +2533,10 @@ (define-public xf86-input-synaptics (base32 "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s")))) (build-system gnu-build-system) - ;; FIXME: Add required input mtdev. - (inputs `(("pkg-config" ,pkg-config) + (inputs `(("libx11" ,libx11) + ("libxi" ,libxi) + ("mtdev" ,mtdev) + ("pkg-config" ,pkg-config) ("xorg-server" ,xorg-server))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4485,6 +4484,35 @@ (define-public libxfont (license license:x11))) +(define-public libxi + (package + (name "libxi") + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXi-" + version + ".tar.bz2")) + (sha256 + (base32 + "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libxext" ,libxext))) + (inputs + `(("xproto" ,xproto) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("inputproto" ,inputproto) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public libxrandr (package (name "libxrandr") From bc3073c8e3768f8fcad0b745f8dfd4269a68b7f3 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 30 Mar 2013 10:13:23 +0100 Subject: [PATCH 38/44] gnu: xorg: Make font-adobe75dpi and font-adobe100dpi compile (not install). * gnu/packages/xorg/scm (font-adobe75dpi, font-adobe100dpi): Add inputs bdftopcf, font-util and mkfontdir. --- gnu/packages/xorg.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 34553861d7..8376a4230f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -380,6 +380,11 @@ (define-public font-adobe100dpi (base32 "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j")))) (build-system gnu-build-system) + (inputs + `(("bdftopcf" ,bdftopcf) + ("font-util", font-util) + ("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -401,6 +406,11 @@ (define-public font-adobe75dpi (base32 "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6")))) (build-system gnu-build-system) + (inputs + `(("bdftopcf" ,bdftopcf) + ("font-util", font-util) + ("mkfontdir" ,mkfontdir) + ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") From bd8c5d5b02d33ed5952a7d093298611cadfa5818 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Mar 2013 14:33:33 +0200 Subject: [PATCH 39/44] gnu: xorg: Add libxp and printproto, not included in X11R7.7. * gnu/packages/xorg.scm (libxp, printproto): New variables. --- gnu/packages/xorg.scm | 51 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8376a4230f..d770531f5d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1848,6 +1848,29 @@ (define-public mkfontscale (license license:x11))) +;; The package is missing from X11R7.7. +(define-public printproto + (package + (name "printproto") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/proto/printproto-" + version + ".tar.bz2")) + (sha256 + (base32 + "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j")))) + (build-system gnu-build-system) + (inputs `(("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public randrproto (package (name "randrproto") @@ -4215,6 +4238,34 @@ (define-public libxinerama (license license:x11))) +;; The package is missing from X11R7.7. +(define-public libxp + (package + (name "libxp") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/lib/libXp-" + version + ".tar.bz2")) + (sha256 + (base32 + "1blwrr5zhmwwy87j0svmhv3hc13acyn5j14n5rv0anz81iav2r3y")))) + (build-system gnu-build-system) + (propagated-inputs + `(("printproto" ,printproto))) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("pkg-config" ,pkg-config))) + (home-page "http://www.x.org/wiki/") + (synopsis "xorg implementation of the X Window System") + (description "X.org provides an implementation of the X Window System") + (license license:x11))) + + (define-public libxrender (package (name "libxrender") From 0a92b5b30a1701ca6e96e729041b305c057dac37 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Mar 2013 14:50:10 +0200 Subject: [PATCH 40/44] gnu: freetype: Make include file ft2build.h work without changing the CPATH of dependent packages. * gnu/packages/fontutils.scm (freetype): Add link include/freetype to include/freetype2/freetype. --- gnu/packages/fontutils.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 551d4ac167..14f8250357 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -38,6 +38,20 @@ (define-public freetype (sha256 (base32 "0gpcz6swir64kp0dk3rwgqqkmf48b90dqgczdmznjjryhrahx9r9")))) (build-system gnu-build-system) + (arguments + `(#:phases + (alist-replace + 'install + (lambda* (#:key outputs #:allow-other-keys #:rest args) + (let ((install (assoc-ref %standard-phases 'install)) + (include (string-append (assoc-ref outputs "out") "/include"))) + (apply install args) + ;; Unravel one directory, since ft2build.h includes directly from + ;; freetype/, not freetype2/freetype; this is announced in the file + ;; to be changed in a future release. + (symlink (string-append include "/freetype2/freetype") + (string-append include "/freetype")))) + %standard-phases))) (synopsis "Freetype, a library to render fonts") (description "Freetype is a library that can be used by applications to access the From 141ccae8a737ba89eeb3d7f749270c5eda73d8b7 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Mar 2013 14:58:01 +0200 Subject: [PATCH 41/44] gnu: lesstif: Make package usable by adding propagated input. * gnu/packages/lesstif.scm (lesstif): Add propagated input printproto; include/Xm/Print.h from lesstif includes X11/extensions/Print.h from printproto. --- gnu/packages/lesstif.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lesstif.scm b/gnu/packages/lesstif.scm index 3d89258399..d15549454f 100644 --- a/gnu/packages/lesstif.scm +++ b/gnu/packages/lesstif.scm @@ -39,9 +39,11 @@ (define-public lesstif (base32 "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb")))) (build-system gnu-build-system) + (propagated-inputs + `(("printproto" ,printproto))) (inputs `(("libxext" ,libxext) - ("libxt" ,libxt))); + ("libxt" ,libxt))) (home-page "http://lesstif.sourceforge.net/") (synopsis "Clone of the Motif toolkit for the X window system") (description "Clone of the Motif toolkit for the X window system") From 14ecc0effca4d7447510bc67a774f897ac03ab87 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Mar 2013 17:25:11 +0200 Subject: [PATCH 42/44] gnu: Add xpdf. * gnu/packages/pdf.scm (xpdf): New variable. * gnu/packages/patches/xpdf-constchar.patch: New file. * Makefile.am (dist_patch_DATA): Add it. --- Makefile.am | 3 +- gnu/packages/patches/xpdf-constchar.patch | 15 ++++++++ gnu/packages/pdf.scm | 42 +++++++++++++++++++++-- 3 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/xpdf-constchar.patch diff --git a/Makefile.am b/Makefile.am index 54ca41b3b8..9b9bdbf8b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -223,7 +223,8 @@ dist_patch_DATA = \ gnu/packages/patches/tar-gets-undeclared.patch \ gnu/packages/patches/tcsh-fix-autotest.patch \ gnu/packages/patches/teckit-cstdio.patch \ - gnu/packages/patches/vpnc-script.patch + gnu/packages/patches/vpnc-script.patch \ + gnu/packages/patches/xpdf-constchar.patch bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux diff --git a/gnu/packages/patches/xpdf-constchar.patch b/gnu/packages/patches/xpdf-constchar.patch new file mode 100644 index 0000000000..95dbe73c71 --- /dev/null +++ b/gnu/packages/patches/xpdf-constchar.patch @@ -0,0 +1,15 @@ +This patch circumvents an error with 'const char *' to 'char *' conversion, +see http://gnats.netbsd.org/45562 . + +diff -u a/xpdf/XPDFViewer.cc b/xpdf/XPDFViewer.cc +--- a/xpdf/XPDFViewer.cc 2011-08-15 23:08:53.000000000 +0200 ++++ b/xpdf/XPDFViewer.cc 2013-03-31 15:13:21.000000000 +0200 +@@ -1803,7 +1803,7 @@ + menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n); + for (i = 0; i < nZoomMenuItems; ++i) { + n = 0; +- s = XmStringCreateLocalized(zoomMenuInfo[i].label); ++ s = XmStringCreateLocalized((char *) zoomMenuInfo[i].label); + XtSetArg(args[n], XmNlabelString, s); ++n; + XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n; + sprintf(buf, "zoom%d", i); diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index a172414553..b2f1ade143 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -17,17 +17,21 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages pdf) - #:use-module ((guix licenses) #:select (gpl2+)) + #:use-module ((guix licenses) + #:renamer (symbol-prefix-proc 'license:)) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) + #:use-module (gnu packages ghostscript) + #:use-module (gnu packages lesstif) #:use-module (gnu packages libjpeg) #:use-module (gnu packages libpng) #:use-module (gnu packages libtiff) - #:use-module (gnu packages pkg-config)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xorg)) (define-public poppler (package @@ -63,5 +67,37 @@ (define-public poppler (synopsis "Poppler, a pdf rendering library") (description "Poppler is a PDF rendering library based on the xpdf-3.0 code base.") - (license gpl2+) + (license license:gpl2+) (home-page "http://poppler.freedesktop.org/"))) + +(define-public xpdf + (package + (name "xpdf") + (version "3.03") + (source (origin + (method url-fetch) + (uri (string-append "ftp://ftp.foolabs.com/pub/xpdf/xpdf-" + version ".tar.gz")) + (sha256 (base32 + "1jnfzdqc54wa73lw28kjv0m7120mksb0zkcn81jdlvijyvc67kq2")))) + (build-system gnu-build-system) + (inputs `(("freetype" ,freetype) + ("lesstif" ,lesstif) + ("libpaper" ,libpaper) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxp" ,libxp) + ("libxpm" ,libxpm) + ("libxt" ,libxt) + ("zlib" ,zlib) + ("patch/constchar" + ,(search-patch "xpdf-constchar.patch")))) + (arguments + `(#:tests? #f ; there is no check target + #:patches (list (assoc-ref %build-inputs + "patch/constchar")))) + (synopsis "Viewer for pdf files based on the Motif toolkit.") + (description + "Xpdf is a viewer for Portable Document Format (PDF) files") + (license license:gpl3) ; or gpl2, but not gpl2+ + (home-page "http://www.foolabs.com/xpdf/"))) From c7f9993146a12c579098959b3b0dcfdb46151fee Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 31 Mar 2013 21:16:50 +0200 Subject: [PATCH 43/44] gnu: xorg: Remove inputs already available through propagation. * gnu/packages/xorg.scm: Remove inputs that are available through propagation. --- gnu/packages/xorg.scm | 92 ++++++++----------------------------------- 1 file changed, 17 insertions(+), 75 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d770531f5d..0059effa95 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -59,8 +59,7 @@ (define-public xeyes "04c3md570j67g55h3bix1qbngcslnq91skli51k3g1avki88zkm9")))) (build-system gnu-build-system) (inputs - `(("libx11" ,libx11) - ("libxext" ,libxext) + `(("libxext" ,libxext) ("libxmu" ,libxmu) ("libxt" ,libxt) ("pkg-config" ,pkg-config))) @@ -702,8 +701,7 @@ (define-public font-bitstream-type1 "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv")))) (build-system gnu-build-system) (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) + `(("mkfontdir" ,mkfontdir) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -953,8 +951,7 @@ (define-public font-misc-ethiopic "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk")))) (build-system gnu-build-system) (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) + `(("mkfontdir" ,mkfontdir) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1003,8 +1000,7 @@ (define-public font-misc-misc "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq")))) (build-system gnu-build-system) (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) + `(("mkfontdir" ,mkfontdir) ("font-util" ,font-util) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) @@ -1055,8 +1051,7 @@ (define-public font-schumacher-misc "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74")))) (build-system gnu-build-system) (inputs - `(("mkfontscale" ,mkfontscale) - ("mkfontdir" ,mkfontdir) + `(("mkfontdir" ,mkfontdir) ("font-util" ,font-util) ("bdftopcf" ,bdftopcf) ("pkg-config" ,pkg-config))) @@ -1272,8 +1267,7 @@ (define-public iceauth "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) - ("libice" ,libice) + `(("libice" ,libice) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1493,7 +1487,6 @@ (define-public libsm (build-system gnu-build-system) (inputs `(("xtrans" ,xtrans) - ("xproto" ,xproto) ("util-linux" ,util-linux) ("libice" ,libice) ("pkg-config" ,pkg-config))) @@ -1596,8 +1589,7 @@ (define-public libxft "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz")))) (build-system gnu-build-system) (inputs - `(("renderproto" ,renderproto) - ("libx11" ,libx11) + `(("libx11" ,libx11) ("xproto" ,xproto) ("libxrender" ,libxrender) ("xproto" ,xproto) @@ -1628,7 +1620,6 @@ (define-public libxkbfile (build-system gnu-build-system) (inputs `(("libx11" ,libx11) - ("kbproto" ,kbproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1654,9 +1645,7 @@ (define-public libxmu (inputs `(("libxt" ,libxt) ("xproto" ,xproto) - ("xextproto" ,xextproto) ("libxext" ,libxext) - ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1683,9 +1672,7 @@ (define-public libxpm `(("gettext" ,gnu:gettext) ("libxt" ,libxt) ("xproto" ,xproto) - ("xextproto" ,xextproto) ("libxext" ,libxext) - ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -1710,7 +1697,6 @@ (define-public libxres (build-system gnu-build-system) (inputs `(("xproto" ,xproto) - ("xextproto" ,xextproto) ("libxext" ,libxext) ("libx11" ,libx11) ("resourceproto" ,resourceproto) @@ -1737,8 +1723,7 @@ (define-public libxscrnsaver "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg")))) (build-system gnu-build-system) (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) + `(("libxext" ,libxext) ("libx11" ,libx11) ("scrnsaverproto" ,scrnsaverproto) ("pkg-config" ,pkg-config))) @@ -2047,8 +2032,6 @@ (define-public smproxy (inputs `(("libxt" ,libxt) ("libxmu" ,libxmu) - ("libsm" ,libsm) - ("libice" ,libice) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -2195,7 +2178,6 @@ (define-public xbacklight `(("libx11" ,libx11) ("libxrandr" ,libxrandr) ("libxrender" ,libxrender) - ("libxcb" ,libxcb) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -2336,7 +2318,6 @@ (define-public xcursorgen (build-system gnu-build-system) (inputs `(("libxcursor" ,libxcursor) - ("libx11" ,libx11) ("libpng" ,libpng) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -2362,17 +2343,14 @@ (define-public xdpyinfo (build-system gnu-build-system) (inputs `(("inputproto" ,inputproto) + ("libx11" ,libx11) ("libxxf86vm" ,libxxf86vm) -;; ("libxxf86misc" ,libxxf86misc) ("libxxf86dga" ,libxxf86dga) ("libxtst" ,libxtst) ("libxrender" ,libxrender) ("libxinerama" ,libxinerama) ("libxi" ,libxi) - ("libxext" ,libxext) ("libxcomposite" ,libxcomposite) - ("libxcb" ,libxcb) - ("libx11" ,libx11) ("libdmx" ,libdmx) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -2398,9 +2376,7 @@ (define-public xdriinfo (build-system gnu-build-system) (inputs `(("mesa" ,mesa) - ("glproto" ,glproto) ("libx11" ,libx11) - ("glproto" ,glproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -3546,7 +3522,6 @@ (define-public xinput ("libxrandr" ,libxrandr) ("libxinerama" ,libxinerama) ("libxi" ,libxi) - ("libxext" ,libxext) ("libx11" ,libx11) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) @@ -3626,7 +3601,6 @@ (define-public xkbutils `(("libxt" ,libxt) ("xproto" ,xproto) ("libxaw" ,libxaw) - ("libx11" ,libx11) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -3960,8 +3934,7 @@ (define-public xset "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1")))) (build-system gnu-build-system) (inputs - `(;("libxxf86misc" ,libxxf86misc) - ("xproto" ,xproto) + `(("xproto" ,xproto) ("libxmu" ,libxmu) ("libxext" ,libxext) ("libx11" ,libx11) @@ -3991,7 +3964,6 @@ (define-public xsetroot `(("libxmu" ,libxmu) ("libxcursor" ,libxcursor) ("xbitmaps" ,xbitmaps) - ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4065,7 +4037,6 @@ (define-public xwd (inputs `(("libxt" ,libxt) ("xproto" ,xproto) - ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4089,10 +4060,9 @@ (define-public xwininfo "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg")))) (build-system gnu-build-system) (inputs - `(("xproto" ,xproto) - ("libxcb" ,libxcb) - ("libx11" ,libx11) - ("pkg-config" ,pkg-config))) + `(("libx11" ,libx11) + ("pkg-config" ,pkg-config) + ("xproto" ,xproto))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -4172,9 +4142,7 @@ (define-public libxdamage (inputs `(("xproto" ,xproto) ("libxfixes" ,libxfixes) - ("xextproto" ,xextproto) ("libx11" ,libx11) - ("fixesproto" ,fixesproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4201,7 +4169,6 @@ (define-public libxext `(("xextproto" ,xextproto))) (inputs `(("libxau" ,libxau) - ("xproto" ,xproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -4228,8 +4195,7 @@ (define-public libxinerama (propagated-inputs `(("xineramaproto" ,xineramaproto))) (inputs - `(("xextproto" ,xextproto) - ("libxext" ,libxext) + `(("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -4312,8 +4278,6 @@ (define-public libxtst `(("recordproto" ,recordproto))) (inputs `(("libxi" ,libxi) - ("xextproto" ,xextproto) - ("libxext" ,libxext) ("libx11" ,libx11) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) @@ -4342,7 +4306,6 @@ (define-public libxv `(("videoproto" ,videoproto))) (inputs `(("xproto" ,xproto) - ("xextproto" ,xextproto) ("libxext" ,libxext) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) @@ -4478,8 +4441,6 @@ (define-public libxaw (inputs `(("libxt" ,libxt) ("xproto" ,xproto) - ("xextproto" ,xextproto) - ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4506,7 +4467,6 @@ (define-public libxfixes `(("fixesproto" ,fixesproto))) (inputs `(("xproto" ,xproto) - ("xextproto" ,xextproto) ("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") @@ -4564,7 +4524,6 @@ (define-public libxi `(("libxext" ,libxext))) (inputs `(("xproto" ,xproto) - ("xextproto" ,xextproto) ("libx11" ,libx11) ("inputproto" ,inputproto) ("pkg-config" ,pkg-config))) @@ -4595,9 +4554,7 @@ (define-public libxrandr (inputs `(("libxrender" ,libxrender) ("xproto" ,xproto) - ("xextproto" ,xextproto) ("libx11" ,libx11) - ("renderproto" ,renderproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4624,10 +4581,8 @@ (define-public libxvmc `(("libxv" ,libxv))) (inputs `(("xproto" ,xproto) - ("xextproto" ,xextproto) ("libxext" ,libxext) ("libx11" ,libx11) - ("videoproto" ,videoproto) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4655,7 +4610,6 @@ (define-public libxxf86vm ("xf86vidmodeproto" ,xf86vidmodeproto))) (inputs `(("libx11" ,libx11) - ("libxext" ,libxext) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") @@ -4694,7 +4648,6 @@ (define-public mesa ("expat" ,expat) ("flex" ,flex) ("libx11" ,libx11) - ("libxext" ,libxext) ("libxfixes" ,libxfixes) ("libxml2" ,libxml2) ("makedepend" ,makedepend) @@ -4753,8 +4706,7 @@ (define-public libxcb `(("xcb-proto" ,xcb-proto) ("libxslt" ,libxslt) ("pkg-config" ,pkg-config) - ("python" ,python) - ("xproto" ,xproto))) + ("python" ,python))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -4795,18 +4747,13 @@ (define-public xorg-server ("damageproto" ,damageproto) ("dbus" ,dbus) ("dmxproto" ,dmxproto) - ("glproto" ,glproto) ("libdmx" ,libdmx) - ("libx11" ,libx11) ("libxau" ,libxau) ("libxaw" ,libxaw) ("libxdmcp" ,libxdmcp) - ("libxext" ,libxext) ("libxfixes" ,libxfixes) ("libxfont" ,libxfont) ("libxkbfile" ,libxkbfile) - ("libxmu" ,libxmu) - ("libxpm" ,libxpm) ("libxrender" ,libxrender) ("libxres" ,libxres) ("libxt" ,libxt) @@ -4823,7 +4770,6 @@ (define-public xorg-server ("xf86dgaproto" ,xf86dgaproto) ("xf86driproto" ,xf86driproto) ("xf86vidmodeproto" ,xf86vidmodeproto) -;; ("xkbcomp" ,xkbcomp) ;; ("xkbutils" ,xkbutils) ;; ("xkeyboard-config" ,xkeyboard-config) ("xtrans" ,xtrans) @@ -4859,7 +4805,6 @@ (define-public libx11 ("libxcb" ,libxcb))) (inputs `(("inputproto" ,inputproto) - ("libxcb" ,libxcb) ("pkg-config" ,pkg-config) ("xextproto" ,xextproto) ("xtrans" ,xtrans))) @@ -4892,8 +4837,7 @@ (define-public libxcursor ("libxfixes" ,libxfixes) ("xproto" ,xproto))) (inputs - `(("fixesproto" ,fixesproto) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System") @@ -4920,9 +4864,7 @@ (define-public libxt ("libice" ,libice) ("libsm" ,libsm))) (inputs - `(("xproto" ,xproto) - ("libx11" ,libx11) - ("kbproto" ,kbproto) + `(("libx11" ,libx11) ("pkg-config" ,pkg-config))) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") From 8dc5d0cf7e18ee423c73087570c6b50d215ae216 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Tue, 2 Apr 2013 12:47:39 +0200 Subject: [PATCH 44/44] gnu: xorg: Re-enable tests for xorg-server. * gnu/packages/xorg.scm (xorg-server): Re-enable (failing) tests. --- gnu/packages/xorg.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0059effa95..7c08e4471e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4774,8 +4774,6 @@ (define-public xorg-server ;; ("xkeyboard-config" ,xkeyboard-config) ("xtrans" ,xtrans) ("zlib" ,zlib))) - (arguments - `(#:tests? #f)) (home-page "http://www.x.org/wiki/") (synopsis "xorg implementation of the X Window System") (description "X.org provides an implementation of the X Window System")