diff options
29 files changed, 479 insertions, 189 deletions
diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index 329f4077c..70db053d9 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92237 2013-06-03 06:54:08Z tredaelli $ +# $Id: PKGBUILD 92952 2013-06-20 11:00:24Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: shahid <helllamer@gmail.com> pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') pkgver=0.8.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.bitcoin.org/" makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc') diff --git a/community/bochs/PKGBUILD b/community/bochs/PKGBUILD index e5722c6eb..ffb45cc3d 100644 --- a/community/bochs/PKGBUILD +++ b/community/bochs/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 83126 2013-01-27 16:09:41Z pierre $ +# $Id: PKGBUILD 92959 2013-06-20 20:17:58Z kkeen $ #Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=bochs -pkgver=2.6 -pkgrel=1.1 +pkgver=2.6.2 +pkgrel=1 pkgdesc="A portable x86 PC emulation software package" arch=('i686' 'x86_64' 'mips64el') url="http://bochs.sourceforge.net/" license=('LGPL') depends=('gcc-libs' 'libxrandr') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('7e25e1a4d2f7e0464e8d6381f38741d9') +md5sums=('82ecaff9826d4f29fa46f3062e2957b8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index ddc99181f..0a8b6eb0e 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 91731 2013-05-26 17:21:25Z bluewind $ +# $Id: PKGBUILD 92950 2013-06-20 08:29:35Z bluewind $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla -pkgver=3.7.0.2 +pkgver=3.7.1 pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64' 'mips64el') @@ -31,4 +31,4 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('04a6a6aea31a01feda78e509246ae10a') +md5sums=('be19e8c157e81f94048ed3b1e3031b07') diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 6d45cce5f..857b4610c 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90717 2013-05-13 14:36:35Z spupykin $ +# $Id: PKGBUILD 92955 2013-06-20 12:43:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.6.13 -pkgrel=2 +pkgver=2.6.14 +pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') url="http://redis.io/" @@ -17,7 +17,7 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.service" "redis.logrotate") -md5sums=('c4be422013905c64af18b1ef140de21f' +md5sums=('02e0c06e953413017ff64862953e2756' '5ab9fdb200e15c13b450fda77fa030b6' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/core/cloog/PKGBUILD b/core/cloog/PKGBUILD index 543b1012a..d5a38a163 100644 --- a/core/cloog/PKGBUILD +++ b/core/cloog/PKGBUILD @@ -1,30 +1,39 @@ -# $Id: PKGBUILD 173940 2012-12-28 13:11:09Z allan $ +# $Id: PKGBUILD 188781 2013-06-20 06:35:09Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=cloog pkgver=0.18.0 -pkgrel=1 +pkgrel=2 pkgdesc="Library that generates loops for scanning polyhedra" arch=('i686' 'x86_64' 'mips64el') url="http://www.bastoul.net/cloog/" license=('GPL') depends=('isl' 'gmp') options=('!libtool') -source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz) -md5sums=('be78a47bd82523250eb3e91646db5b3d') +source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz + cloog-0.18.0-isl-0.11.2.patch) +md5sums=('be78a47bd82523250eb3e91646db5b3d' + '1bec9a7f1c3e9e0f3f10f23898f7148d') + +prepare() { + cd $srcdir/$pkgname-$pkgver + + # test-suite fix - commit fc8b0627 + patch -p1 -i $srcdir/cloog-0.18.0-isl-0.11.2.patch +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --with-isl=system make } check() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver make check } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir/ install } diff --git a/core/cloog/cloog-0.18.0-isl-0.11.2.patch b/core/cloog/cloog-0.18.0-isl-0.11.2.patch new file mode 100644 index 000000000..ca4290b68 --- /dev/null +++ b/core/cloog/cloog-0.18.0-isl-0.11.2.patch @@ -0,0 +1,95 @@ +diff --git a/test/darte.c b/test/darte.c +index e185b7a..2a4a1b8 100644 +--- a/test/darte.c ++++ b/test/darte.c +@@ -6,14 +6,14 @@ if (n >= 1) { + } + } + for (t1=-n+2;t1<=n-1;t1++) { +- if (t1 >= 2) { ++ if (t1 >= 0) { + for (t3=t1+4;t3<=t1+2*n+2;t3++) { + if ((t1+t3)%2 == 0) { + S1(t1+1,1,(-t1+t3-2)/2); + } + } + } +- for (t2=max(-t1+2,t1+2);t2<=-t1+4;t2++) { ++ for (t2=max(-t1+2,t1+3);t2<=-t1+4;t2++) { + for (t3=t2+2;t3<=t2+2*n;t3++) { + if ((t1+t2)%2 == 0) { + if ((t1+t3)%2 == 0) { +diff --git a/test/dartef.f b/test/dartef.f +index 50e1073..3b5e3e2 100644 +--- a/test/dartef.f ++++ b/test/dartef.f +@@ -6,14 +6,14 @@ IF (n >= 1) THEN + END IF + END DO + DO t1=-n+2, n-1 +- IF (t1 >= 2) THEN ++ IF (t1 >= 0) THEN + DO t3=t1+4, t1+2*n+2 + IF (MOD(t1+t3, 2) == 0) THEN + S1(t1+1,1,(-t1+t3-2)/2) + END IF + END DO + END IF +- DO t2=MAX(-t1+2,t1+2), -t1+4 ++ DO t2=MAX(-t1+2,t1+3), -t1+4 + DO t3=t2+2, t2+2*n + IF (MOD(t1+t2, 2) == 0) THEN + IF (MOD(t1+t3, 2) == 0) THEN +diff --git a/test/dealII.c b/test/dealII.c +index 200b257..5d28c4a 100644 +--- a/test/dealII.c ++++ b/test/dealII.c +@@ -3,10 +3,13 @@ for (scat_0=0;scat_0<=min(T_66,T_2-1);scat_0++) { + S1(scat_0); + S2(scat_0); + } +-if ((T_2 == 0) && (T_67 == 0)) { ++if ((T_2 == 0) && (T_66 >= 0) && (T_67 == 0)) { + S1(0); + } +-for (scat_0=max(0,T_66+1);scat_0<=T_2-1;scat_0++) { ++if ((T_66 <= -1) && (T_67 == 0)) { ++ S1(0); ++} ++for (scat_0=max(max(0,T_66+1),-T_67+1);scat_0<=T_2-1;scat_0++) { + S1(scat_0); + } + for (scat_0=T_2;scat_0<=min(T_66,T_67-1);scat_0++) { +diff --git a/test/isl/jacobi-shared.c b/test/isl/jacobi-shared.c +index e8e5ec7..9e345c6 100644 +--- a/test/isl/jacobi-shared.c ++++ b/test/isl/jacobi-shared.c +@@ -1,6 +1,6 @@ + /* Generated from ../../../git/cloog/test/isl/jacobi-shared.cloog by CLooG 0.16.3-2-g5511bef gmp bits in 1.82s. */ + if ((h0+1)%2 == 0) { +- if ((16*floord(t0-1,16) >= -N+g1+t0+1) && (16*floord(N+15*g1+15*t0+15,16) >= 15*g1+15*t0+19) && (32*floord(t1-1,32) <= g2+t1-3) && (32*floord(t1-1,32) >= -N+g2+t1+1)) { ++ if ((16*floord(N+15*g1+15*t0+15,16) >= 15*g1+15*t0+19) && (16*floord(N+15*g1+15*t0+15,16) >= 16*g1+15*t0+17) && (32*floord(t1-1,32) <= g2+t1-3) && (32*floord(t1-1,32) >= -N+g2+t1+1)) { + for (c0=max(-16*floord(t0-1,16)+t0,-16*floord(g1+t0-3,16)+t0);c0<=min(32,N-g1-1);c0+=16) { + c1 = 32*floord(-t1,32)+t1+32; + if (c1 <= 32) { +diff --git a/test/vasilache.c b/test/vasilache.c +index 5a00a33..fdff031 100644 +--- a/test/vasilache.c ++++ b/test/vasilache.c +@@ -15,12 +15,12 @@ for (p1=0;p1<=N-1;p1++) { + S6(p1,p3,p5,p7-1); + S7(p1,p3,p5,p7); + } +- if (p5 <= floord(N-33,32)) { +- S6(p1,p3,p5,32*p5+31); +- } +- if (p5 >= ceild(N-32,32)) { ++ if (p5 >= ceild(N-31,32)) { + S6(p1,p3,p5,N-1); + } ++ if (p5 <= floord(N-32,32)) { ++ S6(p1,p3,p5,32*p5+31); ++ } + } + } + } diff --git a/core/gzip/PKGBUILD b/core/gzip/PKGBUILD index a92978565..3002f5222 100644 --- a/core/gzip/PKGBUILD +++ b/core/gzip/PKGBUILD @@ -1,36 +1,33 @@ -# $Id: PKGBUILD 177557 2013-02-07 05:59:16Z allan $ +# $Id: PKGBUILD 188782 2013-06-20 06:35:10Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=gzip -pkgver=1.5 -pkgrel=3 +pkgver=1.6 +pkgrel=1 pkgdesc="GNU compression utility" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gzip/" license=('GPL3') groups=('base' 'base-devel') -depends=('glibc' 'bash') +depends=('glibc' 'bash' 'less') install=gzip.install -source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig} - gzip-1.5-yesno-declaration.patch) -md5sums=('2a431e169b6f62f7332ef6d47cc53bae' - '2de95937a3f65137acf9c55d4ad0447a' - 'd63249578de2eb6aadaded26918d8eed') +source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig}) +md5sums=('da981f86677d58a106496e68de6f8995' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr - patch -p1 -i $srcdir/gzip-1.5-yesno-declaration.patch make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make prefix=${pkgdir}/usr install } diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index cbd07a628..53ca4d00e 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186998 2013-06-03 02:50:09Z allan $ +# $Id: PKGBUILD 188783 2013-06-20 06:35:11Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,11 +6,12 @@ pkgname=('libtool' 'libltdl') pkgver=2.4.2 -pkgrel=9 +pkgrel=10 pkgdesc="A generic library support script" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libtool" license=('GPL') +makedepends=('gcc=4.8.1') options=('!libtool') source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig} nopic.patch) diff --git a/extra/efivar/PKGBUILD b/extra/efivar/PKGBUILD new file mode 100644 index 000000000..fcbcca915 --- /dev/null +++ b/extra/efivar/PKGBUILD @@ -0,0 +1,65 @@ +# $Id: PKGBUILD 188788 2013-06-20 17:50:47Z tpowa $ +# Maintainer : Tobias Powalowski <tpowa@archlinux.org> +# Contributor : Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> + +_gitroot="git://github.com/vathpela/efivar.git" +_gitname="efivar" +_gitbranch="master" + +_pkgname="efivar" +pkgname="${_pkgname}" + +pkgdesc="Library to manipulate EFI variables - GIT Version" + +pkgver=0.4_18_gb8c524c +pkgrel=1 +arch=('x86_64' 'i686') +url="https://github.com/vathpela/efivar" +license=('LGPL2.1') +depends=('popt') +conflicts=("${_pkgname}" 'libefivar' 'libefivar-git') +provides=("${_pkgname}" 'libefivar' 'libefivar-git') +options=('strip' 'emptydirs' 'zipman' 'libtool' 'docs') + +source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}") +sha1sums=('SKIP') + +pkgver() { + cd "${srcdir}/${_gitname}/" + echo "$(git describe --tags)" | sed 's|-|_|g' +} + +build() { + + rm -rf "${srcdir}/${_gitname}_build/" || true + cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build" + + cd "${srcdir}/${_gitname}_build/" + + git clean -x -d -f + echo + + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + sed 's|-rpath=$(TOPDIR)/src/|-rpath=$(libdir)|g' -i "${srcdir}/${_gitname}_build/src/test/Makefile" || true + + make libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" V=1 -j1 + echo + +} + +package() { + + cd "${srcdir}/${_gitname}_build/" + + make -j1 V=1 DESTDIR="${pkgdir}/" libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" install + echo + + install -d "${pkgdir}/usr/bin" + install -D -m0755 "${srcdir}/${_gitname}_build/src/test/tester" "${pkgdir}/usr/bin/efivar-tester" + +} diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index cfde39745..ea77f1bff 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186339 2013-05-25 02:56:29Z foutrelis $ +# $Id: PKGBUILD 188785 2013-06-20 07:31:01Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders pkgver=1.7.7 -pkgrel=2 +pkgrel=3 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD index 8e4ef4e50..c3dbd69e7 100644 --- a/extra/libdiscid/PKGBUILD +++ b/extra/libdiscid/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182706 2013-04-13 00:27:30Z eric $ +# $Id: PKGBUILD 188777 2013-06-20 04:15:31Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Eric Gillingham <sysrq@sysrq.tk> pkgname=libdiscid -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="A Library for creating MusicBrainz DiscIDs" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL') depends=('glibc') options=('!libtool') source=("http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pkgname}-${pkgver}.tar.gz") -md5sums=('a029355e53db1c2c24cc34a6d3e3b626') +md5sums=('7770e649929b378d4758f97f9937a3d5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libqmi/PKGBUILD b/extra/libqmi/PKGBUILD index d3a6d6fd4..b3d1be2a5 100644 --- a/extra/libqmi/PKGBUILD +++ b/extra/libqmi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183435 2013-04-21 22:11:28Z heftig $ +# $Id: PKGBUILD 188775 2013-06-20 03:53:16Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libqmi -pkgver=1.2.0 -pkgrel=2 +pkgver=1.4.0 +pkgrel=1 pkgdesc="QMI modem protocol helper library" arch=(i686 x86_64 mips64el) url="http://cgit.freedesktop.org/libqmi" @@ -12,12 +12,12 @@ depends=(glib2 bash) makedepends=(gtk-doc python) options=('!libtool') source=($url/snapshot/$pkgname-$pkgver.tar.xz) -sha256sums=('4c0fe5fedd33dffd60d845c571243a2f25834019c159377d8df2c7cf5ff3a515') +sha256sums=('3a9d1359da703905147c173df4f6c0e5bb5dbca0a0fd3d0ce6efe26331bcafeb') build() { cd $pkgname-$pkgver ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static + --disable-static --with-tests make } diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD index 8571f0b4c..cadb3d7c1 100644 --- a/extra/xfce4-xkb-plugin/PKGBUILD +++ b/extra/xfce4-xkb-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185421 2013-05-14 08:06:15Z foutrelis $ +# $Id: PKGBUILD 188774 2013-06-20 03:52:24Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-xkb-plugin -pkgver=0.5.5 +pkgver=0.5.6 pkgrel=1 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('xfce4-panel' 'libxklavier' 'librsvg') makedepends=('intltool') options=('!libtool') source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2) -sha256sums=('c97306298b0c804d4797c431bb9b698f123c0437ec845930bf938dc5d24ea8c9') +sha256sums=('09e4623033987ce7b711252609a17291b306cdf60863ee39677a4995a93318a5') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/libre/mime-types/PKGBUILD b/libre/mime-types/PKGBUILD index 2ac7928c1..31e373545 100644 --- a/libre/mime-types/PKGBUILD +++ b/libre/mime-types/PKGBUILD @@ -1,19 +1,19 @@ -# $Id$ +# $Id: PKGBUILD 188113 2013-06-10 01:37:40Z bisson $ # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=mime-types -pkgver=8 -pkgrel=1.2 -pkgdesc='Provides /etc/mime.types, Parabola rebranded' +pkgver=9 +pkgrel=1 +pkgdesc='Provides /etc/mime.types (Parabola rebranded)' url='https://parabolagnulinux.org/' license=('GPL2') arch=('any') backup=('etc/mime.types') source=("http://mirrors.kernel.org/gentoo/distfiles/${pkgname}-${pkgver}.tar.bz2" 'parabola.patch') -sha1sums=('01682b0ad3111a6cf65e6c9db0c18ddd7523c593' +sha1sums=('b21b7775a006b60113a6648e20beb1decdac8899' '0d3b34c7b4a384be674192ecbfd8f22271906ae8') package() { diff --git a/libre/ogmrip-libre/PKGBUILD b/libre/ogmrip-libre/PKGBUILD index cd2e48f2b..6876f699f 100644 --- a/libre/ogmrip-libre/PKGBUILD +++ b/libre/ogmrip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 89460 2013-04-29 13:17:27Z jelle $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Daenyth # Contributor: Allan McRae <allan@archlinux.org> @@ -7,9 +7,9 @@ _pkgname=ogmrip pkgname=ogmrip-libre -pkgver=0.13.8 -pkgrel=1 -pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder (without nonfree faac support)" +pkgver=1.0.0 +pkgrel=2 +pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder, without nonfree faac support" arch=('i686' 'x86_64') url="http://ogmrip.sourceforge.net/" license=('GPL') @@ -31,7 +31,7 @@ options=('!libtool' '!makeflags') changelog=$_pkgname.changelog install=$_pkgname.install source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz) -sha256sums=('ea6a75e6cc4fe7df1ed65648af208c87748959a6b372847b1005c3b92cc5a423') +sha256sums=('6848a622152a62899b6e876e70ec36df1af7be9803b8b9c809ed631196bc18cc') build() { cd "${srcdir}/${_pkgname}-${pkgver}" diff --git a/libre/ogmrip-libre/ogmrip.changelog b/libre/ogmrip-libre/ogmrip.changelog index 76179a2d3..bf5d84482 100644 --- a/libre/ogmrip-libre/ogmrip.changelog +++ b/libre/ogmrip-libre/ogmrip.changelog @@ -1,3 +1,6 @@ +2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * ogmrip 1.0.0-1 + 2013-03-13 André Silva <emulatorman@lavabit.com> * Remove nonfree faac support diff --git a/libre/openshot-libre/PKGBUILD b/libre/openshot-libre/PKGBUILD index 31ea71824..4c5c97a12 100644 --- a/libre/openshot-libre/PKGBUILD +++ b/libre/openshot-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 92333 2013-06-04 05:05:15Z svenstaro $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Asa Marco <marcoasa90[at]gmail[.]com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,8 +6,8 @@ _pkgname=openshot pkgname=openshot-libre pkgver=1.4.3 -pkgrel=1 -pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework (without nonfree faac recommendation)" +pkgrel=2 +pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation" arch=('any') url="http://www.openshotvideo.com/" license=('GPL') diff --git a/libre/openshot-libre/openshot.install b/libre/openshot-libre/openshot.install index cc0de896d..aab69abed 100644 --- a/libre/openshot-libre/openshot.install +++ b/libre/openshot-libre/openshot.install @@ -1,11 +1,11 @@ post_install() { - [ -x `which update-mime-database` ] && update-mime-database usr/share/mime + update-mime-database usr/share/mime &>/dev/null } post_upgrade() { - [ -x `which update-mime-database` ] && update-mime-database usr/share/mime + post_install } post_remove() { - [ -x `which update-mime-database` ] && update-mime-database usr/share/mime + post_install } diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD index 8696a1bfa..a519499f7 100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 188504 2013-06-15 04:51:48Z bisson $ # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: TuxSpirit<tuxspirit@archlinux.fr> 2007/11/17 21:22:36 UTC @@ -8,7 +8,7 @@ pkgname=p7zip-libre _pkgname=${pkgname%-libre} pkgver=9.20.1 -pkgrel=6.1 +pkgrel=7 pkgdesc='Command-line version of the 7zip compressed file archiver without Rar' url='http://p7zip.sourceforge.net/' license=('GPL') @@ -20,21 +20,22 @@ depends=('gcc-libs' 'bash') optdepends=('wxgtk: GUI' 'desktop-file-utils: desktop entries') makedepends=('yasm' 'nasm' 'wxgtk') -source=("http://repo.parabolagnulinux.org/other/${pkgname}_${pkgver}.tar.bz2" +source=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2" 'p7zip-libre.patch' '7zFM.desktop') -sha1sums=('4cffac613e7f3d8fc3c60677491b83a2d5cf16c9' +sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7' '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed' 'f2c370d6f1b286b7ce9a2804e22541b755616a40') + +options=('!makeflags') install=install -mksource() { - if [ ! -d "${_pkgname}_${pkgver}" ]; then - wget -O - "http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2" | \ - tar xjf - - fi +build() { + cd "${srcdir}/${_pkgname}_${pkgver}" - pushd "${_pkgname}_${pkgver}" + [[ $CARCH = x86_64 ]] \ + && cp makefile.linux_amd64_asm makefile.machine \ + || cp makefile.linux_x86_asm_gcc_4.X makefile.machine msg "Removing unRar" # Generate patch @@ -43,19 +44,6 @@ mksource() { # Remove Rar mentions in CPP/7zip/Bundles/Format7zFree/makefile patch -Np1 -i ../p7zip-libre.patch - popd - - tar czvf "${pkgname}_${pkgver}.tar.bz2" "${_pkgname}_${pkgver}" -} - -build() { - cd "${srcdir}/${_pkgname}_${pkgver}" - - case $CARCH in - x86_64) cp makefile.linux_amd64_asm makefile.machine ;; - i686) cp makefile.linux_x86_asm_gcc_4.X makefile.machine ;; - esac - if [ "$CARCH" = "mips64el" ]; then make all3 OPTFLAGS="${CXXFLAGS}" else @@ -72,7 +60,7 @@ package() { DEST_MAN="/usr/share/man" # Integration with stuff... - install -D GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png + install -Dm644 GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus} cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/ cp ../7zFM.desktop "${pkgdir}"/usr/share/applications/ diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 614c1156e..1dec5dcc9 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,10 +1,10 @@ # vim: set ts=2 sw=2 et: -# $Id: PKGBUILD 184462 2013-05-07 03:37:44Z allan $ +# $Id: PKGBUILD 188692 2013-06-18 04:04:38Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pacman -pkgver=4.1.1 +pkgver=4.1.2 pkgrel=1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') @@ -26,7 +26,7 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} pacman.conf.x86_64 pacman.conf.mips64el makepkg.conf) -md5sums=('72a1688ff73c1c0b79d8f87b3793d446' +md5sums=('063c8b0ff6bdf903dc235445525627cd' 'SKIP' '688feb0a552f42643a76f72e7198bfe4' '765858b55d2112d948932fc645ea538b' diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD index c627b61c0..4a55ea38e 100644 --- a/libre/psutils-libre/PKGBUILD +++ b/libre/psutils-libre/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 140791 2011-10-19 10:03:22Z andrea $ +# $Id: PKGBUILD 176972 2013-02-03 07:11:03Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: xihh <hahj87@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): xihh <hahj87@gmail.com> _pkgname=psutils pkgname=psutils-libre pkgver=1.17 -pkgrel=3.2 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') -pkgdesc="A set of postscript utilities" -url="http://www.tardis.ed.ac.uk/~ajcd/psutils/index.html" +pkgdesc="A set of postscript utilities, without nonfree files" +url="http://knackered.org/angus/psutils/" license=('custom') depends=('glibc' 'ghostscript') provides=('psutils-lprng' 'psutils') @@ -18,16 +19,22 @@ replaces=('psutils-lprng' 'psutils') conflicts=('psutils-lprng' 'psutils') options=('!makeflags') source=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz" - 'psutils-1.17.diff') + 'psutils-1.17.diff' + 'libre.patch') md5sums=('b161522f3bd1507655326afa7db4a0ad' - '2b49e9e796000b42f42804d4b50a2be1') + '2b49e9e796000b42f42804d4b50a2be1' + 'a4beaf371607085e89ef190c1db7aee3') build() { cd "${srcdir}/${_pkgname}" patch -Np1 -i "${srcdir}/psutils-1.17.diff" - make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \ - INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \ - MANDIR="${pkgdir}/usr/share/man/man1" \ + # apply patch to remove nonfree files support from Makefile + patch -Np1 -i "${srcdir}/libre.patch" + # remove nonfree files + rm -v {fixmacps.{man,pl},md{68_0,71_0}.ps} + make -f Makefile.unix BINDIR=/usr/bin \ + INCLUDEDIR=/usr/include/psutils PERL=/usr/bin/perl \ + MANDIR=/usr/share/man/man1 \ CFLAGS="$CFLAGS -DPAPER=\\\"letter\\\" -DUNIX -Wall" \ CCFLAGS="$LDFLAGS" } diff --git a/libre/psutils-libre/libre.patch b/libre/psutils-libre/libre.patch new file mode 100644 index 000000000..c2bd21245 --- /dev/null +++ b/libre/psutils-libre/libre.patch @@ -0,0 +1,41 @@ +--- psutils.orig/Makefile.unix 2013-06-21 05:46:39.671197867 -0300 ++++ psutils/Makefile.unix 2013-06-21 05:55:30.248672628 -0300 +@@ -44,15 +44,14 @@ + BIN = psbook psselect pstops epsffit psnup \ + psresize + SHELLSCRIPTS = getafm showchar +-PERLSCRIPTS = fixfmps fixmacps fixpsditps fixpspps \ ++PERLSCRIPTS = fixfmps fixpsditps fixpspps \ + fixtpps fixwfwps fixwpps fixscribeps fixwwps \ + fixdlsrps extractres includeres psmerge + MANPAGES = psbook.$(MANEXT) psselect.$(MANEXT) pstops.$(MANEXT) epsffit.$(MANEXT) psnup.$(MANEXT) \ + psresize.$(MANEXT) psmerge.$(MANEXT) fixscribeps.$(MANEXT) getafm.$(MANEXT) \ +- fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixmacps.$(MANEXT) fixpsditps.$(MANEXT) \ ++ fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixpsditps.$(MANEXT) \ + fixpspps.$(MANEXT) fixtpps.$(MANEXT) fixwfwps.$(MANEXT) fixwpps.$(MANEXT) \ + fixwwps.$(MANEXT) extractres.$(MANEXT) includeres.$(MANEXT) +-INCLUDES = md68_0.ps md71_0.ps + + all: $(BIN) $(PERLSCRIPTS) $(MANPAGES) $(SHELLSCRIPTS) + +@@ -106,10 +105,6 @@ + $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ + +-fixmacps: fixmacps.pl +- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@ +- $(CHMOD) $(BINMODE) $@ +- + fixpsditps: fixpsditps.pl + $(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@ + $(CHMOD) $(BINMODE) $@ +@@ -174,9 +169,6 @@ + fixfmps.$(MANEXT): fixfmps.man + $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ + +-fixmacps.$(MANEXT): fixmacps.man +- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@ +- + fixpsditps.$(MANEXT): fixpsditps.man + $(PERL) maketext "MAN=$(MANPAGES)" $? > $@ + diff --git a/libre/xorg-fonts-type1-libre/PKGBUILD b/libre/xorg-fonts-type1-libre/PKGBUILD index 3e52ef85a..4904a4477 100644 --- a/libre/xorg-fonts-type1-libre/PKGBUILD +++ b/libre/xorg-fonts-type1-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71695 2010-03-08 13:31:38Z jgc $ +# $Id: PKGBUILD 150375 2012-02-17 09:54:09Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-fonts-type1-libre pkgver=7.4 -pkgrel=1 -pkgdesc="X.org Type1 fonts without Adobe fonts" +pkgrel=2 +pkgdesc="X.org Type1 fonts, without nonfree fonts" arch=(any) license=('custom') url="http://xorg.freedesktop.org/" @@ -20,15 +20,25 @@ md5sums=('27c55f6a938e7153c59fb551b2f491f9' build() { cd "${srcdir}" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" for dir in *; do if [ -d "${dir}" ]; then pushd "${dir}" ./configure --prefix=/usr \ - --with-fontdir=/usr/share/fonts/Type1 || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-*}" || return 1 + --with-fontdir=/usr/share/fonts/Type1 + make + popd + fi + done +} + +package() { + cd "${srcdir}" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + for dir in *; do + if [ -d "${dir}" ]; then + pushd "${dir}" + make DESTDIR="${pkgdir}" install + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-*}" popd fi done diff --git a/libre/xsp/PKGBUILD b/libre/xsp/PKGBUILD index 1692357e7..02e172c8f 100644 --- a/libre/xsp/PKGBUILD +++ b/libre/xsp/PKGBUILD @@ -1,19 +1,23 @@ -# $Id$ +# $Id: PKGBUILD 188153 2013-06-10 16:36:32Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=xsp -pkgver=2.10.2 -pkgrel=4.1 -pkgdesc="A simple webserver based on mono - provides ASP.NET support, Parabola rebranded" -arch=(i686 x86_64 mips64el) +pkgver=3.0.11 +pkgrel=1 +pkgdesc="A simple webserver based on mono - provides ASP.NET support (Parabola rebranded)" +arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://www.go-mono.com" -depends=('mono>=2.10.2' 'sqlite') +depends=('mono' 'sqlite') options=(!makeflags) install=${pkgname}.install -source=(http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2 - ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp ${pkgname}.service) +source=(https://github.com/mono/xsp/archive/${pkgver}.tar.gz + ${pkgname}.webapp + ${pkgname}.service) +md5sums=('6a694d5e87ebe57e532ec80a16b6966d' + 'c917c07f68b945691506c29750db482f' + '9d83bd36d209f8d36a11dfbc4fa50819') build() { # get rid of that .wapi errors; thanks to brice @@ -23,8 +27,9 @@ build() { # build cd ${srcdir}/${pkgname}-${pkgver} #sed -i 's|/bin/sh|\0\nexport MONO_PATH=${MONO_PATH}:/opt/mono/lib/mono/1.0|' scripts/script.in + ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 + make # tweak the xsp shellscript to grab system dll's for script in scripts/*2; do sed -i 's|/usr/lib/mono/1.0|/usr/lib/mono/2.0|' $script @@ -43,12 +48,6 @@ package(){ rm -rf ${pkgdir}/usr/share chown -R http:http ${pkgdir}/srv/http/html/${pkgname} - # install a deamon - install -D -m755 ${srcdir}/${pkgname}.rc.d \ - ${pkgdir}/etc/rc.d/${pkgname} - # install a deamon configurationfile - install -D -m644 ${srcdir}/$pkgname.conf.d \ - ${pkgdir}/etc/conf.d/${pkgname} # install a xsp configuration home install -D -m644 ${srcdir}/${pkgname}.webapp \ ${pkgdir}/etc/${pkgname}/${pkgname}.webapp @@ -57,8 +56,3 @@ package(){ install -D -m644 ${srcdir}/${pkgname}.service \ ${pkgdir}/usr/lib/systemd/system/xsp.service } -md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6' - '9575bd7d6f64d51ba05bdd6370665858' - 'b2063679d9c77a9e7b2d90d1fee76608' - 'c917c07f68b945691506c29750db482f' - '9d83bd36d209f8d36a11dfbc4fa50819') diff --git a/pcr/maliit-framework/PKGBUILD b/pcr/maliit-framework/PKGBUILD new file mode 100644 index 000000000..545c34a0c --- /dev/null +++ b/pcr/maliit-framework/PKGBUILD @@ -0,0 +1,33 @@ +# Contributor: Jon Nordby <jononor@gmail.com> +# Maintainer: Jon Nordby <jononor@gmail.com> +# Maintainer (Parabola): Javier Barcena <javierbuilder@gmail.com> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> + +pkgname=maliit-framework +pkgver=0.99.0 +pkgrel=6 +pkgdesc="Maliit Input Methods - Framework" +arch=('x86_64' 'i686') +url="http://maliit.org" +license=('LGPL') +depends=('qt5-base' 'qt5-quick1' 'gtk2' 'gtk3' 'gconf') +install=$pkgname.install +source=(http://maliit.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('c5e8c67cbfb514122518d92f1edcc990') + +build() { + cd "$pkgname-$pkgver" + + # BUILD + qmake -r . + make +} + +package() { + cd "$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install + + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain maliit-framework "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas +} diff --git a/pcr/maliit-framework/maliit-framework.install b/pcr/maliit-framework/maliit-framework.install new file mode 100755 index 000000000..08c54ae1b --- /dev/null +++ b/pcr/maliit-framework/maliit-framework.install @@ -0,0 +1,30 @@ +pkgname=maliit-framework + +post_install() { + echo "Updating gtk.immodules..." + gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + gtk-query-immodules-3.0 --update-cache + echo "Done." + + gconfpkg --install ${pkgname} +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall ${pkgname} +} + +post_remove() { + echo "Updating gtk.immodules..." + gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + gtk-query-immodules-3.0 --update-cache + echo "Done." + +} diff --git a/pcr/maliit-plugins/PKGBUILD b/pcr/maliit-plugins/PKGBUILD new file mode 100644 index 000000000..cdab07003 --- /dev/null +++ b/pcr/maliit-plugins/PKGBUILD @@ -0,0 +1,32 @@ +# Contributor: Jon Nordby <jononor@gmail.com> +# Maintainer: Jon Nordby <jononor@gmail.com> + +pkgname=maliit-plugins +pkgver=0.99.0 +pkgrel=1 +pkgdesc="Maliit Input Methods - Plugins" +arch=('x86_64' 'i686') +url="http://maliit.org" +license=('LGPL') +depends=('qt5-base' 'maliit-framework') +source=(http://maliit.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + config.patch) +md5sums=('29f07d937803a61e74301e4616d55dbb' + 'f43d45c9917924750edf36000492bd73') + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + + # fix issue on building + patch -Np1 -i "$srcdir/config.patch" + + # BUILD + qmake -r . CONFIG+=notests + make +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}" + + make install INSTALL_ROOT="$pkgdir/" +} diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD index 219da84fc..747641dcc 100644 --- a/pcr/mitsuba/PKGBUILD +++ b/pcr/mitsuba/PKGBUILD @@ -4,32 +4,31 @@ pkgname=( mitsuba blender-addon-mitsuba ) +_pkgname=${pkgname[0]} _bldname=${pkgname[1]::7} -_addname=${pkgname[0]}-${_bldname} -pkgver=0.4.4 # Thu Feb 28 15:00:37 2013 -0800 tag:v0.4.4 rev:1674 -_pkgdat=20130228 -_pkgrev=1674 -_bldver=2.66 +_addname=$_pkgname-$_bldname +pkgver=0.4.4 +_bldver=2.67 _addver=0.2.1 # Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/${pkgname[0]}/__init__.py:bl_info>version) _adddat=20130320 _addrev=40 -_bldep=7 +_bldep=8 _pyver=3.3 -pkgrel=1 +pkgrel=2 pkgdesc='A physically based renderer' arch=( i686 x86_64 mips64el ) -url=https://${pkgname[0]}-renderer.org/ +url=https://www.$_pkgname-renderer.org/ license=GPL3 depends=( boost-libs collada-dom glew libxxf86vm - 'openexr=2.0.0' + openexr qt4 xerces-c ) @@ -44,28 +43,25 @@ makedepends=( mercurial python ) -install=$pkgname.install +install=$_pkgname.install source=( - hg+https://${pkgname[0]}-renderer.org/hg/${pkgname[0]} - hg+https://${pkgname[0]}-renderer.org/hg/$_addname + ${url}hg/$_pkgname/archive/v$pkgver.tar.bz2 + hg+${url}hg/$_addname ${pkgname[1]}.install ) -sha512sums=(SKIP SKIP SKIP) +sha512sums=( + 66dcab376a44eeb2fbe808a32ead5b554d777fb2f6a73c43883086b7829e0c697aaeccbb6fbbed9fcb221684a64ccce8be81a78ebcd228316ea12b8f6f3e7f6c + SKIP SKIP +) prepare() { mv $srcdir/${pkgname[1]}.install $startdir - cd $srcdir/${pkgname[0]} + cd $srcdir/$_pkgname-v$pkgver [[ -d build ]] && rm -r build mkdir build - cd $startdir/../srcdest/${pkgname[0]} - - msg "${pkgname[0]}" - hg update -c v$pkgver - hg log -l 1 -r v$pkgver - cd $startdir/../srcdest/$_addname msg "${pkgname[1]}" @@ -74,7 +70,7 @@ prepare() { } build() { - cd $srcdir/${pkgname[0]}/build + cd $srcdir/$_pkgname-v$pkgver/build [[ $CARCH != x86_64 ]] && DMTS_SSE='-DMTS_SSE=OFF' @@ -83,24 +79,23 @@ build() { -DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python${_pyver::1}.so\ -DPYTHON_INCLUDE_DIR=/usr/include/python${_pyver}m\ -DPYTHON_LIBRARY=/usr/lib/libpython${_pyver}m.so - setarch $CARCH make } package_mitsuba() { - cd $srcdir/${pkgname[0]}/build + cd $srcdir/$_pkgname-v$pkgver/build setarch $CARCH make DESTDIR=$pkgdir install #fixing files and folders location a=$pkgdir/usr - b=$srcdir/${pkgname[0]} - install -d $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}${pkgname[0]},pixmaps}} - install -m644 $b/data/linux/${pkgname[0]}.desktop $a/share/applications - install -m644 $b/src/mtsgui/resources/${pkgname[0]}48.png $a/share/pixmaps - install -m644 $b/doc/license.txt $a/share/licenses/${pkgname[0]}/LICENSE + b=$srcdir/$_pkgname-v$pkgver + install -d $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}} + install -m644 $b/data/linux/$_pkgname.desktop $a/share/applications + install -m644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps + install -m644 $b/doc/license.txt $a/share/licenses/$_pkgname/LICENSE mv $a/{m{itsuba,ts{gui,import,srv,util}},bin} mv $a/lib{${pkgname[0]}-{bidir,core,hw,render}.so,} - mv $a/{{data,plugins},share/${pkgname[0]}} + mv $a/{{data,plugins},share/$_pkgname} mv $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload} mv $a/{sdk/include,} rmdir $a/{python,sdk} @@ -123,8 +118,8 @@ package_blender-addon-mitsuba() { cd $srcdir/$_addname a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons - b=$pkgdir/usr/share/licenses/$pkgname - c=$srcdir/$_pkgname/doc/license.txt + b=$pkgdir/usr/share/licenses/$_pkgname + c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt install -d $a && cp -a $_pkgname $a install -d $b && install -m644 $c $b/LICENSE diff --git a/pcr/yafaray-git/PKGBUILD b/pcr/yafaray/PKGBUILD index 1d4b3436c..e3c0381d8 100644 --- a/pcr/yafaray-git/PKGBUILD +++ b/pcr/yafaray/PKGBUILD @@ -1,18 +1,18 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> pkgname=( - yafaray-git - blender-addon-yafaray-git + yafaray + blender-addon-yafaray ) -_pkgflag=git -_pkgname=${pkgname[0]%-$_pkgflag} +_pkgname=${pkgname[0]} _bldname=${pkgname[1]::7} _gitname=Core _addname=${_bldname^}-Exporter -pkgver=$(LC_ALL=C date -u +%Y%m%d) -_pkgver=1.2 -_bldver=2.66 -_bldep=7 +_pkgdate=20130510 +pkgver=1.5.$_pkgdate +_srcver=44323def5b3866ff601fd401ef2160b80ced8141 # Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background +_bldver=2.67 +_bldep=8 _pyver=3.3 pkgrel=1 pkgdesc='A libre software raytracing engine' @@ -27,7 +27,7 @@ depends=( freetype2 libjpeg libxml2 - 'openexr=2.0.0' + openexr ) optdepends=( 'python: Python bindings' @@ -41,17 +41,17 @@ makedepends=( qt4 swig ) -provides=($_pkgname=$_pkgver) -conflicts=$_pkgname source=( - git://github.com/YafaRay/$_gitname.$_pkgflag - git://github.com/YafaRay/$_addname.$_pkgflag + git://github.com/YafaRay/$_gitname.git + git://github.com/YafaRay/$_addname.git ) sha512sums=(SKIP SKIP) prepare() { cd $srcdir/$_gitname + git checkout $_srcver + [[ -d build ]] && rm -r build mkdir build } @@ -62,17 +62,17 @@ build() { setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\ -DYAF_PY_VERSION=$_pyver\ -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver - setarch $CARCH make } -package_yafaray-git() { +package_yafaray() { cd $srcdir/$_gitname/build setarch $CARCH make DESTDIR=$pkgdir install } -package_blender-addon-yafaray-git() { +package_blender-addon-yafaray() { pkgver=$pkgver.v$_bldver + _srcver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169 # Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)" arch=any depends=( @@ -80,24 +80,14 @@ package_blender-addon-yafaray-git() { "$_bldname>=$(($_bldep-1)):$_bldver" "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" ) - optdepends='' - provides=( - ${pkgname%-$_pkgflag}=$_pkgver.v$_bldver - $_pkgname-$_bldname-exporter=$_pkgver.v$_bldver - $_pkgname-$_bldname-exporter-$_pkgflag=$pkgver - ) - conflicts=( - ${pkgname%-$_pkgflag} - $_pkgname-$_bldname-exporter - $_pkgname-$_bldname-exporter-$_pkgflag - ) - replaces=$_pkgname-$_bldname-exporter-$_pkgflag + optdepends= cd $srcdir/$_addname a=/usr/lib b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin + git checkout $_srcver git checkout-index -a -f --prefix=${b%bin} install -d $b |