* [gentoo-commits] proj/kde:master commit in: kde-apps/krdc/files/, kde-apps/krdc/
@ 2015-02-03 12:26 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2015-02-03 12:26 UTC (permalink / raw
To: gentoo-commits
commit: f2ef9126c35223ef7383bbc529a5b445215c912b
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 3 12:25:04 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 3 12:25:04 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f2ef9126
[kde-apps/krdc] Remove patch merged upstream.
Upstream commit: a9e514b29b5611e01c2c024157d36eaf416e0c5a
Package-Manager: portage-2.2.14
---
kde-apps/krdc/files/krdc-4.13.1-freerdp.patch | 184 --------------------------
kde-apps/krdc/krdc-9999.ebuild | 2 -
2 files changed, 186 deletions(-)
diff --git a/kde-apps/krdc/files/krdc-4.13.1-freerdp.patch b/kde-apps/krdc/files/krdc-4.13.1-freerdp.patch
deleted file mode 100644
index 75b5146..0000000
--- a/kde-apps/krdc/files/krdc-4.13.1-freerdp.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-Support >=free-rdp-1.1.0.
-
-https://git.reviewboard.kde.org/r/115059/
-
-diff --git a/rdp/rdpview.cpp b/rdp/rdpview.cpp
-index 0d14e04691549e084b58501cd10ca2382ef25c63..9062ba5fa060284a679f0c9bc211ab7dd6972c0a 100644
---- a/rdp/rdpview.cpp
-+++ b/rdp/rdpview.cpp
-@@ -158,71 +158,58 @@ bool RdpView::start()
- width = this->parentWidget()->size().width();
- height = this->parentWidget()->size().height();
- }
-- arguments << "-g" << QString::number(width) + 'x' + QString::number(height);
-+ arguments << "-decorations"; // put this option first so we can detect xfreerdp < 1.1
-+ arguments << "/w:" + QString::number(width);
-+ arguments << "/h:" + QString::number(height);
-
-- arguments << "-k" << keymapToXfreerdp(m_hostPreferences->keyboardLayout());
-+ arguments << "/kbd:" + keymapToXfreerdp(m_hostPreferences->keyboardLayout());
-
- if (!m_url.userName().isEmpty()) {
- // if username contains a domain, it needs to be set with another parameter
- if (m_url.userName().contains('\\')) {
- const QStringList splittedName = m_url.userName().split('\\');
-- arguments << "-d" << splittedName.at(0);
-- arguments << "-u" << splittedName.at(1);
-+ arguments << "/d:" + splittedName.at(0);
-+ arguments << "/u:" + splittedName.at(1);
- } else {
-- arguments << "-u" << m_url.userName();
-+ arguments << "/u:" + m_url.userName();
- }
- } else {
-- arguments << "-u" << "";
-+ arguments << "-u:";
- }
-
-- if (!m_url.password().isNull())
-- arguments << "-p" << m_url.password();
--
-- arguments << "-D"; // request the window has no decorations
-- arguments << "-X" << QString::number(m_container->winId());
-- arguments << "-a" << QString::number((m_hostPreferences->colorDepth() + 1) * 8);
--
-- switch (m_hostPreferences->sound()) {
-- case 1:
-- arguments << "-o";
-- break;
-- case 0:
-- arguments << "--plugin" << "rdpsnd";
-- break;
-- case 2:
-- default:
-- break;
-- }
-+ arguments << "/parent-window:" + QString::number(m_container->winId());
-+ arguments << "/bpp:" + QString::number((m_hostPreferences->colorDepth() + 1) * 8);
-+ arguments << "/audio-mode:" + m_hostPreferences->sound();
-
- if (!m_hostPreferences->shareMedia().isEmpty()) {
- QStringList shareMedia;
-- shareMedia << "--plugin" << "rdpdr" << "--data" << "disk:media:" + m_hostPreferences->shareMedia() << "--";
-+ shareMedia << "/drive:media," + m_hostPreferences->shareMedia();
- arguments += shareMedia;
- }
-
- QString performance;
- switch (m_hostPreferences->performance()) {
- case 0:
-- performance = 'm';
-+ performance = "modem";
- break;
- case 1:
-- performance = 'b';
-+ performance = "broadband";
- break;
- case 2:
-- performance = 'l';
-+ performance = "lan";
- break;
- default:
- break;
- }
-
-- arguments << "-x" << performance;
-+ arguments << "/network:" + performance;
-
- if (m_hostPreferences->console()) {
-- arguments << "-0";
-+ arguments << "/admin";
- }
-
- if (m_hostPreferences->remoteFX()) {
-- arguments << "--rfx";
-+ arguments << "/rfx";
- }
-
- if (!m_hostPreferences->extraOptions().isEmpty()) {
-@@ -233,16 +220,21 @@ bool RdpView::start()
- // krdc has no support for certificate management yet; it would not be possbile to connect to any host:
- // "The host key for example.com has changed" ...
- // "Add correct host key in ~/.freerdp/known_hosts to get rid of this message."
-- arguments << "--ignore-certificate";
-+ arguments << "/cert-ignore";
-
- // clipboard sharing is activated in KRDC; user can disable it at runtime
-- arguments << "--plugin" << "cliprdr";
-+ arguments << "/clipboard";
-
-- arguments << "-t" << QString::number(m_port);
-- arguments << m_host;
-+ arguments << "/port:" + QString::number(m_port);
-+ arguments << "/v:" + m_host;
-
- kDebug(5012) << "Starting xfreerdp with arguments:" << arguments;
-
-+ //avoid printing the password in debug
-+ if (!m_url.password().isNull()) {
-+ arguments << "/p:" + m_url.password();
-+ }
-+
- setStatus(Connecting);
-
- connect(m_process, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
-@@ -302,7 +294,7 @@ void RdpView::connectionError()
-
- void RdpView::processError(QProcess::ProcessError error)
- {
-- kDebug(5012) << "processError:" << error;
-+ kDebug(5012) << error;
- if (m_quitFlag) // do not try to show error messages while quitting (prevent crashes)
- return;
-
-@@ -319,33 +311,13 @@ void RdpView::processError(QProcess::ProcessError error)
- void RdpView::receivedStandardError()
- {
- const QString output(m_process->readAllStandardError());
-- kDebug(5012) << "receivedStandardError:" << output;
-- QString line;
-- int i = 0;
-- while (!(line = output.section('\n', i, i)).isEmpty()) {
--
-- // the following error is issued by freerdp because of a bug in freerdp 1.0.1 and below;
-- // see: https://github.com/FreeRDP/FreeRDP/pull/576
-- //"X Error of failed request: BadWindow (invalid Window parameter)
-- // Major opcode of failed request: 7 (X_ReparentWindow)
-- // Resource id in failed request: 0x71303348
-- // Serial number of failed request: 36
-- // Current serial number in output stream: 36"
-- if (line.contains(QLatin1String("X_ReparentWindow"))) {
-- KMessageBox::error(0, i18n("The version of \"xfreerdp\" you are using is too old.\n"
-- "xfreerdp 1.0.2 or greater is required."),
-- i18n("RDP Failure"));
-- connectionError();
-- return;
-- }
-- i++;
-- }
-+ kDebug(5012) << output;
- }
-
- void RdpView::receivedStandardOutput()
- {
- const QString output(m_process->readAllStandardOutput());
-- kDebug(5012) << "receivedStandardOutput:" << output;
-+ kDebug(5012) << output;
- QString line;
- int i = 0;
- while (!(line = output.section('\n', i, i)).isEmpty()) {
-@@ -373,6 +345,14 @@ void RdpView::receivedStandardOutput()
- return;
- }
-
-+ // we no longer support freerdp < 1.1, we only support versions with the new interface
-+ if (line.contains(QLatin1String("invalid option: -decorations"))) {
-+ KMessageBox::error(0, i18n("The version of \"xfreerdp\" you are using is too old.\n"
-+ "xfreerdp 1.1 or greater is required."),
-+ i18n("RDP Failure"));
-+ connectionError();
-+ return;
-+ }
- i++;
- }
- }
diff --git a/kde-apps/krdc/krdc-9999.ebuild b/kde-apps/krdc/krdc-9999.ebuild
index 9e0c72e..f6b9780 100644
--- a/kde-apps/krdc/krdc-9999.ebuild
+++ b/kde-apps/krdc/krdc-9999.ebuild
@@ -24,8 +24,6 @@ RDEPEND="${DEPEND}
rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] )
"
-PATCHES=( "${FILESDIR}/${PN}-4.13.1-freerdp.patch" )
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_with jpeg)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/krdc/files/, kde-apps/krdc/
@ 2020-04-18 8:21 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2020-04-18 8:21 UTC (permalink / raw
To: gentoo-commits
commit: 3aaf91b1e83da2fda284a26b3b4e7f68f28c7562
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 17 19:13:18 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 08:04:22 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3aaf91b1
kde-apps/krdc: Adapt the code to >=kde-frameworks/kbookmarks-5.69
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/krdc-19.12.3-kf5bookmarks-5.69.patch | 48 ++++++++++++++++++++++
kde-apps/krdc/krdc-20.04.0.ebuild | 2 +
2 files changed, 50 insertions(+)
diff --git a/kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch b/kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch
new file mode 100644
index 0000000000..03dc005914
--- /dev/null
+++ b/kde-apps/krdc/files/krdc-19.12.3-kf5bookmarks-5.69.patch
@@ -0,0 +1,48 @@
+From 70e9d2728a4928dd2aeb170935d966e934315cf4 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Fri, 17 Apr 2020 15:52:15 +0200
+Subject: Adapt to changes in KBookmarks >= 5.69
+
+Test Plan:
+The Bookmarks menu is still added as expected and the actions still show
+in the configure shortcuts dialog. I couldn't test actually creating a
+bookmark as I have no access to remote servers.
+
+Reviewers: cfeck, uwolfer, murrant
+
+Reviewed By: cfeck
+
+Differential Revision: https://phabricator.kde.org/D28920
+---
+ bookmarkmanager.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/bookmarkmanager.cpp b/bookmarkmanager.cpp
+index 47ac779..a34cb2c 100644
+--- a/bookmarkmanager.cpp
++++ b/bookmarkmanager.cpp
+@@ -25,6 +25,7 @@
+ #include "mainwindow.h"
+ #include "krdc_debug.h"
+
++#include <kbookmarks_version.h>
+ #include <KBookmarks/KBookmarkOwner>
+ #include <KLocalizedString>
+
+@@ -41,7 +42,13 @@ BookmarkManager::BookmarkManager(KActionCollection *collection, QMenu *menu, Mai
+
+ m_manager = KBookmarkManager::managerForFile(file, QLatin1String("krdc"));
+ m_manager->setUpdate(true);
++
++#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
+ m_bookmarkMenu = new KBookmarkMenu(m_manager, this, menu, collection);
++#else
++ m_bookmarkMenu = new KBookmarkMenu(m_manager, this, menu);
++ collection->addActions(menu->actions());
++#endif
+
+ KBookmarkGroup root = m_manager->root();
+ KBookmark bm = root.first();
+--
+cgit v1.1
+
diff --git a/kde-apps/krdc/krdc-20.04.0.ebuild b/kde-apps/krdc/krdc-20.04.0.ebuild
index 223b760bc6..9ff86a28f0 100644
--- a/kde-apps/krdc/krdc-20.04.0.ebuild
+++ b/kde-apps/krdc/krdc-20.04.0.ebuild
@@ -43,6 +43,8 @@ RDEPEND="${DEPEND}
rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] )
"
+PATCHES=( "${FILESDIR}/${PN}-19.12.3-kf5bookmarks-5.69.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package vnc LibVNCServer)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-18 8:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-18 8:21 [gentoo-commits] proj/kde:master commit in: kde-apps/krdc/files/, kde-apps/krdc/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2015-02-03 12:26 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox