* A descriptor for running the Pan newsreader.

* Added descriptors for gtkspell and its support package pspell.
  Gtkspell is an optional dependency of Pan, so we should add the
  ability to nix-instantiate to instantiate variants of a package
  based on a selection of features.

8 files changed, 86 insertions, 0 deletions

diff --git a/test/build/gtkspell-build.sh b/test/build/gtkspell-build.sh
new file mode 100755
index 000000000000..d1e56943fabd
--- /dev/null
+++ b/test/build/gtkspell-build.sh
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+export PATH=$pkgconfig/bin:/bin:/usr/bin
+export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig
+export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$pspell/lib
+export C_INCLUDE_PATH=$pspell/include
+
+top=`pwd`
+tar xvfz $src
+cd gtkspell-*
+./configure --prefix=$top
+make
+make install
diff --git a/test/build/pan-build-2.sh b/test/build/pan-build-2.sh
new file mode 100755
index 000000000000..87dd4e6a1b02
--- /dev/null
+++ b/test/build/pan-build-2.sh
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+export PATH=$pkgconfig/bin:$gnet/bin:/bin:/usr/bin
+export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig:$gtkspell/lib/pkgconfig
+export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib:$pspell/lib:$gtkspell/lib
+
+# A bug in gtkspell: the pspell library path is not exported
+# through pkgconfig.
+export LIBRARY_PATH=$pspell/lib
+
+export LDFLAGS=-s
+
+top=`pwd`
+tar xvfj $src
+cd pan-*
+./configure --prefix=$top
+make
+make install
+cd ..
+rm -rf pan-*
diff --git a/test/build/pan-run.sh b/test/build/pan-run.sh
new file mode 100755
index 000000000000..923a232925d4
--- /dev/null
+++ b/test/build/pan-run.sh
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib:$pspell/lib:$gtkspell/lib
+
+ldd $pan/bin/pan
+
+$pan/bin/pan
\ No newline at end of file
diff --git a/test/build/pspell-build.sh b/test/build/pspell-build.sh
new file mode 100755
index 000000000000..588c2f1a09a8
--- /dev/null
+++ b/test/build/pspell-build.sh
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+export PATH=/bin:/usr/bin
+
+top=`pwd`
+tar xvfz $src
+cd pspell-*
+./configure --prefix=$top
+make
+make install
diff --git a/test/tmpl/gtkspell-2.0.2.nix b/test/tmpl/gtkspell-2.0.2.nix
new file mode 100644
index 000000000000..844a75867696
--- /dev/null
+++ b/test/tmpl/gtkspell-2.0.2.nix
@@ -0,0 +1,10 @@
+pkgconfig <- ./pkgconfig-0.15.0.nix
+glib <- ./glib-2.2.1.nix
+atk <- ./atk-1.2.0.nix
+pango <- ./pango-1.2.1.nix
+gtk <- ./gtk+-2.2.1.nix
+pspell <- ./pspell-.12.2.nix
+
+src = url(http://pan.rebelbase.com/download/extras/gtkspell/SOURCES/gtkspell-2.0.2.tar.gz)
+
+build = ../build/gtkspell-build.sh
diff --git a/test/tmpl/pan-0.13.91-run.nix b/test/tmpl/pan-0.13.91-run.nix
new file mode 100644
index 000000000000..9fe803defd6b
--- /dev/null
+++ b/test/tmpl/pan-0.13.91-run.nix
@@ -0,0 +1,11 @@
+pan <- ./pan-0.13.91.nix
+
+glib <- ./glib-2.2.1.nix
+atk <- ./atk-1.2.0.nix
+pango <- ./pango-1.2.1.nix
+gtk <- ./gtk+-2.2.1.nix
+gnet <- ./gnet-1.1.8.nix
+pspell <- ./pspell-.12.2.nix
+gtkspell <- ./gtkspell-2.0.2.nix
+
+run = ../build/pan-run.sh
diff --git a/test/tmpl/pan-0.13.91.nix b/test/tmpl/pan-0.13.91.nix
new file mode 100644
index 000000000000..e6baf76293b1
--- /dev/null
+++ b/test/tmpl/pan-0.13.91.nix
@@ -0,0 +1,12 @@
+pkgconfig <- ./pkgconfig-0.15.0.nix
+glib <- ./glib-2.2.1.nix
+atk <- ./atk-1.2.0.nix
+pango <- ./pango-1.2.1.nix
+gtk <- ./gtk+-2.2.1.nix
+gnet <- ./gnet-1.1.8.nix
+pspell <- ./pspell-.12.2.nix
+gtkspell <- ./gtkspell-2.0.2.nix
+
+src = url(http://pan.rebelbase.com/download/releases/0.13.91/SOURCE/pan-0.13.91.tar.bz2)
+
+build = ../build/pan-build-2.sh
diff --git a/test/tmpl/pspell-.12.2.nix b/test/tmpl/pspell-.12.2.nix
new file mode 100644
index 000000000000..33e63b85aacc
--- /dev/null
+++ b/test/tmpl/pspell-.12.2.nix
@@ -0,0 +1,3 @@
+src = url(http://unc.dl.sourceforge.net/sourceforge/pspell/pspell-.12.2.tar.gz)
+
+build = ../build/pspell-build.sh