Wed Apr 24 00:49:37 PDT 2013

7 files changed, 33 insertions, 76 deletions

diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index c86f5b324..b374331bd 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -1,31 +1,32 @@
-# $Id: PKGBUILD 183336 2013-04-21 22:08:36Z heftig $
-# Maintainer:
+# $Id: PKGBUILD 183561 2013-04-23 13:10:19Z 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=1
+pkgrel=3
 pkgdesc="Braille display driver for Linux/Unix"
 arch=(i686 x86_64)
 url="http://mielke.cc/brltty"
 license=(GPL LGPL)
-depends=(libxaw at-spi2-core gpm 'icu>=51.1' tcl atk cython)
-makedepends=(bluez)
-optdepends=('bluez: bluetooth support')
+depends=(libxaw gpm icu tcl cython)
+makedepends=(bluez at-spi2-core)
+optdepends=('bluez: bluetooth support'
+	    'at-spi2-core: X11/GNOME Apps accessibility'
+	    'atk: ATK bridge for X11/GNOME accessibility')
 backup=(etc/brltty.conf)
 options=('!emptydirs')
 install=brltty.install
 source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
         brltty.service)
-md5sums=('7b52fa7746fed41ed344a1f75ce55951'
-         '7acecd700b9f94d76fe4a6ad56cb0448')
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --mandir=/usr/share/man \
     --with-tables-directory=/usr/share/brltty \
-    --with-screen-driver=a2 \
+    --with-screen-driver=lx \
     --enable-gpm \
     --disable-java-bindings \
     --disable-static
@@ -39,3 +40,5 @@ package() {
   install -Dm644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
   install -Dm644 ../brltty.service "$pkgdir/usr/lib/systemd/system/brltty.service"
 }
+md5sums=('7b52fa7746fed41ed344a1f75ce55951'
+         '0cad54bb5470122535f5e3a11d5ca123')
diff --git a/extra/brltty/brltty.service b/extra/brltty/brltty.service
index 1b9d55e32..4ef39c3fc 100644
--- a/extra/brltty/brltty.service
+++ b/extra/brltty/brltty.service
@@ -9,4 +9,4 @@ Type=forking
 PIDFile=/run/brltty.pid
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sysinit.target
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index d7557337a..a12c0d2ec 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183343 2013-04-21 22:08:45Z heftig $
+# $Id: PKGBUILD 183552 2013-04-23 04:49:12Z eric $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=dconf
@@ -9,7 +9,7 @@ arch=(i686 x86_64)
 url="http://live.gnome.org/dconf"
 license=('LGPL2.1')
 depends=('glib2' 'gtk-update-icon-cache')
-makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl' 'python')
+makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl' 'python' 'python2')
 optdepends=('gtk3: for dconf-editor')
 install=dconf.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index 83e5fa89a..8b0964afa 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -1,19 +1,24 @@
-# $Id: PKGBUILD 169483 2012-10-22 00:13:27Z eric $
+# $Id: PKGBUILD 183544 2013-04-22 22:24:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=msmtp
 pkgname=('msmtp' 'msmtp-mta')
-pkgver=1.4.30
+pkgver=1.4.31
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://msmtp.sourceforge.net"
 makedepends=('texlive-core' 'gsasl' 'libgnome-keyring')
 source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2)
-sha1sums=('fd469bae0c3394b30b771780e62bbd41c4d5d175')
+sha1sums=('c0edce1e1951968853f15209c8509699ff9e9ab5')
+
+prepare() {
+  cd ${pkgbase}-${pkgver}
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' scripts/msmtp-gnome-tool/msmtp-gnome-tool.py
+}
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls
   make
   make -C doc html pdf
