+++ /dev/null
-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
+++ /dev/null
-# 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
-}
projects / gentoo.git / commitdiff