From bd9a07f99ce66fd2cfacc394a70862cfb398b720 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Nov 2003 16:28:57 +0000 Subject: [PATCH] * Converted GTK 1 / Sylpheed, with optional support for gdk-pixbuf. svn path=/nixpkgs/trunk/; revision=490 --- pkgs-ng/README | 2 ++ .../mailreaders/sylpheed/builder.sh | 20 ++++++++++++ .../mailreaders/sylpheed/default.fix | 27 ++++++++++++++++ .../networking/newsreaders/pan/default.fix | 3 ++ .../libraries/gtk+-1/gdk-pixbuf/builder.sh | 10 ++++++ .../libraries/gtk+-1/gdk-pixbuf/default.fix | 21 ++++++++++++ .../libraries/gtk+-1/glib/builder.sh | 9 ++++++ .../libraries/gtk+-1/glib/default.fix | 10 ++++++ .../libraries/gtk+-1/gtk+/builder.sh | 12 +++++++ .../libraries/gtk+-1/gtk+/default.fix | 19 +++++++++++ .../libraries/gtk+/gtk+/builder.sh | 3 +- pkgs-ng/system/all-packages-generic.fix | 32 +++++++++++++++++++ pkgs-ng/system/user-environment.fix | 1 + 13 files changed, 167 insertions(+), 2 deletions(-) create mode 100755 pkgs-ng/applications/networking/mailreaders/sylpheed/builder.sh create mode 100644 pkgs-ng/applications/networking/mailreaders/sylpheed/default.fix create mode 100755 pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/builder.sh create mode 100644 pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/default.fix create mode 100755 pkgs-ng/development/libraries/gtk+-1/glib/builder.sh create mode 100644 pkgs-ng/development/libraries/gtk+-1/glib/default.fix create mode 100755 pkgs-ng/development/libraries/gtk+-1/gtk+/builder.sh create mode 100644 pkgs-ng/development/libraries/gtk+-1/gtk+/default.fix diff --git a/pkgs-ng/README b/pkgs-ng/README index 7747953ef15..7d3dc1395c7 100644 --- a/pkgs-ng/README +++ b/pkgs-ng/README @@ -83,6 +83,8 @@ ELSE IF it's an APPLICATION: IF it's a VERSION MANAGEMENT system: ./applications/version-management ELSE IF it's for NETWORKING: + IF it's a MAILREADER: + ./applications/networking/mailreaders IF it's a NEWSREADER: ./applications/networking/newsreaders ELSE diff --git a/pkgs-ng/applications/networking/mailreaders/sylpheed/builder.sh b/pkgs-ng/applications/networking/mailreaders/sylpheed/builder.sh new file mode 100755 index 00000000000..db66df470aa --- /dev/null +++ b/pkgs-ng/applications/networking/mailreaders/sylpheed/builder.sh @@ -0,0 +1,20 @@ +#! /bin/sh + +buildinputs="$gtk $gdkpixbuf $openssl" +. $stdenv/setup || exit 1 + +if test $sslSupport; then + extraflags="--enable-ssl $extraflags" +fi + +if test $imageSupport; then + extraflags="--enable-gdk-pixbuf $extraflags" +else + extraflags="--disable-gdk-pixbuf --disable-imlibtest $extraflags" +fi + +tar xvfj $src || exit 1 +cd sylpheed-* || exit 1 +./configure --prefix=$out $extraflags || exit 1 +make || exit 1 +make install || exit 1 diff --git a/pkgs-ng/applications/networking/mailreaders/sylpheed/default.fix b/pkgs-ng/applications/networking/mailreaders/sylpheed/default.fix new file mode 100644 index 00000000000..c6e8cc066f8 --- /dev/null +++ b/pkgs-ng/applications/networking/mailreaders/sylpheed/default.fix @@ -0,0 +1,27 @@ +{ sslSupport ? true +, imageSupport ? true +, stdenv, fetchurl, gtk, openssl ? null, gdkpixbuf ? null +}: + +assert !isNull gtk; +assert sslSupport -> !isNull openssl; +assert imageSupport -> !isNull gdkpixbuf; + +derivation { + name = "sylpheed-0.9.7"; + system = stdenv.system; + + builder = ./builder.sh; + src = fetchurl { + url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.7.tar.bz2; + md5 = "399deb5abd52396d26d6475689a5ec3f"; + }; + + sslSupport = sslSupport; + imageSupport = imageSupport; + + stdenv = stdenv; + gtk = gtk; + openssl = if sslSupport then openssl else null; + gdkpixbuf = if imageSupport then gdkpixbuf else null; +} diff --git a/pkgs-ng/applications/networking/newsreaders/pan/default.fix b/pkgs-ng/applications/networking/newsreaders/pan/default.fix index ecb91b0cd19..26b7e6af2b5 100644 --- a/pkgs-ng/applications/networking/newsreaders/pan/default.fix +++ b/pkgs-ng/applications/networking/newsreaders/pan/default.fix @@ -10,12 +10,15 @@ assert gtk.glib == gnet.glib; derivation { name = "pan-0.14.2"; system = stdenv.system; + builder = ./builder.sh; src = fetchurl { url = http://pan.rebelbase.com/download/releases/0.14.2/SOURCE/pan-0.14.2.tar.bz2; md5 = "ed3188e7059bb6d6c209ee5d46ac1852"; }; + spellChecking = spellChecking; + stdenv = stdenv; pkgconfig = pkgconfig; gtk = gtk; diff --git a/pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/builder.sh b/pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/builder.sh new file mode 100755 index 00000000000..c3dc0238305 --- /dev/null +++ b/pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/builder.sh @@ -0,0 +1,10 @@ +#! /bin/sh + +buildinputs="$gtk $libtiff $libjpeg $libpng" +. $stdenv/setup || exit 1 + +tar xvfj $src || exit 1 +cd gdk-pixbuf-* || exit 1 +./configure --prefix=$out || exit 1 +make || exit 1 +make install || exit 1 diff --git a/pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/default.fix b/pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/default.fix new file mode 100644 index 00000000000..8fe9f5e0e14 --- /dev/null +++ b/pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/default.fix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, gtk, libtiff, libjpeg, libpng}: + +assert !isNull gtk && !isNull libtiff + && !isNull libjpeg && !isNull libpng; + +derivation { + name = "gdk-pixbuf-0.22.0"; + system = stdenv.system; + + builder = ./builder.sh; + src = fetchurl { + url = ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/0.22/gdk-pixbuf-0.22.0.tar.bz2; + md5 = "05fcb68ceaa338614ab650c775efc2f2"; + }; + + stdenv = stdenv; + gtk = gtk; + libtiff = libtiff; + libjpeg = libjpeg; + libpng = libpng; +} diff --git a/pkgs-ng/development/libraries/gtk+-1/glib/builder.sh b/pkgs-ng/development/libraries/gtk+-1/glib/builder.sh new file mode 100755 index 00000000000..e6f721de3f4 --- /dev/null +++ b/pkgs-ng/development/libraries/gtk+-1/glib/builder.sh @@ -0,0 +1,9 @@ +#! /bin/sh + +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd glib-* || exit 1 +./configure --prefix=$out || exit 1 +make || exit 1 +make install || exit 1 diff --git a/pkgs-ng/development/libraries/gtk+-1/glib/default.fix b/pkgs-ng/development/libraries/gtk+-1/glib/default.fix new file mode 100644 index 00000000000..7ae9be406b3 --- /dev/null +++ b/pkgs-ng/development/libraries/gtk+-1/glib/default.fix @@ -0,0 +1,10 @@ +{stdenv, fetchurl}: derivation { + name = "glib-1.2.10"; + system = stdenv.system; + builder = ./builder.sh; + src = fetchurl { + url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz; + md5 = "6fe30dad87c77b91b632def29dd69ef9"; + }; + stdenv = stdenv; +} diff --git a/pkgs-ng/development/libraries/gtk+-1/gtk+/builder.sh b/pkgs-ng/development/libraries/gtk+-1/gtk+/builder.sh new file mode 100755 index 00000000000..0487465727a --- /dev/null +++ b/pkgs-ng/development/libraries/gtk+-1/gtk+/builder.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +buildinputs="$x11 $glib" +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd gtk+-* || exit 1 +./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1 +make || exit 1 +make install || exit 1 + +echo "$x11 $glib" > $out/propagated-build-inputs || exit 1 diff --git a/pkgs-ng/development/libraries/gtk+-1/gtk+/default.fix b/pkgs-ng/development/libraries/gtk+-1/gtk+/default.fix new file mode 100644 index 00000000000..856b2ffcad0 --- /dev/null +++ b/pkgs-ng/development/libraries/gtk+-1/gtk+/default.fix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, x11, glib}: + +assert !isNull x11 && !isNull glib; +assert x11.buildClientLibs; + +derivation { + name = "gtk+-1.2.10"; + system = stdenv.system; + + builder = ./builder.sh; + src = fetchurl { + url = ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz; + md5 = "4d5cb2fc7fb7830e4af9747a36bfce20"; + }; + + stdenv = stdenv; + x11 = x11; + glib = glib; +} diff --git a/pkgs-ng/development/libraries/gtk+/gtk+/builder.sh b/pkgs-ng/development/libraries/gtk+/gtk+/builder.sh index 9aac8713783..e8835feb3a7 100755 --- a/pkgs-ng/development/libraries/gtk+/gtk+/builder.sh +++ b/pkgs-ng/development/libraries/gtk+/gtk+/builder.sh @@ -5,8 +5,7 @@ buildinputs="$pkgconfig $x11 $glib $atk $pango $perl $libtiff $libjpeg $libpng" tar xvfj $src || exit 1 cd gtk+-* || exit 1 -./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib \ - --with-libtiff=$tiff || exit 1 +./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1 make || exit 1 make install || exit 1 diff --git a/pkgs-ng/system/all-packages-generic.fix b/pkgs-ng/system/all-packages-generic.fix index 7cba70c2c3f..be52870b0f8 100644 --- a/pkgs-ng/system/all-packages-generic.fix +++ b/pkgs-ng/system/all-packages-generic.fix @@ -250,6 +250,27 @@ libpng = libpng; }; + glib1 = (import ../development/libraries/gtk+-1/glib) { + fetchurl = fetchurl; + stdenv = stdenv; + }; + + gtk1 = (import ../development/libraries/gtk+-1/gtk+) { + fetchurl = fetchurl; + stdenv = stdenv; + x11 = xfree86; + glib = glib1; + }; + + gdkpixbuf = (import ../development/libraries/gtk+-1/gdk-pixbuf) { + fetchurl = fetchurl; + stdenv = stdenv; + gtk = gtk1; + libtiff = libtiff; + libjpeg = libjpeg; + libpng = libpng; + }; + gnet = (import ../development/libraries/gnet) { fetchurl = fetchurl; stdenv = stdenv; @@ -258,6 +279,7 @@ }; + ### SERVERS apacheHttpd = (import ../servers/http/apache-httpd) { @@ -315,4 +337,14 @@ perl = perl; }; + sylpheed = (import ../applications/networking/mailreaders/sylpheed) { + sslSupport = true; + imageSupport = true; + fetchurl = fetchurl; + stdenv = stdenv; + gtk = gtk1; + openssl = openssl; + gdkpixbuf = gdkpixbuf; + }; + } diff --git a/pkgs-ng/system/user-environment.fix b/pkgs-ng/system/user-environment.fix index ef3849a0348..87605c47a70 100644 --- a/pkgs-ng/system/user-environment.fix +++ b/pkgs-ng/system/user-environment.fix @@ -13,6 +13,7 @@ selectedPkgs = [ pkgs.subversion pkgs.pan + pkgs.sylpheed ]; # Create a user environment.