From cdc73ac802a1af7a5e797e2789db591b244787be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sun, 18 Nov 2012 21:11:10 -0300 Subject: Upgrade - noticed --bibliography isn't working It looks like it's like this since 1.9.4 --- ~fauno/pandoc/SRCBUILD | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to '~fauno/pandoc/SRCBUILD') diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD index 29c5f25ae..ebe1a0552 100755 --- a/~fauno/pandoc/SRCBUILD +++ b/~fauno/pandoc/SRCBUILD @@ -2,14 +2,17 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.9.4.2 -pkgrel=2 +pkgver=1.9.4.5 +# 0.3.6 fails with embed_data_files +_citeproc=0.3.5 +pkgrel=3 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') arch=('any') makedepends=('ghc' 'sh' 'cabal-install') source=() +options=(!strip) # PKGBUILD functions build() { @@ -20,22 +23,22 @@ build() { cabal --verbose=3 update HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal --verbose=3 fetch file-embed ${pkgname}-${pkgver} + cabal --verbose=3 fetch file-embed citeproc-hs-${_citeproc} ${pkgname}-${pkgver} msg2 "Getting the dependency build order" # Ignore the cabal messages HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --dry-run file-embed ${pkgname}-${pkgver} | tail -n+3 >> BUILDORDER + cabal install --dry-run file-embed citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER } package() { export PKGEXT=.src.tar.xz - export PKGDEST=${startdir} + export PKGDEST=${SRCDEST} mkdir -p ${pkgdir}/${pkgname}-${pkgver} cd ${pkgdir}/${pkgname}-${pkgver} - find ${srcdir} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \ + find ${srcdir}/${pkgname}-${pkgver} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \ bsdtar xvf '{}' \; cp ${srcdir}/${pkgname}-${pkgver}/BUILDORDER . -- cgit v1.2.3-2-g168b From 084d0a37c8d0f1a991ce22ccc6d8c3dd8ca12a33 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Dec 2012 22:14:47 -0500 Subject: (scripted) fix file permission breakage introduced in commit d62bd1 I did this with this command: git diff d62bd1^..d62bd1 | egrep '^old mode ' -C1 \ | tr '\n' ' ' | sed 's/diff --git/\n&/g' \ | sed -r 's|^diff --git a/([^ ]*) b/([^ ]*) old mode 100([0-9]*) new mode 100([0-9]*)|chmod \3 ./\1|' \ | bash The first line finds all of the file-permission changes in the commit. The second line squashes some newlines to get one line per file. This line is in the format: diff --git a/FILE b/FILE old mode OLDMODE new mode NEWMODE The third line extracts the values from those lines and transforms the line into: chmod FILE ./OLDMODE The fourth line (obviously) just executes the output. --- ~fauno/pandoc/SRCBUILD | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 ~fauno/pandoc/SRCBUILD (limited to '~fauno/pandoc/SRCBUILD') diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD old mode 100755 new mode 100644 -- cgit v1.2.3-2-g168b