* Converted GTK 1 / Sylpheed, with optional support for gdk-pixbuf.

svn path=/nixpkgs/trunk/; revision=490

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

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

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;
+}

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;

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

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;
+}

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

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;
+}

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

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;
+}

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
 

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;
+  };
+
 }

pkgs-ng/system/user-environment.fix

@@ -13,6 +13,7 @@
   selectedPkgs = [
     pkgs.subversion
     pkgs.pan
+    pkgs.sylpheed
   ];
 
   # Create a user environment.