From deeadfc6f52a8d075d22c48846731b91deda4f9a Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Sun, 13 Aug 2006 09:46:54 +0000 Subject: [PATCH] Tried to add kuickshow (a pretty fast image viewer that used to be distributed by default in KDE). Unfortunately it doesn't work, because of some strange problems with mime types. But well, it compiles. The libraries are useful anyway: - arts (kde) - imlib (gnome) - libungif (aka libgif) svn path=/nixpkgs/trunk/; revision=6111 --- .../graphics/kuickshow/builder.sh | 12 ++++++++++ .../graphics/kuickshow/default.nix | 23 +++++++++++++++++++ .../libraries/gnome/imlib/default.nix | 21 +++++++++++++++++ .../libraries/kde/arts/default.nix | 22 ++++++++++++++++++ .../libraries/libungif/default.nix | 10 ++++++++ pkgs/top-level/all-packages.nix | 23 +++++++++++++++++++ 6 files changed, 111 insertions(+) create mode 100644 pkgs/applications/graphics/kuickshow/builder.sh create mode 100644 pkgs/applications/graphics/kuickshow/default.nix create mode 100644 pkgs/development/libraries/gnome/imlib/default.nix create mode 100644 pkgs/development/libraries/kde/arts/default.nix create mode 100644 pkgs/development/libraries/libungif/default.nix diff --git a/pkgs/applications/graphics/kuickshow/builder.sh b/pkgs/applications/graphics/kuickshow/builder.sh new file mode 100644 index 000000000000..e2e0659ae34f --- /dev/null +++ b/pkgs/applications/graphics/kuickshow/builder.sh @@ -0,0 +1,12 @@ +source $stdenv/setup + +patchPhase=patchPhase +patchPhase() { + sed -e "s@-ljpeg6b@-ljpeg@" configure > configure.patched + mv configure.patched configure + chmod u+x configure +} + +genericBuild + +ln -s $KDEDIR/share/mimelnk $out/share \ No newline at end of file diff --git a/pkgs/applications/graphics/kuickshow/default.nix b/pkgs/applications/graphics/kuickshow/default.nix new file mode 100644 index 000000000000..83fac86bf813 --- /dev/null +++ b/pkgs/applications/graphics/kuickshow/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, libX11, libXext, libSM, kdelibs, qt, libjpeg, libungif, libpng, libtiff, imlib, arts, expat, perl}: + +stdenv.mkDerivation { + name = "kuickshow-0.8.5"; + builder = ./builder.sh; + + src = fetchurl { + url = http://surfnet.dl.sourceforge.net/sourceforge/kuickshow/kuickshow-0.8.5.tgz; + md5 = "7a95852a0670b18859a1e6789b256ebd"; + }; + + configureFlags = " + --with-imlib-config=${imlib}/bin + --with-extra-includes=${libjpeg}/include + --with-extra-libs=${libjpeg}/lib + --x-includes=${libX11}/include + --x-libraries=${libX11}/lib"; + + buildInputs = [kdelibs libX11 libXext libSM qt libjpeg libungif libpng libtiff imlib arts expat perl]; + inherit libjpeg; + + KDEDIR = kdelibs; +} diff --git a/pkgs/development/libraries/gnome/imlib/default.nix b/pkgs/development/libraries/gnome/imlib/default.nix new file mode 100644 index 000000000000..96fb397f55b9 --- /dev/null +++ b/pkgs/development/libraries/gnome/imlib/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, libX11, libXext, xextproto, libjpeg, libungif, libtiff, libpng}: + +stdenv.mkDerivation { + name = "imlib-1.9.15"; + src = fetchurl { + url = http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-1.9.15.tar.gz; + md5 = "2a5561457e7f8b2e04d88f73508fd13a"; + }; + + configureFlags = " + --disable-shm + --x-includes=${libX11}/include + --x-libraries=${libX11}/lib"; + + buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng]; +} + + + + + diff --git a/pkgs/development/libraries/kde/arts/default.nix b/pkgs/development/libraries/kde/arts/default.nix new file mode 100644 index 000000000000..182c735accfa --- /dev/null +++ b/pkgs/development/libraries/kde/arts/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg, libpng, perl, qt}: + +stdenv.mkDerivation { + name = "arts-1.5.4"; + + KDEDIR = kdelibs; + configureFlags = " + --with-extra-includes=${libjpeg}/include + --with-extra-libs=${libjpeg}/lib + --x-includes=${libX11}/include + --x-libraries=${libX11}/lib"; + + src = fetchurl { + url = ftp://ftp.kde.org/pub/kde/stable/latest/src/arts-1.5.4.tar.bz2; + md5 = "886ba4a13dc0da312d94c09f50c3ffe6"; + }; + + buildInputs = [pkgconfig glib kdelibs libX11 libXext zlib libjpeg libpng perl qt]; + +} + + diff --git a/pkgs/development/libraries/libungif/default.nix b/pkgs/development/libraries/libungif/default.nix new file mode 100644 index 000000000000..6ca8679ad30d --- /dev/null +++ b/pkgs/development/libraries/libungif/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "libungif-4.1.4"; + src = fetchurl { + url = http://surfnet.dl.sourceforge.net/sourceforge/libungif/libungif-4.1.4.tar.gz; + md5 = "efdfcf8e32e35740288a8c5625a70ccb"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7587bfd51f1..f0be62e04196 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1159,6 +1159,15 @@ rec { inherit fetchurl stdenv zlib; }; + libungif = (import ../development/libraries/libungif) { + inherit fetchurl stdenv; + }; + + imlib = (import ../development/libraries/gnome/imlib) { + inherit fetchurl stdenv libjpeg libtiff libungif libpng; + inherit (xlibs) libX11 libXext xextproto; + }; + aalib = (import ../development/libraries/aalib) { inherit fetchurl stdenv ncurses; }; @@ -1281,6 +1290,14 @@ rec { qt = qt3; }; + arts = import ../development/libraries/kde/arts { + inherit fetchurl stdenv pkgconfig; + inherit (xlibs) libX11 libXext; + inherit kdelibs zlib libjpeg libpng perl; + qt = qt3; + inherit (gnome) glib; + }; + gtksharp1 = (import ../development/libraries/gtk-sharp-1) { inherit fetchurl stdenv mono pkgconfig libxml2 monoDLLFixer; inherit (gnome) gtk glib pango libglade libgtkhtml gtkhtml @@ -2332,6 +2349,12 @@ rec { inherit (gtkLibs) gtk; }; + kuickshow = (import ../applications/graphics/kuickshow) { + inherit fetchurl stdenv kdelibs arts libpng libjpeg libtiff libungif imlib expat perl; + inherit (xlibs) libX11 libXext libSM; + qt = qt3; + }; + batik = (import ../applications/graphics/batik) { inherit fetchurl stdenv unzip; };