- Update to version 2.1, now Qt5 based

- USES=compiler for better handling of needed compiler
- USES=libarchive to prevent linking with libarchive from base on 10+

5 files changed, 65 insertions, 37 deletions

diff --git a/polish/kadu/files/patch-Plugins.cmake b/polish/kadu/files/patch-Plugins.cmake
new file mode 100644
index 000000000000..62a75673efd1
--- /dev/null
+++ b/polish/kadu/files/patch-Plugins.cmake
@@ -0,0 +1,16 @@
+--- Plugins.cmake.orig	2015-02-21 00:27:48 UTC
++++ Plugins.cmake
+@@ -117,11 +117,11 @@ if (UNIX AND NOT APPLE)
+ 
+ 	# docking
+ 		# Indicator docking support
+-		indicator_docking
++		#indicator_docking
+ 
+ 	# integration
+ 		# integration with Unity
+-		unity_integration
++		#unity_integration
+ 
+ 	# notifiers
+ 		# Freedesktop notification support
diff --git a/polish/kadu/files/patch-cmake_3.1.0 b/polish/kadu/files/patch-cmake_3.1.0
deleted file mode 100644
index ac846bc560eb..000000000000
--- a/polish/kadu/files/patch-cmake_3.1.0
+++ /dev/null
@@ -1,37 +0,0 @@
-Submitted upstream: https://gitorious.org/kadu/kadu/merge_requests/2122
-
-From: Raphael Kubo da Costa <rakuco@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 <rakuco@FreeBSD.org>
---- CMakeLists.txt
-+++ 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 ()
---- cmake/KaduConfig.cmake.in
-+++ 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@")
- 
diff --git a/polish/kadu/files/patch-kadu-core_CMakeLists.txt b/polish/kadu/files/patch-kadu-core_CMakeLists.txt
new file mode 100644
index 000000000000..972309336c92
--- /dev/null
+++ b/polish/kadu/files/patch-kadu-core_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- kadu-core/CMakeLists.txt.orig	2015-02-21 00:27:48 UTC
++++ kadu-core/CMakeLists.txt
+@@ -217,6 +217,7 @@ find_package (QCA2 REQUIRED)
+ add_executable (kadu WIN32 ${main_SRCS})
+ kadu_set_flags (kadu)
+ qt5_use_modules (kadu LINK_PRIVATE Core Gui Widgets Network Xml)
++include_directories (${QCA2_INCLUDE_DIR})
+ target_link_libraries (kadu LINK_PRIVATE libkadu ${ADDITIONAL_LIBRARIES} ${QCA2_LIBRARIES})
+ 
+ if (NOT IS_ABSOLUTE "${KADU_INSTALL_LIB_DIR}")
diff --git a/polish/kadu/files/patch-kadu-core_main.cpp b/polish/kadu/files/patch-kadu-core_main.cpp
new file mode 100644
index 000000000000..7b2f80ed226d
--- /dev/null
+++ b/polish/kadu/files/patch-kadu-core_main.cpp
@@ -0,0 +1,11 @@
+--- kadu-core/main.cpp.orig	2015-07-20 19:41:44 UTC
++++ kadu-core/main.cpp
+@@ -33,7 +33,7 @@
+ 
+ #include <QtCore/QLibraryInfo>
+ #include <QtCore/QTranslator>
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ #include <QtWidgets/QApplication>
+ #include <QtWidgets/QMessageBox>
+ 
diff --git a/polish/kadu/files/patch-kadu-core_os_single-application_single-application.cpp b/polish/kadu/files/patch-kadu-core_os_single-application_single-application.cpp
new file mode 100644
index 000000000000..0809a97d1f5f
--- /dev/null
+++ b/polish/kadu/files/patch-kadu-core_os_single-application_single-application.cpp
@@ -0,0 +1,28 @@
+--- kadu-core/os/single-application/single-application.cpp.orig	2015-02-21 00:27:48 UTC
++++ kadu-core/os/single-application/single-application.cpp
+@@ -30,6 +30,7 @@
+ #include <QtCore/QRegExp>
+ #include <QtNetwork/QLocalServer>
+ #include <QtNetwork/QLocalSocket>
++#include <QString>
+ #include <memory>
+ 
+ #if defined(Q_OS_WIN)
+@@ -107,7 +108,7 @@ QString SingleApplication::socketName(co
+ {
+ 	auto idc = applicationId.toUtf8();
+ 	auto idNum = qChecksum(idc.constData(), static_cast<uint>(idc.size()));
+-	auto result = QString{QLatin1String{"qtsingleapp-"} + prefix + QLatin1Char{'-'} + QString::number(idNum, 16)};
++	auto result = QString(QLatin1String{"qtsingleapp-"} + prefix + QLatin1Char{'-'} + QString::number(idNum, 16));
+ 
+ #if defined(Q_OS_WIN)
+ 	if (!pProcessIdToSessionId)
+@@ -131,7 +132,7 @@ QString SingleApplication::socketName(co
+ 
+ QString SingleApplication::lockName(const QString &socketName)
+ {
+-	return QString{QDir{QDir::tempPath()}.absolutePath() + QLatin1Char{'/'} + socketName + QLatin1String{"-lockfile"}};
++	return QString(QDir{QDir::tempPath()}.absolutePath() + QLatin1Char{'/'} + socketName + QLatin1String{"-lockfile"});
+ }
+ 
+ void SingleApplication::startServer()