[gentoo-commits] repo/gentoo:master commit in: net-im/kadu/, net-im/kadu/files/
commit: 07cfdeb06f37d2456aceaaa35b2323c8bf0116d8
Author: Maciej Mrozowski gentoo org>
AuthorDate: Thu Oct 22 22:11:46 2020 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Thu Oct 22 22:12:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07cfdeb0
net-im/kadu: fix compilation
Closes: https://bugs.gentoo.org/749873
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Maciej Mrozowski gentoo.org>
net-im/kadu/files/kadu-4.3-compilation.patch | 23 +++
net-im/kadu/kadu-4.3-r2.ebuild | 1 +
2 files changed, 24 insertions(+)
diff --git a/net-im/kadu/files/kadu-4.3-compilation.patch
b/net-im/kadu/files/kadu-4.3-compilation.patch
new file mode 100644
index 000..b9cd0c58288
--- /dev/null
+++ b/net-im/kadu/files/kadu-4.3-compilation.patch
@@ -0,0 +1,23 @@
+diff -ruN kadu-4.3/kadu-core/gui/widgets/avatar-painter.cpp
kadu-my/kadu-core/gui/widgets/avatar-painter.cpp
+--- kadu-4.3/kadu-core/gui/widgets/avatar-painter.cpp 2017-01-24
22:36:21.0 +0100
kadu-my/kadu-core/gui/widgets/avatar-painter.cpp 2020-10-22
23:57:41.486490926 +0200
+@@ -22,6 +22,7 @@
+
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+diff -ruN kadu-4.3/kadu-core/plugin/state/plugin-state.test.cpp
kadu-my/kadu-core/plugin/state/plugin-state.test.cpp
+--- kadu-4.3/kadu-core/plugin/state/plugin-state.test.cpp 2017-01-24
22:36:21.0 +0100
kadu-my/kadu-core/plugin/state/plugin-state.test.cpp 2020-10-23
00:06:51.167189202 +0200
+@@ -34,7 +34,7 @@
+
+ void PluginStateTest::newTest()
+ {
+- QCOMPARE(pluginStateToString(PluginState::New), {});
++ QCOMPARE(pluginStateToString(PluginState::New), QString{});
+ QCOMPARE(stringToPluginState(""), PluginState::New);
+ QCOMPARE(stringToPluginState("New"), PluginState::New);
+ QCOMPARE(stringToPluginState("Invalid"), PluginState::New);
diff --git a/net-im/kadu/kadu-4.3-r2.ebuild b/net-im/kadu/kadu-4.3-r2.ebuild
index 994c8fdf46f..d2e585826dd 100644
--- a/net-im/kadu/kadu-4.3-r2.ebuild
+++ b/net-im/kadu/kadu-4.3-r2.ebuild
@@ -105,6 +105,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.3-fix-plugins-rpath.patch"
"${FILESDIR}/${PN}-4.3-gcc7.patch"
"${FILESDIR}/${PN}-4.3-find-x11-with-newer-cmake-modules.patch"
+ "${FILESDIR}/${PN}-4.3-compilation.patch"
)
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-im/kadu/, net-im/kadu/files/
commit: ba419d35eb00c705dd3e2be7fc7a74d4e6b38669
Author: Maciej Mrozowski gentoo org>
AuthorDate: Fri Nov 22 01:11:07 2019 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Fri Nov 22 01:15:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba419d35
net-im/kadu: support newer CMake
Bug: https://bugs.gentoo.org/692232
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Maciej Mrozowski gentoo.org>
...adu-4.3-find-x11-with-newer-cmake-modules.patch | 48 ++
net-im/kadu/kadu-4.3-r2.ebuild | 6 ++-
2 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch
b/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch
new file mode 100644
index 000..ec44a0be7f5
--- /dev/null
+++ b/net-im/kadu/files/kadu-4.3-find-x11-with-newer-cmake-modules.patch
@@ -0,0 +1,48 @@
+diff -ruN kadu-4.3/kadu-core/CMakeLists.txt my/kadu-core/CMakeLists.txt
+--- kadu-4.3/kadu-core/CMakeLists.txt 2017-01-24 22:36:21.0 +0100
my/kadu-core/CMakeLists.txt2019-11-22 02:05:51.381540018 +0100
+@@ -111,7 +111,7 @@
+ list (APPEND ADDITIONAL_LIBKADU_LIBRARIES ${LibArchive_LIBRARIES})
+
+ if (UNIX AND NOT APPLE)
+- find_package (X11 REQUIRED COMPONENTS X11 Xutil Xfixes)
++ find_package (X11 REQUIRED COMPONENTS Xutil Xfixes)
+ if (X11_FOUND AND X11_Xutil_FOUND AND X11_Xfixes_FOUND)
+ message (STATUS "Found required X11 libraries:
${X11_X11_LIB};${X11_Xfixes_LIB}")
+ else ()
+diff -ruN kadu-4.3/plugins/idle/CMakeLists.txt my/plugins/idle/CMakeLists.txt
+--- kadu-4.3/plugins/idle/CMakeLists.txt 2017-01-24 22:36:22.0
+0100
my/plugins/idle/CMakeLists.txt 2019-11-22 02:06:57.503381610 +0100
+@@ -15,7 +15,7 @@
+ )
+
+ if (UNIX AND NOT APPLE)
+- find_package (X11 REQUIRED COMPONENTS X11 Xutil Xscreensaver)
++ find_package (X11 REQUIRED COMPONENTS Xutil Xscreensaver)
+ if (X11_Xscreensaver_FOUND)
+ message (STATUS "Found required X11 libraries:
${X11_X11_LIB};${X11_Xscreensaver_LIB}")
+ else ()
+diff -ruN kadu-4.3/plugins/pcspeaker/CMakeLists.txt
my/plugins/pcspeaker/CMakeLists.txt
+--- kadu-4.3/plugins/pcspeaker/CMakeLists.txt 2017-01-24 22:36:22.0
+0100
my/plugins/pcspeaker/CMakeLists.txt2019-11-22 02:07:45.315719788
+0100
+@@ -15,7 +15,7 @@
+ set (LIBRARIES "")
+
+ if (UNIX AND NOT APPLE)
+- find_package (X11 REQUIRED COMPONENTS X11)
++ find_package (X11 REQUIRED)
+ if (NOT X11_FOUND)
+ message (SEND_ERROR "Could NOT find X11")
+ endif ()
+diff -ruN kadu-4.3/plugins/screenshot/CMakeLists.txt
my/plugins/screenshot/CMakeLists.txt
+--- kadu-4.3/plugins/screenshot/CMakeLists.txt 2017-01-24 22:36:22.0
+0100
my/plugins/screenshot/CMakeLists.txt 2019-11-22 02:07:54.323972436
+0100
+@@ -30,7 +30,7 @@
+
+ if (UNIX AND NOT APPLE)
+ set (PLUGIN_ADDITIONAL_QT_MODULES X11Extras)
+- find_package (X11 REQUIRED COMPONENTS X11 Xext Xshape)
++ find_package (X11 REQUIRED COMPONENTS Xext Xshape)
+ if (X11_Xshape_FOUND)
+ message (STATUS "Found required X11 libraries:
${X11_X11_LIB};${X11_Xext_LIB}")
+ else ()
diff --git a/net-im/kadu/kadu-4.3-r2.ebuild b/net-im/kadu/kadu-4.3-r2.ebuild
index 10dd889fae2..8caf2eac7c4 100644
--- a/net-im/kadu/kadu-4.3-r2.ebuild
+++ b/net-im/kadu/kadu-4.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -40,6 +40,7 @@ COMMON_DEPEND="
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5
x11-libs/libX11
+ x11-libs/libXfixes
x11-libs/libXext
x11-libs/libXScrnSaver
gadu? ( >=net-libs/libgadu-1.12.2[threads] )
@@ -50,7 +51,7 @@ COMMON_DEPEND="
)
spell? ( app-text/enchant )
xmpp? (
- net-dns/libidn
+ net-dns/libidn:*
>=net-libs/qxmpp-0.9.3-r1
sys-libs/zlib
)
@@ -102,6 +103,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.3-do-not-force-ccache.patch"
"${FILESDIR}/${PN}-4.3-fix-plugins-rpath.patch"
"${FILESDIR}/${PN}-4.3-gcc7.patch"
+ "${FILESDIR}/${PN}-4.3-find-x11-with-newer-cmake-modules.patch"
)
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-im/kadu/, net-im/kadu/files/
commit: e80bbd9e976c7d965f1f56cd1cc09ee6f019629f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 25 08:53:29 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 25 08:54:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e80bbd9e
net-im/kadu: Drop 2.1
Package-Manager: Portage-2.3.48, Repoman-2.3.10
net-im/kadu/Manifest | 1 -
.../kadu/files/kadu-2.1-port-to-QtQuick-2.3.patch | 150 -
net-im/kadu/files/kadu-2.1-qt5-compilation.patch | 11 --
net-im/kadu/kadu-2.1-r2.ebuild | 138 ---
net-im/kadu/metadata.xml | 1 -
5 files changed, 301 deletions(-)
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index cff5a2e9fc0..01f168c5213 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -1,2 +1 @@
-DIST kadu-2.1.tar.bz2 6013519 BLAKE2B
31df1b245ec402a44c60581084d4ec9216636e14a1c11d8609862d982ad08ff3717c16bc9431c21366ef9852eb0035828a11d8010178736ec6b6ebfbadfd971c
SHA512
3f0e38aefbaf15f357ae8232b1364deb5954a2464895fafa0a324ad99c7d14c6ba7495bed51d628e04c30bbaaf8e49412c70f01a40f360406c1afba2384a
DIST kadu-4.3.tar.bz2 8087786 BLAKE2B
b63ce2beebb1fd1f64ae8e85430784c6c7d25a071e00342e33d97a2e49b25c02ab131fb30d591acc11a336427118d4dd23e03d89ad07ef066eca09d0463397db
SHA512
fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9
diff --git a/net-im/kadu/files/kadu-2.1-port-to-QtQuick-2.3.patch
b/net-im/kadu/files/kadu-2.1-port-to-QtQuick-2.3.patch
deleted file mode 100644
index cdfd549a347..000
--- a/net-im/kadu/files/kadu-2.1-port-to-QtQuick-2.3.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 6912d8fc02b5ff4d6675656d6c00506c48fdd940 Mon Sep 17 00:00:00 2001
-From: Rafał Przemysław Malinowski
-Date: Sat, 21 Mar 2015 01:32:11 +0100
-Subject: [PATCH] gui: ported open chat with from qml to quick 2.3
-
-Signed-off-by: Rafał Przemysław Malinowski
- cmake/KaduMacros.cmake | 2 +-
- kadu-core/CMakeLists.txt| 2 +-
- kadu-core/gui/windows/open-chat-with/open-chat-with.cpp | 11 ++-
- kadu-core/gui/windows/open-chat-with/open-chat-with.h | 4 ++--
- tests/CMakeLists.txt| 2 +-
- varia/qml/Contact.qml | 2 +-
- varia/qml/ContactsGridView.qml | 2 +-
- varia/qml/openChatWith.qml | 2 +-
- 8 files changed, 14 insertions(+), 13 deletions(-)
-
-diff --git a/cmake/KaduMacros.cmake b/cmake/KaduMacros.cmake
-index ac9e94e..0a7712a 100644
a/cmake/KaduMacros.cmake
-+++ b/cmake/KaduMacros.cmake
-@@ -183,7 +183,7 @@ function (kadu_plugin KADU_PLUGIN_NAME)
- endforeach ()
- endif ()
-
-- qt5_use_modules (${KADU_PLUGIN_NAME} LINK_PRIVATE Core Gui Widgets
Network Xml WebKit WebKitWidgets Declarative)
-+ qt5_use_modules (${KADU_PLUGIN_NAME} LINK_PRIVATE Core Gui Network Qml
Quick QuickWidgets WebKit WebKitWidgets Widgets Xml)
- if (UNIX AND NOT APPLE)
- qt5_use_modules (${KADU_PLUGIN_NAME} LINK_PRIVATE DBus)
- endif ()
-diff --git a/kadu-core/CMakeLists.txt b/kadu-core/CMakeLists.txt
-index be52339..46317d1 100644
a/kadu-core/CMakeLists.txt
-+++ b/kadu-core/CMakeLists.txt
-@@ -205,7 +205,7 @@ if (FAST_LINKING)
- endif ()
- endif ()
-
--qt5_use_modules (libkadu LINK_PRIVATE Core Gui Widgets Xml Network WebKit
WebKitWidgets Declarative)
-+qt5_use_modules (libkadu LINK_PRIVATE Core Gui Network Qml Quick QuickWidgets
WebKit WebKitWidgets Widgets Xml)
- if (UNIX AND NOT APPLE)
- qt5_use_modules (libkadu LINK_PRIVATE DBus X11Extras)
- endif ()
-diff --git a/kadu-core/gui/windows/open-chat-with/open-chat-with.cpp
b/kadu-core/gui/windows/open-chat-with/open-chat-with.cpp
-index 2c14c3f..9ff00d1 100644
a/kadu-core/gui/windows/open-chat-with/open-chat-with.cpp
-+++ b/kadu-core/gui/windows/open-chat-with/open-chat-with.cpp
-@@ -21,8 +21,9 @@
- * along with this program. If not, see
[gentoo-commits] repo/gentoo:master commit in: net-im/kadu/, net-im/kadu/files/
commit: 44f39950b3a43193931dcbae213fa65321e0aac8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Mar 22 11:10:38 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Mar 22 12:16:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f39950
net-im/kadu: Fix build with GCC-7
Thanks-to: Arfrever Frehtes Taifersar Arahesis gmail.com>
Closes: https://bugs.gentoo.org/636738
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-im/kadu/files/kadu-4.3-gcc7.patch | 10 ++
net-im/kadu/kadu-4.3-r1.ebuild| 3 ++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/net-im/kadu/files/kadu-4.3-gcc7.patch
b/net-im/kadu/files/kadu-4.3-gcc7.patch
new file mode 100644
index 000..097157f98c7
--- /dev/null
+++ b/net-im/kadu/files/kadu-4.3-gcc7.patch
@@ -0,0 +1,10 @@
+--- a/kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
b/kadu-core/plugin/dependency-graph/plugin-dependency-graph-builder.h
+@@ -20,6 +20,7 @@
+ #pragma once
+
+ #include
++#include
+ #include
+ #include
+
diff --git a/net-im/kadu/kadu-4.3-r1.ebuild b/net-im/kadu/kadu-4.3-r1.ebuild
index 64b44fa43c1..5e1f571bbf7 100644
--- a/net-im/kadu/kadu-4.3-r1.ebuild
+++ b/net-im/kadu/kadu-4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -103,6 +103,7 @@ word_fix
PATCHES=(
"${FILESDIR}/${PN}-4.3-do-not-force-ccache.patch"
"${FILESDIR}/${PN}-4.3-fix-plugins-rpath.patch"
+ "${FILESDIR}/${PN}-4.3-gcc7.patch"
)
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-im/kadu/, net-im/kadu/files/
commit: d98611843b68f0c3d545d291df522f1b71a60737
Author: Maciej Mrozowski gentoo org>
AuthorDate: Fri Nov 3 02:37:32 2017 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Fri Nov 3 02:37:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9861184
net-im/kadu: Make rpath absolute, bug 614202.
Package-Manager: Portage-2.3.8, Repoman-2.3.4
net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch | 12
net-im/kadu/kadu-4.3-r1.ebuild | 1 +
2 files changed, 13 insertions(+)
diff --git a/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch
b/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch
new file mode 100644
index 000..bb171af5f41
--- /dev/null
+++ b/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch
@@ -0,0 +1,12 @@
+diff -ruN kadu-4.3/cmake/KaduMacros.cmake my/cmake/KaduMacros.cmake
+--- kadu-4.3/cmake/KaduMacros.cmake2017-01-24 22:36:21.0 +0100
my/cmake/KaduMacros.cmake 2017-11-03 03:24:17.827054622 +0100
+@@ -221,7 +221,7 @@
+
+ if (NOT WIN32)
+ set_target_properties (${KADU_PLUGIN_NAME} PROPERTIES
+- INSTALL_RPATH "${KADU_INSTALL_LIB_DIR}/kadu"
++ INSTALL_RPATH
"${KADU_INSTALL_PREFIX}/${KADU_INSTALL_LIB_DIR}/kadu"
+ BUILD_WITH_INSTALL_RPATH TRUE
+ )
+ endif ()
diff --git a/net-im/kadu/kadu-4.3-r1.ebuild b/net-im/kadu/kadu-4.3-r1.ebuild
index a2dbc88c32f..b33c0729b45 100644
--- a/net-im/kadu/kadu-4.3-r1.ebuild
+++ b/net-im/kadu/kadu-4.3-r1.ebuild
@@ -102,6 +102,7 @@ word_fix
PATCHES=(
"${FILESDIR}/${PN}-4.3-do-not-force-ccache.patch"
+ "${FILESDIR}/${PN}-4.3-fix-plugins-rpath.patch"
)
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-im/kadu/, net-im/kadu/files/
commit: 2c5a02cd1cf4f6ccec3b0317b1d4b867f107448c
Author: Maciej Mrozowski gentoo org>
AuthorDate: Fri Nov 3 02:10:25 2017 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Fri Nov 3 02:10:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5a02cd
net-im/kadu: Update gtk icon cache, bug 630464. Remove custom handling of
ccache, bug 622610.
Package-Manager: Portage-2.3.8, Repoman-2.3.4
net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch | 17 +
net-im/kadu/kadu-4.3-r1.ebuild | 10 +-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch
b/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch
new file mode 100644
index 000..2511f3c42b9
--- /dev/null
+++ b/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch
@@ -0,0 +1,17 @@
+diff -ruN kadu-4.3/CMakeLists.txt my/CMakeLists.txt
+--- kadu-4.3/CMakeLists.txt2017-01-24 22:36:21.0 +0100
my/CMakeLists.txt 2017-11-03 03:00:07.005162047 +0100
+@@ -75,13 +75,6 @@
+ endif ()
+ endif ()
+
+-## CCache is cool stuff to improve compilation time
+-find_program (CCACHE_FOUND ccache)
+-if (CCACHE_FOUND)
+- set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+- set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+-endif (CCACHE_FOUND)
+-
+ # Look above, DEBUG_ENABLED is always enabled in Debug configuration.
+ # Enable it in all configurations when ENABLE_DEVELOPER_BUILD is on.
+ if (ENABLE_DEVELOPER_BUILD)
diff --git a/net-im/kadu/kadu-4.3-r1.ebuild b/net-im/kadu/kadu-4.3-r1.ebuild
index b3e45cf121e..a2dbc88c32f 100644
--- a/net-im/kadu/kadu-4.3-r1.ebuild
+++ b/net-im/kadu/kadu-4.3-r1.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-inherit cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic gnome2-utils
MY_P="${P/_/-}"
@@ -100,6 +100,10 @@ tabs
word_fix
'
+PATCHES=(
+ "${FILESDIR}/${PN}-4.3-do-not-force-ccache.patch"
+)
+
src_configure() {
# Filter out dangerous flags
filter-flags -fno-rtti
@@ -128,3 +132,7 @@ src_configure() {
cmake-utils_src_configure
}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
