Fri Jul 18 04:02:21 UTC 2014

6 files changed, 49 insertions, 39 deletions

diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 88299910c..4618ee4a0 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 216036 2014-07-01 13:09:58Z fyan $
+# $Id: PKGBUILD 216947 2014-07-17 14:38:44Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.7.3
-pkgrel=4
+pkgver=1.7.4
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -31,7 +31,7 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
         cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
         get-ppd-file-for-statically-configured-ipp-shared-queues.patch
         ppd-poll-with-client-conf.patch)
-md5sums=('d498c3020acda0904ab0c13b6389a1ec'
+md5sums=('1a2295c2b2d2f422db2e50f40ed2fb99'
          'SKIP'
          '26e9b4e65c0a4d76db5737c9b156fd80'
          '96f82c38f3f540b53f3e5144900acf17'
@@ -120,8 +120,6 @@ build() {
 
 check() {
   cd ${pkgbase}-${pkgver}
-#./run-stp-tests.sh: line 782:  6307 Aborted                 (core dumped) $VALGRIND ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f > /tmp/cups-$user/log/debug_log 2>&1
-#FAIL: 87 error messages, expected 33.
   make -k check || /bin/true
 }
 
diff --git a/extra/docker-tray/PKGBUILD b/extra/docker-tray/PKGBUILD
index 68309c6fc..0894f5f7c 100644
--- a/extra/docker-tray/PKGBUILD
+++ b/extra/docker-tray/PKGBUILD
@@ -1,16 +1,14 @@
-# $Id: PKGBUILD 200798 2013-12-05 11:49:45Z bpiotrowski $
+# $Id: PKGBUILD 216953 2014-07-17 18:48:18Z svenstaro $
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=docker-tray
 pkgver=1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Docker is a docking application (WindowMaker dock app) which acts as a system tray for KDE and GNOME2."
 arch=('i686' 'x86_64')
 url="http://icculus.org/openbox/2/docker/"
 license=('GPL')
 depends=('glibc' 'glib2' 'libx11')
-replaces=("docker<=1.5")
-conflicts=("docker")
 source=("http://icculus.org/openbox/2/docker/docker-$pkgver.tar.gz")
 md5sums=('349320bebd43babb8b43e11c7aae0293')
 
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index b110a3650..e603e78fb 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 216875 2014-07-14 06:25:36Z fyan $
+# $Id: PKGBUILD 216951 2014-07-17 16:03:17Z fyan $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=licq
 pkgver=1.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced graphical ICQ clone and more for Unix"
 arch=('i686' 'x86_64')
 url="http://www.licq.org"
@@ -16,7 +16,7 @@ md5sums=('46af2bc95865ee61a103d27812fe6e6a')
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  mkdir {,plugins/qt4-gui/}build
+  mkdir build
 
   # Fix invalid PNG images to work with libpng 1.6
   # https://github.com/licq-im/licq/pull/32
@@ -26,21 +26,20 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # licq
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr  ..
-  make
+  local licq_plugins="auto-reply icq rms msn qt4-gui" # osd jabber aosd
+  
+  local plugins="" _plugin
+  for _plugin in ${licq_plugins}; do
+    plugins+=" ${_plugin}\/CMakeLists.txt"
+  done
+  sed -i -e "s/file(GLOB cmake_plugins.*$/set(cmake_plugins ${plugins})/" plugins/CMakeLists.txt
 
-  # qt4-gui
-  cd ../plugins/qt4-gui/build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake"  ..
+  cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_FIFO=ON -DBUILD_PLUGINS=ON  ..
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
-
-  cd ../plugins/qt4-gui/build
-  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/python-pycurl/PKGBUILD b/extra/python-pycurl/PKGBUILD
index de88e58cd..1f642fe78 100644
--- a/extra/python-pycurl/PKGBUILD
+++ b/extra/python-pycurl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 208855 2014-03-27 14:43:37Z fyan $
+# $Id: PKGBUILD 216937 2014-07-17 06:56:13Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
@@ -6,40 +6,55 @@
 _pypiname=pycurl
 pkgbase=python-$_pypiname
 pkgname=('python-pycurl' 'python2-pycurl')
-pkgver=7.19.3.1
-pkgrel=2
+pkgver=7.19.5
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://pycurl.sourceforge.net/"
 license=('LGPL' 'MIT')
 makedepends=('python' 'python2' 'curl' 'git')
+checkdepends=('python-bottle' 'python2-bottle' 'python-nose' 'python2-nose' 'vsftpd')
 source=("git+https://github.com/pycurl/pycurl.git#tag=REL_${pkgver//./_}")
 sha1sums=('SKIP')
 
 prepare() {
-  cp -r ${_pypiname} python2-${_pypiname}
+  cp -r $_pypiname{,-py2}
 
-  cd "${srcdir}/${_pypiname}"
+  cd "$srcdir/$_pypiname"
   find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python3|" {} +
     sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python-pycurl"/' setup.py
+  sed -i "s/nosetests/nosetests3/" Makefile
 
-  cd "${srcdir}/python2-${_pypiname}"
+  cd "$srcdir/$_pypiname-py2"
   find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python2|" {} +
     sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python2-pycurl"/' setup.py
+  sed -i "s/nosetests/nosetests2/" Makefile
 }
 
 build() {
-  cd "${srcdir}/${_pypiname}"
+  cd "$srcdir/$_pypiname"
+  make
   python3 setup.py build --with-ssl
 
-  cd "${srcdir}/python2-${_pypiname}"
+  cd "$srcdir/$_pypiname-py2"
+  make
   python2 setup.py build --with-ssl
 }
 
+check() {
+  export PYCURL_VSFTPD_PATH=vsftpd
+
+  cd "$srcdir/$_pypiname"
+  PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.4:$PYTHONPATH" make test || warning "Tests failed"
+
+  cd "$srcdir/$_pypiname-py2"
+  PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH" make test || warning "Tests failed"
+}
+
 package_python-pycurl() {
   pkgdesc="A Python 3.x interface to libcurl"
   depends=('python' 'curl')
 
-  cd ${_pypiname}
+  cd $_pypiname
   python setup.py install -O1 --root="${pkgdir}"
   install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
@@ -48,7 +63,7 @@ package_python2-pycurl() {
   pkgdesc="A Python 2.x interface to libcurl"
   depends=('python2' 'curl')
 
-  cd python2-${_pypiname}
+  cd $_pypiname-py2
   python2 setup.py install -O1 --root="${pkgdir}"
   install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index 1e6f146ea..f587322e9 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 204968 2014-02-02 11:52:21Z thomas $
+# $Id: PKGBUILD 216938 2014-07-17 06:56:15Z fyan $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
-pkgver=1.0.1
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ optdepends=('qt4')
 depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
 source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2
         http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc)
-sha256sums=('fc0132e82a18dfad9619be3abf50c206e2f449b1c14440cde36f25874fdce7df'
+sha256sums=('9b658fbcaaf8127115316e07fea314aebc21dd6dc3491cd8753a768521c4b9af'
             'SKIP')
 
 build() {
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index 713829bdb..c41cd5f3c 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 215362 2014-06-23 17:04:03Z andyrtr $
+# $Id: PKGBUILD 216943 2014-07-17 13:56:28Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=308
+pkgver=309
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz{,.asc}
         LICENSE)
-md5sums=('1ec76c1a79a70de4f82c24c527ef4626'
+md5sums=('6d494f7a31ce579aac0e7b71e8b7d68f'
          'SKIP'
          '10ecc3f8ee91e3189863a172f68282d2')