diff options
54 files changed, 645 insertions, 638 deletions
diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD index 5029f8157..a7af7b714 100644 --- a/community/blueman/PKGBUILD +++ b/community/blueman/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 87809 2013-04-06 22:04:55Z bgyorgy $ -# Maintainer : Ionut Biru <ibiru@archlinux.org +# $Id: PKGBUILD 92494 2013-06-07 09:28:53Z tomegun $ +# Contributor: Ionut Biru <ibiru@archlinux.org # Contributor: Abhishek Dasgupta <abhidg@gmail.com> pkgname=blueman pkgver=1.23 -pkgrel=6 +pkgrel=10 pkgdesc="GTK+ bluetooth manager" arch=('i686' 'x86_64') license=('GPL') url="https://launchpad.net/blueman" -depends=('bluez' 'gnome-icon-theme' 'libpulse' 'obex-data-server' 'python2-dbus' - 'python2-notify' 'startup-notification' 'xdg-utils') +depends=('bluez4' 'bluez-libs' 'gnome-icon-theme' 'libpulse' 'obex-data-server' + 'python2-dbus' 'python2-notify' 'startup-notification' 'xdg-utils') makedepends=('pyrex' 'intltool') optdepends=('dnsmasq: For creating PAN network' 'modemmanager: For modem management service' diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index a35e27aee..424e7da81 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,10 +1,10 @@ -#$Id: PKGBUILD 90387 2013-05-12 06:30:53Z dwallace $ +#$Id: PKGBUILD 92495 2013-06-07 09:28:54Z tomegun $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.14 -pkgrel=2 +pkgver=1.15 +pkgrel=1 pkgdesc="Wireless LAN network manager" url="http://connman.net/" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn') options=('!libtool') source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'allow_group_network.diff') -md5sums=('d8c98071ca244d2e66ae49becfcd0634' +md5sums=('d68ec364b4b3fba3131defe074c768dc' 'a8d22ee089fb0ed725130d16ad393047') prepare(){ diff --git a/community/cwiid/PKGBUILD b/community/cwiid/PKGBUILD index a98abf2e5..780155b0d 100644 --- a/community/cwiid/PKGBUILD +++ b/community/cwiid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72056 2012-06-07 14:10:17Z speps $ +# $Id: PKGBUILD 92496 2013-06-07 09:28:55Z tomegun $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Wieland Hoffmann <the_mineo@web.de> @@ -8,11 +8,12 @@ pkgname=cwiid pkgver=0.6.00 -pkgrel=12 +pkgrel=13 pkgdesc="Linux Nintendo Wiimote interface" arch=('i686' 'x86_64') url="http://abstrakraft.org/cwiid" -depends=('bluez' 'gtk2') +depends=('bluez-libs' 'gtk2' 'python2') +makedepends=('python2') license=('GPL') install="$pkgname.install" source=("$url/downloads/$pkgname-$pkgver.tgz" diff --git a/community/dietlibc/PKGBUILD b/community/dietlibc/PKGBUILD index b944ce259..6926505b4 100644 --- a/community/dietlibc/PKGBUILD +++ b/community/dietlibc/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 65120 2012-02-20 04:53:08Z spupykin $ +# $Id: PKGBUILD 92521 2013-06-07 16:21:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tino Reichardt <milky-archlinux@mcmilk.de> pkgname=dietlibc -pkgver=0.32 -pkgrel=3 +pkgver=0.33 +pkgrel=1 pkgdesc="a libc optimized for small size" arch=('i686' 'x86_64') url="http://www.fefe.de/dietlibc/" license=("GPL") #source=(http://www.kernel.org/pub/linux/libs/dietlibc/$pkgname-$pkgver.tar.bz2) -source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.bz2) -md5sums=('0098761c17924c15e21d25acdda4a8b5') +source=("http://www.fefe.de/dietlibc/dietlibc-$pkgver.tar.bz2") +md5sums=('9d541b9a6623b04ec12e5248b82db7c0') build() { cd $srcdir/$pkgname-$pkgver - make -j1 all dyn - mkdir -p $pkgdir/etc + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/gammu/PKGBUILD b/community/gammu/PKGBUILD index 80f0e42ae..95f8da192 100644 --- a/community/gammu/PKGBUILD +++ b/community/gammu/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 87059 2013-03-26 14:42:55Z schiv $ +# $Id: PKGBUILD 92498 2013-06-07 09:28:57Z tomegun $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=gammu pkgver=1.32.0 -pkgrel=3 +pkgrel=4 pkgdesc="GNU All Mobile Management Utilities" arch=('i686' 'x86_64') url="http://wammu.eu/" license=('GPL') -depends=('bluez' 'curl' 'libmariadbclient' - 'postgresql-libs' 'libusb') -makedepends=('cmake' 'doxygen' 'mariadb') +depends=('glib2' 'bluez-libs' 'curl' 'libmariadbclient' 'postgresql-libs' 'libusb') +makedepends=('cmake' 'doxygen' 'mariadb' 'python2') optdepends=('dialog: support for the gammu-config script') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") md5sums=('8ea16c6b3cc48097a8e62311fe0e25b9') diff --git a/community/gnokii/PKGBUILD b/community/gnokii/PKGBUILD index 0c0a051ed..5e5d099a9 100644 --- a/community/gnokii/PKGBUILD +++ b/community/gnokii/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90848 2013-05-14 21:40:33Z andrea $ +# $Id: PKGBUILD 92499 2013-06-07 09:28:58Z tomegun $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,12 +6,12 @@ pkgname=gnokii pkgver=0.6.31 -pkgrel=4 +pkgrel=5 pkgdesc="Tools and user space driver for use with mobile phones" arch=('i686' 'x86_64') url="http://www.gnokii.org/" license=('GPL') -depends=('libusb-compat' 'libxpm' 'bluez' 'libical') +depends=('libusb-compat' 'libxpm' 'bluez-libs' 'libical' 'sqlite') makedepends=('gtk2' 'libmariadbclient' 'postgresql-libs' 'intltool' 'mariadb') optdepends=('gtk2: xgnokii GUI' 'libmariadbclient: smsd mysql backend' diff --git a/community/phantomjs/PKGBUILD b/community/phantomjs/PKGBUILD new file mode 100644 index 000000000..46ba64245 --- /dev/null +++ b/community/phantomjs/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 92506 2013-06-07 11:18:15Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: grimsock <lord.grimsock at gmail dot com> +# Contributor: Dieter Plaetinck <dieter@plaetinck.be> +# Contributor: Vladimir Chizhov <jagoterr@gmail.com> +# Contributor: Henry Tang <henryykt@gmail.com> + +pkgname=phantomjs +pkgver=1.9.1 +pkgrel=2 +pkgdesc="Headless WebKit with JavaScript API" +url="http://www.phantomjs.org/" +license=('BSD' 'LGPL' 'MIT') +arch=('i686' 'x86_64') +depends=('gstreamer0.10-base' 'fontconfig' 'freetype2') +makedepends=('unzip') +source=("http://phantomjs.googlecode.com/files/${pkgname}-${pkgver}-source.zip") +noextract=("${pkgname}-${pkgver}-source.zip") +md5sums=('93a0043d4ff8cd83e23e9d261c93830d') + +build() { + # workaround for https://code.google.com/p/libarchive/issues/detail?id=271 + # cd $srcdir/$pkgname-$pkgver + unzip ${pkgname}-${pkgver}-source.zip + + cd $pkgname-$pkgver + # workaround for http://code.google.com/p/phantomjs/issues/detail?id=635 + sed -i 's/QMAKE_LFLAGS+=-fuse-ld=gold/#QMAKE_LFLAGS+=-fuse-ld=gold/' src/qt/src/3rdparty/webkit/Source/common.pri + + ./build.sh --confirm --qt-config "-no-rpath" +} + +package() { + install -Dm755 "$srcdir/$pkgname-$pkgver/bin/phantomjs" "$pkgdir/usr/bin/phantomjs" + + mkdir -p "$pkgdir/usr/share/$pkgname" + cp -r "$srcdir/$pkgname-$pkgver/examples" "$pkgdir/usr/share/$pkgname"/ + + install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE.BSD" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.BSD" + install -Dm644 "$srcdir/$pkgname-$pkgver/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt" +} + diff --git a/community/python-pybox2d/PKGBUILD b/community/python-pybox2d/PKGBUILD new file mode 100644 index 000000000..6ef9679f8 --- /dev/null +++ b/community/python-pybox2d/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +pkgname=python-pybox2d +pkgver=370 +pkgrel=1 +pkgdesc="Python wrapper for Box2D" +arch=('i686' 'x86_64') +url="http://code.google.com/p/pybox2d" +license=('GPL') +depends=('python' 'swig') +makedepends=('subversion') +source=("svn+http://pybox2d.googlecode.com/svn/trunk/") +md5sums=('SKIP') + +build() { + cd ${srcdir}/trunk + + python setup.py build +} + +package() { + cd ${srcdir}/trunk + + python setup.py install --root=${pkgdir} +} +# vim: sw=2 ts=2 et: diff --git a/community/python-sfml/PKGBUILD b/community/python-sfml/PKGBUILD new file mode 100644 index 000000000..d38c21200 --- /dev/null +++ b/community/python-sfml/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +pkgname=python-sfml +pkgver=1.3 +pkgrel=1 +pkgdesc="The unofficial Python binding for SFML" +arch=('i686' 'x86_64') +url="http://python-sfml.org" +license=('LGPL') +depends=('sfml' 'python') +makedepends=('cython' 'git') +source=("git://github.com/Sonkun/python-sfml.git#tag=v${pkgver}") +md5sums=("SKIP") + +build() { + cd "$srcdir"/python-sfml + + python setup.py build_ext +} + +package() { + cd "$srcdir"/python-sfml + + python setup.py install --root="${pkgdir}" --prefix=/usr + + # Copying the License file + install -D -m644 "$srcdir/python-sfml/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/python2-pybluez/PKGBUILD b/community/python2-pybluez/PKGBUILD index 6007614a6..672954656 100644 --- a/community/python2-pybluez/PKGBUILD +++ b/community/python2-pybluez/PKGBUILD @@ -4,7 +4,7 @@ pkgname=python2-pybluez pkgver=0.18 -pkgrel=4 +pkgrel=6 pkgdesc="Python wrapper for the BlueZ Bluetooth stack" arch=('i686' 'x86_64') url="http://code.google.com/p/pybluez/" @@ -12,11 +12,11 @@ license=('GPL') provides=('pybluez') conflicts=('pybluez') replaces=('pybluez') -depends=('python2' 'bluez') +depends=('python2' 'bluez-libs') source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz) md5sums=('be8c8ce615c3189fda1aaf3d568314b2') -build() { +package() { cd $srcdir/PyBluez-$pkgver python2 setup.py install --root=$pkgdir ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 05834c021..41a7a0525 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 91908 2013-05-29 10:07:02Z spupykin $ +# $Id: PKGBUILD 92529 2013-06-07 17:30:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=7.2.7 -pkgrel=3 +pkgver=7.4.0 +pkgrel=2 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') license=('GPL3') depends=('zlib' 'libestr' 'libee' 'json-c') -makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls') +makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls' + 'python-docutils') optdepends=('postgresql-libs: PostgreSQL Database Support' 'libmariadbclient: MySQL Database Support' 'net-snmp' @@ -21,8 +22,8 @@ options=('strip' 'zipman' '!libtool') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog.logrotate' 'rsyslog.conf') -md5sums=('4a61d182acb5b5487e7b99dea8974857' - '304bc9ea26aa1ff910870899a30512f1' +md5sums=('5bd05354331f4955337d8e4bc64db985' + '0d990373f5c70ddee989296007b4df5b' 'd61dd424e660eb16401121eed20d98bc') build() { diff --git a/community/rsyslog/rsyslog.logrotate b/community/rsyslog/rsyslog.logrotate index 354581767..889c9891e 100644 --- a/community/rsyslog/rsyslog.logrotate +++ b/community/rsyslog/rsyslog.logrotate @@ -1,4 +1,4 @@ -/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log { +/var/log/auth.log /var/log/cron.log /var/log/daemon.log /var/log/debug /var/log/kern.log /var/log/lpr.log /var/log/mail.err /var/log/mail.info /var/log/mail.log /var/log/mail.warn /var/log/messages /var/log/news /var/log/syslog /var/log/user.log { missingok sharedscripts postrotate diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index 4223d1dfe..7d65c4d8d 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90606 2013-05-13 10:37:47Z spupykin $ +# $Id: PKGBUILD 92523 2013-06-07 16:54:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig pkgver=0.64.0 -pkgrel=1 +pkgrel=2 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64) url="http://synfig.org" @@ -18,10 +18,12 @@ replaces=('synfig-core') options=(!libtool) source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz build-fix.patch - ffmpeg-0.8.patch) + ffmpeg-0.8.patch + ffmpeg-loop.patch) md5sums=('124cb4059b9f48dc5c37204660053d6f' 'b5568b06fae1a7ee465b5380b1139b83' - 'ebf41046097cfd778dee9a9854561dae') + 'ebf41046097cfd778dee9a9854561dae' + 'c6684c876c093f5e53d2c46592994e9b') build() { cd $srcdir/$pkgname-$pkgver @@ -33,6 +35,7 @@ build() { [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv patch -p1 -i $srcdir/build-fix.patch patch -Np1 -i $srcdir/ffmpeg-0.8.patch + patch -Np1 -i $srcdir/ffmpeg-loop.patch sed -i '1,1i#include <string.h>' src/modules/mod_png/trgt_png.cpp make } diff --git a/community/synfig/ffmpeg-loop.patch b/community/synfig/ffmpeg-loop.patch new file mode 100644 index 000000000..ce271363b --- /dev/null +++ b/community/synfig/ffmpeg-loop.patch @@ -0,0 +1,56 @@ +--- synfig-0.63.05/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp 2013-02-27 13:51:18.638547204 -0300 ++++ synfig-0.63.05.new/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp 2013-02-27 13:51:09.905261183 -0300 +@@ -172,7 +172,7 @@ + + if( filename.c_str()[0] == '-' ) + command = strprintf("ffmpeg -f image2pipe -vcodec ppm -an" +- " -r %f -i pipe: -loop_input" ++ " -r %f -i pipe: -loop 1" + " -metadata title=\"%s\" " + " -vcodec %s -b %ik" + " -y -- \"%s\"\n", +@@ -182,7 +182,7 @@ + filename.c_str()); + else + command = strprintf("ffmpeg -f image2pipe -vcodec ppm -an" +- " -r %f -i pipe: -loop_input" ++ " -r %f -i pipe: -loop 1" + " -metadata title=\"%s\" " + "-vcodec %s -b %ik" + " -y -- \"%s\"\n", +@@ -227,7 +227,7 @@ + execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec", + "ppm", "-an", "-r", + strprintf("%f", desc.get_frame_rate()).c_str(), +- "-i", "pipe:", "-loop_input", "-metadata", ++ "-i", "pipe:", "-loop", "1", "-metadata", + strprintf("title=\"%s\"", get_canvas()->get_name().c_str()).c_str(), + "-vcodec", video_codec.c_str(), + "-b", strprintf("%ik", bitrate).c_str(), +@@ -237,7 +237,7 @@ + execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec", + "ppm", "-an", "-r", + strprintf("%f", desc.get_frame_rate()).c_str(), +- "-i", "pipe:", "-loop_input", "-metadata", ++ "-i", "pipe:", "-loop", "1", "-metadata", + strprintf("title=\"%s\"", get_canvas()->get_name().c_str()).c_str(), + "-vcodec", video_codec.c_str(), + "-b", strprintf("%ik", bitrate).c_str(), +@@ -249,7 +249,7 @@ + execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec", + "ppm", "-an", "-r", + strprintf("%f", desc.get_frame_rate()).c_str(), +- "-i", "pipe:", "-loop_input", ++ "-i", "pipe:", "-loop", "1", + "-metadata", + strprintf("title=\"%s\"", get_canvas()->get_name().c_str()).c_str(), + "-vcodec", video_codec.c_str(), +@@ -260,7 +260,7 @@ + execlp("ffmpeg", "ffmpeg", "-f", "image2pipe", "-vcodec", + "ppm", "-an", "-r", + strprintf("%f", desc.get_frame_rate()).c_str(), +- "-i", "pipe:", "-loop_input", ++ "-i", "pipe:", "-loop", "1", + "-metadata", + strprintf("title=\"%s\"", get_canvas()->get_name().c_str()).c_str(), + "-vcodec", video_codec.c_str(), diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD index 60ea4b556..d4c56b293 100644 --- a/community/weston/PKGBUILD +++ b/community/weston/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90107 2013-05-06 19:40:06Z foutrelis $ +# $Id: PKGBUILD 92508 2013-06-07 12:43:24Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=weston -pkgver=1.1.0 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 pkgdesc='Reference implementation of a Wayland compositor' arch=('i686' 'x86_64') url='http://wayland.freedesktop.org' @@ -12,7 +12,7 @@ license=('MIT') options=(!libtool) depends=('libxkbcommon' 'libunwind' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'pango') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('0929afa86d795e0e970936623d86bdd950d48e8d') +sha1sums=('5239afe177dadbded3c0018b55dd1045be5f84b2') build() { cd $pkgname-$pkgver diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD index 6616f3643..06bdca011 100644 --- a/community/xbmc/PKGBUILD +++ b/community/xbmc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90148 2013-05-07 12:45:12Z spupykin $ +# $Id: PKGBUILD 92502 2013-06-07 09:29:03Z tomegun $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -9,7 +9,7 @@ _prefix=/usr pkgname=xbmc pkgver=12.2 -pkgrel=1 +pkgrel=4 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -18,13 +18,11 @@ depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' - 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu' + 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu' 'tinyxml' 'taglib') makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' - 'udisks' 'upower' 'bluez' 'mesa' 'doxygen' 'swig' 'java-environment') + 'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment') optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' - 'vdpau-video: accelerated video playback for nvidia cards' - 'xvba-video: accelerated video playback for amd cards' 'pulseaudio: pulseaudio support' 'lirc: remote controller support' 'udisks: automount external drives' diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD index 2d8f14fb5..70947d5b6 100644 --- a/core/dialog/PKGBUILD +++ b/core/dialog/PKGBUILD @@ -1,29 +1,34 @@ -# $Id: PKGBUILD 186478 2013-05-27 12:00:13Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id: PKGBUILD 187873 2013-06-07 13:39:39Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=dialog pkgver=1.2_20130523 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to display dialog boxes from shell scripts" arch=('i686' 'x86_64') url="http://invisible-island.net/dialog/" license=('LGPL2.1') depends=('ncurses') -source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz) -sha1sums=('54768b8443af3de2e6cd16073ec666f19d4ded7a') +source=(ftp://invisible-island.net/$pkgname/$pkgname-${pkgver/_/-}.tgz) +sha256sums=('c8d114b7698022bcbd6c88f3c0b2296b0e846c60c5ed6bd28f86dd72b94fd36d') build() { - cd "${srcdir}/$pkgname-${pkgver/_/-}" - ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-ncursesw --enable-nls + cd "$srcdir/$pkgname-${pkgver/_/-}" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --with-ncursesw \ + --enable-nls make } package() { - cd "${srcdir}/$pkgname-${pkgver/_/-}" - make DESTDIR="${pkgdir}" install install-lib - - rm "${pkgdir}"/usr/lib/libdialog.a + cd "$srcdir/$pkgname-${pkgver/_/-}" + make DESTDIR="$pkgdir" install-full } + +# vim:set ts=2 sw=2 et: diff --git a/extra/bluez-hcidump/PKGBUILD b/extra/bluez-hcidump/PKGBUILD deleted file mode 100644 index 2e586a131..000000000 --- a/extra/bluez-hcidump/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 187051 2013-06-03 11:16:12Z allan $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Geoffroy carrier <geoffroy@archlinux.org> - -pkgname=bluez-hcidump -pkgver=2.4 -pkgrel=2 -pkgdesc="Bluetooth HCI package analyzer" -url="http://www.bluez.org/" -arch=('i686' 'x86_64') -license=('GPL2') -depends=('bluez') -source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.gz") -md5sums=('d39833de0ed26bddf784e9580b6f33c4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - mv "${pkgdir}"/usr/sbin "${pkgdir}"/usr/bin -} diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 2e1cfe46a..422ba049b 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,88 +1,75 @@ -# $Id: PKGBUILD 187050 2013-06-03 11:16:11Z allan $ +# $Id: PKGBUILD 187857 2013-06-07 09:24:54Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> -pkgname=bluez -pkgver=4.101 +pkgbase=bluez +pkgname=('bluez' 'bluez-utils' 'bluez-libs') +pkgver=5.5 pkgrel=2 -pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64') license=('GPL2') -depends=('dbus-core' 'python2' 'systemd-tools') -makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx') -optdepends=("gstreamer0.10-base: bluetooth GStreamer support" - "alsa-lib: Audio bluetooth devices support" - "python2-dbus: to run bluez-simple-agent" - "python2-gobject: to run bluez-simple-agent" - "libusb-compat: USB adapters support" - "cups: CUPS backend") -conflicts=('bluez-libs' 'bluez-utils') -provides=('bluez-libs' 'bluez-utils') -replaces=('bluez-libs' 'bluez-utils') -options=('!libtool') -backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf - 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') -source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" - 'bluetooth.conf.d' - 'rc.bluetooth') +makedepends=('libusb-compat' 'dbus' 'libical' 'systemd') +options=(!libtool) +source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2") build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/lib \ - --enable-gstreamer \ - --enable-alsa \ - --enable-usb \ - --enable-tools \ - --enable-bccmd \ - --enable-dfutool \ - --enable-hid2hci \ - --enable-hidd \ - --enable-pand \ - --enable-dund \ - --enable-cups \ - --enable-wiimote \ - --disable-test \ - --with-systemdunitdir=/usr/lib/systemd/system + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --enable-library # this is deprecated make } -package() { +package_bluez() { + pkgdesc="Daemons for the bluetooth protocol stack" + depends=('libical' 'dbus' 'glib2') + optdepends=("cups: CUPS backend") + backup=('etc/dbus-1/system.d/bluetooth.conf') + conflicts=('obexd-client' 'obexd-server') + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth - - install -d ${pkgdir}/etc/bluetooth - install -m644 network/network.conf \ - input/input.conf \ - audio/audio.conf \ - serial/serial.conf \ - ${pkgdir}/etc/bluetooth/ - - install -Dm644 ${srcdir}/bluetooth.conf.d \ - ${pkgdir}/etc/conf.d/bluetooth + ### split out bluez-utils + rm -rf "$srcdir/_utils" + install -dm755 "$srcdir"/_utils/usr/share/man + mv "$pkgdir"/usr/share/man/man1 "$srcdir"/_utils/usr/share/man/ + install -dm755 "$srcdir"/_utils/usr/bin + mv "$pkgdir"/usr/bin/{bccmd,ciptool,hciattach,hciconfig,hcidump,hcitool,l2ping,l2test,rctest,rfcomm,sdptool}\ + "$srcdir"/_utils/usr/bin/ + install -dm755 "$srcdir"/_utils/usr/lib + mv "$pkgdir"/usr/lib/udev "$srcdir"/_utils/usr/lib/ + + ### split out bluez-libs + rm -rf "$srcdir/_libs" + install -dm755 "$srcdir"/_libs/usr/lib/ + mv "$pkgdir"/usr/lib/{pkgconfig,libbluetooth*} \ + "$srcdir"/_libs/usr/lib/ + mv "$pkgdir"/usr/include \ + "$srcdir"/_libs/usr/ +} - # FS#27630 - install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent - install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device - install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input - sed -i 's#/usr/bin/python#/usr/bin/python2#' \ - "${pkgdir}"/usr/bin/bluez-simple-agent \ - "${pkgdir}"/usr/bin/bluez-test-device \ - "${pkgdir}"/usr/bin/bluez-test-input +package_bluez-libs() { + pkgdesc="Deprecated libraries for the bluetooth protocol stack" + depends=('glibc') + + mv "$srcdir/_libs"/* "$pkgdir" +} +package_bluez-utils() { + pkgdesc="Development and debugging utilities for the bluetooth protocol stack" + depends=('systemd' 'libusb-compat') + conflicts=('bluez-hcidump') + provides=('bluez-hcidump') + replaces=('bluez-hcidump') - # usrmove - cd "$pkgdir" - mv usr/sbin/* usr/bin - rmdir usr/sbin + mv "$srcdir/_utils"/* "$pkgdir" } -md5sums=('902b390af95c6c5d6d1a17d94c8344ab' - '7412982b440f29fa7f76a41a87fef985' - '864cbd24e6efc3592e9284b0b5fb2cfd') +md5sums=('cfe6bd2f7f3f45f689b3a21a6ba59edd') diff --git a/extra/bluez/bluetooth.conf.d b/extra/bluez/bluetooth.conf.d deleted file mode 100644 index 1c1e02589..000000000 --- a/extra/bluez/bluetooth.conf.d +++ /dev/null @@ -1,30 +0,0 @@ -# Bluetooth configuraton file - -# Bluetooth services (allowed values are "true" and "false") - -# Run the bluetoothd daemon (default: true) -#DAEMON_ENABLE="false" - -# Run the sdp daemon (default: false) -# If this is disabled, hcid's internal sdp daemon will be used -#SDPD_ENABLE="true" - -# Run the bluetooth HID daemon (default: false) -#HIDD_ENABLE="true" - -# Activate rfcomm ports (default: false) -#RFCOMM_ENABLE="true" - -# Run bluetooth dial-up networking daemon (default: false) -#DUND_ENABLE="true" - -# Run bluetooth PAN daemon (default: false) -#PAND_ENABLE="true" - -# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf) -#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -# Options for hidd, dund and pand (default: none) -HIDD_OPTIONS="--server" -#DUND_OPTIONS="" -#PAND_OPTIONS="" diff --git a/extra/bluez/rc.bluetooth b/extra/bluez/rc.bluetooth deleted file mode 100644 index 0feeaeab6..000000000 --- a/extra/bluez/rc.bluetooth +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash -# -# Start/stop the Bluetooth daemons -# - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="bluetoothd" -HIDD_NAME="hidd" -RFCOMM_NAME="rfcomm" -PAND_NAME="pand" -DUND_NAME="dund" - -DAEMON_EXEC="/usr/sbin/bluetoothd" -HIDD_EXEC="/usr/bin/hidd" -RFCOMM_EXEC="/usr/bin/rfcomm" -PAND_EXEC="/usr/bin/pand" -DUND_EXEC="/usr/bin/dund" - -DAEMON_ENABLE="true" -HIDD_ENABLE="false" -RFCOMM_ENABLE="false" -PAND_ENABLE="false" -DUND_ENABLE="false" - -RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -HIDD_OPTIONS="" -PAND_OPTIONS="" -DUND_OPTIONS="" - -[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth - -case "$1" in - start) - stat_busy "Starting bluetooth subsystem:" - if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then - stat_append " $DAEMON_NAME" - $DAEMON_EXEC - sleep 1 - fi - if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then - stat_append " $HIDD_NAME" - $HIDD_EXEC $HIDD_OPTIONS - fi - if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then - stat_append " $RFCOMM_NAME" - $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all - fi - if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then - stat_append " $PAND_NAME" - $PAND_EXEC $PAND_OPTIONS - fi - if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then - stat_append " $DUND_NAME" - $DUND_EXEC $DUND_OPTIONS - fi - add_daemon bluetooth - stat_done - ;; - stop) - stat_busy "Stopping bluetooth subsystem:" - - stat_append " $DUND_NAME" - killall $DUND_NAME >/dev/null 2>&1 - - stat_append " $PAND_NAME" - killall $PAND_NAME >/dev/null 2>&1 - - if [ -x "$RFCOMM_EXEC" ]; then - stat_append " $RFCOMM_NAME" - $RFCOMM_EXEC release all >/dev/null 2>&1 - fi - - stat_append " $HIDD_NAME" - killall $HIDD_NAME >/dev/null 2>&1 - - stat_append " $DAEMON_NAME" - killall $DAEMON_NAME >/dev/null 2>&1 - - rm_daemon bluetooth - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/bluez4/PKGBUILD b/extra/bluez4/PKGBUILD new file mode 100644 index 000000000..79e2945bf --- /dev/null +++ b/extra/bluez4/PKGBUILD @@ -0,0 +1,87 @@ +# $Id: PKGBUILD 187858 2013-06-07 09:24:54Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> + +pkgname=bluez4 +pkgver=4.101 +pkgrel=1 +pkgdesc="Deprecated daemon and tools for the Bluetooth protocol stack" +url="http://www.bluez.org/" +arch=('i686' 'x86_64') +license=('GPL2') +depends=('dbus' 'python2') +conflicts=('bluez') +replaces=("bluez<=$pkgver") +makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx') +optdepends=("gstreamer0.10-base: bluetooth GStreamer support" + "alsa-lib: Audio bluetooth devices support" + "dbus-python: to run bluez-simple-agent" + "pygobject: to run bluez-simple-agent" + "libusb-compat: USB adapters support" + "cups: CUPS backend") +options=('!libtool') +backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf + etc/dbus-1/system.d/bluetooth.conf) +source=("http://www.kernel.org/pub/linux/bluetooth/bluez-${pkgver}.tar.bz2") + +build() { + cd bluez-"${pkgver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --sbindir=/usr/lib/bluetooth \ + --enable-gstreamer \ + --enable-alsa \ + --enable-usb \ + --enable-dfutool \ + --enable-dund \ + --enable-hidd \ + --enable-pand \ + --enable-gatt \ + --enable-cups \ + --enable-wiimote \ + --disable-test \ + --with-systemdunitdir=/usr/lib/systemd/system + + make +} + +package() { + cd bluez-"${pkgver}" + make DESTDIR=${pkgdir} install + + # adjust systemd service file + sed -i 's#/usr/sbin/#/usr/lib/bluetooth/#' \ + "${pkgdir}"/usr/lib/systemd/system/bluetooth.service + + install -d ${pkgdir}/etc/bluetooth + install -m644 network/network.conf \ + input/input.conf \ + audio/audio.conf \ + serial/serial.conf \ + ${pkgdir}/etc/bluetooth/ + + # FS#27630 + install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent + install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device + install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input + sed -i 's#/usr/bin/python#/usr/bin/python2#' \ + "${pkgdir}"/usr/bin/bluez-simple-agent \ + "${pkgdir}"/usr/bin/bluez-test-device \ + "${pkgdir}"/usr/bin/bluez-test-input + + # drop files that are in bluez-libs + rm -rf "${pkgdir}"/usr/{include,lib/pkgconfig} + rm "${pkgdir}"/usr/lib/libbluetooth* + + # drop files that are in bluez-utils + rm -rf "${pkgdir}"/lib + rm "${pkgdir}"/usr/bin/{ciptool,hcitool,l2ping,rfcomm,sdptool} + rm "${pkgdir}"/usr/share/man/man1/{ciptool,hcitool,rfcomm,sdptool}.1 + rm "${pkgdir}"/usr/lib/bluetooth/{hciattach,hciconfig} + rm "${pkgdir}"/usr/share/man/man8/{hciattach,hciconfig}.8 +} +md5sums=('902b390af95c6c5d6d1a17d94c8344ab') diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index b374331bd..a4968d8f3 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 183561 2013-04-23 13:10:19Z tomegun $ +# $Id: PKGBUILD 187859 2013-06-07 09:24:55Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=brltty pkgver=4.5 -pkgrel=3 +pkgrel=4 pkgdesc="Braille display driver for Linux/Unix" arch=(i686 x86_64) url="http://mielke.cc/brltty" license=(GPL LGPL) depends=(libxaw gpm icu tcl cython) -makedepends=(bluez at-spi2-core) -optdepends=('bluez: bluetooth support' +makedepends=(bluez-libs at-spi2-core) +optdepends=('bluez-libs: bluetooth support' 'at-spi2-core: X11/GNOME Apps accessibility' 'atk: ATK bridge for X11/GNOME accessibility') backup=(etc/brltty.conf) diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index e5c79203f..9201400ce 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185455 2013-05-14 10:21:59Z heftig $ +# $Id: PKGBUILD 187887 2013-06-07 21:04:48Z heftig $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 epoch=1 pkgdesc="Library with common API for various GNOME modules" @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('af4ec330fa61ee761daf2d5e481e2f9ffbd068d135d5e31a3eaf274524cba33d') +sha256sums=('c9c8d1888e28cb30e466be46909efe640fb3cb348909cae2664489508790e5a2') build() { cd "$pkgname-$pkgver" diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 719906d43..1c0b3a1bc 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185608 2013-05-15 22:56:58Z tomegun $ +# $Id: PKGBUILD 187860 2013-06-07 09:24:56Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,12 +6,12 @@ pkgname=gpsd pkgver=3.9 -pkgrel=2 +pkgrel=3 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64') url="http://catb.org/gpsd/" license=('BSD') -depends=('python2' 'libusb' 'bluez' 'desktop-file-utils') +depends=('python2' 'libusb' 'bluez-libs' 'desktop-file-utils') optdepends=('php: generate a PHP status page for your GPS' 'php-gd: image support for the PHP status page' 'pygtk: GUI frontends') diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 63cee4dff..3979b430d 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 185516 2013-05-14 16:46:51Z heftig $ +# $Id: PKGBUILD 187861 2013-06-07 09:24:57Z tomegun $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp') pkgver=1.16.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray') +makedepends=('avahi' 'bluez-libs' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray') url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) @@ -96,7 +96,7 @@ package_gvfs-gphoto2() { package_gvfs-obexftp() { pkgdesc="ObexFTP (bluetooth) backend for gvfs" - depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server') + depends=("gvfs=$pkgver" 'dbus-glib' 'bluez4' 'obex-data-server') install=gvfs-module.install cd "$pkgbase-$pkgver/daemon" diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index 6ed059387..6b535049b 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,29 +1,46 @@ -# $Id: PKGBUILD 186346 2013-05-25 04:11:23Z foutrelis $ +# $Id: PKGBUILD 187876 2013-06-07 17:10:53Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=harfbuzz -pkgver=0.9.17 -pkgrel=2 -pkgdesc="OpenType text shaping engine." -arch=('i686' 'x86_64') +pkgbase=(harfbuzz) +pkgname=(harfbuzz harfbuzz-icu) +pkgver=0.9.18 +pkgrel=1 +pkgdesc="OpenType text shaping engine" +arch=(i686 x86_64) url="http://www.freedesktop.org/wiki/Software/HarfBuzz" -license=('MIT') -depends=('icu' 'glib2' 'freetype2' 'graphite>=1.2.0') -makedepends=('icu' 'cairo' 'glib2' 'freetype2') -optdepends=('cairo: hb-view program') +license=(MIT) +makedepends=(glib2 freetype2 graphite cairo icu) options=(!libtool) -source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed') +source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2) +sha256sums=('fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908') build() { - cd ${pkgname}-${pkgver} - - ./configure --prefix=/usr + cd $pkgbase-$pkgver + ./configure --prefix=/usr \ + --with-glib --with-freetype --with-cairo --with-icu --with-graphite2 make } -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/harfbuzz/COPYING" +package_harfbuzz() { + depends=(glib2 freetype2 graphite) + optdepends=('cairo: hb-view program') + + cd $pkgbase-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/harfbuzz/COPYING" + +# Split harfbuzz-icu + mkdir -p ../hb-icu/usr/{include/harfbuzz,lib/pkgconfig}; cd ../hb-icu + mv "$pkgdir"/usr/lib/libharfbuzz-icu* ./usr/lib + mv "$pkgdir"/usr/lib/pkgconfig/harfbuzz-icu.pc ./usr/lib/pkgconfig + mv "$pkgdir"/usr/include/harfbuzz/hb-icu.h ./usr/include/harfbuzz +} + +package_harfbuzz-icu(){ + pkgdesc="$pkgdesc (ICU integration)" + depends=(harfbuzz icu) + + mv hb-icu/* "$pkgdir" + + install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir/usr/share/licenses/harfbuzz-icu/COPYING" } diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD index b19a2f399..71d7c62c8 100644 --- a/extra/kismet/PKGBUILD +++ b/extra/kismet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186877 2013-05-31 13:31:02Z andrea $ +# $Id: PKGBUILD 187862 2013-06-07 09:24:58Z tomegun $ # Maintainer: # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> @@ -7,12 +7,12 @@ pkgname=kismet pkgver=2013_03_R1b _realver="${pkgver//_/-}" -pkgrel=1 +pkgrel=2 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system" arch=('i686' 'x86_64') url="http://www.kismetwireless.net/" license=('GPL') -depends=('libpcap' 'pcre' 'bluez') +depends=('libpcap' 'pcre' 'bluez-libs' 'libcap') optdepends=('gpsd: log coordinates of detected networks' 'wireshark-cli: provide OUI files used to determine device manufacturer' 'wireshark-cli: mergecap, to merge multiple capture files' diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD index b35f4db2c..b6794784d 100644 --- a/extra/libbluedevil/PKGBUILD +++ b/extra/libbluedevil/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 180983 2013-03-29 12:07:34Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 187863 2013-06-07 09:24:59Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=libbluedevil pkgver=1.9.3 -pkgrel=1 +pkgrel=2 pkgdesc='A Qt4 wrapper for bluez used in the new KDE bluetooth stack' arch=('i686' 'x86_64') url="https://projects.kde.org/projects/playground/libs/libbluedevil" license=('GPL') -depends=('qt4' 'bluez') +depends=('qt4' 'bluez4') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") md5sums=('fcb1480feba45dcd076b3ee54150bdf5') diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD index a4985784e..adfe05c8e 100644 --- a/extra/libcanberra/PKGBUILD +++ b/extra/libcanberra/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 173082 2012-12-10 12:00:17Z jgc $ +# $Id: PKGBUILD 187881 2013-06-07 18:21:07Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libcanberra pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) pkgver=0.30 -pkgrel=3 +pkgrel=4 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" arch=(i686 x86_64) license=(LGPL) depends=(libvorbis libltdl alsa-lib tdb sound-theme-freedesktop) -makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3) +makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3 git) options=(!emptydirs) -url=http://0pointer.de/lennart/projects/libcanberra -source=("$url/$pkgbase-$pkgver.tar.xz" - libcanberra.xinit) -sha256sums=('c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72' +url="http://0pointer.de/lennart/projects/libcanberra" +source=("git://git.0pointer.de/libcanberra.git#commit=c0620e4" libcanberra.xinit) +sha256sums=('SKIP' '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3') _plugindir=usr/lib/$pkgbase-$pkgver +prepare() { + cd $pkgbase + ./autogen.sh +} + build() { - cd $pkgbase-$pkgver + cd $pkgbase ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ --disable-static --with-builtin=dso --enable-null --disable-oss \ --enable-alsa --enable-gstreamer --enable-pulse \ - --with-systemdsystemunitdir=/usr/lib/systemd/system + --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-gtk-doc # Fight unused direct deps sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool @@ -37,7 +41,7 @@ package_libcanberra() { optdepends=("$pkgbase-pulse: PulseAudio driver" "$pkgbase-gstreamer: GStreamer driver") - cd $pkgbase-$pkgver + cd $pkgbase make -j1 DESTDIR="$pkgdir" install rm "$pkgdir"/usr/lib/libcanberra-gtk*.la diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index 8e93cf29e..c4ead710b 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184181 2013-05-03 08:14:17Z foutrelis $ +# $Id: PKGBUILD 187895 2013-06-07 21:36:22Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,31 +6,20 @@ # Contributor: Will Rea <sillywilly@gmail.com> pkgname=network-manager-applet -pkgver=0.9.8.0 -pkgrel=3 +pkgver=0.9.8.2 +pkgrel=1 pkgdesc="GNOME frontends to NetWorkmanager" arch=(i686 x86_64) license=(GPL) url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver::5}" libgnome-keyring gtk3 libnotify +depends=("networkmanager>=${pkgver::5}" libsecret gtk3 libnotify gnome-icon-theme mobile-broadband-provider-info iso-codes) makedepends=(intltool gnome-bluetooth gobject-introspection) optdepends=('gnome-bluetooth: for PAN/DUN support') options=('!libtool' '!emptydirs') install=network-manager-applet.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz - fixed-signal-icons.tar.xz) -noextract=(fixed-signal-icons.tar.xz) -sha256sums=('1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590' - '08ffd9d045c98119eb1991c036f41e51950e72eea5638549075239256c000e91') - -prepare() { - cd ${pkgname}-${pkgver} - - # Fix signal icons to work with libpng 1.6 - # https://bugzilla.gnome.org/show_bug.cgi?id=697286 - tar xf ${srcdir}/fixed-signal-icons.tar.xz -} +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) +sha256sums=('a540c743971c199a7b8663a8d0a38eb66a4c13a6b5124cd3a7495c75560aadc7') build() { cd ${pkgname}-${pkgver} @@ -39,7 +28,8 @@ build() { --libexecdir=/usr/lib/networkmanager \ --disable-static \ --disable-maintainer-mode \ - --disable-migration + --disable-migration \ + --with-modem-manager-1 make } diff --git a/extra/network-manager-applet/fixed-signal-icons.tar.xz b/extra/network-manager-applet/fixed-signal-icons.tar.xz Binary files differdeleted file mode 100644 index 1f85541dc..000000000 --- a/extra/network-manager-applet/fixed-signal-icons.tar.xz +++ /dev/null diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD index 833edf2f9..3715cfe43 100644 --- a/extra/networkmanager-openconnect/PKGBUILD +++ b/extra/networkmanager-openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179569 2013-03-07 11:54:27Z foutrelis $ +# $Id: PKGBUILD 187896 2013-06-07 21:36:56Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openconnect -pkgver=0.9.8.0 +pkgver=0.9.8.2 pkgrel=1 pkgdesc="NetworkManager VPN integration for openconnect" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) -sha256sums=('c12487f57ad2f2386db4b103397e3cb66bf34ba589c5f48c3c5ec0b5547e4d9b') +sha256sums=('8c3b393d155448d41f5de539d4920f0e5205a087aa5b25ed65601d6a370c44eb') build() { cd NetworkManager-openconnect-${pkgver} diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD index d709fd471..371ac8923 100644 --- a/extra/networkmanager-openvpn/PKGBUILD +++ b/extra/networkmanager-openvpn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179570 2013-03-07 11:54:28Z foutrelis $ +# $Id: PKGBUILD 187897 2013-06-07 21:37:29Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openvpn -pkgver=0.9.8.0 +pkgver=0.9.8.2 pkgrel=1 pkgdesc="NetworkManager VPN plugin for OpenVPN" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') install=networkmanager-openvpn.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) -sha256sums=('4196f4c124426884657c8d0e2578f4d35205b8981a46bf645fd599fb238395ce') +sha256sums=('d1c032f30e3c58d6d6bc371aad6d7e757f748d23a9240c077294492753078359') build() { cd NetworkManager-openvpn-${pkgver} diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD index f048495ff..1d243ef0c 100644 --- a/extra/networkmanager-pptp/PKGBUILD +++ b/extra/networkmanager-pptp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179571 2013-03-07 11:54:28Z foutrelis $ +# $Id: PKGBUILD 187898 2013-06-07 21:38:15Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-pptp -pkgver=0.9.8.0 +pkgver=0.9.8.2 pkgrel=1 pkgdesc="NetworkManager VPN plugin for pptp " arch=('i686' 'x86_64') @@ -15,12 +15,16 @@ options=('!libtool') install=networkmanager-pptp.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz gtk_table_to_gtk_grid.patch) -sha256sums=('34d0981462d8948ace0dd4f49478c86017b53516afbbf62e2a4c6c0adc679cc8' +sha256sums=('7f46ea61376d13d03685eca3f26a26e0022f6e92e6f1fc356034ca9717eb6dac' '17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215') -build() { +prepare() { cd NetworkManager-pptp-${pkgver} patch -Np1 -i ../gtk_table_to_gtk_grid.patch +} + +build() { + cd NetworkManager-pptp-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index a50731449..2735dd46d 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185909 2013-05-19 18:47:29Z dreisner $ +# $Id: PKGBUILD 187899 2013-06-07 21:38:48Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc -pkgver=0.9.8.0 -pkgrel=2 +pkgver=0.9.8.2 +pkgrel=1 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64') license=('GPL') @@ -13,15 +13,8 @@ makedepends=('intltool') optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz - "vpnc-paths.patch") -sha256sums=('e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1' - '0b07abc21823b316bfd9a9faf7bf34ded35d66e904d081c5e285f8dc8ce30a54') - -prepare() { - cd NetworkManager-vpnc-${pkgver} - patch -Np1 <"$srcdir/vpnc-paths.patch" -} +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) +sha256sums=('adf6f4abd29d3f0384ef55fdfea75e6cd56088a0ecdfed2454305fd9e08318a1') build() { cd NetworkManager-vpnc-${pkgver} diff --git a/extra/networkmanager-vpnc/vpnc-paths.patch b/extra/networkmanager-vpnc/vpnc-paths.patch deleted file mode 100644 index eccdf65b2..000000000 --- a/extra/networkmanager-vpnc/vpnc-paths.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/nm-vpnc-service.c 2013-05-19 14:21:35.465816746 -0400 -+++ b/src/nm-vpnc-service.c 2013-05-19 14:23:57.554908088 -0400 -@@ -54,6 +54,7 @@ - - static const char *vpnc_binary_paths[] = - { -+ "/usr/bin/vpnc", - "/usr/sbin/vpnc", - "/sbin/vpnc", - "/usr/local/sbin/vpnc", diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index bac735262..ad3dcf193 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187841 2013-06-06 20:23:04Z tpowa $ +# $Id: PKGBUILD 187894 2013-06-07 21:35:29Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -8,39 +8,33 @@ pkgname=networkmanager _pkgname=NetworkManager -pkgver=0.9.8.0 -pkgrel=6 +pkgver=0.9.8.2 +pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnome.org/projects/$_pkgname/" depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client libsoup systemd modemmanager) -makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc) +makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git) optdepends=('dhclient: DHCPv6 support' - 'iptables: Connection sharing' 'dnsmasq: Connection sharing' - 'bluez: Bluetooth support' + 'bluez4: Bluetooth support' 'openresolv: resolvconf support' 'ppp: Dialup connection support') options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install +#source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz - NetworkManager.conf disable_set_hostname.patch - modem-manager-0.7.991-1.patch - modem-manager-0.7.991-2.patch) -sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b' + NetworkManager.conf disable_set_hostname.patch) +sha256sums=('5c0b2f71b2f61e0dfbe95cebad83001758db252d5cdf5b6f7ceebac9c6bd7ead' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' - '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '0499a409aa53a57290ccecf52e2bfa0b81926261012d166f6d12a36edbbcfeff' - '570626b0bfd86a4ffc30f515ffffbb32f10ea69ae5825a3f015379e1a54066d8') + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') prepare() { cd $_pkgname-$pkgver patch -Np1 -i ../disable_set_hostname.patch - patch -Np1 -i ../modem-manager-0.7.991-1.patch - patch -Np1 -i ../modem-manager-0.7.991-2.patch } build() { diff --git a/extra/networkmanager/modem-manager-0.7.991-1.patch b/extra/networkmanager/modem-manager-0.7.991-1.patch deleted file mode 100644 index 02ed33fdd..000000000 --- a/extra/networkmanager/modem-manager-0.7.991-1.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0ff869e1c76803348047150bb6a361f1fef9ef87 Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado <aleksander@lanedo.com> -Date: Mon, 03 Jun 2013 10:21:25 +0000 -Subject: modem-manager: don't request allowed modes when talking to ModemManager1 modems - -Just let them get connected with whatever network type they currently have. ---- -diff --git a/src/modem-manager/nm-modem-broadband.c b/src/modem-manager/nm-modem-broadband.c -index 538b262..53839df 100644 ---- a/src/modem-manager/nm-modem-broadband.c -+++ b/src/modem-manager/nm-modem-broadband.c -@@ -262,45 +262,6 @@ create_gsm_connect_properties (NMConnection *connection) - if (str) - mm_simple_connect_properties_set_password (properties, str); - -- /* TODO: We should check SUPPORTED MODES here */ -- switch (nm_setting_gsm_get_network_type (setting)) { -- case NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA: -- mm_simple_connect_properties_set_allowed_modes (properties, -- MM_MODEM_MODE_3G, -- MM_MODEM_MODE_NONE); -- break; -- case NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE: -- mm_simple_connect_properties_set_allowed_modes (properties, -- MM_MODEM_MODE_2G, -- MM_MODEM_MODE_NONE); -- break; -- case NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA: -- mm_simple_connect_properties_set_allowed_modes (properties, -- MM_MODEM_MODE_ANY, -- MM_MODEM_MODE_3G); -- break; -- case NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE: -- mm_simple_connect_properties_set_allowed_modes (properties, -- MM_MODEM_MODE_ANY, -- MM_MODEM_MODE_2G); -- break; -- case NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G: -- mm_simple_connect_properties_set_allowed_modes (properties, -- MM_MODEM_MODE_ANY, -- MM_MODEM_MODE_4G); -- break; -- case NM_SETTING_GSM_NETWORK_TYPE_4G: -- mm_simple_connect_properties_set_allowed_modes (properties, -- MM_MODEM_MODE_4G, -- MM_MODEM_MODE_NONE); -- break; -- default: -- mm_simple_connect_properties_set_allowed_modes (properties, -- MM_MODEM_MODE_ANY, -- MM_MODEM_MODE_NONE); -- break; -- } -- - /* Roaming */ - if (nm_setting_gsm_get_home_only (setting)) - mm_simple_connect_properties_set_allow_roaming (properties, FALSE); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/networkmanager/modem-manager-0.7.991-2.patch b/extra/networkmanager/modem-manager-0.7.991-2.patch deleted file mode 100644 index f1ca11784..000000000 --- a/extra/networkmanager/modem-manager-0.7.991-2.patch +++ /dev/null @@ -1,62 +0,0 @@ -From c126d97cb6666c714d75dc68d808b34c77a99398 Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado <aleksander@lanedo.com> -Date: Wed, 05 Jun 2013 14:34:10 +0000 -Subject: modem-manager: read 'SupportedCapabilities' instead of 'ModemCapabilities' (bgo #701668) - -There is no longer a 'ModemCapabilities' uint32 property; instead we have -'SupportedCapabilities' giving a list of uint32 values. Just read the list and -merge the values into a single mask; NM doesn't care about the exact -combinations supported. - -https://bugzilla.gnome.org/show_bug.cgi?id=701668 ---- -diff --git a/configure.ac b/configure.ac -index d0ee1bd..e2e3862 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -464,7 +464,7 @@ AC_SUBST(PPPD_PLUGIN_DIR) - AC_ARG_WITH(modem-manager-1, AS_HELP_STRING([--with-modem-manager-1], [Enable new ModemManager1 interface support]),,[with_modem_manager_1=auto]) - if (test "${with_modem_manager_1}" != "no"); then - PKG_CHECK_MODULES(MM_GLIB, -- [mm-glib], -+ [mm-glib >= 0.7.991], - [have_libmm_glib=yes], - [have_libmm_glib=no]) - AC_SUBST(MM_GLIB_CFLAGS) -@@ -782,4 +782,3 @@ echo " documentation: $enable_gtk_doc" - echo " tests: $enable_tests" - echo " code coverage: $enable_code_coverage" - echo -- -diff --git a/src/modem-manager/nm-modem-broadband.c b/src/modem-manager/nm-modem-broadband.c -index 53839df..febab8a 100644 ---- a/src/modem-manager/nm-modem-broadband.c -+++ b/src/modem-manager/nm-modem-broadband.c -@@ -116,8 +116,23 @@ nm_modem_broadband_get_capabilities (NMModemBroadband *self, - NMDeviceModemCapabilities *modem_caps, - NMDeviceModemCapabilities *current_caps) - { -- *modem_caps = (NMDeviceModemCapabilities)mm_modem_get_modem_capabilities (self->priv->modem_iface); -- *current_caps = (NMDeviceModemCapabilities)mm_modem_get_current_capabilities (self->priv->modem_iface); -+ MMModemCapability all_supported = MM_MODEM_CAPABILITY_NONE; -+ MMModemCapability *supported; -+ guint n_supported; -+ -+ /* For now, we don't care about the capability combinations, just merge all -+ * combinations in a single mask */ -+ if (mm_modem_get_supported_capabilities (self->priv->modem_iface, &supported, &n_supported)) { -+ guint i; -+ -+ for (i = 0; i < n_supported; i++) -+ all_supported |= supported[i]; -+ -+ g_free (supported); -+ } -+ -+ *modem_caps = (NMDeviceModemCapabilities) all_supported; -+ *current_caps = (NMDeviceModemCapabilities) mm_modem_get_current_capabilities (self->priv->modem_iface); - } - - /*****************************************************************************/ --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD index e2505f2f7..5aff3897e 100644 --- a/extra/obexd/PKGBUILD +++ b/extra/obexd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 170095 2012-11-01 11:22:52Z andrea $ +# $Id: PKGBUILD 187865 2013-06-07 09:25:01Z tomegun $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> @@ -6,16 +6,17 @@ pkgbase=obexd pkgname=('obexd-client' 'obexd-server') epoch=1 pkgver=0.46 -pkgrel=1 +pkgrel=2 url="http://www.bluez.org/" arch=('i686' 'x86_64') license=('GPL2') -makedepends=('bluez' 'libical') +makedepends=('bluez4' 'bluez-libs' 'libical' 'glib2') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2") md5sums=('625f0417d119437429c9cce29479cfa4') build() { cd ${pkgbase}-${pkgver} + sed -i 's/#include <string.h>/&\n#include <stdio.h>/' plugins/mas.c ./configure --prefix=/usr \ --libexecdir=/usr/lib/obexd make @@ -23,7 +24,7 @@ build() { package_obexd-client() { pkgdesc="D-Bus service providing high-level OBEX client side functionality" - depends=('bluez') + depends=('bluez4' 'bluez-libs' 'glib2') provides=("obexd=${pkgver}") replaces=('obexd') conflicts=('obexd') @@ -37,7 +38,7 @@ package_obexd-client() { package_obexd-server() { pkgdesc="D-Bus service providing high-level OBEX server side functionality" - depends=('bluez' 'libical') + depends=('bluez4' 'bluez-libs' 'libical' 'glib2') conflicts=('obex-data-server') cd ${pkgbase}-${pkgver}/src diff --git a/extra/openobex/PKGBUILD b/extra/openobex/PKGBUILD index d0cb60d64..32241ad96 100644 --- a/extra/openobex/PKGBUILD +++ b/extra/openobex/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186964 2013-06-01 15:32:09Z eric $ +# $Id: PKGBUILD 187866 2013-06-07 09:25:02Z tomegun $ # Maintainer: # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,12 +6,12 @@ pkgname=openobex pkgver=1.7 -pkgrel=5 +pkgrel=6 pkgdesc="Implementation of the OBject EXchange (OBEX) protocol" url="http://dev.zuckschwerdt.org/openobex/" arch=('i686' 'x86_64') license=('GPL' 'LGPL') -depends=('bluez' 'libusbx') +depends=('libusbx' 'bluez-libs') makedepends=('cmake') options=('!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-Source.tar.gz) @@ -19,12 +19,6 @@ md5sums=('11031f6f0b876bb6259bd27106491528') prepare() { mkdir build - - cd ${pkgname}-${pkgver}-Source - - # Fix path to obex-check-device in udev rule - # https://bugs.archlinux.org/task/35547 - sed -i 's:/sbin/:/bin/:' udev/openobex.rules.in } build() { @@ -33,8 +27,8 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_INSTALL_SBINDIR=bin + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_SBINDIR=/usr/bin make all openobex-apps } @@ -43,4 +37,9 @@ package() { make DESTDIR="${pkgdir}" install cp ../${pkgname}-${pkgver}-Source/apps/lib/*.h "${pkgdir}/usr/include/openobex/" install -m644 apps/lib/libopenobex-apps-common.a "${pkgdir}/usr/lib/libopenobex-apps-common.a" + + # usrmove + cd "$pkgdir" + mv lib/udev usr/lib/ + rmdir lib } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 7bd593a6f..f5d0e1581 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185573 2013-05-15 08:05:33Z bpiotrowski $ +# $Id: PKGBUILD 187846 2013-06-07 04:00:16Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,24 +21,24 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.15 -pkgrel=3 +pkgver=5.4.16 +pkgrel=1 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' - 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') + 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2' 'systemd') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('145ea5e845e910443ff1eddb3dbcf56a' +md5sums=('3d2c694d28861d707b2622c3cc941cff' '44c1bb1df346b3b9d3e092c7df9a37d0' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' 'e036c721e5ad927cd1613c7475a58b3a' - '4af4d94f3db58437eef8db87d16a5fab' + 'cc2940f5312ba42e7aa1ddfab74b84c4' 'c60343df74f8e1afb13b084d5c0e47ed') prepare() { @@ -84,6 +84,7 @@ build() { --with-curl=shared \ --with-db4=/usr \ --with-enchant=shared,/usr \ + --with-fpm-systemd \ --with-freetype-dir=/usr \ --with-gd=shared \ --with-gdbm \ diff --git a/extra/php/php-fpm.service b/extra/php/php-fpm.service index 1ae62051f..6e2faafd8 100644 --- a/extra/php/php-fpm.service +++ b/extra/php/php-fpm.service @@ -3,10 +3,10 @@ Description=The PHP FastCGI Process Manager After=syslog.target network.target [Service] -Type=forking +Type=notify PIDFile=/run/php-fpm/php-fpm.pid PrivateTmp=true -ExecStart=/usr/bin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid +ExecStart=/usr/bin/php-fpm --nodaemonize --pid /run/php-fpm/php-fpm.pid ExecReload=/bin/kill -USR2 $MAINPID [Install] diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 2206d6299..eb2890c91 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181159 2013-04-01 19:36:12Z heftig $ +# $Id: PKGBUILD 187868 2013-06-07 09:26:30Z tomegun $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -7,19 +7,19 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" -pkgver=3.0 -pkgrel=3 +pkgver=4.0 +pkgrel=1 arch=(i686 x86_64) url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit - speex tdb udev dbus-core avahi bluez gconf intltool jack sbc - lirc-utils openssl fftw orc json-c gtk2 webrtc-audio-processing - systemd check) + speex tdb systemd dbus avahi bluez4 bluez-libs gconf intltool jack sbc + lirc-utils openssl fftw orc json-c gtk3 webrtc-audio-processing + check) options=(!emptydirs !libtool) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz pulseaudio.xinit) -sha256sums=('c90bfda29605942d08e3e218ef10e3c660506a06651a616bfbb6a6df8392836d' +sha256sums=('35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae' 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') build() { @@ -42,10 +42,11 @@ build() { } package_pulseaudio() { - depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb udev fftw orc - libsamplerate webrtc-audio-processing systemd sbc) + depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb systemd fftw orc + libsamplerate webrtc-audio-processing sbc) optdepends=('avahi: zeroconf support' - 'bluez: bluetooth support' + 'bluez4: bluetooth support' + 'bluez-libs: bluetooth support' 'gconf: configuration through gconf (paprefs)' 'jack: jack support' 'lirc-utils: infra-red support' @@ -55,7 +56,8 @@ package_pulseaudio() { install=pulseaudio.install cd $pkgbase-$pkgver - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="$pkgdir" install \ + bashcompletiondir=/usr/share/bash-completion/completions # Disable autospawn by default sed -e '/autospawn/iautospawn=no' \ @@ -86,6 +88,9 @@ package_pulseaudio() { # cap is handled in .install chmod 755 "$pkgdir/usr/lib/pulse/proximity-helper" + install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \ + "$pkgdir/usr/share/zsh/site-functions/_pulseaudio" + ### Split libpulse mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{bin,lib/pulseaudio,share/man/man{1,5}}} @@ -116,7 +121,7 @@ package_pulseaudio() { package_libpulse() { pkgdesc="$pkgdesc (client library)" - depends=(dbus-core libasyncns libcap libxtst libsm libsndfile json-c) + depends=(dbus libasyncns libcap libxtst libsm libsndfile json-c) optdepends=('alsa-plugins: ALSA support' 'avahi: zeroconf support') backup=(etc/pulse/client.conf) diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index f7ea473ee..e849ff4e4 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,18 +1,17 @@ # $Id: PKGBUILD 185570 2013-05-15 08:05:29Z bpiotrowski $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=1.4.1 -pkgrel=3 +pkgver=1.4.2 +pkgrel=1 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" makedepends=('texi2html' 'perl' 'python2') -depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng') +depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng') backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 - doc-fix-sheepdog-invalid-texi-table-list-syntax.patch 65-kvm.rules) replaces=('qemu-kvm') options=(!strip) @@ -21,15 +20,12 @@ prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld - # fix building with tex version 5.0 - # https://bugs.launchpad.net/qemu/+bug/1130533 - patch -Np1 -i ${srcdir}/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch } build () { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=alsa,sdl,pa \ --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu @@ -57,6 +53,5 @@ package() { done } -md5sums=('eb2d696956324722b5ecfa46e41f9a75' - 'b431782f310bfc6af4ef21a8068f866b' +md5sums=('b3eafa033ae4b8faba584f9f141b888f' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch b/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch deleted file mode 100644 index bacc87e80..000000000 --- a/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/qemu-options.hx b/qemu-options.hx -index 4bc9c85..3af60bf 100644 ---- a/qemu-options.hx -+++ b/qemu-options.hx -@@ -2095,18 +2095,13 @@ QEMU supports using either local sheepdog devices or remote networked - devices. - - Syntax for specifying a sheepdog device --@table @list --``sheepdog:<vdiname>'' -- --``sheepdog:<vdiname>:<snapid>'' -- --``sheepdog:<vdiname>:<tag>'' -- --``sheepdog:<host>:<port>:<vdiname>'' -- --``sheepdog:<host>:<port>:<vdiname>:<snapid>'' -- --``sheepdog:<host>:<port>:<vdiname>:<tag>'' -+@table @code -+@item sheepdog:<vdiname> -+@item sheepdog:<vdiname>:<snapid> -+@item sheepdog:<vdiname>:<tag> -+@item sheepdog:<host>:<port>:<vdiname> -+@item sheepdog:<host>:<port>:<vdiname>:<snapid> -+@item sheepdog:<host>:<port>:<vdiname>:<tag> - @end table - - Example diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index 0502cb7f6..faf3f61c8 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,38 +1,46 @@ -# $Id: PKGBUILD 185357 2013-05-13 17:34:56Z heftig $ +# $Id: PKGBUILD 187877 2013-06-07 17:10:54Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> -pkgbase=webkitgtk -pkgname=('webkitgtk3') +pkgname=webkitgtk pkgver=2.0.2 -pkgrel=1 -arch=('i686' 'x86_64') +pkgrel=3 +pkgdesc="GTK+ Web content engine library" +arch=(i686 x86_64) url="http://webkitgtk.org/" -license=('custom') -makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gperf' 'gobject-introspection' 'python' 'mesa' 'ruby' 'gtk-doc' 'libsecret' 'libwebp') -options=('!libtool' '!emptydirs') -source=(http://webkitgtk.org/releases/$pkgbase-$pkgver.tar.xz) -sha256sums=('c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2') +license=(custom) +depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk3 gst-plugins-base-libs libsecret libwebp + harfbuzz-icu) +makedepends=(gtk2 gperf gobject-introspection python mesa ruby gtk-doc) +optdepends=('gtk2: Webkit2 plugin support') +conflicts=(webkitgtk3 libwebkit3) +provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}") +replaces=(webkitgtk3 libwebkit3) +options=(!libtool !emptydirs) +source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz + changeset_150963.diff) +sha256sums=('c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2' + '8d2542600cba876b714cdf6be478d847b6672bff2856e6e6d0582b1566fe5764') prepare() { - cd $pkgbase-$pkgver - mkdir build-gtk3 + cd $pkgname-$pkgver + patch -Np2 -i ../changeset_150963.diff + autoreconf -fi -I Source/autotools } build() { - cd $pkgbase-$pkgver/build-gtk3 - ../configure --prefix=/usr --libexecdir=/usr/lib/webkitgtk3 --enable-introspection + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/$pkgname \ + --enable-introspection + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make all stamp-po } -package_webkitgtk3() { - pkgdesc="GTK+ Web content engine library for GTK+ 3.0" - depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk3' 'gst-plugins-base-libs' 'libsecret' 'libwebp') - conflicts=('libwebkit3') - provides=("libwebkit3=${pkgver}") - replaces=('libwebkit3') - optdepends=('gtk2: Webkit2 plugin support') - - cd $pkgbase-$pkgver/build-gtk3 +package() { + cd $pkgname-$pkgver make -j1 DESTDIR="$pkgdir" install - install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/webkitgtk/changeset_150963.diff b/extra/webkitgtk/changeset_150963.diff new file mode 100644 index 000000000..d56c1c729 --- /dev/null +++ b/extra/webkitgtk/changeset_150963.diff @@ -0,0 +1,30 @@ +2013-05-30 Alberto Garcia <agarcia@igalia.com> + +[GTK] Needs to check for harfbuzz-icu +https://bugs.webkit.org/show_bug.cgi?id=116978 + +Reviewed by Xan Lopez. + +HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we +also need to check for it in order to get the necessary flags for +the compiler and the linker. + +We keep this conditional for now since we still want to support +earlier versions of HarfBuzz. + +Index: /trunk/Source/autotools/FindDependencies.m4 +=================================================================== +--- /trunk/Source/autotools/FindDependencies.m4 (revision 150962) ++++ /trunk/Source/autotools/FindDependencies.m4 (revision 150963) +@@ -376,4 +376,11 @@ + [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version]) + fi ++# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library. ++# Since we support earlier HarfBuzz versions we keep this conditional for now. ++if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then ++ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version) ++ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS" ++ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS" ++fi + AC_SUBST([FREETYPE_CFLAGS]) + AC_SUBST([FREETYPE_LIBS]) diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 2f0f13e72..c936481fc 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186484 2013-05-27 13:17:23Z andyrtr $ +# $Id: PKGBUILD 187885 2013-06-07 20:50:17Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.8 +pkgver=2.21.9 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4d850c0515012ca370a72469dfbfa6161aa9ee5bb39779fab5f496f2d94acf8f') +sha256sums=('1359cbc9e494a284faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 2db7dbbc5..00dcb7f7a 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -7,7 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -51,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -sha512sums=('e96b874fd53c771535098c1077200b5ab88aa628383f7af56f861c952a534283942ce34647f279bf4229bfc3a0114f81a7ae3deca4e8e7931d7551fdb75c68c0' +sha512sums=('2a311fd93aaf489849021e34de7cb7fb9343d7ff2d05edbdcf86a0346e616384e57d2367173d0a60916d1154b78f4a1a2a458b3047a96e81ee5b757274068a5e' '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41' '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f') diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD index d274631eb..f83e05741 100644 --- a/pcr/monkeysphere/PKGBUILD +++ b/pcr/monkeysphere/PKGBUILD @@ -4,15 +4,27 @@ # $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $ pkgname=monkeysphere pkgver=0.35 -pkgrel=4 +pkgrel=5 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication" arch=('any') url="http://web.monkeysphere.info/" license=('GPL3') depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1') -source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz) +source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz + binmerge.patch) install=monkeysphere.install -md5sums=('481ac14c9fdef0ccd1944c593bd4f517') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + patch -Ni "${srcdir}/binmerge.patch" +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + + make test +} package() { cd "$srcdir/$pkgname-$pkgver" @@ -20,3 +32,5 @@ package() { make DESTDIR="$pkgdir/" install mkdir -p $pkgdir/var/lib/monkeysphere } +md5sums=('481ac14c9fdef0ccd1944c593bd4f517' + 'a8bd35dc7dd58b5952beeecafe5045a7') diff --git a/pcr/monkeysphere/binmerge.patch b/pcr/monkeysphere/binmerge.patch new file mode 100644 index 000000000..48d945511 --- /dev/null +++ b/pcr/monkeysphere/binmerge.patch @@ -0,0 +1,25 @@ +--- Makefile.orig 2013-06-07 13:02:23.123944233 -0300 ++++ Makefile 2013-06-07 13:02:43.351065809 -0300 +@@ -36,17 +36,17 @@ + # this target is to be called from the tarball, not from the git + # working dir! + install: all installman +- mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin ++ mkdir -p $(DESTDIR)$(PREFIX)/bin + mkdir -p $(DESTDIR)$(PREFIX)/share/monkeysphere/m $(DESTDIR)$(PREFIX)/share/monkeysphere/mh $(DESTDIR)$(PREFIX)/share/monkeysphere/ma $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions + mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere + mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere + printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION + install src/monkeysphere $(DESTDIR)$(PREFIX)/bin + sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere +- install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin +- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host +- install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin +- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication ++ install src/monkeysphere-host $(DESTDIR)$(PREFIX)/bin ++ sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-host ++ install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/bin ++ sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-authentication + install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere + install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere + install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 88f951d03..6fe28cc7c 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -3,19 +3,22 @@ # Run `makepkg -sp SRCBUILD` if you want to update the source tarball -pkgname=pandoc +pkgname=pandoc-static +_pkgname=pandoc pkgver=1.11.1 -pkgrel=1 +pkgrel=2 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') arch=('i686' 'x86_64') makedepends=('ghc' 'sh' 'cabal-install') options=(strip !makeflags !distcc !emptydirs) -source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} +#source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} +source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig} SRCBUILD) # citeproc-hs-pre-0.3.7.patch) -conflicts=('haskell-pandoc') +replaces=('pandoc') +provides=('pandoc') optdepends=('texlive-most: for pdf creation') md5sums=('74acd042fcd85bee9edb093cc3fe5c2e' 'SKIP' @@ -23,13 +26,13 @@ md5sums=('74acd042fcd85bee9edb093cc3fe5c2e' # PKGBUILD functions build() { - mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}} - cd ${srcdir}/${pkgname}-${pkgver} + mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}} + cd ${srcdir}/${_pkgname}-${pkgver} # Patches from the next citeproc-hs release # These are needed because 0.3.6 with embed_data_files is broken # darcs diff --from-tag=0.3.6 -# pushd ${srcdir}/${pkgname}-${pkgver}/citeproc-hs-0.3.6 +# pushd ${srcdir}/${_pkgname}-${pkgver}/citeproc-hs-0.3.6 # patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch # popd @@ -37,29 +40,29 @@ build() { # Skip already built [ -d ${srcdir}/build/usr/lib/$_hkpkg ] && continue - pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null + pushd ${srcdir}/${_pkgname}-${pkgver}/${_hkpkg} >/dev/null msg2 "Building $_hkpkg" case $_hkpkg in - $pkgname-$pkgver) - HOME=${srcdir}/${pkgname}-${pkgver} \ + $_pkgname-$pkgver) + HOME=${srcdir}/${_pkgname}-${pkgver} \ cabal configure --flags='-library blaze_html_0_5' \ --prefix=/usr \ --libdir=${srcdir}/build/usr/lib -v - HOME=${srcdir}/${pkgname}-${pkgver} \ + HOME=${srcdir}/${_pkgname}-${pkgver} \ cabal build ;; citeproc-hs-*) - HOME=${srcdir}/${pkgname}-${pkgver} \ + HOME=${srcdir}/${_pkgname}-${pkgver} \ cabal install --flags='embed_data_files' \ --prefix=${srcdir}/build/usr -v ;; *) - HOME=${srcdir}/${pkgname}-${pkgver} \ + HOME=${srcdir}/${_pkgname}-${pkgver} \ cabal install --prefix=${srcdir}/build/usr ;; esac @@ -70,7 +73,7 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver} + cd ${srcdir}/${_pkgname}-${pkgver}/${_pkgname}-${pkgver} runghc Setup.hs copy --destdir=${pkgdir}/ @@ -81,7 +84,7 @@ package() { # EC is unfree and makes Parabola TeXLive cry # besides, it's unneeded - sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/data/templates/default.latex + sed "/fontenc/d" -i ${pkgdir}/usr/share/${_pkgname}-${pkgver}/data/templates/default.latex find ${pkgdir}/usr/share -type f -exec chmod 644 {} \; find ${pkgdir}/usr/share -type d -exec chmod 755 {} \; |