diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-25 20:06:05 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-25 20:06:05 +0100 |
commit | 5fdd950c7ae03e12746a45c86d85861beaacc846 (patch) | |
tree | bb0ea5fb1ec311961f3b60265ea0381872324448 /net-im/kadu | |
parent | 43793fab84041cfc5c60c0151d1591b8a69fb24a (diff) |
gentoo resync : 25.08.2018
Diffstat (limited to 'net-im/kadu')
-rw-r--r-- | net-im/kadu/Manifest | 6 | ||||
-rw-r--r-- | net-im/kadu/files/kadu-2.1-port-to-QtQuick-2.3.patch | 150 | ||||
-rw-r--r-- | net-im/kadu/files/kadu-2.1-qt5-compilation.patch | 11 | ||||
-rw-r--r-- | net-im/kadu/kadu-2.1-r2.ebuild | 138 | ||||
-rw-r--r-- | net-im/kadu/metadata.xml | 1 |
5 files changed, 1 insertions, 305 deletions
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest index 3a915acdd12f..d6fda30f9514 100644 --- a/net-im/kadu/Manifest +++ b/net-im/kadu/Manifest @@ -1,10 +1,6 @@ -AUX kadu-2.1-port-to-QtQuick-2.3.patch 5640 BLAKE2B 92a012f5d6a731c171de3de6018fd0a924408d5f445b31cb8d6a4b49de7f3a1c8caf821b3f672f43ea11a9b8c59dc10fca841e5fdbd6ce0865821143dccd3fa8 SHA512 f5923c25861497fac78f29ed70fd5ea444797ecd93cd89d5e87326e76977ac74837975a7c0c948463f7eb0b9db25246c71246710a70aad32e01c378251140505 -AUX kadu-2.1-qt5-compilation.patch 542 BLAKE2B 34391497abfcd2ca96180d938b52e6ba7ce594d80c2b833db1ab615bad92ba9c88190d5c0344577aca466ed54e73e7e18e3ec5e4fccba851cf2ade6b60fc00bf SHA512 294a2d90145d8765e0ae25482607f326f5fc8a86c589ed686ad37e02a13a5d487c28c5b0fbc3495de690864cc5b120cc5a75297dfc5ff28a4b6e4eaf7eade5d8 AUX kadu-4.3-do-not-force-ccache.patch 635 BLAKE2B c1b29e41186a05ee7c34b7f2c349095c9e1a12584defd393a0952a6b6c5015ae401cd0a7b8d4579eabe05e4d771aabaa51fba3ccef49d05cf7c0ff702739f893 SHA512 d17b7a20d78c8446d845bdb80c4a110adb164d0dfaff52f5a67730a3e1d861f65ccb84d67d04cc7088169b6d3d56376c8c43b3c432795a273a0da5517eabd86b AUX kadu-4.3-fix-plugins-rpath.patch 473 BLAKE2B 8b7c16e7acecb59798a52c514e9f472c13eeda3c005ae84026d13737362435d7381f302a48d87ec15853067bb1e46699803cdc3ba4de54aa1f67f0f4d3d84023 SHA512 af94cb0127abd7ffe6ebd9fea20d17efb835773a6e8194caddd07b736e84e2ee40da51b820ec38e8eb07de6755941b53ded07f9b8aa9a7acd28b612c3259f952 AUX kadu-4.3-gcc7.patch 266 BLAKE2B 1211251304c10c46df75d3fbc84dff1f560c89a533c8119b80f03d21f8d25def87a32380cb5291d31c3695d706e431fc3fc95c4a35bb8fda9c2c5a0324d257df SHA512 04911ccf7d414a4449634e164ab1c093baa8b05b189a252b8a61bf0f4ad9857e08780620c946524a2d0d4696a6785c0789cbe2ad6f87b2330a093d351df4f982 -DIST kadu-2.1.tar.bz2 6013519 BLAKE2B 31df1b245ec402a44c60581084d4ec9216636e14a1c11d8609862d982ad08ff3717c16bc9431c21366ef9852eb0035828a11d8010178736ec6b6ebfbadfd971c SHA512 3f0e38aefbaf15f357ae8232b1364deb5954a2464895fafa0a324ad99c7d14c6ba7495bed51d628e04c30bbaaf8e49412c70bbbbf01a40f360406c1afba2384a DIST kadu-4.3.tar.bz2 8087786 BLAKE2B b63ce2beebb1fd1f64ae8e85430784c6c7d25a071e00342e33d97a2e49b25c02ab131fb30d591acc11a336427118d4dd23e03d89ad07ef066eca09d0463397db SHA512 fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9 -EBUILD kadu-2.1-r2.ebuild 2712 BLAKE2B fcd6b7ced431d192ddc7ea1f90e226d3b12449bfe815639f3d30162e78a7008918a3fe93401dfba105c9bab787d5060a7939183dd491bad20109209f3e3454c1 SHA512 fddb7b9f30b8310fc93734af671ac75273a704d31e6c3a3ba37e80d951329f08f5d4a783e51a0ed8a7c184c4a64997023aef07e5d76f426988fd9368e4a9f0b9 EBUILD kadu-4.3-r2.ebuild 2591 BLAKE2B 9e859b20e3a792aa10faf4af381b9cc4b9a7ee070db93a0c827191f50cdffe1b5507d882d64ba56bbeec5c96ce73fc9f7aa90941ebb64761b817f1577b4b1cc0 SHA512 1c44d49c19ee9b9e0c0f9ccf5485ba4676c8157441f81fcf088596903ec06fd1f32c11e2c742a401e00000b7f055ac75c37b941ed625e3f3ddd842c4064ddb3d -MISC metadata.xml 635 BLAKE2B 024363b73640cde3ad95f4c1a0a953cc87ea0786da585cdf7b69c75ed2c472120af558d099cced80eaeea6ff293f6502e1cc8e7b2a60621682947b28a95818d3 SHA512 91bc130c8ea984c22e84a1702216fb78956f9c25a60fadab7c9b2afa04067306ffa8936db29eb138b6f95c41b8b99ac18b26b4747a054bf56eb0af87f8cb0571 +MISC metadata.xml 578 BLAKE2B c6454fd583cf3ee9d55963cc482349eb236a46420d956ed7fe199721c81177e4f32c133279a49c71f5a5f64541efdb3ff8933753b3de868562b74a48eb7093c7 SHA512 23b011af6a0bcc235ca6685aeb1ec01cd9ef1e529fb5970860aab059fc1063d39d36446e3b86542ce303becc991e6250d58ec599aeddef6343382956c55a6c89 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 cdfd549a3475..000000000000 --- 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 <rafal.przemyslaw.malinowski@gmail.com> -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 <rafal.przemyslaw.malinowski@gmail.com> ---- - 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 <http://www.gnu.org/licenses/>. - */ - --#include <QtDeclarative/QDeclarativeContext> --#include <QtDeclarative/QDeclarativeView> -+#include <QtQml/QQmlContext> -+#include <QtQuick/QQuickItem> -+#include <QtQuickWidgets/QQuickWidget> - #include <QtGui/QKeyEvent> - #include <QtWidgets/QApplication> - #include <QtWidgets/QDesktopWidget> -@@ -97,18 +98,18 @@ OpenChatWith::OpenChatWith() : - - MainLayout->addWidget(idWidget); - -- BuddiesView = new QDeclarativeView(); -+ BuddiesView = new QQuickWidget(); - - Chain = new ModelChain(this); - ListModel = new BuddyListModel(Chain); - Chain->setBaseModel(ListModel); - Chain->addProxyModel(new TalkableProxyModel(Chain)); - -- QDeclarativeContext *declarativeContext = BuddiesView->rootContext(); -+ QQmlContext *declarativeContext = BuddiesView->rootContext(); - declarativeContext->setContextProperty("buddies", Chain->lastModel()); - - BuddiesView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); -- BuddiesView->setResizeMode(QDeclarativeView::SizeRootObjectToView); -+ BuddiesView->setResizeMode(QQuickWidget::SizeRootObjectToView); - BuddiesView->setSource(QUrl("file:///" + Application::instance()->pathsProvider()->dataPath() + "qml/openChatWith.qml")); - - if (BuddiesView->rootObject()) -diff --git a/kadu-core/gui/windows/open-chat-with/open-chat-with.h b/kadu-core/gui/windows/open-chat-with/open-chat-with.h -index b079b25..8268d8e 100644 ---- a/kadu-core/gui/windows/open-chat-with/open-chat-with.h -+++ b/kadu-core/gui/windows/open-chat-with/open-chat-with.h -@@ -29,9 +29,9 @@ - - #include "open-chat-with-runner.h" - --class QDeclarativeView; - class QLabel; - class QPushButton; -+class QQuickWidget; - class QVBoxLayout; - - class BuddyListModel; -@@ -46,7 +46,7 @@ class KADUAPI OpenChatWith : public QWidget, DesktopAwareObject - - explicit OpenChatWith(); - -- QDeclarativeView *BuddiesView; -+ QQuickWidget *BuddiesView; - LineEditWithClearButton *ContactID; - QVBoxLayout *MainLayout; - OpenChatWithRunner *OpenChatRunner; -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 0dc1dcf..db7c42d 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -31,7 +31,7 @@ function (kadu_add_test name_) - endif () - add_test ("${sourcePath}/${name_}" ${name_}) - -- qt5_use_modules (${name_} LINK_PRIVATE Core Gui Widgets Xml Network WebKit WebKitWidgets Declarative Test) -+ qt5_use_modules (${name_} LINK_PRIVATE Core Gui Network Qml Quick QuickWidgets Test WebKit WebKitWidgets Widgets Xml) - - # Add libkadu after the plugin so that --as-needed won't drop anything - # needed by the plugin. -diff --git a/varia/qml/Contact.qml b/varia/qml/Contact.qml -index 54a551e..2257348 100644 ---- a/varia/qml/Contact.qml -+++ b/varia/qml/Contact.qml -@@ -1,4 +1,4 @@ --import QtQuick 1.1 -+import QtQuick 2.3 - - Rectangle - { -diff --git a/varia/qml/ContactsGridView.qml b/varia/qml/ContactsGridView.qml -index 769a419..141931e 100644 ---- a/varia/qml/ContactsGridView.qml -+++ b/varia/qml/ContactsGridView.qml -@@ -1,4 +1,4 @@ --import QtQuick 1.1 -+import QtQuick 2.3 - - Item - { -diff --git a/varia/qml/openChatWith.qml b/varia/qml/openChatWith.qml -index 317133e..cce65b5 100644 ---- a/varia/qml/openChatWith.qml -+++ b/varia/qml/openChatWith.qml -@@ -1,4 +1,4 @@ --import QtQuick 1.1 -+import QtQuick 2.3 - - Item - { --- -libgit2 0.24.0 diff --git a/net-im/kadu/files/kadu-2.1-qt5-compilation.patch b/net-im/kadu/files/kadu-2.1-qt5-compilation.patch deleted file mode 100644 index 68120a4ede0e..000000000000 --- a/net-im/kadu/files/kadu-2.1-qt5-compilation.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN kadu-2.1/kadu-core/os/single-application/single-application.cpp my/kadu-core/os/single-application/single-application.cpp ---- kadu-2.1/kadu-core/os/single-application/single-application.cpp 2015-03-24 22:13:18.000000000 +0100 -+++ my/kadu-core/os/single-application/single-application.cpp 2015-07-05 21:08:09.044685214 +0200 -@@ -26,6 +26,7 @@ - #include "long-lived-lock-file.h" - - #include <QtCore/QCoreApplication> -+#include <QtCore/QDataStream> - #include <QtCore/QDir> - #include <QtCore/QRegExp> - #include <QtNetwork/QLocalServer> diff --git a/net-im/kadu/kadu-2.1-r2.ebuild b/net-im/kadu/kadu-2.1-r2.ebuild deleted file mode 100644 index ad5ee9102d60..000000000000 --- a/net-im/kadu/kadu-2.1-r2.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils flag-o-matic - -MY_P="${P/_/-}" - -DESCRIPTION="An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client" -HOMEPAGE="http://www.kadu.net" -SRC_URI="http://download.kadu.im/stable/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -SLOT="0" -IUSE="+gadu mpd otr phonon sdk speech spell xmpp" -REQUIRED_USE=" - || ( - gadu - xmpp - ) -" -COMMON_DEPEND=" - app-crypt/qca:2[qt5(+),ssl] - >=dev-libs/injeqt-1.0.0 - >=dev-qt/qtcore-5.2.0:5 - >=dev-qt/qtdbus-5.2.0:5 - >=dev-qt/qtdeclarative-5.2.0:5 - >=dev-qt/qtgui-5.2.0:5 - >=dev-qt/qtmultimedia-5.2.0:5 - >=dev-qt/qtnetwork-5.2.0:5 - >=dev-qt/qtscript-5.2.0:5 - >=dev-qt/qtsql-5.2.0:5 - >=dev-qt/qtsvg-5.2.0:5 - >=dev-qt/qtwebkit-5.2.0:5 - >=dev-qt/qtwidgets-5.2.0:5 - >=dev-qt/qtx11extras-5.2.0:5 - >=dev-qt/qtxml-5.2.0:5 - >=dev-qt/qtxmlpatterns-5.2.0:5 - >=app-arch/libarchive-2.6[lzma] - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXScrnSaver - gadu? ( >=net-libs/libgadu-1.11.1[threads] ) - mpd? ( media-libs/libmpdclient ) - otr? ( - >=dev-libs/libgcrypt-1.2.2:0 - >=net-libs/libotr-4.1.0 - ) - phonon? ( media-libs/phonon[qt5(+)] ) - spell? ( app-text/enchant ) - xmpp? ( - net-dns/libidn - sys-libs/zlib - ) -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/linguist-tools-5.2.0:5 - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - speech? ( app-accessibility/powiedz ) -" - -PATCHES=( - "${FILESDIR}/${P}-qt5-compilation.patch" - "${FILESDIR}/${P}-port-to-QtQuick-2.3.patch" -) - -PLUGINS=' -antistring -auto_hide -autoaway -autoresponder -autostatus -cenzor -chat_notify -config_wizard -desktop_docking -docking -emoticons -encryption_ng -encryption_ng_simlite -exec_notify -ext_sound -falf_mediaplayer -filedesc -firewall -freedesktop_notify -hints -history -idle -imagelink -last_seen -mediaplayer -mprisplayer_mediaplayer -pcspeaker -qt4_docking -qt4_docking_notify -screenshot simpleview -single_window -sms -sound -sql_history -tabs -word_fix -' - -src_configure() { - # Filter out dangerous flags - filter-flags -fno-rtti - strip-unsupported-flags - - # Ensure -DQT_NO_DEBUG is added - append-cppflags -DQT_NO_DEBUG - - # Plugin selection - use gadu && PLUGINS+=' gadu_protocol history_migration profiles_import' - use mpd && PLUGINS+=' mpd_mediaplayer' - use otr && PLUGINS+=' encryption_otr' - use phonon && PLUGINS+=' phonon_sound' - use speech && PLUGINS+=' speech' - use spell && PLUGINS+=' spellchecker' - use xmpp && PLUGINS+=' jabber_protocol' - - # Configure package - local mycmakeargs=( - -DBUILD_DESCRIPTION='Gentoo Linux' - -DCOMPILE_PLUGINS="${PLUGINS}" - -DNETWORK_IMPLEMENTATION="Qt" - -DINSTALL_SDK=$(usex sdk) - -DWITH_ENCHANT=$(usex spell) - ) - unset PLUGINS - - cmake-utils_src_configure -} diff --git a/net-im/kadu/metadata.xml b/net-im/kadu/metadata.xml index e884cc37b59a..6bf7f3370862 100644 --- a/net-im/kadu/metadata.xml +++ b/net-im/kadu/metadata.xml @@ -9,7 +9,6 @@ <flag name="gadu">Enables Gadu communication protocol</flag> <flag name="mpd">Enables Music Player Daemon support</flag> <flag name="otr">Enable char encryption via OTR library</flag> - <flag name="phonon">Enables phonon audio plugin</flag> <flag name="sdk">Install Kadu SDK (cmake module, API headers)</flag> <flag name="speech">Enables speech module</flag> </use> |