Sat Jun 23 00:01:50 UTC 2012

8 files changed, 98 insertions, 31 deletions

diff --git a/community/choqok/PKGBUILD b/community/choqok/PKGBUILD
index 00151541c..eae93565d 100644
--- a/community/choqok/PKGBUILD
+++ b/community/choqok/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67102 2012-03-04 10:12:03Z andrea $
+# $Id: PKGBUILD 72717 2012-06-21 07:02:11Z andrea $
 # Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Emanuele Rossi <newdna1510@yahoo.it>
@@ -6,7 +6,7 @@
 
 pkgname=choqok
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A Twitter/identi.ca/laconica client for KDE"
 url='http://choqok.gnufolks.org/'
 license=('GPL')
diff --git a/community/gluon/PKGBUILD b/community/gluon/PKGBUILD
index b16442551..12d20a320 100644
--- a/community/gluon/PKGBUILD
+++ b/community/gluon/PKGBUILD
@@ -1,33 +1,37 @@
-# $Id: PKGBUILD 61254 2011-12-26 12:01:45Z andrea $
+# $Id: PKGBUILD 72719 2012-06-21 07:09:44Z andrea $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>
 
 pkgname=gluon
 pkgver=0.71.0
 _pkgver=0.71
-pkgrel=3
+pkgrel=4
 pkgdesc="A free and open source platform for creating and distributing games"
 arch=('i686' 'x86_64')
 url="http://gluon.gamingfreedom.org/"
 license=('LGPL')
-depends=('qt' 'kdebase-runtime' 'libsndfile' 'openal' 'alure' 'attica')
+depends=('kdelibs' 'libsndfile' 'alure')
 makedepends=('cmake' 'automoc4' 'mesa' 'kdevplatform')
 install=gluon.install
-source=("http://download.kde.org/download.php?url=unstable/$pkgname/$_pkgver/src/$pkgname-$pkgver.tar.gz")
-md5sums=('e4f284c0ae00e5b8a58cc3e6201857fe')
+source=("http://download.kde.org/unstable/$pkgname/$_pkgver/src/$pkgname-$pkgver.tar.gz"
+        'gcc47.patch')
+md5sums=('e4f284c0ae00e5b8a58cc3e6201857fe'
+         '92adbf8b23f4af2a15a005b031c81c5f')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir"/$pkgname-$pkgver
+  patch -p1 -i "$srcdir"/gcc47.patch
 
-  [[ -d build ]] && rm -rf build
-  mkdir build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+  cd "$srcdir"
+  mkdir build
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cd build
-  make DESTDIR="$pkgdir/" install
+  cd "$srcdir"/build
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/gluon/gcc47.patch b/community/gluon/gcc47.patch
new file mode 100644
index 000000000..1f2a22306
--- /dev/null
+++ b/community/gluon/gcc47.patch
@@ -0,0 +1,31 @@
+From: Christoph Feck <christoph@maxiom.de>
+Date: Fri, 23 Mar 2012 22:35:09 +0000
+Subject: Fix includes
+X-Git-Url: http://quickgit.kde.org/?p=gluon.git&amp;a=commitdiff&amp;h=bccbda88a6bc53ac20091bb6aefd2f1b501ba31a
+---
+Fix includes
+---
+
+
+--- a/input/linux/detectlinux.cpp
++++ b/input/linux/detectlinux.cpp
+@@ -26,6 +26,7 @@
+ 
+ #include <QtCore/QDir>
+ 
++#include <unistd.h>
+ // #include <libudev.h>
+ 
+ using namespace GluonInput;
+
+--- a/input/linux/inputthread.cpp
++++ b/input/linux/inputthread.cpp
+@@ -30,6 +30,7 @@
+ // #include <QtCore/QStringList>
+ 
+ #include <fcntl.h>
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <linux/input.h>
+
diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD
index 5240c6e87..68b9e87b7 100644
--- a/community/klavaro/PKGBUILD
+++ b/community/klavaro/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 63462 2012-02-04 10:23:11Z stativ $
+# $Id: PKGBUILD 72725 2012-06-21 14:59:35Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=klavaro
-pkgver=1.9.4
+pkgver=1.9.5
 pkgrel=1
 pkgdesc="Free touch typing tutor program"
 arch=('i686' 'x86_64')
@@ -11,11 +11,11 @@ depends=('curl' 'gtkdatabox' 'hicolor-icon-theme')
 makedepends=('intltool')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('5f988f7e117958e70a3c4cd621e8a909')
+md5sums=('02d20bd9c2237653dd7d4dd87833ecee')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  CFLAGS="-lgmodule-2.0" ./configure --prefix=/usr
   make
 }
 
diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD
index 4446c8045..c0c3379f1 100755
--- a/community/pragha/PKGBUILD
+++ b/community/pragha/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 72685 2012-06-19 16:24:42Z ttopper $
+# $Id: PKGBUILD 72729 2012-06-21 16:19:43Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 # Contributor: JerichoKru   <jerichokru(AT)htomail.com>
 
 pkgname=pragha
-pkgver=1.1.0
+pkgver=1.1.0.1
 pkgrel=1
 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager."
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ optdepends=('notification-daemon: OSD notification')
 replaces=('dissonance')
 install=pragha.install
 source=("https://github.com/downloads/matiasdelellis/pragha/$pkgname-$pkgver.tar.bz2")
-sha1sums=('255b3a5ff05f5a59311434184c943fcd4b8bb89a')
+sha1sums=('2db115a7f263ea8bcac446590ccc32cae7542c93')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/python-gnutls/PKGBUILD b/community/python-gnutls/PKGBUILD
index 992a476ef..44e0d11fc 100644
--- a/community/python-gnutls/PKGBUILD
+++ b/community/python-gnutls/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56532 2011-10-07 21:32:13Z spupykin $
+# $Id: PKGBUILD 72721 2012-06-21 11:07:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Hugo Doria <hugo@archlinux.org>
 # Contributor: N3RD3X <n3rd3x@linuxmail.org>
 
 pkgname=python-gnutls
-pkgver=1.2.2
+pkgver=1.2.4
 pkgrel=1
 pkgdesc="Python wrapper for the GNUTLS library"
 arch=('i686' 'x86_64')
@@ -12,10 +12,9 @@ url="http://cheeseshop.python.org/pypi/python-gnutls"
 depends=('python2' 'gnutls')
 license=('LGPL')
 source=(http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('1ca32b3e2d22ca33a15222191efc04aa')
+md5sums=('e3536c421291a791869d875a41dcb26a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-#  sed -i "s|openpgp_\(privkey_sign_hash\)|\1|g" gnutls/library/functions.py
   python2 setup.py install --root=${pkgdir}
 }
diff --git a/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch b/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch
new file mode 100644
index 000000000..dda3c48c4
--- /dev/null
+++ b/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch
@@ -0,0 +1,30 @@
+From a47c5838e9f445ab887ad927706b11ccbb181364 Mon Sep 17 00:00:00 2001
+From: David Lamparter <equinox@opensourcerouting.org>
+Date: Thu, 21 Jun 2012 09:55:38 +0200
+Subject: [PATCH] isisd: fix typo in topology generator (BZ#731)
+
+There was a "lsp->" missing before "level" in line 2416.
+(introduced by git commit e38e0df)
+
+Reported-by: Seblu <seblu@seblu.net>
+Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
+---
+ isisd/isis_lsp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
+index 5c1e993..082e9dc 100644
+--- a/isisd/isis_lsp.c
++++ b/isisd/isis_lsp.c
+@@ -2413,7 +2413,7 @@ top_lsp_refresh (struct thread *thread)
+   isis_dynhn_insert (lsp->lsp_header->lsp_id, lsp->tlv_data.hostname,
+ 		     IS_LEVEL_1);
+ 
+-  lsp->lsp_header->lsp_bits = lsp_bits_generate (level,
++  lsp->lsp_header->lsp_bits = lsp_bits_generate (lsp->level,
+                                                  lsp->area->overload_bit);
+   rem_lifetime = lsp_rem_lifetime (lsp->area, IS_LEVEL_1);
+   lsp->lsp_header->rem_lifetime = htons (rem_lifetime);
+-- 
+1.7.11
+
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index 0e4ead5f6..68590da61 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 70110 2012-04-29 20:23:17Z seblu $
+# $Id: PKGBUILD 72737 2012-06-21 19:55:00Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgname=quagga
-pkgver=0.99.20.1
+pkgver=0.99.21
 pkgrel=1
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
 arch=('i686' 'x86_64')
@@ -14,13 +14,16 @@ backup=()
 install=quagga.install
 source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
         'quagga.rc'
-        'quagga.conf')
-md5sums=('270ddd464407f8ce6fa8ada8bc1abbd7'
+        'quagga.conf'
+        '0001-isisd-fix-typo-in-topology-generator-BZ-731.patch')
+md5sums=('99840adbe57047c90dfba6b6ed9aec7f'
          '71d474228a1e02d698cd24e9fd55ca38'
-         '0c4f2dd13c7dac1b73de923d1d5e4e17')
+         '0c4f2dd13c7dac1b73de923d1d5e4e17'
+         'c80174f7bdd32cd84550d52451e8f495')
 
 build() {
   cd $pkgname-$pkgver
+  patch -p 1 -i "$srcdir/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch"
   ./configure --prefix=/usr --sysconfdir=/etc/quagga --localstatedir=/run/quagga \
     --enable-exampledir=/usr/share/doc/quagga/examples \
     --enable-vtysh \