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

[Bartłomiej Piotrowski]

    Date: Sunday, October 5, 2014 @ 18:22:13
  Author: bpiotrowski
Revision: 120169

upgpkg: kadu 1.0-1

new upstream release

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

------------------------------------------+
 PKGBUILD                                 |   28 +++++++++-------------------
 kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch |   12 ------------
 2 files changed, 9 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-05 15:48:33 UTC (rev 120168)
+++ PKGBUILD	2014-10-05 16:22:13 UTC (rev 120169)
@@ -4,32 +4,25 @@
 # Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
 
 pkgname=kadu
-pkgver=0.12.3
-pkgrel=4
+pkgver=1.0
+pkgrel=1
 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')
-makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'optipng')
+         'libmpdclient' 'qtwebkit' 'xdg-utils' 'libotr' 'libarchive')
+makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'chrpath')
 install=kadu.install
-source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2
-        kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch)
-md5sums=('c5d6f0bd384cd96090819ea018eb8ad8'
-         '76e53a1f77699ba81c076f9254bb28c5')
+source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
+md5sums=('a91c00707d73e0ba7fe8245885dd59a5')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch
-  find -name '*.png' -exec optipng -quiet -force -fix {} +
-}
-
 build() {
   mkdir build
   cd build
 
   cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
     -DQT_QMAKE_EXECUTABLE=qmake-qt4
@@ -37,9 +30,6 @@
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" LIBDIR=/usr/lib install
-
-  mv "$pkgdir"/usr/sdk "$pkgdir"/usr/share/kadu/sdk
-  rm -rf "$pkgdir"/usr/{lib,include}/{libgadu*,pkgconfig}
+  make -C build DESTDIR="$pkgdir" LIBDIR=/usr/lib install
+  chrpath -d "$pkgdir"/usr/lib/kadu/plugins/*.so
 }

Deleted: kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch
===================================================================
--- kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch	2014-10-05 15:48:33 UTC (rev 120168)
+++ kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch	2014-10-05 16:22:13 UTC (rev 120169)
@@ -1,12 +0,0 @@
-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)