Sun Jul 6 03:41:15 UTC 2014

8 files changed, 43 insertions, 96 deletions

diff --git a/extra/aspell-pt/PKGBUILD b/extra/aspell-pt/PKGBUILD
index 87479bf4c..d40352a3d 100644
--- a/extra/aspell-pt/PKGBUILD
+++ b/extra/aspell-pt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 215101 2014-06-14 04:25:55Z fyan $
+# $Id: PKGBUILD 216539 2014-07-05 02:54:32Z fyan $
 # Maintainer:
 
 pkgname=aspell-pt
-_pkgverPT=20140513
+_pkgverPT=20140704
 _pkgverBR=20090702
 pkgver=$_pkgverPT
 pkgrel=1
@@ -17,8 +17,8 @@ source=(ftp://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgverBR-0.tar.b
         http://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-$_pkgverPT.tar.bz2
         http://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-preao-$_pkgverPT.tar.bz2)
 sha1sums=('add1db9a6a908dccaad13a7fd85c3b202299ff26'
-          '9b74f0bbdd9afa00cf6b6e86f8be065bc062dfca'
-          '341fe147c4454062249736da360012b4247b4fee')
+          '3d4a4d98179f705a1f3031a3908c20a60c122968'
+          '215b95fd649a68802b0d50fba6f0082ebd5a7d8f')
 
 build() {
   cd aspell6-pt_BR-$_pkgverBR-0
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 6326a1b8b..493152fb2 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 215561 2014-06-29 08:42:36Z andyrtr $
+# $Id: PKGBUILD 216541 2014-07-05 07:48:52Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
-pkgver=5.20
+pkgver=5.21
 pkgrel=1
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.xz
         0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
         bluetooth.modprobe)
 # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
