diff options
34 files changed, 391 insertions, 194 deletions
diff --git a/community/bmake/PKGBUILD b/community/bmake/PKGBUILD index 27475c9c4..385a425e6 100644 --- a/community/bmake/PKGBUILD +++ b/community/bmake/PKGBUILD @@ -3,14 +3,15 @@ # Contributor: Imanol Celaya <ilcra1989@gmail.com> pkgname=bmake -pkgver=20131001 -pkgrel=2 +pkgver=20140101 +pkgrel=1 pkgdesc="Portable version of the NetBSD 'make' build tool" arch=('i686' 'x86_64') url="http://www.crufty.net/help/sjg/bmake.html" license=('BSD') source=("http://www.crufty.net/ftp/pub/sjg/bmake-$pkgver.tar.gz") sha256sums=('0a91ac60b82270c4b4f21a43e66eb51c32b4df55e01ea592e42eb323909a559b') +sha256sums=('0f7ecadb6dcd5e4902a03137daba6fd7756f54e82942b524f3b38d7406b6d83e') prepare() { cd "$srcdir/$pkgname" diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD index eb4b48e3c..677dc72c7 100644 --- a/community/gnome-commander/PKGBUILD +++ b/community/gnome-commander/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103047 2013-12-25 19:18:23Z jlichtblau $ +# $Id: PKGBUILD 104056 2014-01-14 22:32:49Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> @@ -6,17 +6,18 @@ # Contributor: Johannes Sjolund <j.sjolund@gmail.com> pkgname=gnome-commander -pkgver=1.2.8.16 +pkgver=1.2.8.17 pkgrel=1 pkgdesc='Graphical two-pane filemanager for Gnome' arch=('i686' 'x86_64') -url='http://www.nongnu.org/gcmd/' +url='http://gcmd.github.io/' license=('GPL') depends=('libgnomeui' 'gnome-vfs' 'gconf' 'python2' 'libsm') -makedepends=('perlxml' 'gnome-doc-utils' 'intltool') +makedepends=('perl-xml-parser' 'gnome-doc-utils' 'intltool') install=$pkgname.install +changelog=$pkgname.changelog source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz) -sha256sums=('84d653fab2eaec233b6d899f339099c2fa2d2d5cbdb7a33bd7022c34ed901347') +sha256sums=('135033ad2073c9d6fee51a52f1e7a56358b8e3a6fa46d64188dc3feebfe00606') build() { cd "$pkgname-$pkgver" diff --git a/community/gnome-commander/gnome-commander.changelog b/community/gnome-commander/gnome-commander.changelog new file mode 100644 index 000000000..a562c5ae7 --- /dev/null +++ b/community/gnome-commander/gnome-commander.changelog @@ -0,0 +1,2 @@ +2014-01-14 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org> + * gnome-commander 1.2.8.17-1 diff --git a/community/libaacs/PKGBUILD b/community/libaacs/PKGBUILD new file mode 100644 index 000000000..9c3e01eef --- /dev/null +++ b/community/libaacs/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 104040 2014-01-14 17:14:01Z flexiondotorg $ +# Maintainer: Martin Wimpress <code@flexion.org> +# Contributor: Gustavo Alvarez <sl1pkn07@gmail.com> +# Contributor: Dirk Berg <berg1981@googlemail.com> + +pkgname=libaacs +pkgver=0.7.0 +pkgrel=2 +pkgdesc="Advanced Access Content System" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://www.videolan.org/developers/libaacs.html" +depends=('libgcrypt') +source=("ftp://ftp.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +provides=('libaacs') +conflicts=('libaacs-git') +md5sums=('8da0da893d1f266b31bf8a8fc7c84a84') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./bootstrap + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 KEYDB.cfg "${pkgdir}/usr/share/doc/${pkgname}"/KEYDB.cfg + install -Dm644 README.txt "${pkgdir}/usr/share/doc/${pkgname}"/README.txt +} diff --git a/community/libx86emu/PKGBUILD b/community/libx86emu/PKGBUILD index a25689370..c32820a3b 100644 --- a/community/libx86emu/PKGBUILD +++ b/community/libx86emu/PKGBUILD @@ -1,36 +1,31 @@ -# $Id: PKGBUILD 67396 2012-03-11 10:52:58Z lcarlier $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# $Id: PKGBUILD 103957 2014-01-13 23:06:22Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Gergely Imreh <imrehgATgmailDOTcom> pkgname=libx86emu pkgver=1.1 -_pkgver=$pkgver-15.3 -pkgrel=29 +_pkgver=$pkgver-21.4 +pkgrel=30 pkgdesc='x86 emulation library' -arch=('i686' 'x86_64') -url='http://www.opensuse.org/' +arch=('x86_64' 'i686') +url='http://download.opensuse.org/source/factory/repo/oss/suse/src/' license=('BSD') depends=('glibc') makedepends=('rpmextract') source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$_pkgver.src.rpm") -md5sums=('ba6a0fc46307dd79078579140aab2f02') +sha256sums=('d94a9b2e00e995856bf71a1db8d97ba2a622d3f447248f53cd4e175d491c6a1b') build() { - cd "${srcdir}" - rpmextract.sh "${pkgname}-${_pkgver}.src.rpm" - tar -xjf $pkgname-$pkgver.tar.bz2 - - cd "${srcdir}/${pkgname}-${pkgver}" - - make LIBDIR=/usr/lib + tar jxvf "$pkgname-$pkgver.tar.bz2" + make -C "$pkgname-$pkgver" LIBDIR=/usr/lib } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make LIBDIR=/usr/lib DESTDIR=$pkgdir install - - install -Dm644 LICENSE \ - ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + make -C "$pkgname-$pkgver" LIBDIR=/usr/lib DESTDIR="$pkgdir" install + install -Dm644 "$pkgname-$pkgver/LICENSE" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } + +# vim:set ts=2 sw=2 et: diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index d04d5a8e0..6dfdf611d 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 95881 2013-08-18 08:58:15Z ttoepper $ +# $Id: PKGBUILD 103962 2014-01-14 07:07:04Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Daniel Hommel <dhommel@gmail.com> pkgname=mksh -_pkgver=R48b -pkgver=48.1 +_pkgver=R49 +pkgver=49 pkgrel=1 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' url='https://www.mirbsd.org/mksh.htm' @@ -14,8 +14,8 @@ depends=('gcc-libs') install=mksh.install source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$_pkgver.tgz" 'https://www.mirbsd.org/TaC-mksh.txt') -md5sums=('ab9baa6b5a4de9d0e6a3ce9957c18da0' - '0601617f19e1c0423cbdb8599e16eec3') +md5sums=('e8c205cac72c3dc8540bbc3897421422' + 'fd6f7b5eb01280b0110af736d6188f34') check() { cd "$srcdir/$pkgname" diff --git a/community/nullmailer/PKGBUILD b/community/nullmailer/PKGBUILD new file mode 100644 index 000000000..7fa8a5a9b --- /dev/null +++ b/community/nullmailer/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 104004 2014-01-14 15:23:43Z flexiondotorg $ +# Maintainer : Martin Wimpress <code@flexion.org> +# Contributor: Roberto Alsina <ralsina at kde.org> +# Contributor: Kurt J. Bosch <kjb-temp-2009 at alpenjodel.de> + +pkgname=nullmailer +pkgver=1.13 +pkgrel=3 +pkgdesc="Simple relay-only mail transport agent." +arch=('i686' 'x86_64') +url="http://www.untroubled.org/nullmailer/" +license=("GPL") +provides=('smtp-forwarder') +conflicts=('smtp-forwarder' 'smtp-server') +depends=('gnutls') +install=nullmailer.install +source=("http://www.untroubled.org/nullmailer/archive/${pkgname}-${pkgver}.tar.gz" + nullmailer.service) +md5sums=('aaeb8746fbc082917b26d0827ccc9270' + '300f17c52422d4156583f207f2405930') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --sbindir=/usr/bin \ + --enable-tls + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m 0644 ../nullmailer.service "${pkgdir}/usr/lib/systemd/system/nullmailer.service" + # Remove pipe and create on install to work around makepkg hang on grep -R + rm -f "${pkgdir}/var/nullmailer/trigger" +} diff --git a/community/nullmailer/nullmailer.install b/community/nullmailer/nullmailer.install new file mode 100644 index 000000000..823df6e27 --- /dev/null +++ b/community/nullmailer/nullmailer.install @@ -0,0 +1,44 @@ +# arg 1: the new package version +post_install() { + if ! getent passwd nullmail > /dev/null; then + echo "==> Creating nullmail user" + usr/bin/useradd --comment "nullmailer MTA" --shell /bin/sh --home /var/nullmailer --system --user-group nullmail + fi + + echo "==> Creating trigger fifo" + rm -f var/nullmailer/trigger && mkfifo -m 600 var/nullmailer/trigger + + echo "==> Fixing permissions" + chown nullmail var/nullmailer/* + chown nullmail usr/bin/nullmailer-queue + chmod u+s usr/bin/nullmailer-queue + chown nullmail usr/bin/mailq + chmod u+s usr/bin/mailq + if ! [ -s etc/nullmailer/me ]; then + echo "==> Configuring" + hostnamectl --static > etc/nullmailer/me + fi + if ! [ -s etc/nullmailer/remotes ]; then + echo "smarthost.example.org smtp --port=25 --auth-login --user=user --pass=pass" > etc/nullmailer/remotes + chgrp nullmail etc/nullmailer/remotes + chmod 640 etc/nullmailer/remotes + fi +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + systemctl stop nullmailer + # Leave the 'queue' directory intact + rm -rf var/service/nullmailer/{tmp,trigger} + echo "==> Removing nullmailer user and group" + userdel nullmail + if getent group nullmail > /dev/null; then + groupdel nullmail + fi +} diff --git a/community/nullmailer/nullmailer.service b/community/nullmailer/nullmailer.service new file mode 100644 index 000000000..8adbec076 --- /dev/null +++ b/community/nullmailer/nullmailer.service @@ -0,0 +1,13 @@ +[Unit] +Description=Nullmailer relay-only MTA +After=local-fs.target +ConditionPathExists=/var/nullmailer/queue + +[Install] +WantedBy=multi-user.target + +[Service] +WorkingDirectory=/var/nullmailer +ExecStart=/usr/bin/nullmailer-send +User=nullmail +Restart=always diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD index d9e5a6335..ca6c1cafc 100644 --- a/community/nzbget/PKGBUILD +++ b/community/nzbget/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 96729 2013-09-03 15:26:43Z alucryd $ +# $Id: PKGBUILD 104048 2014-01-14 21:30:48Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=nzbget -pkgver=11.0 -pkgrel=3 +pkgver=12.0 +pkgrel=1 pkgdesc="Download from Usenet using .nzb files" arch=('x86_64' 'i686') url="http://nzbget.sourceforge.net/" license=('GPL') depends=('gnutls' 'libpar2' 'libsigc++' 'libxml2' 'python') -changelog="${pkgname}.changelog" -source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.gz") -sha256sums=('27abacf6c604969dc987b7e50689caef22a65dbb1690b020b0c6d147ae123b3d') +changelog=${pkgname}.changelog +source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.gz) +sha256sums=('023c4e3b9c7e920d9ea72b60135b438ce13543454f79984c06fd15365b9a882e') build() { cd ${pkgname}-${pkgver} diff --git a/community/nzbget/nzbget.changelog b/community/nzbget/nzbget.changelog index 8670f51a9..4f48ebf99 100644 --- a/community/nzbget/nzbget.changelog +++ b/community/nzbget/nzbget.changelog @@ -1,3 +1,6 @@ +2014-01-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * nzbget 12.0-1 + 2013-09-03 Maxime Gauduin <alucryd@gmail.com> * Fixed FS#36250 - package built without system CXXFLAGS diff --git a/community/pdf2svg/PKGBUILD b/community/pdf2svg/PKGBUILD index ad3c3d259..ab177cc6c 100644 --- a/community/pdf2svg/PKGBUILD +++ b/community/pdf2svg/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 67717 2012-03-14 08:30:56Z giovanni $ -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# $Id: PKGBUILD 104053 2014-01-14 22:18:17Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: corvolino <corvolino@archlinux.com.br> # Contributor: Joel Schaerer pkgname=pdf2svg -pkgver=0.2.1 -pkgrel=7 +pkgver=0.2.2 +pkgrel=1 pkgdesc="A pdf to svg converter" arch=('i686' 'x86_64') -url="http://www.cityinthesky.co.uk/pdf2svg.html" +url="http://www.cityinthesky.co.uk/opensource/pdf2svg/" license=('GPL') depends=('poppler-glib' 'gtk2' 'glib2') -source=("http://www.cityinthesky.co.uk/_media/opensource/$pkgname-$pkgver.tar.gz") -md5sums=('59b3b9768166f73b77215e95d91f0a9d') +source=(http://www.cityinthesky.co.uk/wp-content/uploads/2013/10/$pkgname-$pkgver.tar.gz) +md5sums=('800488ff6d773b309561dfa9be5dc712') build() { cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr make } package() { cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install } diff --git a/community/pgadmin3/ChangeLog b/community/pgadmin3/ChangeLog deleted file mode 100644 index 76de01d7d..000000000 --- a/community/pgadmin3/ChangeLog +++ /dev/null @@ -1,28 +0,0 @@ -2008-08-21 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 1.8.5 - -2008-06-24 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated for i686 - 1.8.4 - -2008-02-21 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated for i686 - 1.8.2 - -2008-01-05 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated for x86_64 - 1.8.1 - * Updated for i686 - 1.8.1 - -2007-10-28 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated version - -2007-10-11 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated version - -2007-06-28 tardo <tardo@nagi-fanboi.net> - - * Built for x86_64 diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD index e94dee04b..24eb2e296 100644 --- a/community/pgadmin3/PKGBUILD +++ b/community/pgadmin3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103799 2014-01-11 20:08:32Z eric $ +# $Id: PKGBUILD 103960 2014-01-14 05:57:45Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Benjamin Andresen <benny@klapmuetz.org> @@ -6,12 +6,12 @@ pkgname=pgadmin3 pkgver=1.18.1 -pkgrel=7 +pkgrel=8 pkgdesc="Comprehensive design and management interface for PostgreSQL" arch=('i686' 'x86_64') url="http://www.pgadmin.org" license=('custom') -depends=('wxgtk' 'postgresql-libs' 'libxslt') +depends=('wxgtk2.8' 'postgresql-libs' 'libxslt') makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick') install=pgadmin3.install source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz) @@ -22,17 +22,18 @@ build() { convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgadmin3.png cd "pgadmin3-${pkgver}" - [ -f Makefile ] || ./configure --prefix=/usr --with-wx-version=3.0 + sed -i 's/wx-config/wx-config-2.8/' configure + [ -f Makefile ] || ./configure --prefix=/usr --with-wx-version=2.8 make } package() { - cd $srcdir/pgadmin3-${pkgver} + cd "$srcdir"/pgadmin3-${pkgver} - make DESTDIR=$pkgdir/ install - install -Dm644 i18n/$pkgname.lng $pkgdir/usr/share/pgadmin3/i18n - install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - install -Dm644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pgAdmin3.ico + make DESTDIR="$pkgdir/" install + install -Dm644 i18n/$pkgname.lng "$pkgdir/usr/share/pgadmin3/i18n" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 pgadmin/include/images/pgAdmin3.ico "$pkgdir/usr/share/pgadmin3/pgAdmin3.ico" install -Dm644 "$srcdir/pgadmin3-3.png" "$pkgdir/usr/share/pgadmin3/pgAdmin3.png" install -Dm644 "pkg/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop" } diff --git a/community/rdesktop/PKGBUILD b/community/rdesktop/PKGBUILD index 9ed9c79c0..f666847d5 100644 --- a/community/rdesktop/PKGBUILD +++ b/community/rdesktop/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 101267 2013-11-21 12:16:40Z bpiotrowski $ +# $Id: PKGBUILD 104044 2014-01-14 19:45:06Z jelle $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> pkgname=rdesktop pkgver=1.8.1 -pkgrel=1 +pkgrel=3 pkgdesc="An open source client for Windows Remote Desktop Services" arch=('i686' 'x86_64') url="http://www.rdesktop.org/" license=('GPL3') -depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite') +depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite' 'libgssglue') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" rdesktop-send_physical_buttons.diff) sha1sums=('57bb41f98ddf9eeef875c613d790fee37971d0f8' diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 61e8f10c9..e00b00d40 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102497 2013-12-12 12:51:43Z spupykin $ +# $Id: PKGBUILD 103976 2014-01-14 11:37:21Z 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.8.3 +pkgver=2.8.4 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ source=("http://download.redis.io/releases/redis-$pkgver.tar.gz" "redis.service" "redis.logrotate" "redis.tmpfiles.d") -md5sums=('6327e6786130b556b048beef0edbdfa7' +md5sums=('cc161dd8fc8a11727b1b2ad8db8f77a0' '5320aa6d0f31aadc1d6202ca40425aea' '9e2d75b7a9dc421122d673fe520ef17f' 'dd9ab8022b4d963b2e5899170dfff490') diff --git a/core/curl/0001-FILE-don-t-wait-due-to-CURLOPT_MAX_RECV_SPEED_LARGE.patch b/core/curl/0001-FILE-don-t-wait-due-to-CURLOPT_MAX_RECV_SPEED_LARGE.patch new file mode 100644 index 000000000..97858e3f5 --- /dev/null +++ b/core/curl/0001-FILE-don-t-wait-due-to-CURLOPT_MAX_RECV_SPEED_LARGE.patch @@ -0,0 +1,47 @@ +From 2715d7f948c8eb7cd3cba38f3dff6d4148e7cfaf Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Sun, 22 Dec 2013 23:36:11 +0100 +Subject: [PATCH] FILE: don't wait due to CURLOPT_MAX_RECV_SPEED_LARGE + +The FILE:// code doesn't support this option - and it doesn't make sense +to support it as long as it works as it does since then it'd only block +even longer. + +But: setting CURLOPT_MAX_RECV_SPEED_LARGE would make the transfer first +get done and then libcurl would wait until the average speed would get +low enough. This happened because the transfer happens completely in the +DO state for FILE:// but then it would still unconditionally continue in +to the PERFORM state where the speed check is made. + +Starting now, the code will skip from DO_DONE to DONE immediately if no +socket is set to be recv()ed or send()ed to. + +Bug: http://curl.haxx.se/bug/view.cgi?id=1312 +Reported-by: Mohammad AlSaleh +--- + lib/multi.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/lib/multi.c b/lib/multi.c +index ec45ecb..191c9b8 100644 +--- a/lib/multi.c ++++ b/lib/multi.c +@@ -1381,7 +1381,14 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, + Curl_move_handle_from_send_to_recv_pipe(data, data->easy_conn); + /* Check if we can move pending requests to send pipe */ + Curl_multi_process_pending_handles(multi); +- multistate(data, CURLM_STATE_WAITPERFORM); ++ ++ /* Only perform the transfer if there's a good socket to work with. ++ Having both BAD is a signal to skip immediately to DONE */ ++ if((data->easy_conn->sockfd != CURL_SOCKET_BAD) || ++ (data->easy_conn->writesockfd != CURL_SOCKET_BAD)) ++ multistate(data, CURLM_STATE_WAITPERFORM); ++ else ++ multistate(data, CURLM_STATE_DONE); + result = CURLM_CALL_MULTI_PERFORM; + break; + +-- +1.8.5.2 + diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 3ea9f4915..929275905 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203041 2014-01-02 14:43:46Z dreisner $ +# $Id: PKGBUILD 204043 2014-01-14 15:06:13Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,19 +7,21 @@ pkgname=curl pkgver=7.34.0 -pkgrel=2 +pkgrel=3 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" license=('MIT') -depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') +depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib') provides=('libcurl.so') options=('strip' 'debug') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + 0001-FILE-don-t-wait-due-to-CURLOPT_MAX_RECV_SPEED_LARGE.patch 0001-connect-Try-all-addresses-in-first-connection-attemp.patch curlbuild.h) md5sums=('d5b7edccbd1793e3549842e01331da20' 'SKIP' + 'ba766acdb7568aac0b23d479ebecd591' 'ee755b0e886207fc1e8154e426c46ca7' '751bd433ede935c8fae727377625a8ae') @@ -27,6 +29,7 @@ prepare() { cd "$pkgname-$pkgver" patch -Np1 <"$srcdir"/0001-connect-Try-all-addresses-in-first-connection-attemp.patch + patch -Np1 <"$srcdir"/0001-FILE-don-t-wait-due-to-CURLOPT_MAX_RECV_SPEED_LARGE.patch } build() { @@ -41,6 +44,7 @@ build() { --enable-manual \ --enable-versioned-symbols \ --enable-threaded-resolver \ + --with-gssapi \ --without-libidn \ --with-random=/dev/urandom \ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 3f3145e7f..2b51192a4 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193454 2013-08-20 18:08:57Z bluewind $ +# $Id: PKGBUILD 204014 2014-01-14 08:12:09Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> @@ -6,21 +6,20 @@ # Contributor: francois <francois.archlinux.org> pkgname=perl -pkgver=5.18.1 -pkgrel=1 +pkgver=5.18.2 +pkgrel=2 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') url="http://www.perl.org" groups=('base') -depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') +depends=('gdbm' 'db' 'glibc') source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh perlbin.csh provides.pl) -install=perl.install options=('makeflags' '!purge') -md5sums=('4ec1a3f3824674552e749ae420c5e68c' +md5sums=('d549b16ee4e9210988da39193a9389c1' '5ed2542fdb9a60682f215bd33701e61a' '1f0cbbee783e8a6d32f01be5118e0d5e' '999c3eea6464860704abbb055a0f0896') diff --git a/core/perl/perl.install b/core/perl/perl.install deleted file mode 100644 index a355c5bbe..000000000 --- a/core/perl/perl.install +++ /dev/null @@ -1,10 +0,0 @@ -# arg 1: the new package version -post_install() { - for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do - [ -h usr/lib/perl5/$ver ] && rm usr/lib/perl5/$ver - [ -h usr/lib/perl5/site_perl/$ver ] && rm usr/lib/perl5/site_perl/$ver - [ -h usr/bin/perl$ver ] && rm usr/bin/perl$ver - done - return 0 -} - diff --git a/extra/compface/PKGBUILD b/extra/compface/PKGBUILD index 7f96a2690..d7b325185 100644 --- a/extra/compface/PKGBUILD +++ b/extra/compface/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 203536 2014-01-13 10:41:27Z andyrtr $ +# $Id: PKGBUILD 204047 2014-01-14 16:59:02Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: simo <simo@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=compface pkgver=1.5.2 -pkgrel=5 +pkgrel=6 pkgdesc="Utils & libs to convert from/to X-Face format." arch=('i686' 'x86_64') url="http://ftp.xemacs.org/pub/xemacs/aux/" @@ -26,7 +26,7 @@ prepare() { build() { cd $pkgname-$pkgver CFLAGS="$CFLAGS -fPIC" - ./configure --prefix=/usr --mandir=/usr/share + ./configure --prefix=/usr --mandir=/usr/share/man make } diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index eec7de9aa..a4455e18c 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 202971 2013-12-29 17:17:29Z bpiotrowski $ +# $Id: PKGBUILD 203681 2014-01-14 06:49:49Z bpiotrowski $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=2.1.1 -pkgrel=3 +pkgver=2.1.2 +pkgrel=1 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('i686' 'x86_64') @@ -19,15 +19,8 @@ depends=( 'v4l-utils' 'x264' 'xvidcore' 'zlib' ) makedepends=('libvdpau' 'yasm') -source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2 - ffmpeg-2.1.1-freetype2.patch) -md5sums=('2719ab2b3311ac3775b9cdeb66c54849' - '4b5dd079a40f44f4e0d00cdbc9d52ec3') - -prepare() { - cd $pkgname-$pkgver - patch -p1 -i ../ffmpeg-2.1.1-freetype2.patch -} +source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) +md5sums=('4c41fefca609c6ef0dfd539826783e73') build() { cd $pkgname-$pkgver diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index a48e24431..639bc0216 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 201638 2013-12-17 11:09:15Z heftig $ +# $Id: PKGBUILD 204045 2014-01-14 15:48:56Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gdk-pixbuf2 -pkgver=2.30.2 +pkgver=2.30.3 pkgrel=1 pkgdesc="An image loading library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11' 'jasper') makedepends=('gtk-doc' 'gobject-introspection') install=gdk-pixbuf2.install source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('cababfa075a9a60426809309ec86b82ea28e83f44ef69c898e48c040b6feecbf') +sha256sums=('c229c53f59573eab9410b53690a4b9db770312c80a4d84ecd6295aa894574494') build() { cd gdk-pixbuf-$pkgver diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index 840662da9..5ddd9cdb5 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 199786 2013-11-16 12:15:33Z heftig $ +# $Id: PKGBUILD 204013 2014-01-14 08:11:43Z jgc $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.10.1 -pkgrel=2 +pkgver=3.10.2 +pkgrel=1 epoch=1 pkgdesc="Library with common API for various GNOME modules" arch=(i686 x86_64) @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=(gnome) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch) -sha256sums=('10aca72355e8e2854450ce10edfb6da433af62ea0d87b0718ff62e9a40aabb41' +sha256sums=('d4f5944aea5f2a8c7c5dc0e738bf07f293dfff81ddc55a53d661370bf24e4632' '5920cec531b03ebe0ce0941250ce62d92a7b18ae44900f11df90adb381858df2') prepare() { diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index a3128b59b..e47d764d5 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 198041 2013-10-30 12:26:38Z allan $ +# $Id: PKGBUILD 204018 2014-01-14 08:57:49Z jgc $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric -pkgver=1.12.8 +pkgver=1.12.9 pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64') @@ -17,9 +17,9 @@ optdepends=('python2-gobject: for python plugin support' 'psiconv: for Psion 5 file support' 'yelp: for viewing the help manual') install=gnumeric.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz revert-warnings.patch) -sha256sums=('02688fb6c32c28db2eb4e9a8e012cf1386f4f3a18b4c94f5ecdd13342521ec76' +sha256sums=('4cd3ad5d9fc27a86ef62dbb6bf793b27fad9b6736bb8e988fa11dc6cb88b62e7' 'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53') prepare() { diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index 9a87fca37..694ea890d 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 198044 2013-10-30 12:27:46Z allan $ +# $Id: PKGBUILD 204016 2014-01-14 08:43:06Z jgc $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=goffice -pkgver=0.10.8 +pkgver=0.10.9 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') depends=('librsvg' 'gtk3' 'libgsf' 'libspectre') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('11964b907b03dede6d8d8a1a4ae2d5727ffbe8d7bab5c92dec586acb616e807c') +sha256sums=('8f21cc656645dfe9da518a672350f5a5a5710b20278fa6a7a5af4d583d148875') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libatomic_ops/PKGBUILD b/extra/libatomic_ops/PKGBUILD new file mode 100644 index 000000000..58f780beb --- /dev/null +++ b/extra/libatomic_ops/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Adam Walters <abwalters@abwalters.us> +# Contributor: William Rea <sillywilly@gmail.com> +# Contributor: Rémy Oudompheng <remy@archlinux.org> + +pkgname=libatomic_ops +pkgver=7.2.e +pkgrel=1 +pkgdesc="Provides semi-portable access to hardware provided atomic memory operations" +arch=('i686' 'x86_64') +url="https://github.com/ivmai/libatomic_ops" +depends=('glibc') +license=('GPL2' 'MIT') +source=(http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-7.2e.tar.gz) +md5sums=('7035692fec4db2659b06485040829e43') + +prepare(){ + cd libatomic_ops-7.2 + + sed -i 's#AM_CONFIG_HEADER#AC_CONFIG_HEADERS#' configure.ac + sed -i 's#AC_PROG_RANLIB#AC_LIBTOOL_DLOPEN\nAC_PROG_LIBTOOL#' configure.ac + sed -i 's#b_L#b_LTL#;s#\.a#.la#g;s#_a_#_la_#' src/Makefile.am + sed -i 's#\.a#.so#g;s#\.\./src/#../src/.libs/#g' tests/Makefile.am + sed -i 's#pkgdata#doc#' doc/Makefile.am +} + +build() { + cd libatomic_ops-7.2 + autoreconf -fi + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd libatomic_ops-7.2 + LD_LIBRARY_PATH="${srcdir}/libatomic_ops-7.2/src/.libs" make check +} + +package() { + cd libatomic_ops-7.2 + make DESTDIR="${pkgdir}" install + install -D -m644 doc/LICENSING.txt "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD index 3a52c60c6..578bb2f6d 100644 --- a/extra/libktorrent/PKGBUILD +++ b/extra/libktorrent/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203581 2014-01-13 17:12:12Z andyrtr $ +# $Id: PKGBUILD 204052 2014-01-14 20:33:05Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -11,7 +11,7 @@ url="http://ktorrent.org/" license=('GPL2') depends=('kdelibs') makedepends=('automoc4' 'cmake' 'boost' 'doxygen') -source=("http://ktorrent.org/downloads/4.3.1/${pkgname}-${pkgver}.tar.bz2") +source=("http://ktorrent.pwsp.net/downloads/4.3.1/${pkgname}-${pkgver}.tar.bz2") sha1sums=('71b377c0cad01dca6061f1fe92f91c4cf05476b3') prepare() { diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 63d195ff0..313e81327 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 196228 2013-10-08 23:20:06Z eric $ +# $Id: PKGBUILD 203676 2014-01-14 01:46:42Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <emulatorman@parabola.nu> _pkgname=liferea pkgname=liferea-libre -pkgver=1.10.3 +pkgver=1.10.4 pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64') @@ -22,11 +22,11 @@ optdepends=('gnome-keyring: for keyring plugin support' 'gst-plugins-base: for media player plugin support' 'gst-plugins-good: for media player plugin support' 'gst-plugins-bad-libre: for media player plugin support') -options=('!libtool' '!emptydirs') +options=('!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('70ea247cd84274cd6a144f63772d97af4e6b5ebb' +sha1sums=('7ee44bff223cd3112c54399de04e9fa750ac3f6a' '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1') build() { diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD index d97f31df7..88c817dcd 100644 --- a/libre/mesa-libcl/PKGBUILD +++ b/libre/mesa-libcl/PKGBUILD @@ -4,8 +4,8 @@ pkgbase=mesa _pkgname=libcl pkgname=$pkgbase-$_pkgname _pkgflag=libre -pkgver=10.0.1 -pkgrel=2 +pkgver=10.0.2 +pkgrel=1 pkgdesc='Mesa 3-D OpenCL library' url=http://${pkgbase}3d.sourceforge.net license=(MIT Khronos LGPL) @@ -26,21 +26,8 @@ makedepends=( provides=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx) conflicts=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx) replaces=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx) -source=( - ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2 - revert.remove.GLXContextID.typedef.patch -) -sha512sums=( - 7abdc38cb5b8b09bd586e6045b1d67cb809951f467d67a95e866d49b972c0c56d6a5b8612c411580bf59759a7ce49992eaf4dcc1c16aa1d67513f16b869bdfc1 - a2a92d997e1615548371ef618daf47011c7fc71d51d31dbdf47a54d56e078f98af624bde5cd7779c3d8ffb60f3b64aa8ebb5d6363cad261e52605926b47d7a35 -) - -prepare() { - cd $srcdir/${pkgbase^}-$pkgver - - # Cherry picked from mesa branch 10.0, this fix wxgtk rebuild (FS#38392) - patch -Np1 -i ../revert.remove.GLXContextID.typedef.patch -} +source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2 +sha512sums=15741b916e6338645a28961fb7a731f8c2a33afe11e91c0bd144f9d9afca96837c9caf7fb2fd769aedbeba2b8b12443e7a7eb8ab6cd2270024308ca11e88ff24 build() { cd $srcdir/${pkgbase^}-$pkgver diff --git a/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch b/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch deleted file mode 100644 index 92232dd2d..000000000 --- a/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 347f1493320e1bc2194c70d4d66bfe2b5883bf1e Mon Sep 17 00:00:00 2001 -From: Kenneth Graunke <kenneth@whitecape.org> -Date: Mon, 30 Dec 2013 07:19:36 +0000 -Subject: Revert "mesa: Remove GLXContextID typedef from glx.h." - -This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1. - -According to belak51 on IRC, this commit broke Allegro, which would no -longer compile. Applications apparently expect the GLXContextID typedef -to exist in glx.h; removing it breaks them. A bit of searching around -the internet revealed other complaints since upgrading to Mesa 10. - -Cc: "10.0" <mesa-stable@lists.freedesktop.org> -(cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33) ---- -diff --git a/include/GL/glx.h b/include/GL/glx.h -index 62d0ede..234abc0 100644 ---- a/include/GL/glx.h -+++ b/include/GL/glx.h -@@ -168,6 +168,7 @@ typedef XID GLXDrawable; - /* GLX 1.3 and later */ - typedef struct __GLXFBConfigRec *GLXFBConfig; - typedef XID GLXFBConfigID; -+typedef XID GLXContextID; - typedef XID GLXWindow; - typedef XID GLXPbuffer; - --- -cgit v0.9.0.2-2-gbebe - diff --git a/libre/pcsx2-libre/PKGBUILD b/libre/pcsx2-libre/PKGBUILD new file mode 100644 index 000000000..9331100aa --- /dev/null +++ b/libre/pcsx2-libre/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 103474 2014-01-06 14:09:29Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> +# Contributor: josephgbr <rafael.f.f1@gmail.com> +# Contributor: vEX <vex@niechift.com> + +_pkgname=pcsx2 +pkgname=$_pkgname-libre +pkgver=1.1.0.r5797 +pkgrel=1 +pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support' +arch=('i686' 'x86_64') +url='http://www.pcsx2.net' +license=('GPL') +makedepends=('cmake' 'sparsehash' 'svn') +if [[ $CARCH == "i686" ]]; then + depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.8') +elif [[ $CARCH == "x86_64" ]]; then + makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8') +fi +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +replaces=("$_pkgname") +options=('!emptydirs') +source=("${_pkgname}::svn+http://pcsx2.googlecode.com/svn/trunk/#revision=${pkgver#*r}") +sha256sums=('SKIP') + +build() { + cd ${_pkgname} + + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + if [[ $CARCH == "i686" ]]; then + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,SDL2_API,XDG_STD}=TRUE -DPLUGIN_DIR='/usr/lib/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8' + elif [[ $CARCH == "x86_64" ]]; then + export CC='gcc -m32' + export CXX='g++ -m32' + export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,SDL2_API,XDG_STD}=TRUE -DPLUGIN_DIR='/usr/lib32/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8' -DCMAKE_LIBRARY_PATH='/usr/lib32' + fi + + make +} + +package() { + cd ${_pkgname}/build + + if [[ $CARCH == "x86_64" ]]; then + depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-sdl2' 'lib32-soundtouch' 'lib32-wxgtk2.8') + fi + + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/nonprism/bitlbee-libre-nonprism/PKGBUILD b/nonprism/bitlbee-libre-nonprism/PKGBUILD index 02418359a..ef3705757 100644 --- a/nonprism/bitlbee-libre-nonprism/PKGBUILD +++ b/nonprism/bitlbee-libre-nonprism/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 200603 2013-11-29 19:17:58Z dreisner $ +# $Id: PKGBUILD 202378 2013-12-21 14:01:44Z andyrtr $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> @@ -11,7 +11,7 @@ _pkgname=bitlbee pkgname=bitlbee-libre-nonprism pkgver=3.2.1 -pkgrel=1 +pkgrel=2 pkgdesc='Brings XMPP to IRC, without support for unsafe and dangerous for privacy protocols' url='http://www.bitlbee.org/' license=('GPL') diff --git a/nonprism/grilo-plugins-nonprism/PKGBUILD b/nonprism/grilo-plugins-nonprism/PKGBUILD index 8f07b2069..b27e9ac91 100644 --- a/nonprism/grilo-plugins-nonprism/PKGBUILD +++ b/nonprism/grilo-plugins-nonprism/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 194625 2013-09-19 19:20:52Z jgc $ +# $Id: PKGBUILD 201648 2013-12-17 11:32:11Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _pkgname=grilo-plugins pkgname=grilo-plugins-nonprism pkgver=0.2.9 -pkgrel=2 +pkgrel=3 pkgdesc="Plugins for Grilo, without libgdata support" url="http://www.gnome.org" arch=(i686 x86_64) @@ -20,7 +20,7 @@ optdepends=('gupnp-av: uPnP plugin' 'totem-plparser: Youtube plugin, Vimeo plugin, Optical media plugin' 'libdmapsharing: DMAP sharing plugin' 'json-glib: TMDb plugin') -options=('!libtool' '!emptydirs') +options=('!emptydirs') groups=('gnome') replaces=$_pkgname conflicts=$_pkgname |