summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--haskell/haskell-cgi/data-typeable.patch22
-rw-r--r--haskell/haskell-cgi/haskell-cgi.SlackBuild9
-rw-r--r--haskell/haskell-cgi/haskell-cgi.info8
-rw-r--r--haskell/haskell-cgi/network-uri.patch12
4 files changed, 45 insertions, 6 deletions
diff --git a/haskell/haskell-cgi/data-typeable.patch b/haskell/haskell-cgi/data-typeable.patch
new file mode 100644
index 0000000000..226c202136
--- /dev/null
+++ b/haskell/haskell-cgi/data-typeable.patch
@@ -0,0 +1,22 @@
+--- Network/CGI/Protocol.hs.orig 2015-02-22 23:49:07.811998631 +0200
++++ Network/CGI/Protocol.hs 2015-02-22 23:49:47.854998351 +0200
+@@ -44,7 +44,7 @@
+ import qualified Data.ByteString.Lazy.Char8 as BS
+ import Data.ByteString.Lazy.Char8 (ByteString)
+
+-import Data.Typeable (Typeable(..), mkTyConApp, mkTyCon)
++import Data.OldTypeable (Typeable(..), mkTyConApp, mkTyCon)
+
+ import Network.CGI.Header
+ import Network.CGI.Multipart
+--- Network/CGI/Monad.hs.orig 2015-02-22 23:49:22.836998526 +0200
++++ Network/CGI/Monad.hs 2015-02-22 23:50:04.933998232 +0200
+@@ -40,7 +40,7 @@
+ import Control.Monad.Reader (ReaderT(..), asks)
+ import Control.Monad.Writer (WriterT(..), tell)
+ import Control.Monad.Trans (MonadTrans, MonadIO, liftIO, lift)
+-import Data.Typeable (Typeable(..), Typeable1(..),
++import Data.OldTypeable (Typeable(..), Typeable1(..),
+ mkTyConApp, mkTyCon)
+
+ import Network.CGI.Protocol
diff --git a/haskell/haskell-cgi/haskell-cgi.SlackBuild b/haskell/haskell-cgi/haskell-cgi.SlackBuild
index f6c6c4c360..aa73b56105 100644
--- a/haskell/haskell-cgi/haskell-cgi.SlackBuild
+++ b/haskell/haskell-cgi/haskell-cgi.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for cgi
-# Copyright 2013 Mikko Värri, Finland
+# Copyright 2015 Mikko Värri, Finland
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=haskell-cgi
-VERSION=${VERSION:-3001.1.8.3}
+VERSION=${VERSION:-3001.1.8.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -73,6 +73,11 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# make it work with network-uri package, which was spun off from network 2.6
+patch -p0 <$CWD/network-uri.patch
+# make it work with base >= 4.7
+patch -p0 <$CWD/data-typeable.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
runghc Setup configure \
diff --git a/haskell/haskell-cgi/haskell-cgi.info b/haskell/haskell-cgi/haskell-cgi.info
index e016b958d2..38684befc7 100644
--- a/haskell/haskell-cgi/haskell-cgi.info
+++ b/haskell/haskell-cgi/haskell-cgi.info
@@ -1,10 +1,10 @@
PRGNAM="haskell-cgi"
-VERSION="3001.1.8.3"
+VERSION="3001.1.8.5"
HOMEPAGE="http://hackage.haskell.org/package/cgi"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/cgi/3001.1.8.3/cgi-3001.1.8.3.tar.gz"
-MD5SUM="5e1cdb5cb41931a45f549d9eb38c0d07"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/cgi/3001.1.8.5/cgi-3001.1.8.5.tar.gz"
+MD5SUM="e01ef7ed24473d1550579e83a842b017"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="haskell-extensible-exceptions haskell-MonadCatchIO-mtl haskell-network haskell-xhtml"
+REQUIRES="haskell-extensible-exceptions haskell-MonadCatchIO-mtl haskell-mtl haskell-network haskell-network-uri haskell-parsec"
MAINTAINER="Mikko Värri"
EMAIL="vmj@linuxbox.fi"
diff --git a/haskell/haskell-cgi/network-uri.patch b/haskell/haskell-cgi/network-uri.patch
new file mode 100644
index 0000000000..d4f69d6675
--- /dev/null
+++ b/haskell/haskell-cgi/network-uri.patch
@@ -0,0 +1,12 @@
+--- cgi.cabal.orig 2015-02-22 23:54:01.565996578 +0200
++++ cgi.cabal 2015-02-22 23:54:35.682996339 +0200
+@@ -35,7 +35,8 @@
+ ghc-options: -Wall
+
+ Build-depends:
+- network >= 2.0,
++ network >= 2.6,
++ network-uri >= 2.6,
+ parsec >= 2.0,
+ mtl >= 1.0,
+ MonadCatchIO-mtl,