diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/lftp/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/lftp/f8ee088.diff | 11 | ||||
-rw-r--r-- | extra/libjpeg-turbo/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/python-geoip/PKGBUILD | 30 | ||||
-rw-r--r-- | extra/socat/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/system-config-printer/PKGBUILD | 11 | ||||
-rw-r--r-- | extra/vlc/PKGBUILD | 21 | ||||
-rw-r--r-- | extra/xf86-video-intel/PKGBUILD | 6 |
8 files changed, 67 insertions, 45 deletions
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 5b889c9c0..893d4b191 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186270 2013-05-23 15:26:49Z andyrtr $ +# $Id: PKGBUILD 186480 2013-05-27 13:11:34Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp pkgver=4.4.7 -pkgrel=1 +pkgrel=2 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64') license=('GPL3') @@ -12,11 +12,18 @@ depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh') optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') -source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('a4e7b88d6b7aca389010ce6d6dca8099') +source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 + f8ee088.diff) +md5sums=('a4e7b88d6b7aca389010ce6d6dca8099' + 'a8f1c1bb3f5ab60b48507c9722c64d1c') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # fix sftp transfer - FS#35456 + # upstream: https://github.com/lavv17/lftp/issues/39 + patch -Np0 -i ${srcdir}/f8ee088.diff + ./configure --prefix=/usr \ --with-gnutls \ --without-openssl \ diff --git a/extra/lftp/f8ee088.diff b/extra/lftp/f8ee088.diff new file mode 100644 index 000000000..8b490a9dc --- /dev/null +++ b/extra/lftp/f8ee088.diff @@ -0,0 +1,11 @@ +--- src/SFtp.cc 2013-04-18 09:24:36.000000000 +0200 ++++ src/SFtp.cc.new 2013-05-27 15:06:40.998423663 +0200 +@@ -2256,7 +2256,7 @@ + return MOVED; + } + if(b) +- return MOVED; ++ return m; + // eof + if(!result && session->IsOpen()) + result=session.Cast<SFtp>()->GetFileSet(); diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index 387fc2c08..75121fc8f 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 186456 2013-05-26 18:10:34Z eric $ +# $Id: PKGBUILD 186466 2013-05-26 22:08:45Z eric $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> pkgname=libjpeg-turbo pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression" arch=('i686' 'x86_64') url="http://libjpeg-turbo.virtualgl.org/" license=('GPL' 'custom') depends=('glibc') makedepends=('nasm') -provides=('libjpeg=8.0.2') -conflicts=('libjpeg') -replaces=('libjpeg') +provides=('libjpeg=8.0.2' 'turbojpeg') +conflicts=('libjpeg' 'turbojpeg') +replaces=('libjpeg' 'turbojpeg') options=('!libtool') source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz) sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28') diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD index f9a76dbbb..01ab96af0 100644 --- a/extra/python-geoip/PKGBUILD +++ b/extra/python-geoip/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 168340 2012-10-08 23:42:19Z eric $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186477 2013-05-27 11:23:42Z foutrelis $ +# Maintainer: +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> -pkgbase=python-geoip pkgname=('python2-geoip') -pkgver=1.2.7 -pkgrel=2 +pkgbase=python-geoip +pkgver=1.2.8 +pkgrel=1 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library" arch=('i686' 'x86_64') -url="http://www.maxmind.com/app/python" +url="http://dev.maxmind.com/geoip/legacy/downloadable#Python-10" license=('LGPL') depends=('python2' 'geoip') -source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-${pkgver}.tar.gz) -md5sums=('df71f5ae7a5c77bbdf726d512b7d67cf') +source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-$pkgver.tar.gz) +sha256sums=('8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73') + +build() { + cd "$srcdir/GeoIP-Python-$pkgver" + python2 setup.py build +} package_python2-geoip() { - cd "${srcdir}/GeoIP-Python-${pkgver}" - python2 setup.py build install --root="${pkgdir}" + cd "$srcdir/GeoIP-Python-$pkgver" + python2 setup.py install --root="$pkgdir" -O1 } + +# vim:set ts=2 sw=2 et: diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD index 0f8d929db..2ccdd166c 100644 --- a/extra/socat/PKGBUILD +++ b/extra/socat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 159299 2012-05-21 08:16:43Z bisson $ +# $Id: PKGBUILD 186472 2013-05-27 06:47:24Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=socat -pkgver=1.7.2.1 +pkgver=1.7.2.2 pkgrel=1 pkgdesc='Multipurpose relay' url='http://www.dest-unreach.org/socat/' @@ -12,11 +12,10 @@ license=('GPL2') arch=('i686' 'x86_64') depends=('readline' 'openssl') source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz") -sha1sums=('6e3328cc409550b2367efa8028fe4436e84eb490') +sha1sums=('588294c17373d52a8ac877dcd599ef26f14b110b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ @@ -26,6 +25,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install } diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 563760080..f9b67dff1 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 185094 2013-05-11 04:02:37Z eric $ +# $Id: PKGBUILD 186486 2013-05-27 16:33:02Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=system-config-printer pkgver=1.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64') license=('GPL') -depends=('systemd' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' +depends=('pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'dbus-glib' 'gtk3') makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils') optdepends=('gnome-keyring: password management') @@ -34,10 +34,11 @@ build() { --sysconfdir=/etc \ --with-udev-rules - make + make udevhelperdir=/usr/lib/udev } package() { cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" udevhelperdir=/usr/lib/udev \ + udevrulesdir=/usr/lib/udev/rules.d install } diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index e3492a8bc..b72b168b1 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184445 2013-05-06 19:40:05Z foutrelis $ +# $Id: PKGBUILD 186492 2013-05-27 19:38:42Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=2.0.6 -pkgrel=2 +pkgver=2.0.7 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -13,14 +13,12 @@ license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' - 'xcb-util-keysyms') + 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' - 'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils' - 'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd' - 'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss' - 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' - 'mesa') + 'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca' 'oss' + 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd' 'projectm' + 'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs' + 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' 'mesa') optdepends=('avahi: for service discovery using bonjour protocol' 'libnotify: for notification plugin' 'ncurses: for ncurses interface support' @@ -46,7 +44,6 @@ optdepends=('avahi: for service discovery using bonjour protocol' 'xosd: for xosd support' 'aalib: for ASCII art plugin' 'libmtp: for MTP devices support' - 'fluidsynth: for synthesizer MIDI FluidSynth' 'smbclient: for SMB access plugin' 'libcdio: for audio CD playback support' 'ttf-freefont: for subtitle font ' @@ -60,7 +57,7 @@ backup=('usr/share/vlc/lua/http/.hosts' options=('!libtool' '!emptydirs') install=vlc.install source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('b45be633c71dca04ca7d6c3d64dd728b') +md5sums=('3b0e465b0990097b65abaf3e25589957') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 22815be84..2f0f13e72 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186352 2013-05-25 08:50:03Z andyrtr $ +# $Id: PKGBUILD 186484 2013-05-27 13:17:23Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.7 +pkgver=2.21.8 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=('faeabba40079c49290f39992542d9b0cfd229bda4e389e1352926903038363d9') +sha256sums=('4d850c0515012ca370a72469dfbfa6161aa9ee5bb39779fab5f496f2d94acf8f') build() { cd "${srcdir}/${pkgname}-${pkgver}" |