[arch-commits] Commit in kadu/repos/community-x86_64 (5 files)

[Bartłomiej Piotrowski]

    Date: Friday, October 10, 2014 @ 18:22:33
  Author: bpiotrowski
Revision: 120494

archrelease: copy trunk to community-x86_64

Added:
  kadu/repos/community-x86_64/PKGBUILD
    (from rev 120493, kadu/trunk/PKGBUILD)
  kadu/repos/community-x86_64/kadu.install
    (from rev 120493, kadu/trunk/kadu.install)
Deleted:
  kadu/repos/community-x86_64/PKGBUILD
  kadu/repos/community-x86_64/kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch
  kadu/repos/community-x86_64/kadu.install

------------------------------------------+
 PKGBUILD                                 |   80 ++++++++++++-----------------
 kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch |   12 ----
 kadu.install                             |   24 ++++----
 3 files changed, 47 insertions(+), 69 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-10 16:19:53 UTC (rev 120493)
+++ PKGBUILD	2014-10-10 16:22:33 UTC (rev 120494)
@@ -1,45 +0,0 @@
-# $Id$
-# 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=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')
-makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'optipng')
-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')
-
-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_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    -DQT_QMAKE_EXECUTABLE=qmake-qt4
-  make
-}
-
-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}
-}

Copied: kadu/repos/community-x86_64/PKGBUILD (from rev 120493, kadu/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-10-10 16:22:33 UTC (rev 120494)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Mateusz Herych
+# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
+
+pkgname=kadu
+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' 'libotr' 'libarchive')
+makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'chrpath')
+install=kadu.install
+source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
+md5sums=('a91c00707d73e0ba7fe8245885dd59a5')
+
+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
+  make
+}
+
+package() {
+  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-10 16:19:53 UTC (rev 120493)
+++ kadu-0.12.3-QT4_CREATE_MOC_COMMAND.patch	2014-10-10 16:22:33 UTC (rev 120494)
@@ -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)

Deleted: kadu.install
===================================================================
--- kadu.install	2014-10-10 16:19:53 UTC (rev 120493)
+++ kadu.install	2014-10-10 16:22:33 UTC (rev 120494)
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
-

Copied: kadu/repos/community-x86_64/kadu.install (from rev 120493, kadu/trunk/kadu.install)
===================================================================
--- kadu.install	                        (rev 0)
+++ kadu.install	2014-10-10 16:22:33 UTC (rev 120494)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
+