summaryrefslogtreecommitdiff
path: root/pcr/pandoc
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2013-11-06 20:10:41 -0300
committerNicolás Reynolds <fauno@endefensadelsl.org>2013-11-06 20:10:41 -0300
commit385fda403f286573a778ee525fe56a86d11fc967 (patch)
tree1aabb3a26d366ffa745a559409bcbe91b04dc240 /pcr/pandoc
parent922fd0a3c35beb57adbef0b4c4c122dd29563c97 (diff)
parentfbe5d27eadf86b85244a5ffff62c132cb9a4a158 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/adns/PKGBUILD community/afpfs-ng/PKGBUILD community/aqbanking/PKGBUILD community/arp-scan/PKGBUILD community/arpack/PKGBUILD community/bind/PKGBUILD community/bird/PKGBUILD community/cairo-dock/PKGBUILD community/cinnamon-control-center/PKGBUILD community/commoncpp2/PKGBUILD community/cuetools/PKGBUILD community/erlang/PKGBUILD community/fxdesktop/PKGBUILD community/gavl/PKGBUILD community/google-gadgets/PKGBUILD community/gpicview/PKGBUILD community/gtk-aurora-engine/PKGBUILD community/icewm-utils/PKGBUILD community/inotify-tools/PKGBUILD community/jack2/PKGBUILD community/judy/PKGBUILD community/lash/PKGBUILD community/libdlna/PKGBUILD community/libgexiv2/PKGBUILD community/libgig/PKGBUILD community/liblinebreak/PKGBUILD community/liblockfile/PKGBUILD community/libopenraw/PKGBUILD community/librcd/PKGBUILD community/librsync/PKGBUILD community/libvirt/PKGBUILD community/libyaml/PKGBUILD community/linux-tools/PKGBUILD community/lomoco/PKGBUILD community/luasec/PKGBUILD community/luasocket/PKGBUILD community/lwp/PKGBUILD community/lxappearance-obconf/PKGBUILD community/lxappearance/PKGBUILD community/lxsplit/PKGBUILD community/metamail/PKGBUILD community/mg/PKGBUILD community/nemo-fileroller/PKGBUILD community/nsd/PKGBUILD community/obby/PKGBUILD community/openarena/PKGBUILD community/opensc/PKGBUILD community/osmo/PKGBUILD community/perl-json-xs/PKGBUILD community/pyqt3/PKGBUILD community/python-pymongo/PKGBUILD community/python-pytables/PKGBUILD community/qscintilla-qt3/PKGBUILD community/qtcurve-gtk2/PKGBUILD community/qtcurve-kde4/PKGBUILD community/rxvt-unicode/PKGBUILD community/smalltalk/PKGBUILD community/xmlrpc-c/PKGBUILD community/xpad/PKGBUILD community/xsettings-client/PKGBUILD community/yaws/PKGBUILD core/bzip2/PKGBUILD core/gcc/PKGBUILD core/glibc/PKGBUILD core/keyutils/PKGBUILD core/ldns/PKGBUILD core/libmpc/PKGBUILD core/librpcsecgss/PKGBUILD core/libtool/PKGBUILD core/lvm2/PKGBUILD core/lzo2/PKGBUILD core/openssl/PKGBUILD core/systemd/PKGBUILD core/sysvinit-tools/PKGBUILD cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD extra/aalib/PKGBUILD extra/aiksaurus/PKGBUILD extra/alsa-oss/PKGBUILD extra/alsa-tools/PKGBUILD extra/apache/PKGBUILD extra/autopano-sift-c/PKGBUILD extra/avahi/PKGBUILD extra/cfitsio/PKGBUILD extra/clamav/PKGBUILD extra/compface/PKGBUILD extra/dotconf/PKGBUILD extra/enca/PKGBUILD extra/eventlog/PKGBUILD extra/exiv2/PKGBUILD extra/faad2/PKGBUILD extra/fcgi/PKGBUILD extra/ffcall/PKGBUILD extra/ffmpeg/PKGBUILD extra/flac/PKGBUILD extra/fltk/PKGBUILD extra/freealut/PKGBUILD extra/freetds/PKGBUILD extra/gc/PKGBUILD extra/gdome2/PKGBUILD extra/giblib/PKGBUILD extra/gmime/PKGBUILD extra/gnome-python-desktop/PKGBUILD extra/gnome-python-extras/PKGBUILD extra/gnome-speech/PKGBUILD extra/graphviz/PKGBUILD extra/gsasl/PKGBUILD extra/gsl/PKGBUILD extra/gtkspell/PKGBUILD extra/gupnp-igd/PKGBUILD extra/htdig/PKGBUILD extra/hugin/PKGBUILD extra/id3lib/PKGBUILD extra/ilmbase/PKGBUILD extra/imagemagick/PKGBUILD extra/iptraf-ng/PKGBUILD extra/jade/PKGBUILD extra/jasper/PKGBUILD extra/kdesdk-thumbnailers/PKGBUILD extra/kdevelop-php/PKGBUILD extra/lablgtk/PKGBUILD extra/lame/PKGBUILD extra/lcms2/PKGBUILD extra/lesstif/PKGBUILD extra/libaio/PKGBUILD extra/libart-lgpl/PKGBUILD extra/libass/PKGBUILD extra/libasyncns/PKGBUILD extra/libavc1394/PKGBUILD extra/libbluray/PKGBUILD extra/libcaca/PKGBUILD extra/libcddb/PKGBUILD extra/libchamplain/PKGBUILD extra/libdca/PKGBUILD extra/libdv/PKGBUILD extra/libglade/PKGBUILD extra/libgtkhtml/PKGBUILD extra/libice/PKGBUILD extra/libid3tag/PKGBUILD extra/libidl2/PKGBUILD extra/libieee1284/PKGBUILD extra/libjpeg-turbo/PKGBUILD extra/liblo/PKGBUILD extra/libmad/PKGBUILD extra/libmikmod/PKGBUILD extra/libmowgli/PKGBUILD extra/libmpd/PKGBUILD extra/libmpdclient/PKGBUILD extra/libofa/PKGBUILD extra/liboil/PKGBUILD extra/libotf/PKGBUILD extra/libpeas/PKGBUILD extra/libqalculate/PKGBUILD extra/libraw1394/PKGBUILD extra/libsndfile/PKGBUILD extra/libstroke/PKGBUILD extra/libvncserver/PKGBUILD extra/libxkbui/PKGBUILD extra/libxss/PKGBUILD extra/libytnef/PKGBUILD extra/libzvt/PKGBUILD extra/lynx/PKGBUILD extra/lzo/PKGBUILD extra/mariadb/PKGBUILD extra/mesa/PKGBUILD extra/mhash/PKGBUILD extra/musicbrainz/PKGBUILD extra/ocaml/PKGBUILD extra/openal/PKGBUILD extra/openmpi/PKGBUILD extra/pavucontrol/PKGBUILD extra/perl-dbi/PKGBUILD extra/phonon-vlc/PKGBUILD extra/phonon/PKGBUILD extra/ppl/PKGBUILD extra/progsreiserfs/PKGBUILD extra/pulseaudio/PKGBUILD extra/pycurl/PKGBUILD extra/pyopenssl/PKGBUILD extra/pyxml/PKGBUILD extra/qt4/PKGBUILD extra/qt5/PKGBUILD extra/qtwebkit/PKGBUILD extra/schroedinger/PKGBUILD extra/sdl_gfx/PKGBUILD extra/signon/PKGBUILD extra/slang/PKGBUILD extra/sofia-sip/PKGBUILD extra/spandsp/PKGBUILD extra/speech-dispatcher/PKGBUILD extra/sqlite/PKGBUILD extra/t1lib/PKGBUILD extra/taglib/PKGBUILD extra/tidyhtml/PKGBUILD extra/totem/PKGBUILD extra/unixodbc/PKGBUILD extra/vigra/PKGBUILD extra/virtuoso/PKGBUILD extra/wavpack/PKGBUILD extra/webkitgtk/PKGBUILD extra/webrtc-audio-processing/PKGBUILD extra/xfce4-mailwatch-plugin/PKGBUILD extra/xine-lib/PKGBUILD extra/xmms/PKGBUILD extra/xorg-server/PKGBUILD extra/yajl/PKGBUILD extra/yasm/PKGBUILD extra/zenity/PKGBUILD extra/zziplib/PKGBUILD libre/blackbox-libre/PKGBUILD libre/linux-libre/PKGBUILD libre/sdl-libre/PKGBUILD
Diffstat (limited to 'pcr/pandoc')
-rw-r--r--pcr/pandoc/PKGBUILD51
-rw-r--r--pcr/pandoc/SRCBUILD8
2 files changed, 34 insertions, 25 deletions
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 0d2f2d8ea..49fcabcfe 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -5,36 +5,29 @@
pkgname=pandoc-static
_pkgname=pandoc
-pkgver=1.12
+pkgver=1.12.1
pkgrel=1
pkgdesc='Conversion between markup formats (no Haskell libs)'
url='http://johnmacfarlane.net/pandoc/'
license=('GPL')
arch=('i686' 'x86_64')
+# Needed for pandoc-citeproc
+depends=('icu>=52' 'icu<=53')
makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy')
options=(strip !makeflags !distcc !emptydirs)
-#source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig}
SRCBUILD)
-# citeproc-hs-pre-0.3.7.patch)
replaces=('pandoc')
provides=('pandoc')
optdepends=('texlive-most: for pdf creation')
-md5sums=('3d5f23060cad2ff29ba2df5651e92f8a'
- 'SKIP'
- 'c2e9f9b880468455b6e6a7f9ba7308e8')
# PKGBUILD functions
build() {
- mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}}
- cd ${srcdir}/${_pkgname}-${pkgver}
+ mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}}
+ cd ${srcdir}/${_pkgname}-${pkgver}
-# Patches from the next citeproc-hs release
-# These are needed because 0.3.6 with embed_data_files is broken
-# darcs diff --from-tag=0.3.6
-# pushd ${srcdir}/${_pkgname}-${pkgver}/citeproc-hs-0.3.6
-# patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
-# popd
+# pandoc-citeproc needs hsb2hs
+ export PATH=${srcdir}/build/usr/bin:$PATH
while read _hkpkg; do
# Skip already built
@@ -47,23 +40,29 @@ build() {
case $_hkpkg in
$_pkgname-$pkgver)
HOME=${srcdir}/${_pkgname}-${pkgver} \
- cabal configure --flags='-library' \
- --prefix=/usr \
+ cabal configure --prefix=/usr \
--libdir=${srcdir}/build/usr/lib -v
HOME=${srcdir}/${_pkgname}-${pkgver} \
cabal build
+
+ HOME=${srcdir}/${_pkgname}-${pkgver} \
+ cabal register --inplace
;;
- citeproc-hs-*)
+ pandoc-citeproc*)
+ HOME=${srcdir}/${_pkgname}-${pkgver} \
+ cabal configure --flags='small_base embed_data_files bibutils hexpat unicode_collation' \
+ --libdir=${srcdir}/build/usr/lib \
+ --prefix=/usr -v
+
HOME=${srcdir}/${_pkgname}-${pkgver} \
- cabal install --flags='embed_data_files' \
- --prefix=${srcdir}/build/usr -v
+ cabal build
;;
*)
HOME=${srcdir}/${_pkgname}-${pkgver} \
- cabal install --prefix=${srcdir}/build/usr
+ cabal install --prefix=${srcdir}/build/usr --flags="embed_data_files"
;;
esac
@@ -77,11 +76,16 @@ package() {
runghc Setup.hs copy --destdir=${pkgdir}/
+ cd ${srcdir}/${_pkgname}-${pkgver}/pandoc-citeproc*
+ runghc Setup.hs copy --destdir=${pkgdir}/
+
# For some reason the library is installed anyway
# Remove all files and !emptydirs takes care of the rest
msg2 "Removing lib files..."
find ${pkgdir} -iname lib -print0 | xargs -0 rm -rvf
+ cp -av ${srcdir}/build/usr/bin/* ${pkgdir}/usr/bin/
+
# 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
@@ -90,6 +94,9 @@ package() {
find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
msg2 "Installing licenses"
- install -d ${pkgdir}/usr/share
- cp -rv ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/
+ install -d ${pkgdir}/usr/share/licenses
+ cp -rv ${srcdir}/build/usr/share/doc/* ${pkgdir}/usr/share/licenses/
}
+sha256sums=('4cbeb1b112985961ff78b9baaa4cca3b24e5996c243c790fa00bbe44052cd418'
+ 'SKIP'
+ '25fae3ded388733915dbaca9970ac5f5ef53883410564305bd225a950e5951db')
diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD
index f822bb1a0..242356c89 100644
--- a/pcr/pandoc/SRCBUILD
+++ b/pcr/pandoc/SRCBUILD
@@ -2,7 +2,7 @@
# Based on haskell-pandoc
pkgname=pandoc
-pkgver=1.12
+pkgver=1.12.1
pkgrel=1
pkgdesc='Conversion between markup formats (no Haskell libs)'
url='http://johnmacfarlane.net/pandoc/'
@@ -21,12 +21,14 @@ build() {
cabal --verbose=3 update
HOME=${srcdir}/${pkgname}-${pkgver} \
- cabal --verbose=3 fetch file-embed ${pkgname}-${pkgver}
+ 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 --dry-run file-embed ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER
+ cabal install --flags="embed_data_files bibutils hexpat unicode_collation" --dry-run hsb2hs ${pkgname}-${pkgver} pandoc-citeproc |
+ grep "\-[0-9]\+" |
+ tee BUILDORDER
}
package() {