Thu Sep 12 01:42:53 PDT 2013

9 files changed, 101 insertions, 31 deletions

diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index 658d13067..2a8ef73c3 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91644 2013-05-26 08:19:25Z bpiotrowski $
+# $Id: PKGBUILD 97034 2013-09-11 06:15:17Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=aria2
-pkgver=1.17.1
+pkgver=1.18.0
 pkgrel=1
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates')
 checkdepends=('cppunit')
 source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.xz)
-sha256sums=('7e18cf15afa17cf725c2ab4338751bc165e33d41917a4af9927da0855298efc0')
+sha256sums=('431aa6a1ba1cf992d5ac68c2822854a6c6991f03d025608311b5d99227fc0ab7')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD
index ec205977f..a4ef8897d 100644
--- a/community/kmess/PKGBUILD
+++ b/community/kmess/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94926 2013-08-01 07:01:20Z bpiotrowski $
+# $Id: PKGBUILD 97032 2013-09-11 02:13:11Z bgyorgy $
 # Maintainer:
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
 
 pkgname=kmess
 pkgver=2.0.6.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A MSN Messenger client for Linux"
 arch=('i686' 'x86_64')
 url='http://kmess.sourceforge.net/'
@@ -15,9 +15,11 @@ makedepends=('automoc4' 'cmake' 'optipng')
 optdepends=('cabextract: provides winks support')
 install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2"
-        giflib-5.0.patch)
+        giflib-5.0.patch
+        fix-crash-in-contactlistmodel.patch)
 md5sums=('a2e57911713308bef81b9347135cc5dd'
-         '97734b073bf4a45ed3612d7626541cee')
+         '97734b073bf4a45ed3612d7626541cee'
+         'fdfe837f4bd64a5123edc63019bd5cf2')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -26,6 +28,9 @@ prepare() {
   find -name '*.png' -exec optipng -quiet -force -fix {} +
 
   patch -Np1 -i ../giflib-5.0.patch
+
+  # Fix crash in ContactListModel (FS#32402)
+  patch -Np1 -i ../fix-crash-in-contactlistmodel.patch
 }
 
 build() {
diff --git a/community/kmess/fix-crash-in-contactlistmodel.patch b/community/kmess/fix-crash-in-contactlistmodel.patch
new file mode 100644
index 000000000..c72659bc6
--- /dev/null
+++ b/community/kmess/fix-crash-in-contactlistmodel.patch
@@ -0,0 +1,29 @@
+commit e10ebb8bd33cf807e2edfa56c465b40f3237102e
+Author: Ruben Vandamme <ruben@kmess.org>
+Date:   Sun Jul 8 10:56:37 2012 +0200
+
+    Fix crash in ContactListModel.
+    
+    * Individually delete every child instead of using qDeleteAll.
+    * Crash only happens in combination with Qt 4.8.
+    * See https://bugs.kde.org/show_bug.cgi?id=285951 for similar issue in Amarok.
+    * See https://bugreports.qt-project.org/browse/QTBUG-22037 for Qt report.
+    * Many thanks to Bob ("badjar" on kmess.org/board) for providing the fix.
+
+diff --git a/src/model/contactlistmodelitem.cpp b/src/model/contactlistmodelitem.cpp
+index 462d555..ac5a6ca 100644
+--- a/src/model/contactlistmodelitem.cpp
++++ b/src/model/contactlistmodelitem.cpp
+@@ -79,7 +79,11 @@ ContactListModelItem::ContactListModelItem( Group *group, ContactListModelItem *
+  */
+ ContactListModelItem::~ContactListModelItem()
+ {
+-  qDeleteAll( childItems_ );
++  while( !childItems_.isEmpty() )
++  {
++    delete childItems_.takeFirst();
++  }
++
+   childItems_.clear();
+ 
+   // Delete this item from the parent's children
diff --git a/community/libkkc/PKGBUILD b/community/libkkc/PKGBUILD
index 91970093b..4ea1c0c20 100644
--- a/community/libkkc/PKGBUILD
+++ b/community/libkkc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94838 2013-07-31 03:58:39Z fyan $
+# $Id: PKGBUILD 97042 2013-09-11 09:43:26Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 pkgname=libkkc
-pkgver=0.2.7
+pkgver=0.3.0
 pkgrel=1
 pkgdesc="Japanese Kana Kanji conversion library"
 arch=('i686' 'x86_64')
@@ -31,4 +31,4 @@ package() {
     "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/"  
 }
 
-sha512sums=('2bb056cf00b6212a18462a5f952d4557944b29f49a92b0701abed5f5d6601fdb3b57c4e09a0b3db8ff39be01e91ab658656b89f576663046e53478ed07fe87af')
+sha512sums=('32b7268e4566acc7b13b9ae8ac06fe3ea3c23fef2a7157f8246f7ddb7b1f844da111334bea5b0b5ad9ac822a9be3a07ea5126ac59b8add1217aad2ba8157345f')
diff --git a/community/lockdev/PKGBUILD b/community/lockdev/PKGBUILD
index 5a4de60d5..8694c7513 100644
--- a/community/lockdev/PKGBUILD
+++ b/community/lockdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83333 2013-01-29 17:40:17Z spupykin $
+# $Id: PKGBUILD 97056 2013-09-11 21:00:47Z bgyorgy $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Wagner <a.wagner@stud.uni-frankfurt.de>
@@ -6,22 +6,27 @@
 pkgname=lockdev
 pkgver=1.0.3_1.5
 _pkgver=1.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.'
 url='http://packages.qa.debian.org/l/lockdev.html'
 license=("GPL")
 arch=('i686' 'x86_64')
 source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz"
-	      "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz")
+	"http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz"
+	'build.patch')
 md5sums=('64b9c1b87b125fc348e892e24625524a'
-         'c4e8a5a2e46b76b48339c232b358f579')
+         'c4e8a5a2e46b76b48339c232b358f579'
+         '2db93cadf6670ddcd01de4bfc22a35e1')
 
