diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-04-12 17:01:00 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-04-12 17:01:00 -0300 |
| commit | fe94a4cc5fddef6b5e6a7ed02dee5a9d970b30bb (patch) | |
| tree | 239b1db439fca6883fc660396fe9bc1505ece982 | |
| parent | 4adad75f6e7fbd6cb2540713561cd9f72d249c35 (diff) | |
| parent | 11d812072c9f8ae4bbdb688cdcde129d7ad2cc69 (diff) | |
| download | abslibre-fe94a4cc5fddef6b5e6a7ed02dee5a9d970b30bb.tar.gz abslibre-fe94a4cc5fddef6b5e6a7ed02dee5a9d970b30bb.tar.bz2 abslibre-fe94a4cc5fddef6b5e6a7ed02dee5a9d970b30bb.zip | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
| -rw-r--r-- | pcr/pandoc/PKGBUILD | 8 | ||||
| -rw-r--r-- | pcr/pandoc/SRCBUILD | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 74b1c77d9..5698ac14f 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -4,7 +4,7 @@ # Run `makepkg -sp SRCBUILD` if you want to update the source tarball pkgname=pandoc -pkgver=1.10.1 +pkgver=1.11.1 pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' @@ -17,9 +17,6 @@ source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any # citeproc-hs-pre-0.3.7.patch) conflicts=('haskell-pandoc') optdepends=('texlive-most: for pdf creation') -md5sums=('bca5fa27ac593f24d18cd434289d4673' - '87a6a5fd1abfbe3199c5ff42742ff5f1' - '0d5b6d7adf6fdcea52dcbb7b62368b19') # PKGBUILD functions build() { @@ -90,3 +87,6 @@ package() { install -d ${pkgdir}/usr/share cp -rv ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/ } +md5sums=('74acd042fcd85bee9edb093cc3fe5c2e' + 'SKIP' + '0d5b6d7adf6fdcea52dcbb7b62368b19') diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD index 4c7f5de8d..ec499f814 100644 --- a/pcr/pandoc/SRCBUILD +++ b/pcr/pandoc/SRCBUILD @@ -2,10 +2,10 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.10.1 +pkgver=1.11.1 # 0.4 doesn't work with ghc 7.6 # Use blaze_html_0_5 flag in the future -_blaze_html=0.5.1.3 +_blaze_html=0.6.1.1 pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' @@ -29,7 +29,7 @@ build() { msg2 "Getting the dependency build order" # Ignore the cabal messages HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --flags="blaze_html_0_5" --dry-run file-embed ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER + cabal install --dry-run file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER } package() { |