-sha256sums=('531fbaa0a9baf7b1f76fb8fd8975c20d3cc61cdc772a39d63df1d6abfc2a7481'
+sha256sums=('81eb073516f39ff1fa02fa40120e834f40fdb0b772f8f4153a9ab566cc0a1f4f'
             '896a1403d9b7258c4fb0d41f3a6f70fd51eaa1115ab3f4259f3dbbe02b55766b'
             '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
 
diff --git a/extra/fluxbox/PKGBUILD b/extra/fluxbox/PKGBUILD
index 3618a80f7..fae0959a7 100644
--- a/extra/fluxbox/PKGBUILD
+++ b/extra/fluxbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 181689 2013-04-04 05:04:01Z eric $
+# $Id: PKGBUILD 216535 2014-07-05 02:17:29Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fluxbox
 pkgver=1.3.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A lightweight and highly-configurable window manager"
 arch=('i686' 'x86_64')
 url="http://www.fluxbox.org"
@@ -16,19 +16,23 @@ source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkg
 sha1sums=('495d82ca428949cc2bc85814898b49cf4624b7cb'
           'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i 's/@EXEEXT@//g' util/fluxbox-generate_menu.in #share/fluxbox/menu}
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
     --enable-xft --enable-xinerama \
     --enable-imlib2 --enable-nls
+  sed -i 's/@my_libs@//' {,*/,*/*/}Makefile
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
-  sed -i 's/@EXEEXT@//g' "${pkgdir}"/usr/{bin/fluxbox-generate_menu,share/fluxbox/menu}
-
-  install -D -m644 ../fluxbox.desktop "${pkgdir}/usr/share/xsessions/fluxbox.desktop"
+  install -D -m644 "${srcdir}/fluxbox.desktop" "${pkgdir}/usr/share/xsessions/fluxbox.desktop"
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/kdiff3/PKGBUILD b/extra/kdiff3/PKGBUILD
index 05b316fee..6e15ce260 100644
--- a/extra/kdiff3/PKGBUILD
+++ b/extra/kdiff3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 216451 2014-07-04 01:18:59Z eric $
+# $Id: PKGBUILD 216543 2014-07-05 14:28:45Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=kdiff3
-pkgver=0.9.97
-pkgrel=3
+pkgver=0.9.98
+pkgrel=1
 pkgdesc="A KDE file comparator/merge tool"
 arch=('i686' 'x86_64')
 url="http://kdiff3.sourceforge.net/"
@@ -12,18 +12,11 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml')
 optdepends=('kdebase-lib: for the plugin')
 install=kdiff3.install
-source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz
-        kdiff3-relative-path.patch)
-sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547'
-          'b5359dcec2ebb8221a232ecc2ea9982b290172e5')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p2 -i "${srcdir}/kdiff3-relative-path.patch"
-  mkdir release
-}
+source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('1390b4ca9c58316de49cb0aabb433f14ebf2dc3f')
 
 build() {
+  mkdir ${pkgname}-${pkgver}/release
   cd ${pkgname}-${pkgver}/release
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr
   make
diff --git a/extra/kdiff3/kdiff3-relative-path.patch b/extra/kdiff3/kdiff3-relative-path.patch
deleted file mode 100644
index 7cfccd6f5..000000000
--- a/extra/kdiff3/kdiff3-relative-path.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/kdiff3/src-QT4/fileaccess.cpp
-+++ b/kdiff3/src-QT4/fileaccess.cpp
-@@ -183,7 +183,8 @@
- 
- void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent )
- {
--   m_filePath   = nicePath( fi.filePath() ); // remove "./" at start   
-+   m_filePath   = pParent == 0 ? fi.absoluteFilePath() : 
-+                                 nicePath( fi.filePath() ); // remove "./" at start   
- 
-    m_bSymLink   = fi.isSymLink();
-    if ( m_bSymLink || (!m_bExists  && m_filePath.contains("@@") ) )
-@@ -566,7 +567,16 @@
-    if ( parent() != 0 )
-       return parent()->absoluteFilePath() + "/" + m_filePath;
-    else
--      return m_filePath;
-+   {
-+      if ( m_filePath.isEmpty() )
-+	 return QString();
-+      
-+      QFileInfo fi( m_filePath );
-+      if ( fi.isAbsolute() )
-+	 return m_filePath;
-+      else
-+	 return fi.absoluteFilePath(); // Probably never reached
-+   }
- }  // Full abs path
- 
- // Just the name-part of the path, without parent directories
-@@ -1184,7 +1194,7 @@
-       m_bSuccess = false;
-       KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->url(), kurl, permissions, KIO::HideProgressInfo );
-       connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*)));
--      connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long)));
-+      connect( pJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long)));
- 
-       ProgressProxy::enterEventLoop( pJob,
-          i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) );
-@@ -1673,7 +1683,7 @@
-                   &pp,      SLOT( slotListDirInfoMessage(KJob*, const QString&) ));
- 
-          // This line makes the transfer via fish unreliable.:-(
--         //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long)));
-+         //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long)));
- 
-          ProgressProxy::enterEventLoop( pListJob,
-             i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) );
---- a/kdiff3/src-QT4/kdiff3.cpp
-+++ b/kdiff3/src-QT4/kdiff3.cpp
-@@ -211,6 +211,8 @@
-       m_outputFilename = args->getOption("output");
-       if ( m_outputFilename.isEmpty() )
-          m_outputFilename = args->getOption("out");
-+      if ( ! m_outputFilename.isEmpty() )
-+         m_outputFilename = FileAccess( m_outputFilename, true ).absoluteFilePath();
-    }
- 
-    m_bAutoFlag = args!=0  && args->isSet("auto");
diff --git a/extra/liboauth/PKGBUILD b/extra/liboauth/PKGBUILD
index b920cab0b..9fe903703 100644
--- a/extra/liboauth/PKGBUILD
+++ b/extra/liboauth/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198211 2013-10-30 13:28:54Z allan $
+# $Id: PKGBUILD 216533 2014-07-05 00:36:46Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Martin Häger <martin.haeger@gmail.com>
 
 pkgname=liboauth
-pkgver=1.0.1
+pkgver=1.0.3
 pkgrel=1
 pkgdesc='C library implementing OAuth Core RFC 5849'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url='http://liboauth.sourceforge.net'
 license=('MIT')
 depends=('curl')
 source=("$url/pool/$pkgname-$pkgver.tar.gz")
-sha256sums=('5087d32fe1db7b588246a7de64fc0c2464c95efdebb2c7fe6f482d9b00e68d8b')
+sha256sums=('0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/python-cffi/PKGBUILD b/extra/python-cffi/PKGBUILD
index b00712046..a898f3c5d 100644
--- a/extra/python-cffi/PKGBUILD
+++ b/extra/python-cffi/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 208840 2014-03-27 14:43:25Z fyan $
+# $Id: PKGBUILD 216549 2014-07-05 16:05:54Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: lilydjwg <lilydjwg@gmail.com>
 
 _name=cffi
 pkgbase=python-$_name
 pkgname=(python-$_name python2-$_name)
-pkgver=0.8.2
-pkgrel=4
+pkgver=0.8.3
+pkgrel=1
 pkgdesc="Foreign Function Interface for Python calling C code"
 arch=('i686' 'x86_64')
 url="http://cffi.readthedocs.org/"
 license=('MIT')
 makedepends=('python-setuptools' 'python2-setuptools' 'python-pycparser' 'python2-pycparser')
-md5sums=('37fc88c62f40d04e8a18192433f951ec')
+checkdepends=('python-pytest' 'python2-pytest')
 source=("http://pypi.python.org/packages/source/c/${_name}/${_name}-${pkgver}.tar.gz")
+md5sums=('57e140a7d475f58bada8f2ada3f5749e')
 
 prepare() {
-  cp -r $_name-$pkgver{,-py2}
+  cp -a $_name-$pkgver{,-py2}
 }
 
 build() {
@@ -27,6 +28,14 @@ build() {
   python2 setup.py build
 }
 
+check() {
+  cd "$srcdir/$_name-$pkgver"
+  PYTHONPATH="$(pwd)/build/lib.linux-$CARCH-3.4:$PYTHONPATH" py.test
+
+  cd "$srcdir/$_name-$pkgver-py2"
+  PYTHONPATH="$(pwd)/build/lib.linux-$CARCH-2.7:$PYTHONPATH" py.test2
+}
+
 package_python-cffi() {
   depends=('python' 'python-pycparser')
 
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index ac217835a..700639fe0 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 216434 2014-07-03 20:26:05Z andrea $
+# $Id: PKGBUILD 216551 2014-07-05 17:32:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
@@ -6,7 +6,7 @@ pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
          'python-qscintilla-common')
 pkgver=2.8.3
-pkgrel=1
+pkgrel=2
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"