Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d54b44285ab0a12723aa49e5e19f1f1a7977077a

commit d54b44285ab0a12723aa49e5e19f1f1a7977077a
Author: DeX77 <[email protected]>
Date:   Mon Apr 13 21:50:57 2015 +0200

kadu-2.1-1-x86_64

* version bump

diff --git a/source/xapps-extra/kadu/FrugalBuild 
b/source/xapps-extra/kadu/FrugalBuild
index 33845d5..a2e13e5 100644
--- a/source/xapps-extra/kadu/FrugalBuild
+++ b/source/xapps-extra/kadu/FrugalBuild
@@ -6,22 +6,31 @@
options+=('asneeded')

pkgname=kadu
-pkgver=1.2
-pkgrel=2
+pkgver=2.1
+pkgrel=1
pkgdesc="Gadu-Gadu, Jabber/XMPP protocol Instant Messenger client"
url="http://www.kadu.im";
-depends=('libqtwebkit' 'libqtscripttools' 'libqtmultimedia' 'libqtopengl' 
'libqthelp' \
-         'libqtdesigner' 'libqtdeclarative' 'libqttest' 'libqt3support' 
'libxscrnsaver' \
-         'libgadu>=1.12.0' 'libindicate-qt' 'libidn>=1.30' 'libmpdclient' 
'qca-gnupg' 'qca-ossl' \
-         'aspell' 'qt4-linguist' 'qt4-plugin-sqlite3' 'libotr')
+depends=('libqt5core' 'qt5-linguist' 'libqt5x11extras' 'libqt5gui' \
+       'libqt5imageformats' 'libqt5platformsupport' 'injeqt' 'libqt5quick' \
+       'qca-qt5' 'libotr' 'libgadu' 'phonon-qt5' 'libqt5multimedia' \
+       'libqt5concurrent' 'qt5-plugin-ibase' 'qt5-plugin-sqlite2' \
+       'qt5-plugin-sqlite3' 'qt5-plugin-psql' 'qt5-plugin-mysql' \
+       'qt5-plugin-odbc' 'qt5-plugin-tds' 'enchant' 'libxscrnsaver' \
+       'libmpdclient' 'xdg-utils')
groups=('xapps-extra')
archs=('i686' 'x86_64')
up2date="Flasttar http://www.kadu.im/w/English:Download:Sources";
-source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2 \
-       fix_cmake_bailout.patch)
-sha1sums=('d0e763d801a24ea328f31621f1fb4a1b45aed58e' \
-          'ea70ed632c2794b5a15b23d836461402b80ba61c')
+source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
+sha1sums=('38990c4e47fa5c4aaa19d036eed9001686835a45')
_F_cmake_type="Release"
+_F_cmake_confopts="-DCOMPILE_PLUGINS=docking;mediaplayer;amarok1_mediaplayer;antistring;idle;auto_hide;autoaway;
 \
+       
autoresponder;autostatus;cenzor;chat_notify;config_wizard;desktop_docking;\
+       emoticons;encryption_ng;encryption_ng_simlite;encryption_otr; \
+       
exec_notify;ext_sound;falf_mediaplayer;filedesc;firewall;freedesktop_notify; \
+       
gadu_protocol;hints;history;history_migration;imagelink;indicator_docking; \
+       jabber_protocol;last_seen;mpd_mediaplayer;mprisplayer_mediaplayer; \
+       
pcspeaker;phonon_sound;profiles_import;;qt4_docking;qt4_docking_notify;screenshot;
 \
+       
simpleview;single_window;sms;sound;speech;spellchecker;sql_history;tabs;word_fix"
Finclude cmake

build()
diff --git a/source/xapps-extra/kadu/fix_cmake_bailout.patch 
b/source/xapps-extra/kadu/fix_cmake_bailout.patch
deleted file mode 100644
index 1b78139..0000000
--- a/source/xapps-extra/kadu/fix_cmake_bailout.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8185e79cbc6ce3e53006861c8edc0c7b26dc06d8 Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <[email protected]>
-Date: Tue, 30 Dec 2014 22:18:20 +0200
-Subject: [PATCH] Make the call to configure_package_config_file work with 
CMake 3.1.0.
-
-configure_package_config_file()'s PATH_VARS option expects several
-separate variable names instead of one list with all the names. Passing
-the values in the expected format fixes the following error:
-
-CMake Error at 
/usr/local/share/cmake/Modules/CMakePackageConfigHelpers.cmake:231 (message):
-  Unknown keywords given to CONFIGURE_PACKAGE_CONFIG_FILE():
-  "INCLUDE_DIR;SDK_DIR"
-Call Stack (most recent call first):
-  CMakeLists.txt:226 (configure_package_config_file)
-  CMakeLists.txt:279 (kadu_configure_package_config_file)
----
- CMakeLists.txt |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ef624a9..315bb5e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -221,11 +221,10 @@ macro (kadu_configure_package_config_file _in _out _mode)
-       elseif ("${_mode}" STREQUAL INSTALL_TREE)
-               set (INCLUDE_DIR "${INSTALL_INCLUDE_DIR}")
-               set (SDK_DIR "${INSTALL_SDK_DIR}")
--              list (APPEND path_vars INCLUDE_DIR SDK_DIR)
-
-               configure_package_config_file ("${_in}" "${_out}"
-                       INSTALL_DESTINATION "${INSTALL_CMAKE_DIR}"
--                      PATH_VARS ${path_vars}
-+                      PATH_VARS INCLUDE_DIR SDK_DIR
-                       NO_SET_AND_CHECK_MACRO 
NO_CHECK_REQUIRED_COMPONENTS_MACRO
-               )
-       endif ()
---
-1.7.1
-
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to