@@ -24,7 +29,7 @@ package_msmtp() {
   depends=('gsasl' 'libgnome-keyring')
   install=msmtp.install
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install 
   make DESTDIR="${pkgdir}" -C doc install-html install-pdf
 
diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD
index 227a66368..67d61514a 100644
--- a/extra/opengtl/PKGBUILD
+++ b/extra/opengtl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 173974 2012-12-30 15:30:38Z foutrelis $
+# $Id: PKGBUILD 183549 2013-04-23 00:30:16Z eric $
 # Maintainer:
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andries Radu <admiral0@live.it>
 
 pkgname=opengtl
-pkgver=0.9.17
-pkgrel=2
+pkgver=0.9.18
+pkgrel=1
 pkgdesc="A set of libraries for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications"
 url="http://www.opengtl.org"
 arch=('i686' 'x86_64')
@@ -13,18 +13,11 @@ license=('GPL')
 depends=('gcc-libs' 'llvm')
 makedepends=('cmake' 'libpng')
 optdepends=('libpng: for using the png extension')
-source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2
-        opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch)
-sha256sums=('89a37394fe71f2e771d7230333c86b93706f0083f86a58a86a670bca7e4f905e'
-            'd3e12d964c927e6f659df00e6210815c803c9126b34e9e92d4ccfebd6d30c8d7')
+source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2)
+sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8')
 
 build() {
   cd "$srcdir"
-
-  #  Fix build with LLVM 3.2
-  patch -d OpenGTL-$pkgver -Np1 -i \
-    "$srcdir/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch"
-
   mkdir build
   cd build
   cmake ../OpenGTL-$pkgver \
diff --git a/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch b/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch
deleted file mode 100644
index c148c88bb..000000000
--- a/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -upr OpenGTL-0.9.17.orig/CMakeLists.txt OpenGTL-0.9.17/CMakeLists.txt
---- OpenGTL-0.9.17.orig/CMakeLists.txt	2012-06-04 17:51:43.000000000 +0300
-+++ OpenGTL-0.9.17/CMakeLists.txt	2012-12-25 03:00:30.000000000 +0200
-@@ -47,8 +47,8 @@ configure_file(config-endian.h.cmake ${C
- 
- find_package(LLVM REQUIRED)
- 
--if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" ) ) # There is no way with MSVC to know the llvm version
--  message(FATAL_ERROR "LLVM 3.0 or 3.1 is required.")
-+if( NOT MSVC AND NOT LLVM_VERSION STREQUAL "3.2" ) # There is no way with MSVC to know the llvm version
-+  message(FATAL_ERROR "LLVM 3.2 is required.")
- endif()
- 
- if(MSVC)
-diff -upr OpenGTL-0.9.17.orig/OpenCTL/OpenCTL/Program.cpp OpenGTL-0.9.17/OpenCTL/OpenCTL/Program.cpp
---- OpenGTL-0.9.17.orig/OpenCTL/OpenCTL/Program.cpp	2012-06-04 17:51:43.000000000 +0300
-+++ OpenGTL-0.9.17/OpenCTL/OpenCTL/Program.cpp	2012-12-25 02:59:17.000000000 +0200
-@@ -29,7 +29,7 @@
- #include <llvm/PassManager.h>
- #include <llvm/Analysis/LoopPass.h>
- #include <llvm/Analysis/Verifier.h>
--#include <llvm/Target/TargetData.h>
-+#include <llvm/DataLayout.h>
- #include <llvm/GlobalVariable.h>
- 
- // GTLCore
-diff -upr OpenGTL-0.9.17.orig/OpenGTL/GTLCore/ModuleData_p.cpp OpenGTL-0.9.17/OpenGTL/GTLCore/ModuleData_p.cpp
---- OpenGTL-0.9.17.orig/OpenGTL/GTLCore/ModuleData_p.cpp	2012-06-04 17:51:43.000000000 +0300
-+++ OpenGTL-0.9.17/OpenGTL/GTLCore/ModuleData_p.cpp	2012-12-25 02:59:34.000000000 +0200
-@@ -23,7 +23,7 @@
- 
- #include <llvm/Module.h>
- #include <llvm/PassManager.h>
--#include <llvm/Target/TargetData.h>
-+#include <llvm/DataLayout.h>
- #include <llvm/Target/TargetMachine.h>
- #include <llvm/Analysis/Verifier.h>
- #include <llvm/Transforms/Utils/Cloning.h>
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index 2e2064da0..6ed0b16ad 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 179560 2013-03-07 08:19:05Z andrea $
+# $Id: PKGBUILD 183563 2013-04-23 13:10:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt
 pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.10
+pkgver=4.10.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
@@ -13,7 +13,7 @@ license=('GPL')
 makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
              'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
 source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('b5953e96d0f82d322d0cba008163321e')
+md5sums=('e5973c4ec0b0469f329bc00209d2ad9c')
 
 build() {
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
@@ -27,9 +27,6 @@ build() {
   # Thanks Gerardo for the rpath fix
   find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
 
-  # Ugly workaround to fix build
-  sed -i 's|/usr/include/qt4/phonon|/usr/include/phonon|' phonon/Makefile
-
   make
 
   ### Python2 version ###
@@ -43,9 +40,6 @@ build() {
   # Thanks Gerardo for the rpath fix
   find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
   
-  # Ugly workaround to fix build
-  sed -i 's|/usr/include/qt4/phonon|/usr/include/phonon|' phonon/Makefile
-
   make
 }