diff --git a/haskell/haskell-citeproc-hs/citeproc-hs_cabal.patch b/haskell/haskell-citeproc-hs/citeproc-hs_cabal.patch new file mode 100644 index 0000000000..cbc2401ade --- /dev/null +++ b/haskell/haskell-citeproc-hs/citeproc-hs_cabal.patch @@ -0,0 +1,15 @@ +--- citeproc-hs.cabal~ 2013-01-23 15:06:35.000000000 +0200 ++++ citeproc-hs.cabal 2013-02-25 19:39:32.000000000 +0200 +@@ -125,10 +125,12 @@ + + if flag(hexpat) + build-depends: hexpat >= 0.20.2 ++ extensions: CPP + exposed-modules: Text.CSL.Pickle.Hexpat + cpp-options: -DUSE_HEXPAT + else + build-depends: xml ++ extensions: CPP + exposed-modules: Text.CSL.Pickle.Xml + + if flag(embed_data_files) diff --git a/haskell/haskell-citeproc-hs/haskell-citeproc-hs.SlackBuild b/haskell/haskell-citeproc-hs/haskell-citeproc-hs.SlackBuild index 5eccd8f360..7187971ffe 100644 --- a/haskell/haskell-citeproc-hs/haskell-citeproc-hs.SlackBuild +++ b/haskell/haskell-citeproc-hs/haskell-citeproc-hs.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for citeproc-hs # Written by Peter Wang (novalazy@gmail.com) -# Copyright 2012 Mikko Värri, Finland +# Copyright 2013 Mikko Värri, Finland # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=haskell-citeproc-hs -VERSION=${VERSION:-0.3.4} +VERSION=${VERSION:-0.3.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,6 +74,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix compilation which is missing a CPP pass +patch -p0 <$CWD/citeproc-hs_cabal.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ runghc Setup configure \ diff --git a/haskell/haskell-citeproc-hs/haskell-citeproc-hs.info b/haskell/haskell-citeproc-hs/haskell-citeproc-hs.info index 38e9114b63..bb99af3eff 100644 --- a/haskell/haskell-citeproc-hs/haskell-citeproc-hs.info +++ b/haskell/haskell-citeproc-hs/haskell-citeproc-hs.info @@ -1,8 +1,8 @@ PRGNAM="haskell-citeproc-hs" -VERSION="0.3.4" +VERSION="0.3.7" HOMEPAGE="http://gorgias.mine.nu/repos/citeproc-hs/" -DOWNLOAD="http://hackage.haskell.org/packages/archive/citeproc-hs/0.3.4/citeproc-hs-0.3.4.tar.gz" -MD5SUM="3891e64c624454721c7da17b12cd2158" +DOWNLOAD="http://hackage.haskell.org/packages/archive/citeproc-hs/0.3.7/citeproc-hs-0.3.7.tar.gz" +MD5SUM="11add895d1ae41b27dabcaebc0da409c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="haskell-json haskell-pandoc-types haskell-parsec haskell-utf8-string haskell-xml" diff --git a/haskell/haskell-citeproc-hs/slack-desc b/haskell/haskell-citeproc-hs/slack-desc index 6e07e940e9..545c84a4d6 100644 --- a/haskell/haskell-citeproc-hs/slack-desc +++ b/haskell/haskell-citeproc-hs/slack-desc @@ -1,9 +1,9 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| haskell-citeproc-hs: haskell-citeproc-hs (implementation of the Citation Style Language)