diff options
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/krdc/files/krdc-4.13.1-freerdp.patch | 184 | ||||
| -rw-r--r-- | kde-base/krdc/krdc-4.13.49.9999.ebuild | 10 | ||||
| -rw-r--r-- | kde-base/krdc/krdc-4.9999.ebuild | 10 | ||||
| -rw-r--r-- | kde-base/milou/Manifest | 1 | ||||
| -rw-r--r-- | kde-base/milou/metadata.xml | 5 | ||||
| -rw-r--r-- | kde-base/milou/milou-4.96.0.ebuild | 25 | ||||
| -rw-r--r-- | kde-base/milou/milou-9999.ebuild | 25 | ||||
| -rw-r--r-- | kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild | 2 | ||||
| -rw-r--r-- | kde-base/plasma-workspace/plasma-workspace-9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-base/powerdevil/Manifest | 1 | ||||
| -rw-r--r-- | kde-base/powerdevil/metadata.xml | 8 | ||||
| -rw-r--r-- | kde-base/powerdevil/powerdevil-4.96.0.ebuild | 23 | ||||
| -rw-r--r-- | kde-base/powerdevil/powerdevil-9999.ebuild | 23 |
13 files changed, 305 insertions, 14 deletions
diff --git a/kde-base/krdc/files/krdc-4.13.1-freerdp.patch b/kde-base/krdc/files/krdc-4.13.1-freerdp.patch new file mode 100644 index 00000000000..75b51468885 --- /dev/null +++ b/kde-base/krdc/files/krdc-4.13.1-freerdp.patch @@ -0,0 +1,184 @@ +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-base/krdc/krdc-4.13.49.9999.ebuild b/kde-base/krdc/krdc-4.13.49.9999.ebuild index 59390f4f0f6..8cf9bf373de 100644 --- a/kde-base/krdc/krdc-4.13.49.9999.ebuild +++ b/kde-base/krdc/krdc-4.13.49.9999.ebuild @@ -10,22 +10,24 @@ inherit kde4-base DESCRIPTION="KDE remote desktop connection (RDP and VNC) client" HOMEPAGE="http://www.kde.org/applications/internet/krdc/" KEYWORDS="" -IUSE="debug jpeg rdesktop vnc zeroconf telepathy" +IUSE="debug jpeg rdesktop telepathy vnc zeroconf" -#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.3.61 +#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.13.1 DEPEND=" jpeg? ( virtual/jpeg:0 ) + telepathy? ( >=net-libs/telepathy-qt-0.9 ) vnc? ( >=net-libs/libvncserver-0.9 ) zeroconf? ( net-dns/avahi ) - telepathy? ( >=net-libs/telepathy-qt-0.9 ) " RDEPEND="${DEPEND} rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] ) " +PATCHES=( "${FILESDIR}/${PN}-4.13.1-freerdp.patch" ) + src_configure() { - mycmakeargs=( + local mycmakeargs=( $(cmake-utils_use_with jpeg) $(cmake-utils_use_with telepathy TelepathyQt4) $(cmake-utils_use_with vnc LibVNCServer) diff --git a/kde-base/krdc/krdc-4.9999.ebuild b/kde-base/krdc/krdc-4.9999.ebuild index 59390f4f0f6..8cf9bf373de 100644 --- a/kde-base/krdc/krdc-4.9999.ebuild +++ b/kde-base/krdc/krdc-4.9999.ebuild @@ -10,22 +10,24 @@ inherit kde4-base DESCRIPTION="KDE remote desktop connection (RDP and VNC) client" HOMEPAGE="http://www.kde.org/applications/internet/krdc/" KEYWORDS="" -IUSE="debug jpeg rdesktop vnc zeroconf telepathy" +IUSE="debug jpeg rdesktop telepathy vnc zeroconf" -#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.3.61 +#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.13.1 DEPEND=" jpeg? ( virtual/jpeg:0 ) + telepathy? ( >=net-libs/telepathy-qt-0.9 ) vnc? ( >=net-libs/libvncserver-0.9 ) zeroconf? ( net-dns/avahi ) - telepathy? ( >=net-libs/telepathy-qt-0.9 ) " RDEPEND="${DEPEND} rdesktop? ( >=net-misc/freerdp-1.1.0_beta1[X] ) " +PATCHES=( "${FILESDIR}/${PN}-4.13.1-freerdp.patch" ) + src_configure() { - mycmakeargs=( + local mycmakeargs=( $(cmake-utils_use_with jpeg) $(cmake-utils_use_with telepathy TelepathyQt4) $(cmake-utils_use_with vnc LibVNCServer) diff --git a/kde-base/milou/Manifest b/kde-base/milou/Manifest new file mode 100644 index 00000000000..a7d2f88cdc9 --- /dev/null +++ b/kde-base/milou/Manifest @@ -0,0 +1 @@ +DIST milou-4.96.0.tar.xz 25864 SHA256 33fec64b34a9f7bebffd422e3f221cf6461fc49355f5081cf04b5612d752325d SHA512 3d75df068c6a0d10874862657b35db4bb04c169e3324ed29443c22478c3c1b579466f16912f43fcdb3004e214b28a455f84f70e9004e2cdbc8c43f2592e4d16c WHIRLPOOL fd351e43a4ab154b0ac76699b7a003921200a0c93efa5bd9921b6f4a4b82df3b44fbc86ae209f3c1b3e137c55ac32c679596e2c3e52e1028194cc118cc337308 diff --git a/kde-base/milou/metadata.xml b/kde-base/milou/metadata.xml new file mode 100644 index 00000000000..a23f444b67d --- /dev/null +++ b/kde-base/milou/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>kde</herd> +</pkgmetadata> diff --git a/kde-base/milou/milou-4.96.0.ebuild b/kde-base/milou/milou-4.96.0.ebuild new file mode 100644 index 00000000000..86b99592b83 --- /dev/null +++ b/kde-base/milou/milou-4.96.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +EGIT_BRANCH="frameworks" +inherit kde5 + +DESCRIPTION="Dedicated search application built on top of Baloo" +HOMEPAGE="https://projects.kde.org/projects/kde/workspace/milou" + +LICENSE="GPL-2 LGPL-2.1" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep krunner) + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 +" +RDEPEND="${DEPEND} + $(add_kdebase_dep baloo) + !kde-misc/milou +" diff --git a/kde-base/milou/milou-9999.ebuild b/kde-base/milou/milou-9999.ebuild new file mode 100644 index 00000000000..7c55ba336ce --- /dev/null +++ b/kde-base/milou/milou-9999.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +EGIT_BRANCH="frameworks" +inherit kde5 + +DESCRIPTION="Dedicated search application built on top of Baloo" +HOMEPAGE="https://projects.kde.org/projects/kde/workspace/milou" + +LICENSE="GPL-2 LGPL-2.1" +KEYWORDS="" +IUSE="" + +DEPEND=" + $(add_frameworks_dep krunner) + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 +" +RDEPEND="${DEPEND} + $(add_kdebase_dep baloo) + !kde-misc/milou +" diff --git a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild index 778e2d751e5..66ab73482f9 100644 --- a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild @@ -71,7 +71,7 @@ COMMON_DEPEND=" ) " RDEPEND="${COMMON_DEPEND} - $(add_kdemisc_dep milou) + $(add_kdebase_dep milou) dev-qt/qtquickcontrols:5 !kde-base/freespacenotifier:4 !kde-base/libkworkspace:4 diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild index b6ce84b7191..0ed1cfaee3c 100644 --- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild @@ -71,7 +71,7 @@ COMMON_DEPEND=" ) " RDEPEND="${COMMON_DEPEND} - $(add_kdemisc_dep milou) + $(add_kdebase_dep milou) dev-qt/qtquickcontrols:5[widgets] !kde-base/freespacenotifier:4 !kde-base/libkworkspace:4 diff --git a/kde-base/powerdevil/Manifest b/kde-base/powerdevil/Manifest new file mode 100644 index 00000000000..8e81cf2a4a6 --- /dev/null +++ b/kde-base/powerdevil/Manifest @@ -0,0 +1 @@ +DIST powerdevil-4.96.0.tar.xz 92612 SHA256 c5866144438569596d04706fbc5b345b6762f1c48b766e3b5c8de0b59228f790 SHA512 786c817aaa29dfccd613ad6f53643fc5122886e5f3d05a973b2e65c93335966f6e034c56e77d4b5c91666a9568815b16f287f4d65a09ba35e58ec3d9e0fec038 WHIRLPOOL 20e52a512ec5c3d3fed2bf2f5c40cc196b8218a8512de9c75e92eaf81dec073ba8b328287d6000a5c165c1b4e03c13bfaa724f3dda69f4a7e921c44ab8afd878 diff --git a/kde-base/powerdevil/metadata.xml b/kde-base/powerdevil/metadata.xml index 94ce7b0aa16..4116ba03bac 100644 --- a/kde-base/powerdevil/metadata.xml +++ b/kde-base/powerdevil/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>kde</herd> -<use> - <flag name="pm-utils">Adds support for suspend/resume the system through <pkg>sys-power/pm-utils</pkg></flag> -</use> + <herd>kde</herd> + <use> + <flag name="pm-utils">Adds support for suspend/resume the system through <pkg>sys-power/pm-utils</pkg></flag> + </use> </pkgmetadata> diff --git a/kde-base/powerdevil/powerdevil-4.96.0.ebuild b/kde-base/powerdevil/powerdevil-4.96.0.ebuild new file mode 100644 index 00000000000..33bb71835f1 --- /dev/null +++ b/kde-base/powerdevil/powerdevil-4.96.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit kde5 + +DESCRIPTION="Manages the power consumption settings of a Plasma Shell" +HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil" + +LICENSE="GPL-2 LGPL-2.1" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep krunner) + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 +" +RDEPEND="${DEPEND} + !kde-base/powerdevil:4 +" diff --git a/kde-base/powerdevil/powerdevil-9999.ebuild b/kde-base/powerdevil/powerdevil-9999.ebuild new file mode 100644 index 00000000000..9fcdef63329 --- /dev/null +++ b/kde-base/powerdevil/powerdevil-9999.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit kde5 + +DESCRIPTION="Manages the power consumption settings of a Plasma Shell" +HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil" + +LICENSE="GPL-2 LGPL-2.1" +KEYWORDS="" +IUSE="" + +DEPEND=" + $(add_frameworks_dep krunner) + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 +" +RDEPEND="${DEPEND} + !kde-base/powerdevil:4 +" |
