diff options
34 files changed, 255 insertions, 218 deletions
diff --git a/community/canorus/PKGBUILD b/community/canorus/PKGBUILD index 9ea89a79a..459d17891 100644 --- a/community/canorus/PKGBUILD +++ b/community/canorus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85336 2013-03-01 10:28:57Z andrea $ +# $Id: PKGBUILD 106369 2014-03-01 08:32:49Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Arch Linux Pro Audio <dev@archaudio.org> # Contributor: Coenraad van der Westhuizen <chwesthuizen@gmail.com> @@ -13,13 +13,11 @@ url="http://www.canorus.org/" license=('GPL') depends=('qt4' 'alsa-lib' 'python2' 'swig' 'zlib') makedepends=('cmake') -options=('strip') source=(http://download.berlios.de/$pkgname/$pkgname\_$pkgver\_source.tar.bz2) md5sums=('5575b7c54633056a463177579a390318') build() { - cd $srcdir/$pkgname-$pkgver - source /etc/profile.d/qt4.sh + cd $pkgname-$pkgver export LDFLAGS="-lz -lpthread" cmake . -DCMAKE_INSTALL_PREFIX=$pkgdir/usr \ -DDEFAULT_DATA_DIR="/usr/share/canorus" \ @@ -27,7 +25,7 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver make install install -d $pkgdir/usr/share/{applications,pixmaps} cp canorus.desktop $pkgdir/usr/share/applications diff --git a/community/djview4/PKGBUILD b/community/djview4/PKGBUILD index 0125231f5..86eb5c241 100644 --- a/community/djview4/PKGBUILD +++ b/community/djview4/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85340 2013-03-01 10:29:36Z andrea $ +# $Id: PKGBUILD 106366 2014-03-01 08:29:34Z andrea $ # Contributor: Paulo Matias <matias.archlinux-br.org> # Contributor: Leslie P. Polzer <polzer.gnu.org> # Contributor: erm67 <erm67.yahoo.it> @@ -19,15 +19,14 @@ sha1sums=('07f97e32919bfb34ff2d59b928c47ffbc96dcfc5') install=install build() { - cd "${srcdir}/${pkgname}-${pkgver}" - source /etc/profile.d/qt4.sh + cd ${pkgname}-${pkgver} ./configure --prefix=/usr sed 's/netscape/mozilla/g' -i nsdejavu/Makefile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install-djview install-nsdejavu cd desktopfiles diff --git a/community/gitg/PKGBUILD b/community/gitg/PKGBUILD index ab5e6a1c4..90acc7100 100644 --- a/community/gitg/PKGBUILD +++ b/community/gitg/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 99215 2013-10-25 20:50:04Z eric $ +# $Id: PKGBUILD 106380 2014-03-01 19:26:09Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gitg -pkgver=0.2.7 -pkgrel=2 +pkgver=0.3.2 +pkgrel=1 pkgdesc='A GIT repository viewer based on GTK+' arch=('i686' 'x86_64') url='https://git.gnome.org/browse/gitg/' license=('GPL') -depends=('gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas') -makedepends=('intltool') +depends=('gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas' + 'libgit2-glib' 'gobject-introspection' 'libgee' 'json-glib' 'webkitgtk' + 'libpeas' 'gtkspell3') +makedepends=('intltool' 'vala') install=gitg.install source=(ftp://ftp.gnome.org/pub/GNOME/sources/gitg/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('7b1428819666e4797d64dc94bb1624d5e7b75e6a') +sha1sums=('01dc89fab5b66a6917755ae9ded20e923290353f') build() { cd ${pkgname}-${pkgver} diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD index 763238050..a23703217 100644 --- a/community/monit/PKGBUILD +++ b/community/monit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 97739 2013-09-28 07:54:08Z jlichtblau $ +# $Id: PKGBUILD 106371 2014-03-01 12:19:21Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: Marco Bartholomew <marco@marcobartholomew.com> pkgname=monit -pkgver=5.6 +pkgver=5.7 pkgrel=1 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system" arch=('i686' 'x86_64') @@ -19,16 +19,18 @@ sha256sums=('38e09bd8b39abc59e6b9a9bb7a78f7eac2b02a92f4de1f3a6dc24e84dfedae0d' 'cf607209e9e5d39e708152dc181525570371fab750f828e890e2b6a00b81ebc4') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR=${pkgdir} install - install -D -m700 monitrc ${pkgdir}/etc/monitrc - install -D -m644 ${srcdir}/$pkgname.service ${pkgdir}/usr/lib/systemd/system/$pkgname.service + make DESTDIR="${pkgdir}" install + install -D -m700 monitrc "${pkgdir}"/etc/monitrc + install -D -m644 "${srcdir}"/$pkgname.service "${pkgdir}"/usr/lib/systemd/system/$pkgname.service } +sha256sums=('bb250ab011d805b5693972afdf95509e79bb3b390caa763275c9501f74b598a2' + 'cf607209e9e5d39e708152dc181525570371fab750f828e890e2b6a00b81ebc4') diff --git a/community/monit/monit.changelog b/community/monit/monit.changelog index ddc3eac05..0d2459695 100644 --- a/community/monit/monit.changelog +++ b/community/monit/monit.changelog @@ -1,3 +1,6 @@ +2014-03-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * monit 5.7-1 + 2013-09-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * monit 5.6-1 diff --git a/community/pam_mysql/PKGBUILD b/community/pam_mysql/PKGBUILD deleted file mode 100644 index 5493e6b7e..000000000 --- a/community/pam_mysql/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 99946 2013-10-31 02:37:33Z allan $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Arjan Timmerman<arjan@archlinux.org> -# Contributor: Manolis Tzanidakis -pkgname=pam_mysql -pkgver=0.7RC1 -pkgrel=7 -pkgdesc="A PAM module to authenticate users against mysql." -arch=(i686 x86_64) -license=('GPL') -url="http://pam-mysql.sourceforge.net" -depends=('pam' 'mariadb' 'openssl') -source=(http://sourceforge.net/projects/pam-mysql/files/pam-mysql/${pkgver}/${pkgname}-${pkgver}.tar.gz) -md5sums=('6177183d7e98dc12f2e444c9fbd4f13c') - -build() { - cd $srcdir/$pkgname-$pkgver - - sed -i 's/pam_mysql_la_LIBADD = /pam_mysql_la_LIBADD = -lpam/g' Makefile.in - ./configure --prefix=/usr --with-pam-mods-dir=/usr/lib/security - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir install -} diff --git a/community/simplescreenrecorder/PKGBUILD b/community/simplescreenrecorder/PKGBUILD index 49aa26559..58676420c 100644 --- a/community/simplescreenrecorder/PKGBUILD +++ b/community/simplescreenrecorder/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 106080 2014-02-22 04:33:02Z kkeen $ +# $Id: PKGBUILD 106356 2014-02-28 23:38:25Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Maarten Baert pkgname=simplescreenrecorder -pkgver=0.2.0 -pkgrel=2 +pkgver=0.2.1 +pkgrel=1 pkgdesc="A feature-rich screen recorder that supports X11 and OpenGL." arch=("i686" "x86_64") url="http://www.maartenbaert.be/simplescreenrecorder/" license=("GPL3") -depends=("qt4" "ffmpeg" "ffmpeg-compat" "alsa-lib" "libpulse" "jack" "libgl" "glu" "libx11" "libxext" "libxfixes") +depends=("qt4" "ffmpeg" "alsa-lib" "libpulse" "jack" "libgl" "glu" "libx11" "libxext" "libxfixes") optdepends=("lib32-simplescreenrecorder: OpenGL recording of 32-bit applications") makedepends=("git") -source=("git+https://github.com/MaartenBaert/ssr.git#tag=0.2.0") +source=("git+https://github.com/MaartenBaert/ssr.git#tag=$pkgver") md5sums=("SKIP") options=("!libtool") diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 92dc67073..857f7c877 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 205934 2014-02-14 08:16:44Z allan $ +# $Id: PKGBUILD 206523 2014-03-01 06:07:22Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -8,7 +8,7 @@ pkgname=glibc pkgver=2.19 -pkgrel=2 +pkgrel=3 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -23,11 +23,13 @@ options=('!strip' 'staticlibs') install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} glibc-2.18-xattr-compat-hack.patch + glibc-2.19-fix-sign-in-bsloww1-input.patch locale.gen.txt locale-gen) md5sums=('e26b8cc666b162f999404b03970f14e4' 'SKIP' '7ca96c68a37f2a4ab91792bfa0160a24' + '755a1a9d7844a5e338eddaa9a5d974cd' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -37,6 +39,9 @@ prepare() { # hack fix for {linux,sys}/xattr.h incompatibility patch -p1 -i $srcdir/glibc-2.18-xattr-compat-hack.patch + # fix issues in sin/cos slow path calculation - commit ffe768a9 + patch -p1 -i $srcdir/glibc-2.19-fix-sign-in-bsloww1-input.patch + mkdir ${srcdir}/glibc-build } diff --git a/core/glibc/glibc-2.19-fix-sign-in-bsloww1-input.patch b/core/glibc/glibc-2.19-fix-sign-in-bsloww1-input.patch new file mode 100644 index 000000000..91b0c9abb --- /dev/null +++ b/core/glibc/glibc-2.19-fix-sign-in-bsloww1-input.patch @@ -0,0 +1,71 @@ +From ffe768a90912f9bce43b70a82576b3dc99e3121c Mon Sep 17 00:00:00 2001 +From: Siddhesh Poyarekar <siddhesh@redhat.com> +Date: Thu, 27 Feb 2014 21:29:16 +0530 +Subject: [PATCH] Fix sign of input to bsloww1 (BZ #16623) + +In 84ba214c, I removed some redundant sign computations and in the +process, I incorrectly got rid of a temporary variable, thus passing +the absolute value of the input to bsloww1. This caused #16623. + +This fix undoes the incorrect change. +--- + sysdeps/ieee754/dbl-64/s_sin.c | 16 ++++++++++------ + 3 files changed, 18 insertions(+), 7 deletions(-) + +diff --git a/sysdeps/ieee754/dbl-64/s_sin.c b/sysdeps/ieee754/dbl-64/s_sin.c +index 6105e9f..50109b8 100644 +--- a/sysdeps/ieee754/dbl-64/s_sin.c ++++ b/sysdeps/ieee754/dbl-64/s_sin.c +@@ -447,19 +447,21 @@ __sin (double x) + } + else + { ++ double t; + if (a > 0) + { + m = 1; ++ t = a; + db = da; + } + else + { + m = 0; +- a = -a; ++ t = -a; + db = -da; + } +- u.x = big + a; +- y = a - (u.x - big); ++ u.x = big + t; ++ y = t - (u.x - big); + res = do_sin (u, y, db, &cor); + cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps; + retval = ((res == res + cor) ? ((m) ? res : -res) +@@ -671,19 +673,21 @@ __cos (double x) + } + else + { ++ double t; + if (a > 0) + { + m = 1; ++ t = a; + db = da; + } + else + { + m = 0; +- a = -a; ++ t = -a; + db = -da; + } +- u.x = big + a; +- y = a - (u.x - big); ++ u.x = big + t; ++ y = t - (u.x - big); + res = do_sin (u, y, db, &cor); + cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps; + retval = ((res == res + cor) ? ((m) ? res : -res) +-- +1.9.0 + diff --git a/core/glibc/nscd.service b/core/glibc/nscd.service deleted file mode 100644 index 875570dc2..000000000 --- a/core/glibc/nscd.service +++ /dev/null @@ -1,18 +0,0 @@ -# systemd service file for nscd - -[Unit] -Description=Name Service Cache Daemon - -[Service] -Type=simple -ExecStart=/usr/sbin/nscd --foreground -ExecStop=/usr/sbin/nscd --shutdown -ExecReload=/usr/sbin/nscd -i passwd -ExecReload=/usr/sbin/nscd -i group -ExecReload=/usr/sbin/nscd -i hosts -ExecReload=/usr/sbin/nscd -i services -Restart=always -PIDFile=/run/nscd/nscd.pid - -[Install] -WantedBy=multi-user.target diff --git a/core/glibc/nscd.tmpfiles b/core/glibc/nscd.tmpfiles deleted file mode 100644 index 52edbba67..000000000 --- a/core/glibc/nscd.tmpfiles +++ /dev/null @@ -1,4 +0,0 @@ -# Configuration to create /run/nscd directory -# Used as part of systemd's tmpfiles - -d /run/nscd 0755 root root diff --git a/core/libtirpc/PKGBUILD b/core/libtirpc/PKGBUILD index 0092a7be9..8573c242e 100644 --- a/core/libtirpc/PKGBUILD +++ b/core/libtirpc/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 197801 2013-10-30 10:37:59Z allan $ +# $Id: PKGBUILD 206562 2014-03-01 14:26:14Z bpiotrowski $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libtirpc -pkgver=0.2.3 -pkgrel=2 +pkgver=0.2.4 +pkgrel=1 pkgdesc="Transport Independent RPC library (SunRPC replacement)" arch=('i686' 'x86_64') url="http://libtirpc.sourceforge.net/" license=('BSD') -depends=('libgssglue') +depends=('krb5') backup=('etc/netconfig') -source=(http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2 - libtirpc-build.patch) +source=(http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2) build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 <"$srcdir/libtirpc-build.patch" - - ./configure --prefix=/usr --sysconf=/etc --enable-gss + ./configure --prefix=/usr --sysconf=/etc make } @@ -29,5 +26,4 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } -md5sums=('b70e6c12a369a91e69fcc3b9feb23d61' - 'd4c0eef2f0891abf06cd4146eb51ed36') +md5sums=('847995e8d002cbf1387bda05947be086') diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD index 2ff9af87f..9195f2110 100644 --- a/core/ppp/PKGBUILD +++ b/core/ppp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 206326 2014-02-23 23:01:58Z thomas $ +# $Id: PKGBUILD 206560 2014-03-01 11:01:32Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=ppp pkgver=2.4.6 -pkgrel=1 +pkgrel=2 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" arch=(i686 x86_64) url="http://www.samba.org/ppp/" @@ -22,7 +22,7 @@ source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz{,.asc} ppp.systemd) sha256sums=('1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d' 'SKIP' - '811059427fb4240c29712782a7bb3f3e860450efe554ecbe094b78c9af6028cd' + 'f04f47318226c79594f45b8b75877c30710d22fe0fb1e2e17db3b4257dc4218c' '0933fecb9e0adaddd88ee1e049a5f3a0508e83b81dc1aa333df784e729ab4b6e' 'ddef42b2cc5d49e81556dc9dbacf5ee3bf8dc32704f3670c2233eed42c4a4efd' '658630ba4c5cb583df80af6d4df81df8ae20798f63cc4b9cec8d4dad13a6a897' diff --git a/core/ppp/ppp-2.4.6-makefiles.patch b/core/ppp/ppp-2.4.6-makefiles.patch index 3e328d8c6..5fc7bccb5 100644 --- a/core/ppp/ppp-2.4.6-makefiles.patch +++ b/core/ppp/ppp-2.4.6-makefiles.patch @@ -1,6 +1,6 @@ diff -Nur ppp-2.4.6.orig/chat/Makefile.linux ppp-2.4.6/chat/Makefile.linux --- ppp-2.4.6.orig/chat/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/chat/Makefile.linux 2014-02-21 23:55:33.256988585 +0100 ++++ ppp-2.4.6/chat/Makefile.linux 2014-02-24 09:00:16.666577906 +0100 @@ -1,7 +1,7 @@ # $Id: Makefile.linux,v 1.15 2006/06/04 05:07:46 paulus Exp $ @@ -31,7 +31,7 @@ diff -Nur ppp-2.4.6.orig/chat/Makefile.linux ppp-2.4.6/chat/Makefile.linux mkdir -p $(BINDIR) $(MANDIR) diff -Nur ppp-2.4.6.orig/configure ppp-2.4.6/configure --- ppp-2.4.6.orig/configure 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/configure 2014-02-21 23:56:43.732151365 +0100 ++++ ppp-2.4.6/configure 2014-02-24 09:00:16.743242620 +0100 @@ -185,7 +185,10 @@ rm -f $2 if [ -f $1 ]; then @@ -46,7 +46,7 @@ diff -Nur ppp-2.4.6.orig/configure ppp-2.4.6/configure diff -Nur ppp-2.4.6.orig/linux/Makefile.top ppp-2.4.6/linux/Makefile.top --- ppp-2.4.6.orig/linux/Makefile.top 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/linux/Makefile.top 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/linux/Makefile.top 2014-02-24 09:00:16.743242620 +0100 @@ -1,7 +1,7 @@ # PPP top-level Makefile for Linux. @@ -58,7 +58,7 @@ diff -Nur ppp-2.4.6.orig/linux/Makefile.top ppp-2.4.6/linux/Makefile.top ETCDIR = $(INSTROOT)@SYSCONF@/ppp diff -Nur ppp-2.4.6.orig/pppd/Makefile.linux ppp-2.4.6/pppd/Makefile.linux --- ppp-2.4.6.orig/pppd/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppd/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/pppd/Makefile.linux 2014-02-24 09:00:16.743242620 +0100 @@ -5,7 +5,7 @@ # Default installation locations @@ -80,7 +80,7 @@ diff -Nur ppp-2.4.6.orig/pppd/Makefile.linux ppp-2.4.6/pppd/Makefile.linux # Uncomment the next 2 lines to include support for Microsoft's diff -Nur ppp-2.4.6.orig/pppd/plugins/Makefile.linux ppp-2.4.6/pppd/plugins/Makefile.linux --- ppp-2.4.6.orig/pppd/plugins/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppd/plugins/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/pppd/plugins/Makefile.linux 2014-02-24 09:00:16.779908379 +0100 @@ -1,11 +1,11 @@ #CC = gcc -COPTS = -O2 -g @@ -98,7 +98,7 @@ diff -Nur ppp-2.4.6.orig/pppd/plugins/Makefile.linux ppp-2.4.6/pppd/plugins/Make diff -Nur ppp-2.4.6.orig/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.6/pppd/plugins/pppoatm/Makefile.linux --- ppp-2.4.6.orig/pppd/plugins/pppoatm/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppd/plugins/pppoatm/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/pppd/plugins/pppoatm/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 @@ -1,7 +1,7 @@ #CC = gcc -COPTS = -O2 -g @@ -120,8 +120,8 @@ diff -Nur ppp-2.4.6.orig/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.6/pppd/plug $(INSTALL) -d -m 755 $(LIBDIR) diff -Nur ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux ppp-2.4.6/pppd/plugins/pppol2tp/Makefile.linux --- ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppd/plugins/pppol2tp/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 -@@ -1,7 +1,7 @@ ++++ ppp-2.4.6/pppd/plugins/pppol2tp/Makefile.linux 2014-02-24 09:01:06.325349425 +0100 +@@ -1,12 +1,12 @@ #CC = gcc -COPTS = -O2 -g +COPTS = @CFLAGS@ @@ -131,6 +131,12 @@ diff -Nur ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux ppp-2.4.6/pppd/plu INSTALL = install #*********************************************************************** + +-DESTDIR = @DESTDIR@ ++DESTDIR = $(INSTROOT)@DESTDIR@ + LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) + + VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) @@ -16,7 +16,7 @@ all: $(PLUGINS) @@ -142,7 +148,7 @@ diff -Nur ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux ppp-2.4.6/pppd/plu $(INSTALL) -d -m 755 $(LIBDIR) diff -Nur ppp-2.4.6.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.6/pppd/plugins/radius/Makefile.linux --- ppp-2.4.6.orig/pppd/plugins/radius/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppd/plugins/radius/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/pppd/plugins/radius/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 @@ -12,7 +12,8 @@ INSTALL = install @@ -172,7 +178,7 @@ diff -Nur ppp-2.4.6.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.6/pppd/plugi clientid.o sendserver.o lock.o util.o md5.o diff -Nur ppp-2.4.6.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.6/pppd/plugins/rp-pppoe/Makefile.linux --- ppp-2.4.6.orig/pppd/plugins/rp-pppoe/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppd/plugins/rp-pppoe/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/pppd/plugins/rp-pppoe/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 @@ -15,7 +15,7 @@ #*********************************************************************** @@ -210,7 +216,7 @@ diff -Nur ppp-2.4.6.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.6/pppd/plu $(INSTALL) -d -m 755 $(LIBDIR) diff -Nur ppp-2.4.6.orig/pppdump/Makefile.linux ppp-2.4.6/pppdump/Makefile.linux --- ppp-2.4.6.orig/pppdump/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppdump/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/pppdump/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 @@ -1,8 +1,9 @@ DESTDIR = $(INSTROOT)@DESTDIR@ -BINDIR = $(DESTDIR)/sbin @@ -234,7 +240,7 @@ diff -Nur ppp-2.4.6.orig/pppdump/Makefile.linux ppp-2.4.6/pppdump/Makefile.linux rm -f pppdump $(OBJS) *~ diff -Nur ppp-2.4.6.orig/pppstats/Makefile.linux ppp-2.4.6/pppstats/Makefile.linux --- ppp-2.4.6.orig/pppstats/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 -+++ ppp-2.4.6/pppstats/Makefile.linux 2014-02-21 23:55:33.336986730 +0100 ++++ ppp-2.4.6/pppstats/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 @@ -3,14 +3,15 @@ # $Id: Makefile.linux,v 1.9 2006/06/04 05:07:46 paulus Exp $ # diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD index 76d7968a9..052244dac 100644 --- a/core/readline/PKGBUILD +++ b/core/readline/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 197153 2013-10-23 13:04:18Z allan $ +# $Id: PKGBUILD 206524 2014-03-01 06:07:23Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=readline -_basever=6.2 -_patchlevel=004 #prepare for some patches -pkgver=$_basever.$_patchlevel -pkgrel=2 +_basever=6.3 +_patchlevel=000 #prepare for some patches +pkgver=$_basever #.$_patchlevel +pkgrel=1 pkgdesc="GNU readline library" arch=('i686' 'x86_64') url="http://tiswww.case.edu/php/chet/readline/rltop.html" @@ -22,17 +22,10 @@ if [ $_patchlevel -gt 00 ]; then source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig}) done fi -md5sums=('67948acb2ca081f23359d0256e9a271c' - '928f7d248320a65e43c2dc427e99582b' - '58d54966c1191db45973cb3191ac621a' - '83287d52a482f790dfb30ec0a8746669' - '8e6a51e2e0e6e45a82752e3692c111ac' - '0665020ea118e8434bd145fb71f452cc' - '285361ca6d48c51ae2428157e174e812' - 'c9d5d79718856e711667dede87cb7622' - '4437205bb1462f5f32e4812b8292c675' - 'c08e787f50579ce301075c523fa660a4' - '7e39cad1d349b8ae789e4fc33dbb235f') +md5sums=('33c8fb279e981274f485fd91da77e94a' + 'SKIP' + '58d54966c1191db45973cb3191ac621a') + build() { cd ${srcdir}/${pkgname}-$_basever diff --git a/extra/appmenu-qt/PKGBUILD b/extra/appmenu-qt/PKGBUILD index 1b566bacd..cb9cba804 100644 --- a/extra/appmenu-qt/PKGBUILD +++ b/extra/appmenu-qt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178947 2013-03-01 10:19:09Z andrea $ +# $Id: PKGBUILD 206527 2014-03-01 08:09:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=appmenu-qt @@ -16,15 +16,15 @@ md5sums=('90cce750e5412d43ce075b0a9bdb6782' 'de499d01369fc85040f5bbfc53ae1700' '5db00ca92274c8b1797c204321961189') -build() { - . /etc/profile.d/qt4.sh +prepare() { + mkdir build # FS#33286 cd ${pkgname}-${pkgver} patch -p0 -i "${srcdir}"/appmenu-async.diff - cd ../ +} - mkdir build +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/automoc4/PKGBUILD b/extra/automoc4/PKGBUILD index 903090736..b4e153571 100644 --- a/extra/automoc4/PKGBUILD +++ b/extra/automoc4/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178949 2013-03-01 10:19:23Z andrea $ +# $Id: PKGBUILD 206531 2014-03-01 08:11:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -16,21 +16,22 @@ source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver md5sums=('91bf517cb940109180ecd07bc90c69ec' '9014edbb7e2f02fe90b2db8707487bce') -build() { - . /etc/profile.d/qt4.sh - +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd build + cd build make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/license.txt" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 "${srcdir}/license.txt" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index de86e00d3..b1bf8bec6 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 188169 2013-06-11 11:59:02Z bisson $ +# $Id: PKGBUILD 206522 2014-03-01 05:47:00Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=2.9.3 +pkgver=2.10 pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' @@ -16,7 +16,7 @@ optdepends=('perl: feh-cam, webcam wrapper for feh' 'imagemagick: support more file formats') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2"{,.asc}) -sha1sums=('6e93c9bbc339d36002ead189d0a94880f58876bd' 'SKIP') +sha1sums=('38b472f2a3222e287269a0719c7ead383f1cb8a5' 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index 360db097e..2f5e9a004 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 203018 2014-01-01 13:31:09Z juergen $ +# $Id: PKGBUILD 206564 2014-03-01 15:20:03Z bpiotrowski $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Mark Schneider <queueRAM@gmail.com> pkgname=gnucash -pkgver=2.6.0 +pkgver=2.6.1 pkgrel=1 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('evince: for print preview' options=('!makeflags' '!emptydirs') install=gnucash.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('9715468bbe9e4cef6559bfa9825d51ac10d6ff84') +sha1sums=('726ee08e95206ec3746a92efaa5281f27d6eacc8') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD index 21c7e46ae..6e3fa134e 100644 --- a/extra/haskell-http/PKGBUILD +++ b/extra/haskell-http/PKGBUILD @@ -2,7 +2,7 @@ _hkgname=HTTP pkgname=haskell-http -pkgver=4000.2.8 +pkgver=4000.2.11 pkgrel=1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" @@ -12,7 +12,7 @@ depends=('ghc=7.6.3-1' 'sh' 'haskell-network=2.4.1.2-1' 'haskell-parsec=3.1.3-3' source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install options=('staticlibs') -md5sums=('94be05278da4e9324aaef6e012e751e2') +md5sums=('a293c8a1b6caebda06cf655f42d473d0') build() { cd ${_hkgname}-${pkgver} diff --git a/extra/libdbusmenu-qt/PKGBUILD b/extra/libdbusmenu-qt/PKGBUILD index 4f3c0fa15..2397638c8 100644 --- a/extra/libdbusmenu-qt/PKGBUILD +++ b/extra/libdbusmenu-qt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178965 2013-03-01 10:21:35Z andrea $ +# $Id: PKGBUILD 206555 2014-03-01 08:25:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libdbusmenu-qt @@ -13,10 +13,11 @@ makedepends=('cmake' 'doxygen' 'qjson') source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") md5sums=('9a49484927669cd2ec91b3bf9ba8b79e') -build() { - . /etc/profile.d/qt4.sh - +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD index a7449d95a..4ae640420 100644 --- a/extra/libgphoto2/PKGBUILD +++ b/extra/libgphoto2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 204790 2014-01-27 08:48:48Z jgc $ +# $Id: PKGBUILD 206566 2014-03-01 15:43:35Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Eduardo Romero <eduardo@archlinux.org> @@ -6,14 +6,16 @@ pkgname=libgphoto2 pkgver=2.5.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs." arch=(i686 x86_64) url="http://www.gphoto.org" license=(LGPL) depends=('libexif' 'libjpeg' 'gd' 'libltdl' 'libusb') install=libgphoto2.install -options=('libtool') +# libtool files should be obsolete meanwhile, they have been added in 2008 +# https://projects.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/libgphoto2&id=e029ddabe9716521cf1e0eeb1f1988e4104e15b6 +#options=('libtool') source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2{,.asc}) md5sums=('aad2607a84442769c14f6acce2ca1ddf' 'SKIP') @@ -37,7 +39,7 @@ package() { LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \ "${pkgdir}/usr/lib/libgphoto2/print-camera-list" hwdb > \ - "${pkgdir}/usr/lib/udev/hwdb.d/20-gphoto.conf" + "${pkgdir}/usr/lib/udev/hwdb.d/20-gphoto.hwdb" # Remove recursive symlink rm -f "${pkgdir}/usr/include/gphoto2/gphoto2" diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD index ee930d067..7e683cf9c 100644 --- a/extra/libqzeitgeist/PKGBUILD +++ b/extra/libqzeitgeist/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178968 2013-03-01 10:21:57Z andrea $ +# $Id: PKGBUILD 206552 2014-03-01 08:24:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libqzeitgeist @@ -15,22 +15,22 @@ source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pk md5sums=('97bdea6a1865db7d5f29c93e3a492f24' '712013e582acb73296e41ad842d0da01') -build() { - . /etc/profile.d/qt4.sh +prepare() { + mkdir build cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}"/set-declarative-installation-dir.patch - cd ../ # Fix python2 path sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ ${pkgname}-${pkgver}/scripts/onto2cpp.py +} - mkdir build +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DDECLARATIVE_IMPORT_PREFIX=/usr/lib/qt4/imports/ make } diff --git a/extra/polkit-qt/PKGBUILD b/extra/polkit-qt/PKGBUILD index d77ee8182..fecd886c4 100644 --- a/extra/polkit-qt/PKGBUILD +++ b/extra/polkit-qt/PKGBUILD @@ -14,10 +14,11 @@ makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2") md5sums=('a105e233e6733fb072c9080cd7ae1af2') -build() { - . /etc/profile.d/qt4.sh - +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-1-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/prison/PKGBUILD b/extra/prison/PKGBUILD index 7552fa8dc..942c46b30 100644 --- a/extra/prison/PKGBUILD +++ b/extra/prison/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178975 2013-03-01 10:22:55Z andrea $ +# $Id: PKGBUILD 206549 2014-03-01 08:22:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=prison @@ -13,10 +13,11 @@ makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.gz") md5sums=('8baac61506e37a31482a0df4a5d02cd2') -build() { - . /etc/profile.d/qt4.sh - +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/qca/PKGBUILD b/extra/qca/PKGBUILD index e37bf7c4f..13ddac998 100644 --- a/extra/qca/PKGBUILD +++ b/extra/qca/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178977 2013-03-01 10:23:13Z andrea $ +# $Id: PKGBUILD 206535 2014-03-01 08:14:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,16 +10,18 @@ arch=('i686' 'x86_64') url="http://delta.affinix.com/qca/" license=('LGPL') depends=('qt4' 'ca-certificates') -source=("http://delta.affinix.com/download/qca/2.0/${pkgname}-${pkgver}.tar.bz2" +source=("http://delta.affinix.com/download/${pkgname}/2.0/${pkgname}-${pkgver}.tar.bz2" 'gcc47.patch') md5sums=('fc15bd4da22b8096c51fcfe52d2fa309' 'dffc7367152d8888c1447253a0387a2a') -build() { - . /etc/profile.d/qt4.sh +prepare() { + cd ${pkgname}-${pkgver} + patch -p0 -i "${srcdir}"/gcc47.patch +} - cd $srcdir/${pkgname}-${pkgver} - patch -p0 -i ${srcdir}/gcc47.patch +build() { + cd ${pkgname}-${pkgver} ./configure \ --prefix=/usr \ --disable-tests \ @@ -30,6 +32,6 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make INSTALL_ROOT=${pkgdir} install + cd ${pkgname}-${pkgver} + make INSTALL_ROOT="${pkgdir}" install } diff --git a/extra/qimageblitz/PKGBUILD b/extra/qimageblitz/PKGBUILD index 193a92be8..0e33fafda 100644 --- a/extra/qimageblitz/PKGBUILD +++ b/extra/qimageblitz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178980 2013-03-01 10:23:35Z andrea $ +# $Id: PKGBUILD 206544 2014-03-01 08:20:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -14,14 +14,15 @@ makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('0ae2f7d4e0876764a97ca73799f61df4') -build() { - . /etc/profile.d/qt4.sh - +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/extra/qjson/PKGBUILD b/extra/qjson/PKGBUILD index ab298d47f..be1af2187 100644 --- a/extra/qjson/PKGBUILD +++ b/extra/qjson/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178982 2013-03-01 10:23:51Z andrea $ +# $Id: PKGBUILD 206538 2014-03-01 08:16:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qjson @@ -13,10 +13,11 @@ makedepends=('cmake') source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/flavio/${pkgname}/archive/${pkgver}.tar.gz") md5sums=('4eef13da988edf8f91c260a3e1baeea9') -build() { - . /etc/profile.d/qt4.sh - +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/qt-gstreamer/PKGBUILD b/extra/qt-gstreamer/PKGBUILD index a7ccc9d5c..f7ccbb405 100644 --- a/extra/qt-gstreamer/PKGBUILD +++ b/extra/qt-gstreamer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178986 2013-03-01 10:24:22Z andrea $ +# $Id: PKGBUILD 206559 2014-03-01 08:27:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: laloch <laloch@atlas.cz> @@ -14,10 +14,11 @@ makedepends=('cmake' 'automoc4' 'boost' 'mesa' 'doxygen') source=("http://gstreamer.freedesktop.org/src/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('0428aedf2874fd0884ad4c41db9da20e') -build() { - . /etc/profile.d/qt4.sh - +prepare() { mkdir build +} + +build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -28,5 +29,5 @@ build() { package() { cd build - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD index 6cf4ca5c3..1fe9df007 100644 --- a/extra/qwtplot3d/PKGBUILD +++ b/extra/qwtplot3d/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178992 2013-03-01 10:24:54Z andrea $ +# $Id: PKGBUILD 206541 2014-03-01 08:19:07Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -17,33 +17,34 @@ sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' '52fa169b651a98550f8a8391ddf52e0eaeb2c215' '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005') -build() { - . /etc/profile.d/qt4.sh - - cd ${srcdir}/${pkgname} - patch -p1 < ../qwtplot3d-gcc44.patch - patch -p1 < ../qwtplot3d-qt-4.8.0.patch +prepare() { + cd ${pkgname} + patch -p1 -i "${srcdir}"/qwtplot3d-gcc44.patch + patch -p1 -i "${srcdir}"/qwtplot3d-qt-4.8.0.patch +} +build() { + cd ${pkgname} # build qwt: qmake qwtplot3d.pro make } package() { - cd ${srcdir}/${pkgname} + cd ${pkgname} # install qwtplot3d: (by hand, because the Makefile do not provide a "install:") - install -d ${pkgdir}/usr/{include/qwtplot3d,lib} + install -d "${pkgdir}"/usr/{include/qwtplot3d,lib} for n in include/* ; do - cp -d $n ${pkgdir}/usr/include/qwtplot3d + cp -d $n "${pkgdir}"/usr/include/qwtplot3d done for n in lib/libqwtplot3d.so* ; do - cp -d $n ${pkgdir}/usr/lib + cp -d $n "${pkgdir}"/usr/lib done # install custom license - install -Dm644 ${srcdir}/${pkgname}/COPYING ${pkgdir}/usr/share/licenses/qwtplot3d/LICENSE + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index 9ab604021..a37002878 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 202202 2013-12-19 10:41:19Z bpiotrowski $ +# $Id: PKGBUILD 206568 2014-03-01 15:57:24Z bpiotrowski $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=raptor -pkgver=2.0.12 +pkgver=2.0.13 pkgrel=1 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64') @@ -32,4 +32,4 @@ package() { cd "${srcdir}"/raptor2-${pkgver} make prefix="${pkgdir}"/usr install } -md5sums=('a015a7fcc2cbdd38ee1450a5eb526ab5') +md5sums=('f380566229d6264590315b0a5341b689') diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD index a332699dc..3d7a83b32 100644 --- a/extra/rasqal/PKGBUILD +++ b/extra/rasqal/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 203590 2014-01-13 17:12:22Z andyrtr $ +# $Id: PKGBUILD 206572 2014-03-01 18:07:57Z bpiotrowski $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: Lawrence Lee <valheru@facticius.net> pkgname=rasqal epoch=1 -pkgver=0.9.30 -pkgrel=4 +pkgver=0.9.32 +pkgrel=1 pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings" url="http://librdf.org/rasqal" license=('GPL' 'LGPL') arch=('i686' 'x86_64') depends=('raptor' 'mpfr' 'util-linux') source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz) -md5sums=('b12c5f9cfdb6b04efce5a4a186b8416b') +md5sums=('dc7c6107de00c47f85f6ab7db164a136') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ - --disable-static \ - --enable-release + --disable-static \ + --enable-release make } diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index b098d36e5..ea68e4893 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 197128 2013-10-22 10:14:37Z andrea $ +# $Id: PKGBUILD 206570 2014-03-01 18:07:03Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgbase=virtuoso pkgname=('virtuoso' 'virtuoso-base') epoch=1 -pkgver=6.1.7 -pkgrel=2 +pkgver=6.1.8 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtuoso.openlinksw.com/wiki/main/Main/' license=('GPL') makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2' 'optipng') source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz") -md5sums=('88885e84e8f7b61e59516f696b1d3be5') +md5sums=('94ef4f93cad915f73bee547fe95db725') prepare() { cd ${pkgbase}-opensource-${pkgver} @@ -50,7 +50,7 @@ package_virtuoso-base() { package_virtuoso() { pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality' - depends=('virtuoso-base' 'libxml2') + depends=('virtuoso-base' 'libxml2' 'java-environment') cd ${pkgbase}-opensource-${pkgver} make DESTDIR=${pkgdir} install diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD index aba64f230..0e7498c02 100644 --- a/libre/soundkonverter-libre/PKGBUILD +++ b/libre/soundkonverter-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103245 2013-12-31 11:33:47Z stativ $ +# $Id: PKGBUILD 106378 2014-03-01 17:19:07Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,12 +7,15 @@ _pkgname=soundkonverter pkgname=soundkonverter-libre -pkgver=2.0.5 +pkgver=2.1.0 pkgrel=1 pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation" arch=('i686' 'x86_64') url="http://www.kde-apps.org/content/show.php?content=29024" license=('GPL') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver depends=('kdebase-runtime' 'libkcddb' 'cdparanoia' 'taglib') makedepends=('automoc4' 'cmake') optdepends=('cdrkit: cdda2wav backend' @@ -31,12 +34,9 @@ optdepends=('cdrkit: cdda2wav backend' 'vorbis-tools: vorbis tools backend' 'wavpack: wavpack backend' 'sox: sox plugin (change sample rate, various effects)') -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver install=$_pkgname.install source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz") -md5sums=('42f7dd8fe5f4d8d18d41c2b1302322ee') +md5sums=('763dd81c14948ca6ffa8637f6bda0e5f') build() { cd "$srcdir"/$_pkgname-$pkgver |