From 6b05ee99c8c06660f75ac8d03f922f9d3dbd6c22 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 16 Jan 2013 14:50:08 -0300 Subject: Pandoc rebuild --- ~fauno/pandoc/PKGBUILD | 13 ++++++++----- ~fauno/pandoc/SRCBUILD | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD index 18e249a47..96f7015b9 100755 --- a/~fauno/pandoc/PKGBUILD +++ b/~fauno/pandoc/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: Nicolas Reynolds # Based on haskell-pandoc -# Run `makepkg -srp SRCBUILD` if you want to update the source tarball +# Run `makepkg -sp SRCBUILD` if you want to update the source tarball pkgname=pandoc pkgver=1.9.4.5 -pkgrel=3 +pkgrel=4 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -15,9 +15,6 @@ options=(strip !makeflags !distcc) source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD) conflicts=('haskell-pandoc') optdepends=('texlive-most: for pdf creation') -md5sums=('912abc4574aea3c5203eff1b02ceafa9' - '7ac798d62f253535a2e194af5aa1c3c3' - 'e632f8c06be8284e17329a5d1c459e3b') # PKGBUILD functions build() { @@ -72,3 +69,9 @@ package() { find ${pkgdir}/usr/share -type f -exec chmod 644 {} \; find ${pkgdir}/usr/share -type d -exec chmod 755 {} \; } +md5sums=('5ccbf0a74bb8594e42f7c2448952680e' + '233ef5ec5bb7bc91c8cd9dbe09841558' + 'e0f60926ed8bf5e8f592bb3aa649093b') +md5sums=('5ccbf0a74bb8594e42f7c2448952680e' + '233ef5ec5bb7bc91c8cd9dbe09841558' + 'e0f60926ed8bf5e8f592bb3aa649093b') diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD index ebe1a0552..615a291f6 100755 --- a/~fauno/pandoc/SRCBUILD +++ b/~fauno/pandoc/SRCBUILD @@ -5,7 +5,7 @@ pkgname=pandoc pkgver=1.9.4.5 # 0.3.6 fails with embed_data_files _citeproc=0.3.5 -pkgrel=3 +pkgrel=4 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') -- cgit v1.2.3-54-g00ecf From 4446f2330756577653fd2ebbaf1bef6950720fde Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 16 Jan 2013 14:51:23 -0300 Subject: opentracker.service --- .gitignore | 1 + social/libowfat/PKGBUILD | 4 ++-- social/opentracker/PKGBUILD | 28 +++++++++++++++++----------- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 6dc4e19af..62970f3ee 100755 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ pkg/ *.tar* *.tgz *.zip +*.orig diff --git a/social/libowfat/PKGBUILD b/social/libowfat/PKGBUILD index ea43adfab..4962068fb 100755 --- a/social/libowfat/PKGBUILD +++ b/social/libowfat/PKGBUILD @@ -4,8 +4,8 @@ # henning mueller pkgname=libowfat -pkgver=0.28 -pkgrel=4 +pkgver=0.29 +pkgrel=1 pkgdesc='GPL reimplementation of libdjb' arch=(i686 x86_64) url=http://www.fefe.de/libowfat/ diff --git a/social/opentracker/PKGBUILD b/social/opentracker/PKGBUILD index f328607e7..2826a21ef 100755 --- a/social/opentracker/PKGBUILD +++ b/social/opentracker/PKGBUILD @@ -1,8 +1,9 @@ # Contributor: Pierre Schmitz +# Maintainer: Jonas Heinrich pkgname=opentracker -pkgver=20111020 -pkgrel=1 +pkgver=20120911 +pkgrel=2 pkgdesc='An open and free bittorrent tracker (open mode)' arch=('i686' 'x86_64') url='http://erdgeist.org/arts/software/opentracker/' @@ -10,13 +11,12 @@ license=('custom:Beer' 'GPL') makedepends=('libowfat' 'cvs') depends=('bash' 'zlib') backup=('etc/opentracker/config') -install=${pkgname}.install -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz" - 'opentracker.rc.d' - 'license.txt') -md5sums=('1dbace4895b4e1d290790f8ebacb2a2f' - '390bde9d010e79ab1309c02dcf9972e8' - '865211941e882c0aff5d36a22ac9efaa') +source=('opentracker.rc' +'opentracker.service' +'license.txt') +md5sums=('390bde9d010e79ab1309c02dcf9972e8' +'3c638b71d5ecb65fb7964796975b2078' +'865211941e882c0aff5d36a22ac9efaa') _cvsroot=':pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot' _cvsmod='opentracker' @@ -42,7 +42,6 @@ build() { cd "${srcdir}/${_cvsmod}" msg 'Starting make...' - sed -e 's|# tracker.rootdir /usr/local/etc/opentracker|tracker.rootdir /etc/opentracker|' \ -e 's|# access.stats 192.168.0.23|access.stats 127.0.0.1|' \ -i opentracker.conf.sample @@ -58,7 +57,14 @@ package(){ cd "${srcdir}/${_cvsmod}" install -D -m 755 opentracker $pkgdir/usr/bin/opentracker - install -D -m 755 $srcdir/opentracker.rc.d $pkgdir/etc/rc.d/opentracker install -D -m 644 opentracker.conf.sample $pkgdir/etc/opentracker/config install -D -m 644 $srcdir/license.txt $pkgdir/usr/share/licenses/opentracker/license.txt + + # create /etc/rc.d/opentracker + mkdir -p "$pkgdir/etc/rc.d/" + install -m 755 "$srcdir/opentracker.rc" "$pkgdir/etc/rc.d/opentracker" + + # Create opentracker service + mkdir -p "$pkgdir/usr/lib/systemd/system/" + install -m 644 "$srcdir/opentracker.service" "$pkgdir/usr/lib/systemd/system/" } -- cgit v1.2.3-54-g00ecf From 01f906403504ea1a61cc42b6bf4d795571dda0f8 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 16 Jan 2013 15:53:37 -0200 Subject: mplayer{-vaapi,}-libre: changing libcdio to libcdio-paranoia --- libre/mplayer-libre/PKGBUILD | 21 ++++++------- libre/mplayer-libre/cdio-includes.patch | 43 +++++++++++++++++++++++++++ libre/mplayer-vaapi-libre/PKGBUILD | 12 +++++--- libre/mplayer-vaapi-libre/cdio-includes.patch | 43 +++++++++++++++++++++++++++ 4 files changed, 105 insertions(+), 14 deletions(-) create mode 100644 libre/mplayer-libre/cdio-includes.patch create mode 100644 libre/mplayer-vaapi-libre/cdio-includes.patch diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 583b679ca..936dc402a 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -2,25 +2,28 @@ # Maintainer : Ionut Biru # Contributor: Hugo Doria # Maintainer (Parabola): André Silva +# Contributor (Parabola): Márcio Silva _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=35421 -pkgrel=1.1 -arch=('i686' 'x86_64') +pkgrel=2 +arch=('i686' 'x86_64' 'mips64el') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' -'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio' 'subversion') +'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion') license=('GPL') url="http://www.mplayerhq.hu/" options=(!buildflags !emptydirs) -source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop) -md5sums=('b8a82ad1e1d6c3ac847074772daba817' - 'c0d6ef795cf6de48e3b87ff7c23f0319') +source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch) +md5sums=('b5d8c24fc106b4ed58acda3b86c468fa' + 'c0d6ef795cf6de48e3b87ff7c23f0319' + 'dcf64a9113ecb99ec102108c901159e3') build() { cd "$srcdir/$_pkgbase" + patch -Np0 -i ../cdio-includes.patch ./configure --prefix=/usr \ --enable-runtime-cpudetection \ @@ -51,7 +54,7 @@ package_mplayer-libre() { backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' - 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio') + 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia') provides=("mplayer=$pkgver") replaces=('mplayer') conflicts=('mplayer') @@ -71,7 +74,7 @@ package_mplayer-libre() { package_mencoder-libre() { pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)" depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' - 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio' 'libvorbis') + 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' 'libvorbis') provides=("mencoder=$pkgver") replaces=('mencoder') conflicts=('mencoder') @@ -80,5 +83,3 @@ package_mencoder-libre() { make DESTDIR="$pkgdir" install-mencoder install-mencoder-man find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; } -md5sums=('b5d8c24fc106b4ed58acda3b86c468fa' - 'c0d6ef795cf6de48e3b87ff7c23f0319') diff --git a/libre/mplayer-libre/cdio-includes.patch b/libre/mplayer-libre/cdio-includes.patch new file mode 100644 index 000000000..894650717 --- /dev/null +++ b/libre/mplayer-libre/cdio-includes.patch @@ -0,0 +1,43 @@ +Index: configure +=================================================================== +--- configure (revision 35421) ++++ configure (working copy) +@@ -5968,8 +5968,8 @@ + cat > $TMPC << EOF + #include + #include +-#include +-#include ++#include ++#include + int main(void) { + void *test = cdda_verbose_set; + printf("%s\n", CDIO_VERSION); +Index: gui/win32/interface.c +=================================================================== +--- gui/win32/interface.c (revision 35421) ++++ gui/win32/interface.c (working copy) +@@ -24,7 +24,7 @@ + #include "config.h" + + #if defined(CONFIG_LIBCDIO) +-#include ++#include + #elif defined(CONFIG_CDDA) + #include + #endif +Index: stream/stream_cdda.c +=================================================================== +--- stream/stream_cdda.c (revision 35421) ++++ stream/stream_cdda.c (working copy) +@@ -21,8 +21,8 @@ + #include + #include + #else +-#include +-#include ++#include ++#include + #endif + #include + #include diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index c5b33cf75..f1042a9b1 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -4,17 +4,18 @@ # Contributor: Hugo Doria # Maintainer (Parabola): fauno # Maintainer (Parabola): André Silva +# Contributor (Parabola): Márcio Silva pkgname=mplayer-vaapi-libre pkgver=35107 -pkgrel=3.1 +pkgrel=4 pkgdesc="A movie player, compiled with vaapi (without unfree faac support)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://gitorious.org/vaapi/mplayer" license=('GPL') -depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl' +depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama' 'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu' - 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2' + 'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'libbluray' 'libva' 'libass' 'desktop-file-utils') @@ -24,15 +25,18 @@ conflicts=('mplayer' 'mplayer-vaapi') replaces=('mplayer-vaapi') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz + cdio-includes.patch tweak-desktop-file.patch) options=('!buildflags' '!emptydirs') install=mplayer-vaapi.install sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56' + '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b') build() { cd "$srcdir/mplayer-vaapi-$pkgver" + patch -Np0 -i "$srcdir/cdio-includes.patch" patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" ./configure \ diff --git a/libre/mplayer-vaapi-libre/cdio-includes.patch b/libre/mplayer-vaapi-libre/cdio-includes.patch new file mode 100644 index 000000000..894650717 --- /dev/null +++ b/libre/mplayer-vaapi-libre/cdio-includes.patch @@ -0,0 +1,43 @@ +Index: configure +=================================================================== +--- configure (revision 35421) ++++ configure (working copy) +@@ -5968,8 +5968,8 @@ + cat > $TMPC << EOF + #include + #include +-#include +-#include ++#include ++#include + int main(void) { + void *test = cdda_verbose_set; + printf("%s\n", CDIO_VERSION); +Index: gui/win32/interface.c +=================================================================== +--- gui/win32/interface.c (revision 35421) ++++ gui/win32/interface.c (working copy) +@@ -24,7 +24,7 @@ + #include "config.h" + + #if defined(CONFIG_LIBCDIO) +-#include ++#include + #elif defined(CONFIG_CDDA) + #include + #endif +Index: stream/stream_cdda.c +=================================================================== +--- stream/stream_cdda.c (revision 35421) ++++ stream/stream_cdda.c (working copy) +@@ -21,8 +21,8 @@ + #include + #include + #else +-#include +-#include ++#include ++#include + #endif + #include + #include -- cgit v1.2.3-54-g00ecf From ab6724c5e86058455d6163046dd4c817d22059b6 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 16 Jan 2013 15:04:00 -0300 Subject: Moved to [pcr] --- pcr/pandoc/PKGBUILD | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ pcr/pandoc/SRCBUILD | 45 +++++++++++++++++++++++++++++ ~fauno/pandoc/PKGBUILD | 77 -------------------------------------------------- ~fauno/pandoc/SRCBUILD | 45 ----------------------------- 4 files changed, 122 insertions(+), 122 deletions(-) create mode 100644 pcr/pandoc/PKGBUILD create mode 100644 pcr/pandoc/SRCBUILD delete mode 100644 ~fauno/pandoc/PKGBUILD delete mode 100644 ~fauno/pandoc/SRCBUILD diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD new file mode 100644 index 000000000..96f7015b9 --- /dev/null +++ b/pcr/pandoc/PKGBUILD @@ -0,0 +1,77 @@ +# Maintainer: Nicolas Reynolds +# Based on haskell-pandoc + +# Run `makepkg -sp SRCBUILD` if you want to update the source tarball + +pkgname=pandoc +pkgver=1.9.4.5 +pkgrel=4 +pkgdesc='Conversion between markup formats (no Haskell libs)' +url='http://johnmacfarlane.net/pandoc/' +license=('GPL') +arch=('i686' 'x86_64') +makedepends=('ghc' 'sh' 'cabal-install') +options=(strip !makeflags !distcc) +source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD) +conflicts=('haskell-pandoc') +optdepends=('texlive-most: for pdf creation') + +# PKGBUILD functions +build() { + mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}} + cd ${srcdir}/${pkgname}-${pkgver} + + while read _hkpkg; do + pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null + + msg2 "Building $_hkpkg" + + case $_hkpkg in + $pkgname-$pkgver) + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal configure --flags='-library' \ + --prefix=/usr \ + --libdir=${srcdir}/build/usr/lib -v + + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal build + ;; + + citeproc-hs-*) + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal install --flags='embed_data_files' \ + --prefix=${srcdir}/build/usr -v + ;; + + *) + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal install --prefix=${srcdir}/build/usr + ;; + esac + + popd >/dev/null + done +# Based on haskell-pandoc + +pkgname=pandoc +pkgver=1.9.4.5 +# 0.3.6 fails with embed_data_files +_citeproc=0.3.5 +pkgrel=4 +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() { + mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}} + cd ${srcdir}/${pkgname}-${pkgver} + + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal --verbose=3 update + + HOME=${srcdir}/${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 citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER +} + +package() { + export PKGEXT=.src.tar.xz + export PKGDEST=${SRCDEST} + + mkdir -p ${pkgdir}/${pkgname}-${pkgver} + cd ${pkgdir}/${pkgname}-${pkgver} + + find ${srcdir}/${pkgname}-${pkgver} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \ + bsdtar xvf '{}' \; + + cp ${srcdir}/${pkgname}-${pkgver}/BUILDORDER . +} diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD deleted file mode 100644 index 96f7015b9..000000000 --- a/~fauno/pandoc/PKGBUILD +++ /dev/null @@ -1,77 +0,0 @@ -# Maintainer: Nicolas Reynolds -# Based on haskell-pandoc - -# Run `makepkg -sp SRCBUILD` if you want to update the source tarball - -pkgname=pandoc -pkgver=1.9.4.5 -pkgrel=4 -pkgdesc='Conversion between markup formats (no Haskell libs)' -url='http://johnmacfarlane.net/pandoc/' -license=('GPL') -arch=('i686' 'x86_64') -makedepends=('ghc' 'sh' 'cabal-install') -options=(strip !makeflags !distcc) -source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD) -conflicts=('haskell-pandoc') -optdepends=('texlive-most: for pdf creation') - -# PKGBUILD functions -build() { - mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}} - cd ${srcdir}/${pkgname}-${pkgver} - - while read _hkpkg; do - pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null - - msg2 "Building $_hkpkg" - - case $_hkpkg in - $pkgname-$pkgver) - HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal configure --flags='-library' \ - --prefix=/usr \ - --libdir=${srcdir}/build/usr/lib -v - - HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal build - ;; - - citeproc-hs-*) - HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --flags='embed_data_files' \ - --prefix=${srcdir}/build/usr -v - ;; - - *) - HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --prefix=${srcdir}/build/usr - ;; - esac - - popd >/dev/null - done -# Based on haskell-pandoc - -pkgname=pandoc -pkgver=1.9.4.5 -# 0.3.6 fails with embed_data_files -_citeproc=0.3.5 -pkgrel=4 -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() { - mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}} - cd ${srcdir}/${pkgname}-${pkgver} - - HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal --verbose=3 update - - HOME=${srcdir}/${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 citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER -} - -package() { - export PKGEXT=.src.tar.xz - export PKGDEST=${SRCDEST} - - mkdir -p ${pkgdir}/${pkgname}-${pkgver} - cd ${pkgdir}/${pkgname}-${pkgver} - - 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-54-g00ecf From 0cebd4f8227080a80981c18e9d53430db2c175e0 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 16 Jan 2013 16:29:40 -0300 Subject: Fixed build for ghc 7.6 --- pcr/pandoc/PKGBUILD | 5 ++++- pcr/pandoc/SRCBUILD | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 96f7015b9..3b3d97f86 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=pandoc pkgver=1.9.4.5 -pkgrel=4 +pkgrel=5 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -75,3 +75,6 @@ md5sums=('5ccbf0a74bb8594e42f7c2448952680e' md5sums=('5ccbf0a74bb8594e42f7c2448952680e' '233ef5ec5bb7bc91c8cd9dbe09841558' 'e0f60926ed8bf5e8f592bb3aa649093b') +md5sums=('af01e55daded42fa54e8a2bb142c0a78' + '2e6916055ec2a2965596a08ea1e8d050' + '54b521d5c3ed5e2b53c4ca3206f6c941') diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD index 615a291f6..1eb01acc1 100644 --- a/pcr/pandoc/SRCBUILD +++ b/pcr/pandoc/SRCBUILD @@ -5,7 +5,9 @@ pkgname=pandoc pkgver=1.9.4.5 # 0.3.6 fails with embed_data_files _citeproc=0.3.5 -pkgrel=4 +# 0.4 doesn't work with ghc 7.6 +_blaze_html=0.5.1.3 +pkgrel=5 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -23,12 +25,12 @@ build() { cabal --verbose=3 update HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal --verbose=3 fetch file-embed citeproc-hs-${_citeproc} ${pkgname}-${pkgver} + cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} 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 citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER + cabal install --dry-run file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER } package() { -- cgit v1.2.3-54-g00ecf From 34b4ef355879aeff7b0f23ae7b2ae04d38233952 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 16 Jan 2013 16:30:34 -0300 Subject: Checksum cleanup --- pcr/pandoc/PKGBUILD | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 3b3d97f86..009d47398 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -69,12 +69,6 @@ package() { find ${pkgdir}/usr/share -type f -exec chmod 644 {} \; find ${pkgdir}/usr/share -type d -exec chmod 755 {} \; } -md5sums=('5ccbf0a74bb8594e42f7c2448952680e' - '233ef5ec5bb7bc91c8cd9dbe09841558' - 'e0f60926ed8bf5e8f592bb3aa649093b') -md5sums=('5ccbf0a74bb8594e42f7c2448952680e' - '233ef5ec5bb7bc91c8cd9dbe09841558' - 'e0f60926ed8bf5e8f592bb3aa649093b') md5sums=('af01e55daded42fa54e8a2bb142c0a78' - '2e6916055ec2a2965596a08ea1e8d050' + '96d0ba0d9060574e56e3f23c996d0e8e' '54b521d5c3ed5e2b53c4ca3206f6c941') -- cgit v1.2.3-54-g00ecf