-build() {
+prepare() {
   cd "${pkgname}-${_pkgver}"
-
   patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff"
   sed -i "s|CFLAGS	= -g|CFLAGS	= -g -fPIC|" Makefile
+  patch -p1 -i ../build.patch # FS#33280
+}
 
+build() {
+  cd "${pkgname}-${_pkgver}"
   make shared CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
   make static CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
 }
diff --git a/community/lockdev/build.patch b/community/lockdev/build.patch
new file mode 100644
index 000000000..f1053d032
--- /dev/null
+++ b/community/lockdev/build.patch
@@ -0,0 +1,30 @@
+commit 0dd47123655c52d68185f06b9da8fb0e1b925400
+Author: Ludwig Nussel <ludwig.nussel@suse.de>
+Date:   Tue Feb 9 14:56:23 2010 +0100
+
+    RedHat patch 2
+    
+    - change library file name
+    - install devel symlink
+
+diff --git a/Makefile b/Makefile
+index b7b4d1f..3b351dd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,7 @@ VER	= $(shell expr `pwd` : '.*-\([0-9.]*\)')
+ MVER	= ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'}
+ 
+ static	= ${libname}.a
+-shared	= ${libname}.${VER}.so
++shared	= ${libname}.so.${VER}
+ soname	= ${libname}.so.${MVER}
+ 
+ # overwritten by caller (e.g.: debian/rules)
+@@ -76,6 +76,7 @@ install_doc:	docs/lockdev.3
+ install_run:	${shared}
+ 	install -m755 -d	${libdir}
+ 	install -m644 ${shared}	${libdir}
++	ln -s ${shared}		${libdir}/liblockdev.so
+ 
+ .PHONY: clean distclean perl-clean mostyclean 
+ perl-clean:	clean
diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD
index e010ef758..186477069 100644
--- a/community/minitube/PKGBUILD
+++ b/community/minitube/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 83577 2013-02-03 13:21:39Z speps $
+# $Id: PKGBUILD 97038 2013-09-11 07:54:39Z bpiotrowski $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=minitube
-pkgver=2.0
+pkgver=2.1
 pkgrel=1
-pkgdesc="A native YouTube client in QT. Watch YouTube videos without Flash Player"
+pkgdesc="A native YouTube client in Qt. Watch YouTube videos without Flash Player"
 arch=('i686' 'x86_64')
 url='http://flavio.tordini.org/minitube'
 license=('GPL')
 depends=('phonon')
 install="$pkgname.install"
-source=("http://flavio.tordini.org/files/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('7df1e44b86a4744a492ccc414c0fa77d')
+source=("ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+md5sums=('5851cb3e75b39ab7dfbdd45a8ebc6197'
+         'SKIP')
 
 build() {
-  cd "$srcdir/$pkgname"
-  qmake
+  cd $pkgname-$pkgver
+  qmake-qt4
 }
 
 package() {
-  cd "$srcdir/$pkgname"
+  cd $pkgname-$pkgver
   make install INSTALL_ROOT="$pkgdir/"
 }
diff --git a/community/phantomjs/PKGBUILD b/community/phantomjs/PKGBUILD
index 46ba64245..9bbf6f5cc 100644
--- a/community/phantomjs/PKGBUILD
+++ b/community/phantomjs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92506 2013-06-07 11:18:15Z fyan $
+# $Id: PKGBUILD 97046 2013-09-11 13:42:10Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: grimsock <lord.grimsock at gmail dot com>
 # Contributor: Dieter Plaetinck <dieter@plaetinck.be>
@@ -6,8 +6,8 @@
 # Contributor: Henry Tang <henryykt@gmail.com>
 
 pkgname=phantomjs
-pkgver=1.9.1
-pkgrel=2
+pkgver=1.9.2
+pkgrel=1
 pkgdesc="Headless WebKit with JavaScript API"
 url="http://www.phantomjs.org/"
 license=('BSD' 'LGPL' 'MIT')
@@ -16,7 +16,6 @@ depends=('gstreamer0.10-base' 'fontconfig' 'freetype2')
 makedepends=('unzip')
 source=("http://phantomjs.googlecode.com/files/${pkgname}-${pkgver}-source.zip")
 noextract=("${pkgname}-${pkgver}-source.zip")
-md5sums=('93a0043d4ff8cd83e23e9d261c93830d')
 
 build() {
   # workaround for https://code.google.com/p/libarchive/issues/detail?id=271
@@ -40,3 +39,4 @@ package() {
   install -Dm644 "$srcdir/$pkgname-$pkgver/third-party.txt" "$pkgdir/usr/share/licenses/$pkgname/third-party.txt"
 }
 
+sha512sums=('ada4010a1ba43950f25bcf42bc41f158c8dc91320edff18efece68c69cd16d1246512fbd66e2dcbe9d0ecd71d8587252570072e2499ec9dfce0ac871c0ce2720')
diff --git a/community/recorditnow/PKGBUILD b/community/recorditnow/PKGBUILD
index f3c003518..f19f62ea1 100644
--- a/community/recorditnow/PKGBUILD
+++ b/community/recorditnow/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93279 2013-07-01 05:44:50Z fyan $
+# $Id: PKGBUILD 97050 2013-09-11 14:06:02Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Yichao Yu <yyc1992@gmail.com>
 # Contributor: Weng Xuetian <wengxt@gmail.com>
@@ -7,13 +7,13 @@
 
 pkgname=recorditnow
 pkgver=0.8.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A plugin based desktop recorder for KDE SC 4"
 arch=('i686' 'x86_64')
 url="http://kde-apps.org/content/show.php/RecordItNow?content=114610"
 license=('GPL')
 depends=('kdebase-runtime' 'ffmpeg' 'xdg-utils')
-makedepends=('cmake' 'automoc4' 'recordmydesktop')
+makedepends=('cmake' 'automoc4' 'recordmydesktop' 'mencoder')
 optdepends=('mencoder: for mencoder encoder plugin'
             'recordmydesktop')
 provides=('joschy')