[arch-commits] Commit in kadu/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Monday, February 24, 2014 @ 19:01:17
  Author: bpiotrowski
Revision: 106172

upgpkg: kadu 0.12.3-4

free rebuild

Added:
  kadu/trunk/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch
Modified:
  kadu/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |   25 +++++++++++++++----------
 kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch |   12 ++++++++++++
 2 files changed, 27 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-24 17:37:17 UTC (rev 106171)
+++ PKGBUILD	2014-02-24 18:01:17 UTC (rev 106172)
@@ -1,23 +1,27 @@
 # $Id$
-# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 # Contributor: Mateusz Herych
 # Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
 
 pkgname=kadu
 pkgver=0.12.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Qt-based Jabber/XMPP and Gadu-Gadu client'
 arch=('i686' 'x86_64')
 url='http://www.kadu.net/'
 license=('GPL')
-depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl'
-         'libidn' 'libmpdclient' 'qtwebkit' 'xdg-utils')
+depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl' 'libidn'
+         'libmpdclient' 'qtwebkit' 'xdg-utils')
 makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'optipng')
 install=kadu.install
-source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
-sha256sums=('d607bbd0d00b01bfb70dd15f15c8be4076896a935041651e67a3887ad12ab8a8')
+source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2
+        kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch)
+md5sums=('c5d6f0bd384cd96090819ea018eb8ad8'
+         '76e53a1f77699ba81c076f9254bb28c5')
 
 prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch
   find -name '*.png' -exec optipng -quiet -force -fix {} +
 }
 
@@ -27,14 +31,15 @@
 
   cmake ../$pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DQT_QMAKE_EXECUTABLE=qmake-qt4
   make
 }
 
 package() {
   cd build
-  make DESTDIR=$pkgdir LIBDIR=/usr/lib install
+  make DESTDIR="$pkgdir" LIBDIR=/usr/lib install
 
-  mv $pkgdir/usr/sdk $pkgdir/usr/share/kadu/sdk
-  rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}
+  mv "$pkgdir"/usr/sdk "$pkgdir"/usr/share/kadu/sdk
+  rm -rf "$pkgdir"/usr/{lib,include}/{libgadu*,pkgconfig}
 }

Added: kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch
===================================================================
--- kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch	                        (rev 0)
+++ kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch	2014-02-24 18:01:17 UTC (rev 106172)
@@ -0,0 +1,12 @@
+diff -rupN a/plugins/jabber_protocol/3rdparty/CMakeLists.txt b/plugins/jabber_protocol/3rdparty/CMakeLists.txt
+--- a/plugins/jabber_protocol/3rdparty/CMakeLists.txt	2012-09-14 21:54:35.000000000 +0000
++++ b/plugins/jabber_protocol/3rdparty/CMakeLists.txt	2014-02-24 17:43:59.696495517 +0000
+@@ -26,7 +26,7 @@ macro (kadu_jabber_automoc)
+ 					get_filename_component (_basename ${_current_MOC} NAME_WE)
+ 					set (_header ${_abs_FILE})
+ 					set (_moc ${_abs_PATH}/${_current_MOC})
+-					QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "")
++					QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "${moc_target}")
+ 					MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc})
+ 				endforeach (_current_MOC_INC)
+ 			endif (_match)