diff --git a/kadu/PKGBUILD b/kadu/PKGBUILD index 7d7fd154e..98c2b92db 100644 --- a/kadu/PKGBUILD +++ b/kadu/PKGBUILD @@ -1,32 +1,44 @@ # # Apps Packages for Chakra, part of chakra-project.org # -# maintainer abveritas@chakra-project.org pkgname=kadu -pkgver=0.12.3 +pkgver=1.5 pkgrel=1 pkgdesc="A Qt-based Gadu-Gadu client" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.kadu.net/" license=('GPL') -depends=('libgadu' 'aspell' 'phonon' 'libxss' 'qca-ossl' 'libidn') -makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'libmpdclient') +depends=('libgadu>=1.12.1' 'libxss' 'enchant' 'phonon' 'qca-ossl' 'libidn' + 'libmpdclient' 'qtwebkit' 'xdg-utils' 'libotr' 'libarchive') +makedepends=('qt' 'cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'chrpath' 'ninja') conflicts=('kadu-svn') screenshot=('http://www.kadu.im/wiki/images/thumb/2/24/Screen_mainpage_pl.png/450px-Screen_mainpage_pl.png') -install=$pkgname.install -source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('c5d6f0bd384cd96090819ea018eb8ad8') +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') + +prepare() { + cd $pkgname-$pkgver + patch -p1 -i ../kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch +} build() { - cd $srcdir/kadu-$pkgver - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make + mkdir build + cd build + + cmake ../$pkgname-$pkgver \ + -GNinja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake + ninja } package() { - cd $srcdir/kadu-$pkgver - make DESTDIR=$pkgdir install - rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} - rm -rf $pkgdir/usr/share/kadu/{HISTORY,README} + DESTDIR="$pkgdir" LIBDIR=/usr/lib ninja -C build install + chrpath -d "$pkgdir"/usr/lib/kadu/plugins/*.so } diff --git a/kadu/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch b/kadu/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch new file mode 100644 index 000000000..4f8c4eccf --- /dev/null +++ b/kadu/kadu-1.5-Rename-INSTALL-PREFIX-to-KADU_INSTALL_PREFIX.patch @@ -0,0 +1,48 @@ +From bb925f636a8a3f662ef2a5f2826a7e0138dba266 Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa +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 +--- + 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 +