diff options
| -rw-r--r-- | office/pandoc/pandoc.SlackBuild | 21 | ||||
| -rw-r--r-- | office/pandoc/pandoc.info | 10 |
2 files changed, 17 insertions, 14 deletions
diff --git a/office/pandoc/pandoc.SlackBuild b/office/pandoc/pandoc.SlackBuild index 06fa5d3b7f..e282b04ef5 100644 --- a/office/pandoc/pandoc.SlackBuild +++ b/office/pandoc/pandoc.SlackBuild @@ -4,9 +4,10 @@ # Written by Peter Wang <novalazy@gmail.com> # Public domain. +# Updated 2018 David Spencer, Baildon, West Yorkshire, U.K. PRGNAM=pandoc -VERSION=${VERSION:-1.17.0.3} +VERSION=${VERSION:-2.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,8 +58,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Accept haskell-data-default 0.6 -- Arch does this, so it must be ok :p -sed -i -e 's/data-default >= 0.4 \&\& < 0.6,/data-default >= 0.4 \&\& < 0.7,/' $PRGNAM.cabal +# Remove upper version constraint on haddock-library +sed -i -E 's/(haddock-library *>= *[0-9.]+ *)\&\& *<=? *[0-9.]+/\1/' $PRGNAM.cabal # --enable-executable-dynamic seems to only add the build directory to the # rpath but not /usr/lib*/ghc-*/pandoc-*, so libHSpandoc cannot be loaded if @@ -66,10 +67,12 @@ sed -i -e 's/data-default >= 0.4 \&\& < 0.6,/data-default >= 0.4 \&\& < 0.7,/' $ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ runghc Setup.hs configure \ - --prefix=/usr \ - --libdir=/usr/lib$LIBDIRSUFFIX \ - --libsubdir=ghc-$GHC_VERSION/$PRGNAM-$VERSION \ - --docdir=/usr/doc/$PRGNAM-$VERSION + --prefix=/usr \ + --libdir=/usr/lib$LIBDIRSUFFIX \ + --libsubdir=ghc-$GHC_VERSION/$PRGNAM-$VERSION \ + --enable-shared \ + --enable-library-profiling \ + --docdir=/usr/doc/$PRGNAM-$VERSION runghc Setup.hs build runghc Setup.hs haddock @@ -88,12 +91,12 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - BUGS changelog CONTRIBUTING.md COPYING COPYRIGHT README \ + AUTHORS.md BUGS changelog CONTRIBUTING.md COPYING.md COPYRIGHT MANUAL.txt README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # Remove duplicate files in usr/share/$ARCH-linux-ghc-$GHC_VERSION/$PRGNAM-$VERSION -rm $PKG/usr/share/$TARARCH-linux-ghc-$GHC_VERSION/$PRGNAM-$VERSION/{COPYRIGHT,README} +rm $PKG/usr/share/$TARARCH-linux-ghc-$GHC_VERSION/$PRGNAM-$VERSION/COPYRIGHT mkdir -p $PKG/install cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/office/pandoc/pandoc.info b/office/pandoc/pandoc.info index 9737b9c99d..2f0853d155 100644 --- a/office/pandoc/pandoc.info +++ b/office/pandoc/pandoc.info @@ -1,10 +1,10 @@ PRGNAM="pandoc" -VERSION="1.17.0.3" -HOMEPAGE="http://johnmacfarlane.net/pandoc/" -DOWNLOAD="http://hackage.haskell.org/package/pandoc-1.17.0.3/pandoc-1.17.0.3.tar.gz" -MD5SUM="a4d9055e330ea4b573442442e7d411e4" +VERSION="2.3.1" +HOMEPAGE="https://pandoc.org/" +DOWNLOAD="https://hackage.haskell.org/package/pandoc-2.3.1/pandoc-2.3.1.tar.gz" +MD5SUM="46be88df494a63060de9ead9632ecd58" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ghc haskell-aeson haskell-base64-bytestring haskell-blaze-html haskell-blaze-markup haskell-cmark haskell-data-default haskell-deepseq-generics haskell-extensible-exceptions haskell-filemanip haskell-haddock-library haskell-highlighting-kate haskell-hslua haskell-HTTP haskell-http-client haskell-http-client-tls haskell-http-types haskell-JuicyPixels haskell-mtl haskell-network haskell-network-uri haskell-pandoc-types haskell-parsec haskell-random haskell-scientific haskell-SHA haskell-syb haskell-tagsoup haskell-temporary haskell-texmath haskell-text haskell-unordered-containers haskell-vector haskell-xml haskell-yaml haskell-zip-archive haskell-zlib" +REQUIRES="haskell-Glob haskell-HsYAML haskell-aeson-pretty haskell-cmark-gfm haskell-doctemplates haskell-haddock-library haskell-hslua-module-text haskell-safe haskell-skylighting haskell-aeson haskell-base64-bytestring haskell-blaze-html haskell-blaze-markup haskell-cmark haskell-data-default haskell-deepseq-generics haskell-extensible-exceptions haskell-filemanip haskell-haddock-library haskell-highlighting-kate haskell-hslua haskell-HTTP haskell-http-client haskell-http-client-tls haskell-http-types haskell-JuicyPixels haskell-network haskell-network-uri haskell-pandoc-types haskell-random haskell-scientific haskell-SHA haskell-syb haskell-tagsoup haskell-temporary haskell-texmath haskell-unordered-containers haskell-vector haskell-xml haskell-yaml haskell-zip-archive haskell-zlib" MAINTAINER="Peter Wang" EMAIL="novalazy@gmail.com" |