Date: Friday, February 27, 2015 @ 07:23:11 Author: bpiotrowski Revision: 128340
upgpkg: kadu 2.0-1 new upstream release Modified: kadu/trunk/PKGBUILD Deleted: kadu/trunk/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch -------------------------------------------------------------+ PKGBUILD | 20 ++-- kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch | 48 ---------- 2 files changed, 10 insertions(+), 58 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-02-27 05:43:18 UTC (rev 128339) +++ PKGBUILD 2015-02-27 06:23:11 UTC (rev 128340) @@ -4,24 +4,24 @@ # Contributor: Jaroslaw Swierczynski <swier...@aur.archlinux.org> pkgname=kadu -pkgver=1.5 +pkgver=2.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' 'ninja') +depends=('libgadu' 'libxss' 'enchant' 'phonon-qt5' 'qca-ossl' 'qca-qt5' 'libidn' + 'libmpdclient' 'libotr' 'libarchive' 'injeqt' 'xdg-utils' 'qt5-multimedia' + 'qt5-quick1' 'qt5-declarative' 'qt5-webkit' 'qt5-x11extras') +makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'chrpath' 'ninja' + 'qt5-tools') install=kadu.install -source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2 - kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch) -md5sums=('bfc653bc3a5b542877a299209db6adaf' - 'd706ee1839c629bc8cb06153211b2630') +source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) +md5sums=('7239fab871f32082a7cf27433219b08b') prepare() { - cd $pkgname-$pkgver - patch -p1 -i ../kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch + sed -i 's/unity_integration//g' $pkgname-$pkgver/Plugins.cmake + sed -i 's/indicator_docking//g' $pkgname-$pkgver/Plugins.cmake } build() { Deleted: kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch =================================================================== --- kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch 2015-02-27 05:43:18 UTC (rev 128339) +++ kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch 2015-02-27 06:23:11 UTC (rev 128340) @@ -1,48 +0,0 @@ -From bb925f636a8a3f662ef2a5f2826a7e0138dba266 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa <rak...@freebsd.org> -Date: Wed, 31 Dec 2014 01:15:28 +0200 -Subject: [PATCH] Rename INSTALL_PREFIX to KADU_INSTALL_PREFIX. - -In CMake 3.1.0, INSTALL_PREFIX is now an optional argument to -configure_package_config_file(), so our call was confusing the -function's argument parsing code. - -Fix it by renaming INSTALL_PREFIX to KADU_INSTALL_PREFIX. - -Signed-off-by: Raphael Kubo da Costa <rak...@freebsd.org> ---- - CMakeLists.txt | 4 ++-- - cmake/KaduConfig.cmake.in | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ef624a9..3f23c71 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -195,8 +195,8 @@ foreach (install_var ${install_vars}) - endif () - endforeach () - --set (INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") --set (path_vars INSTALL_PREFIX) -+set (KADU_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") -+set (path_vars KADU_INSTALL_PREFIX) - if (UNIX AND NOT APPLE) - list (APPEND path_vars DESKTOP_FILE_DIR) - endif () -diff --git a/cmake/KaduConfig.cmake.in b/cmake/KaduConfig.cmake.in -index 2e22aa4..6a3c683 100644 ---- a/cmake/KaduConfig.cmake.in -+++ b/cmake/KaduConfig.cmake.in -@@ -20,7 +20,7 @@ endif () - set (KADU_INCLUDE_DIR "@PACKAGE_INCLUDE_DIR@") - set (KADU_INCLUDE_DIRS "@PACKAGE_INCLUDE_DIR@" "@PACKAGE_INCLUDE_DIR@/kadu-core") - set (KADU_SDK_DIR "@PACKAGE_SDK_DIR@") --set (KADU_INSTALL_PREFIX "@PACKAGE_INSTALL_PREFIX@") -+set (KADU_INSTALL_PREFIX "@PACKAGE_KADU_INSTALL_PREFIX@") - - set (KADU_INSTALL_SDK "@INSTALL_SDK@") - --- -1.7.1 -