Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/chmsee/PKGBUILD
	community/darkstat/PKGBUILD
	community/dbmail/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/epic4/PKGBUILD
	community/fb-client/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/fdupes/PKGBUILD
	community/flobopuyo/PKGBUILD
	community/intel-tbb/PKGBUILD
	community/openbsd-netcat/PKGBUILD
	community/sunpinyin/PKGBUILD
	community/tinc/PKGBUILD
	community/uudeview/PKGBUILD
	community/zathura/PKGBUILD
	core/libedit/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	core/openssl/PKGBUILD
	core/util-linux/PKGBUILD
	extra/lua/PKGBUILD
	gnome-unstable/pidgin/PKGBUILD
	testing/openssl/PKGBUILD
	testing/sudo/PKGBUILD
	testing/udev/PKGBUILD
	testing/util-linux/PKGBUILD

2 files changed, 49 insertions, 6 deletions

diff --git a/community/qtmpc/PKGBUILD b/community/qtmpc/PKGBUILD
index cd6d10d9a..b83e73cb3 100644
--- a/community/qtmpc/PKGBUILD
+++ b/community/qtmpc/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 47054 2011-05-14 19:45:44Z jlichtblau $
+# $Id: PKGBUILD 67768 2012-03-14 11:08:26Z giovanni $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Shaika-Dzari <shaikadzari at gmail dot com>
 
 pkgname=qtmpc
 pkgver=0.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Qt4-based front-end for MPD"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qtmpc.lowblog.nl/"
 license=('GPL')
-depends=('hicolor-icon-theme' 'kdebase-runtime' 'qt')
+depends=('kdebase-runtime')
 makedepends=('automoc4' 'cmake')
 install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://files.lowblog.nl/$pkgname/QtMPC-$pkgver.tar.bz2)
-sha256sums=('82287a26788b36d49db26518b66203f332cf686eefb81ee2d9be095e61123a62')
+source=("http://files.lowblog.nl/$pkgname/QtMPC-$pkgver.tar.bz2"
+        'qtmpc-0.6.1-underlinking.patch')
+sha256sums=('82287a26788b36d49db26518b66203f332cf686eefb81ee2d9be095e61123a62'
+            '8295218ebeeb14372c36c34510a9eed7210e82d8e474ef3caae1bd58327780d3')
 
 build() {
   cd ${srcdir}/QtMPC
 
+  patch -Np1 -i "${srcdir}/qtmpc-0.6.1-underlinking.patch"
+
   cmake . -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
diff --git a/community/qtmpc/qtmpc-0.6.1-underlinking.patch b/community/qtmpc/qtmpc-0.6.1-underlinking.patch
new file mode 100644
index 000000000..881187d1f
--- /dev/null
+++ b/community/qtmpc/qtmpc-0.6.1-underlinking.patch
@@ -0,0 +1,40 @@
+diff -ruN QtMPC-0-vanilla/CMakeLists.txt QtMPC/CMakeLists.txt
+--- QtMPC-0-vanilla/CMakeLists.txt	2010-11-02 17:00:58.000000000 +0100
++++ QtMPC/CMakeLists.txt	2011-11-20 23:27:18.000000000 +0100
+@@ -81,6 +81,11 @@
+ 
+ # this command finds Qt4 libraries and sets all required variables
+ FIND_PACKAGE( Qt4 REQUIRED )
++
++# add some useful macros and variables
++# (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains a path to CMake script)
++INCLUDE( ${QT_USE_FILE} )
++
+ FIND_PACKAGE( KDE4 )
+ 
+ IF( NOT DEFINED WANT_KDE_SUPPORT )
+@@ -134,12 +139,6 @@
+ 	ADD_DEFINITIONS( -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -Wall -Wextra )
+ ENDIF( NOT ENABLE_KDE_SUPPORT )
+ 
+-# add some useful macros and variables
+-# (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains a path to CMake script)
+-IF( NOT ENABLE_KDE_SUPPORT )
+-	INCLUDE( ${QT_USE_FILE} )
+-ENDIF( NOT ENABLE_KDE_SUPPORT )
+-
+ ADD_SUBDIRECTORY( external/libmaia )
+ 
+ # Compile the resource files
+@@ -169,9 +168,9 @@
+ 
+ # Last but not least, link everything. Based on whether we are using KDE or not.
+ IF( ENABLE_KDE_SUPPORT )
+-	TARGET_LINK_LIBRARIES( QtMPC ${QT_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} Maia )
++	TARGET_LINK_LIBRARIES( QtMPC Maia ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_LIBRARIES} )
+ ELSE( ENABLE_KDE_SUPPORT )
+-	TARGET_LINK_LIBRARIES( QtMPC ${QT_LIBRARIES} Maia )
++	TARGET_LINK_LIBRARIES( QtMPC Maia ${QT_LIBRARIES} )
+ ENDIF( ENABLE_KDE_SUPPORT )
+ 
+ IF( ENABLE_KDE_SUPPORT )