From 41548ccdab1e82a9f42f1a24f75cd165c2c3c833 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Jun 2004 18:13:45 +0000 Subject: [PATCH] * Upgraded some xlibs. * Upgraded zapping (probably doesn't build yet). svn path=/nixpkgs/trunk/; revision=1069 --- pkgs/applications/video/zapping/builder.sh | 2 ++ pkgs/applications/video/zapping/default.nix | 21 ++++++++++--------- pkgs/development/libraries/xlibs/default.nix | 6 +++--- .../libraries/xlibs/libICE/default.nix | 6 +++--- .../libraries/xlibs/libSM/default.nix | 6 +++--- .../libraries/xlibs/libXaw/default.nix | 6 +++--- .../libraries/xlibs/libXext/default.nix | 6 +++--- .../libraries/xlibs/libXmu/default.nix | 13 ++++++------ .../libraries/xlibs/libXmu/no-Xaw.patch | 20 ++++++++++++++++++ .../libraries/xlibs/libXpm/default.nix | 6 +++--- .../libraries/xlibs/libXv/default.nix | 10 ++++----- pkgs/development/libraries/zvbi/default.nix | 6 +++--- pkgs/system/all-packages-generic.nix | 6 ++++-- pkgs/system/populate-cache.nix | 2 +- 14 files changed, 71 insertions(+), 45 deletions(-) create mode 100644 pkgs/development/libraries/xlibs/libXmu/no-Xaw.patch diff --git a/pkgs/applications/video/zapping/builder.sh b/pkgs/applications/video/zapping/builder.sh index 3114f86eda34..6b4790788d39 100644 --- a/pkgs/applications/video/zapping/builder.sh +++ b/pkgs/applications/video/zapping/builder.sh @@ -1,5 +1,7 @@ . $stdenv/setup +export PERL5LIB=$perlXMLParser/lib/site_perl:$PERL5LIB + # !!! hack NIX_LDFLAGS="$NIX_LDFLAGS -rpath $libXext/lib" diff --git a/pkgs/applications/video/zapping/default.nix b/pkgs/applications/video/zapping/default.nix index 6172d31d1790..ac2ffe08ffb3 100644 --- a/pkgs/applications/video/zapping/default.nix +++ b/pkgs/applications/video/zapping/default.nix @@ -2,13 +2,14 @@ , jpegSupport ? true , pngSupport ? true # !!! libXext shouldn't be necessary (it's in x11); but the builder needs it. -, stdenv, fetchurl, pkgconfig, perl, python, x11, libXv, libXext, libgnomeui -, libglade, scrollkeeper, esound, gettext +, stdenv, fetchurl, pkgconfig, perl, python, x11, libXv, libXmu, libXext, libgnomeui +, libglade, scrollkeeper, esound, gettext, perlXMLParser , zvbi ? null, libjpeg ? null, libpng ? null }: -assert pkgconfig != null && perl != null && python != null && - x11 != null && libXv != null && libgnomeui != null && libglade != null && - scrollkeeper != null && esound != null && gettext != null; +assert pkgconfig != null && perl != null && python != null + && x11 != null && libXv != null && libXmu != null && libgnomeui != null && libglade != null + && scrollkeeper != null && esound != null && gettext != null + && perlXMLParser != null; assert teletextSupport -> zvbi != null && zvbi.pngSupport /* !!! && pngSupport && zvbi.libpng == libpng */; @@ -17,18 +18,18 @@ assert jpegSupport -> libjpeg != null; assert pngSupport -> libpng != null; stdenv.mkDerivation { - name = "zapping-0.7cvs6"; + name = "zapping-0.7cvs8"; builder = ./builder.sh; src = fetchurl { - url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.7cvs6.tar.bz2; - md5 = "cdedc0088c70f4520c37066ec05cb996"; + url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.7cvs8.tar.bz2; + md5 = "90324a26025a49916c3c6ae5f1738dfa"; }; - inherit teletextSupport jpegSupport pngSupport libXext; + inherit teletextSupport jpegSupport pngSupport perlXMLParser; buildInputs = [ - pkgconfig perl python x11 libXv libgnomeui + pkgconfig perl python x11 libXv libXmu libgnomeui libglade scrollkeeper esound gettext (if teletextSupport then zvbi else null) (if jpegSupport then libjpeg else null) diff --git a/pkgs/development/libraries/xlibs/default.nix b/pkgs/development/libraries/xlibs/default.nix index f3db8ebd15a4..38dab60270c9 100644 --- a/pkgs/development/libraries/xlibs/default.nix +++ b/pkgs/development/libraries/xlibs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, freetype, expat}: +{stdenv, fetchurl, pkgconfig, freetype, expat, patch}: rec { @@ -55,7 +55,7 @@ rec { }; libXmu = (import ./libXmu) { - inherit fetchurl stdenv pkgconfig xproto libX11 libXt; + inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXext patch; }; libXpm = (import ./libXpm) { @@ -67,7 +67,7 @@ rec { }; libXv = (import ./libXv) { - inherit fetchurl stdenv pkgconfig libX11; + inherit fetchurl stdenv pkgconfig libX11 libXext; }; libXi = (import ./libXi) { diff --git a/pkgs/development/libraries/xlibs/libICE/default.nix b/pkgs/development/libraries/xlibs/libICE/default.nix index daf4043215f1..abc3a657df1e 100644 --- a/pkgs/development/libraries/xlibs/libICE/default.nix +++ b/pkgs/development/libraries/xlibs/libICE/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, libX11}: stdenv.mkDerivation { - name = "libICE-6.3.2"; + name = "libICE-6.3.3"; src = fetchurl { - url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libICE-6.3.2.tar.bz2; - md5 = "06db02e3df846b127a6e2dc3e345039c"; + url = http://freedesktop.org/~xlibs/release/libICE-6.3.3.tar.bz2; + md5 = "e67d98bebfabf884e58501e44b7efd35"; }; buildInputs = [pkgconfig libX11]; } diff --git a/pkgs/development/libraries/xlibs/libSM/default.nix b/pkgs/development/libraries/xlibs/libSM/default.nix index 605749d764b2..e82e910aee72 100644 --- a/pkgs/development/libraries/xlibs/libSM/default.nix +++ b/pkgs/development/libraries/xlibs/libSM/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, libX11, libICE}: stdenv.mkDerivation { - name = "libSM-6.0.2"; + name = "libSM-6.0.3"; src = fetchurl { - url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libSM-6.0.2.tar.bz2; - md5 = "0ecc3ec75391d9158f25a94a652bd387"; + url = http://freedesktop.org/~xlibs/release/libSM-6.0.3.tar.bz2; + md5 = "e01ec6568ad17c5df8f56828e34a0b2b"; }; buildInputs = [pkgconfig]; propagatedBuildInputs = [libX11 libICE]; diff --git a/pkgs/development/libraries/xlibs/libXaw/default.nix b/pkgs/development/libraries/xlibs/libXaw/default.nix index b4649a9e828f..d803ae8bcdf9 100644 --- a/pkgs/development/libraries/xlibs/libXaw/default.nix +++ b/pkgs/development/libraries/xlibs/libXaw/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, xproto, libX11, libXt, libXmu, libXpm}: stdenv.mkDerivation { - name = "libXaw-7.0.0"; + name = "libXaw-7.0.2"; src = fetchurl { - url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXaw-7.0.0.tar.bz2; - md5 = "a58fbb1b5af9e0cf23351b5b1e7b19dd"; + url = http://freedesktop.org/~xlibs/release/libXaw-7.0.2.tar.bz2; + md5 = "30d569f9560c1daac184d5be8085ce37"; }; buildInputs = [pkgconfig]; propagatedBuildInputs = [xproto libX11 libXt libXmu libXpm]; diff --git a/pkgs/development/libraries/xlibs/libXext/default.nix b/pkgs/development/libraries/xlibs/libXext/default.nix index 5226e0601c25..5014126c7bf5 100644 --- a/pkgs/development/libraries/xlibs/libXext/default.nix +++ b/pkgs/development/libraries/xlibs/libXext/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, xproto, xextensions, libX11}: stdenv.mkDerivation { - name = "libXext-6.4.2"; + name = "libXext-6.4.3"; src = fetchurl { - url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXext-6.4.2.tar.bz2; - md5 = "e7c5f5ac3db6d171f8938339f7617281"; + url = http://freedesktop.org/~xlibs/release/libXext-6.4.3.tar.bz2; + md5 = "b7117194e69867905da9701dff56f3ee"; }; buildInputs = [pkgconfig xproto xextensions libX11]; } diff --git a/pkgs/development/libraries/xlibs/libXmu/default.nix b/pkgs/development/libraries/xlibs/libXmu/default.nix index 963fa0e858df..11be462dbaf5 100644 --- a/pkgs/development/libraries/xlibs/libXmu/default.nix +++ b/pkgs/development/libraries/xlibs/libXmu/default.nix @@ -1,11 +1,12 @@ -{stdenv, fetchurl, pkgconfig, xproto, libX11, libXt}: +{stdenv, fetchurl, pkgconfig, xproto, libX11, libXt, libXext, patch}: stdenv.mkDerivation { - name = "libXmu-6.2.1"; + name = "libXmu-6.2.3"; src = fetchurl { - url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXmu-6.2.1.tar.bz2; - md5 = "9bbdfe7eac185872cd1718d3f2014cf1"; + url = http://freedesktop.org/~xlibs/release/libXmu-6.2.3.tar.bz2; + md5 = "7671745bd8a1b0595847541479a327d6"; }; - buildInputs = [pkgconfig]; - propagatedBuildInputs = [xproto libX11 libXt]; + buildInputs = [pkgconfig patch]; + propagatedBuildInputs = [xproto libX11 libXt libXext]; + patches = ./no-Xaw.patch; } diff --git a/pkgs/development/libraries/xlibs/libXmu/no-Xaw.patch b/pkgs/development/libraries/xlibs/libXmu/no-Xaw.patch new file mode 100644 index 000000000000..ba84f60f807d --- /dev/null +++ b/pkgs/development/libraries/xlibs/libXmu/no-Xaw.patch @@ -0,0 +1,20 @@ +diff -rc libXmu-orig/EditresCom.c libXmu-new/EditresCom.c +*** libXmu-orig/EditresCom.c 2004-05-07 02:19:04.000000000 +0200 +--- libXmu-new/EditresCom.c 2004-06-21 20:01:34.000000000 +0200 +*************** +*** 40,46 **** + #include + #include /* for strcpy declaration */ + #include +! #include + #include + #include + #include +--- 40,46 ---- + #include + #include /* for strcpy declaration */ + #include +! /* #include */ + #include + #include + #include diff --git a/pkgs/development/libraries/xlibs/libXpm/default.nix b/pkgs/development/libraries/xlibs/libXpm/default.nix index ba17158ab4a2..49cdeab89f97 100644 --- a/pkgs/development/libraries/xlibs/libXpm/default.nix +++ b/pkgs/development/libraries/xlibs/libXpm/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, xproto, libX11}: stdenv.mkDerivation { - name = "libXpm-3.5.0"; + name = "libXpm-3.5.1"; src = fetchurl { - url = http://losser.st-lab.cs.uu.nl/~eelco/dist/libXpm-3.5.0-cvs.tar.bz2; - md5 = "4695fdbc251e0b6dd1b984c51b85c781"; + url = http://freedesktop.org/~xlibs/release/libXpm-3.5.1.tar.bz2; + md5 = "733e20a60c3343531b50bcc48348fd3e"; }; buildInputs = [pkgconfig]; propagatedBuildInputs = [xproto libX11]; diff --git a/pkgs/development/libraries/xlibs/libXv/default.nix b/pkgs/development/libraries/xlibs/libXv/default.nix index 067dad6a37e5..4927b9783469 100644 --- a/pkgs/development/libraries/xlibs/libXv/default.nix +++ b/pkgs/development/libraries/xlibs/libXv/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, pkgconfig, libX11}: +{stdenv, fetchurl, pkgconfig, libX11, libXext}: stdenv.mkDerivation { - name = "libXv-2.2.1"; + name = "libXv-2.2.2"; src = fetchurl { - url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXv-2.2.1.tar.bz2; - md5 = "89b8ca62a77c662a8a7ded89bcf0dd67"; + url = http://freedesktop.org/~xlibs/release/libXv-2.2.2.tar.bz2; + md5 = "cdd6a79bac8807da83c008dac42fdddb"; }; buildInputs = [pkgconfig]; - propagatedBuildInputs = [libX11]; + propagatedBuildInputs = [libX11 libXext]; } diff --git a/pkgs/development/libraries/zvbi/default.nix b/pkgs/development/libraries/zvbi/default.nix index 6647f52797ee..a02e0adea26e 100644 --- a/pkgs/development/libraries/zvbi/default.nix +++ b/pkgs/development/libraries/zvbi/default.nix @@ -5,10 +5,10 @@ assert x11 != null; assert pngSupport -> libpng != null; stdenv.mkDerivation { - name = "zvbi-0.2.5"; + name = "zvbi-0.2.8"; src = fetchurl { - url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zvbi-0.2.5.tar.bz2; - md5 = "06b370565246758813f6580797369518"; + url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zvbi-0.2.8.tar.bz2; + md5 = "8701d3e4387cd896ff8b68831b57d814"; }; buildInputs = [x11 (if pngSupport then libpng else null)]; inherit pngSupport; diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 62d7256b02fd..9b86c179a69d 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -443,6 +443,7 @@ rec { xlibs = (import ../development/libraries/xlibs) { inherit fetchurl stdenv pkgconfig freetype expat; + patch = gnupatch; }; mesa = (import ../development/libraries/mesa) { @@ -579,9 +580,10 @@ rec { zapping = (import ../applications/video/zapping) { inherit fetchurl stdenv pkgconfig perl python - scrollkeeper gettext zvbi libjpeg libpng x11; + scrollkeeper gettext zvbi libjpeg libpng x11 + perlXMLParser; inherit (gnome) libgnomeui libglade esound; - inherit (xlibs) libXv libXext; + inherit (xlibs) libXv libXmu libXext; teletextSupport = true; jpegSupport = true; pngSupport = true; diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index 9f948f29f80c..d8a53728d48b 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -48,7 +48,7 @@ let { pkgs.MPlayer pkgs.MPlayerPlugin pkgs.vlc - pkgs.zapping +# pkgs.zapping pkgs.gqview pkgs.hello pkgs.xchm