diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-16 13:26:48 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-16 13:26:48 -0400 |
| commit | 9d51ec5b15207912f80b8de68146b342b120fcd4 (patch) | |
| tree | 8436f2349df02d8c13e4cad6d17e4f32cbcac844 /pcr | |
| parent | ff7614a4a43629a52840061f50521474f7d70ecd (diff) | |
| parent | 2688134fc7043cf213cceca630d4a9f0bfa893d0 (diff) | |
| download | abslibre-9d51ec5b15207912f80b8de68146b342b120fcd4.tar.gz abslibre-9d51ec5b15207912f80b8de68146b342b120fcd4.tar.bz2 abslibre-9d51ec5b15207912f80b8de68146b342b120fcd4.zip | |
Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'pcr')
| -rw-r--r-- | pcr/pandoc/PKGBUILD | 19 | ||||
| -rw-r--r-- | pcr/pandoc/SRCBUILD | 8 |
2 files changed, 13 insertions, 14 deletions
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 668c6407b..89e35b17d 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -3,10 +3,14 @@ # Run `makepkg -sp SRCBUILD` if you want to update the source tarball +# hslua fails if LANG is empty or C +test -z "$LANG" && export LANG="en_US.utf8" + pkgname=pandoc-static _pkgname=pandoc -pkgver=1.12.3.3 -pkgrel=2 +pkgver=1.12.4.2 +pkgrel=1 +_srcrel=2 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -15,7 +19,7 @@ arch=('i686' 'x86_64') depends=('icu>=52' 'icu<=54') makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy') options=(strip !makeflags !distcc !emptydirs) -source=(https://repo.parabolagnulinux.org/other/pandoc-static/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig} +source=(https://repo.parabolagnulinux.org/other/pandoc-static/${_pkgname}-${pkgver}-${_srcrel}-any.src.tar.xz{,.sig} SRCBUILD) replaces=('pandoc') provides=('pandoc') @@ -88,7 +92,8 @@ package() { # EC is unfree and makes Parabola TeXLive cry # besides, it's unneeded - sed "/fontenc/d" -i ${pkgdir}/usr/share/${_pkgname}-${pkgver}/data/templates/default.latex + find "${pkgdir}/usr/share" -name default.latex -exec \ + sed "/fontenc/d" -i {} \; find ${pkgdir}/usr/share -type f -exec chmod 644 {} \; find ${pkgdir}/usr/share -type d -exec chmod 755 {} \; @@ -97,9 +102,3 @@ package() { install -d ${pkgdir}/usr/share/licenses cp -rv ${srcdir}/build/usr/share/doc/* ${pkgdir}/usr/share/licenses/ } -sha1sums=('4984149bad15e5b07594d130b4f9d2dad4286e67' - 'SKIP' - '734e0b61b5a1f1ebf42b77c0b52ef18cd899f461') -sha256sums=('7d469701d3bc033dce2e12fca8460f0d17fdb980a65dd25f266ee8f6071f5830' - 'SKIP' - 'a4370706e79992e570334584f647121096ed9b439f4531bfd11da247acff782e') diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD index 618e4e220..9cc4b128e 100644 --- a/pcr/pandoc/SRCBUILD +++ b/pcr/pandoc/SRCBUILD @@ -2,8 +2,8 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.12.3.3 -pkgrel=1 +pkgver=1.12.4.2 +pkgrel=2 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -21,12 +21,12 @@ build() { cabal --verbose=3 update HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal --verbose=3 fetch hs-bibutils network hexpat text-0.11.3.1 text-icu hsb2hs ${pkgname}-${pkgver} pandoc-citeproc + cabal --verbose=3 fetch hs-bibutils network hexpat text text-icu hsb2hs ${pkgname}-${pkgver} pandoc-citeproc msg2 "Getting the dependency build order" # Ignore the cabal messages HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --flags="embed_data_files bibutils hexpat unicode_collation" --dry-run text-0.11.3.1 hsb2hs ${pkgname}-${pkgver} pandoc-citeproc | + cabal install --flags="embed_data_files bibutils hexpat unicode_collation" --dry-run text hsb2hs ${pkgname}-${pkgver} pandoc-citeproc | grep "\-[0-9]\+" | tee BUILDORDER } |