[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdeconnect/, kde-misc/kdeconnect/files/

2023-06-17 Thread Andreas Sturmlechner 
commit: f55f24c0f52b2c9db47d03b5bdd3828bded242f7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 17 10:47:36 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 17 10:49:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f55f24c0

kde-misc/kdeconnect: Fix kdeconnect_open desktop file type

Closes: https://bugs.gentoo.org/739674
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../kdeconnect-23.04.2-fix-desktop-file.patch  |  49 ++
 kde-misc/kdeconnect/kdeconnect-23.04.2-r1.ebuild   | 100 +
 2 files changed, 149 insertions(+)

diff --git 
a/kde-misc/kdeconnect/files/kdeconnect-23.04.2-fix-desktop-file.patch 
b/kde-misc/kdeconnect/files/kdeconnect-23.04.2-fix-desktop-file.patch
new file mode 100644
index ..6e03415d60de
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-23.04.2-fix-desktop-file.patch
@@ -0,0 +1,49 @@
+From 276c2f1334345071eaeef9aea87c96cdd199f8f0 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella 
+Date: Sun, 11 Jun 2023 19:56:59 +0200
+Subject: [PATCH] Fix kdeconnect_open desktop file type
+
+It's an application, not a service
+
+Also don't make it executable, it's not needed
+
+BUG: 424782
+(cherry picked from commit 7569a6ceffc6fc169186e401d33ce1f2049ec5e4)
+---
+ data/CMakeLists.txt  | 2 +-
+ data/org.kde.kdeconnect_open.desktop | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index 5d673f0ab..6d3621f29 100644
+--- a/data/CMakeLists.txt
 b/data/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ install (FILES "kdeconnect.contract" DESTINATION 
${KDE_INSTALL_DATADIR}/contractor/)
+ install (FILES "kdeconnect-thunar.desktop" DESTINATION 
${KDE_INSTALL_DATADIR}/Thunar/sendto/)
+-install(PROGRAMS org.kde.kdeconnect_open.desktop DESTINATION 
${KDE_INSTALL_APPDIR})
++install(FILES org.kde.kdeconnect_open.desktop DESTINATION 
${KDE_INSTALL_APPDIR})
+ install (FILES "kdeconnect-dde.desktop" DESTINATION 
${KDE_INSTALL_DATADIR}/deepin/dde-file-manager/oem-menuextensions/)
+ 
+ if(NOT SAILFISHOS)
+diff --git a/data/org.kde.kdeconnect_open.desktop 
b/data/org.kde.kdeconnect_open.desktop
+index 03de93ef6..110dc2f67 100644
+--- a/data/org.kde.kdeconnect_open.desktop
 b/data/org.kde.kdeconnect_open.desktop
+@@ -1,4 +1,5 @@
+ [Desktop Entry]
++Type=Application
+ GenericName=Open on connected device via KDE Connect
+ GenericName[ar]=افتح في الجهاز المتصل عبر «كِيدِي المتّصل»
+ GenericName[az]=Connectd cihazında KDE Connect ilə açın
+@@ -128,7 +129,6 @@ Comment[zh_TW]=使用 KDE 連線於連線裝置中開啟
+ MimeType=application/octet-stream;
+ Exec=kdeconnect-handler --open %U
+ Icon=kdeconnect
+-Type=Service
+ Terminal=false
+ Categories=Qt;KDE;Network;
+ X-KDE-FormFactor=desktop;tablet;handset;
+-- 
+GitLab
+

diff --git a/kde-misc/kdeconnect/kdeconnect-23.04.2-r1.ebuild 
b/kde-misc/kdeconnect/kdeconnect-23.04.2-r1.ebuild
new file mode 100644
index ..ba3de6380507
--- /dev/null
+++ b/kde-misc/kdeconnect/kdeconnect-23.04.2-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}-kde"
+KDE_SELINUX_MODULE="${PN}"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
+HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect/;
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="bluetooth pulseaudio telephony X"
+
+RESTRICT="test"
+
+DEPEND="
+   >=app-crypt/qca-2.3.0:2[qt5(+),ssl]
+   >=dev-libs/wayland-1.15.0
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtdeclarative-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5=
+   >=dev-qt/qtmultimedia-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtquickcontrols2-${QTMIN}:5
+   >=dev-qt/qtwayland-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtx11extras-${QTMIN}:5
+   >=kde-frameworks/kcmutils-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kirigami-${KFMIN}:5
+   >=kde-frameworks/knotifications-${KFMIN}:5
+   >=kde-frameworks/kpeople-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/plasma-${KFMIN}:5
+   >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+   >=kde-frameworks/solid-${KFMIN}:5
+   x11-libs/libxkbcommon
+   bluetooth? (

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdeconnect/, kde-misc/kdeconnect/files/

2023-04-23 Thread Andreas Sturmlechner 
commit: 48de0dc468f8db4db83a0fc725b667971d550c79
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 23 10:54:52 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 23 11:02:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48de0dc4

kde-misc/kdeconnect: Add IUSE telephony

Upstream commits:
7b1f10d4d514285017928b79316ff5e061f16e86
97e47efdf6626fa0ae282684ab50ee6fce67d642

Closes: https://bugs.gentoo.org/904823
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../kdeconnect-23.04.0-telephony-optional.patch| 40 +
 kde-misc/kdeconnect/kdeconnect-23.04.0-r1.ebuild   | 98 ++
 kde-misc/kdeconnect/metadata.xml   |  1 +
 3 files changed, 139 insertions(+)

diff --git 
a/kde-misc/kdeconnect/files/kdeconnect-23.04.0-telephony-optional.patch 
b/kde-misc/kdeconnect/files/kdeconnect-23.04.0-telephony-optional.patch
new file mode 100644
index ..bec66fd64538
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-23.04.0-telephony-optional.patch
@@ -0,0 +1,40 @@
+From 97e47efdf6626fa0ae282684ab50ee6fce67d642 Mon Sep 17 00:00:00 2001
+From: Heiko Becker 
+Date: Mon, 20 Mar 2023 20:33:11 +0100
+Subject: [PATCH] Make mmtelephony plugin optional
+
+I see little purpose in pulling that stack in on a desktop computer,
+which doesn't even have a modem.
+---
+ plugins/CMakeLists.txt | 5 -
+ plugins/mmtelephony/CMakeLists.txt | 1 -
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
+index dda19398b..1e304b88e 100644
+--- a/plugins/CMakeLists.txt
 b/plugins/CMakeLists.txt
+@@ -39,7 +39,10 @@ if(NOT SAILFISHOS)
+ add_subdirectory(virtualmonitor)
+ 
+ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-  add_subdirectory(mmtelephony)
++find_package(KF5ModemManagerQt ${KF5_MIN_VERSION})
++if (TARGET KF5::ModemManagerQt)
++add_subdirectory(mmtelephony)
++endif()
+ endif()
+ 
+ if(NOT WIN32)
+diff --git a/plugins/mmtelephony/CMakeLists.txt 
b/plugins/mmtelephony/CMakeLists.txt
+index 1fd9afe1e..c792b4c7c 100644
+--- a/plugins/mmtelephony/CMakeLists.txt
 b/plugins/mmtelephony/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS ModemManagerQt)
+ set(debug_file_SRCS)
+ ecm_qt_declare_logging_category(
+ debug_file_SRCS HEADER plugin_mmtelephony_debug.h
+-- 
+GitLab
+

diff --git a/kde-misc/kdeconnect/kdeconnect-23.04.0-r1.ebuild 
b/kde-misc/kdeconnect/kdeconnect-23.04.0-r1.ebuild
new file mode 100644
index ..83f731cb0357
--- /dev/null
+++ b/kde-misc/kdeconnect/kdeconnect-23.04.0-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}-kde"
+KDE_SELINUX_MODULE="${PN}"
+KFMIN=5.104.0
+QTMIN=5.15.5
+inherit ecm gear.kde.org
+
+DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
+HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect/;
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="bluetooth pulseaudio telephony X"
+
+RESTRICT="test"
+
+DEPEND="
+   >=app-crypt/qca-2.3.0:2[qt5(+),ssl]
+   >=dev-libs/wayland-1.15.0
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtdeclarative-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5=
+   >=dev-qt/qtmultimedia-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtquickcontrols2-${QTMIN}:5
+   >=dev-qt/qtwayland-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtx11extras-${QTMIN}:5
+   >=kde-frameworks/kcmutils-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kirigami-${KFMIN}:5
+   >=kde-frameworks/knotifications-${KFMIN}:5
+   >=kde-frameworks/kpeople-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/plasma-${KFMIN}:5
+   >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+   >=kde-frameworks/solid-${KFMIN}:5
+   x11-libs/libxkbcommon
+   bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 )
+   pulseaudio? ( media-libs/pulseaudio-qt:= )
+   telephony? ( >=kde-frameworks/modemmanager-qt-${KFMIN}:5 )
+   X? (
+   x11-libs/libfakekey
+   x11-libs/libX11
+   x11-libs/libXtst
+   )
+"
+RDEPEND="${DEPEND}
+   dev-libs/kpeoplevcard
+   >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdeconnect/, kde-misc/kdeconnect/files/

2020-10-04 Thread Andreas Sturmlechner 
commit: bb81637747a3a0d3cc36bd19f73250d32dfc8b6c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct  4 08:35:47 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  4 15:54:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb816377

kde-misc/kdeconnect: Fix CVE-2020-26164

See also: https://kde.org/info/security/advisory-20201002-1.txt

Bug: https://bugs.gentoo.org/746401
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...re-SSL-errors-except-for-self-signed-cert.patch |  65 +
 ...ot-leak-the-local-user-in-the-device-name.patch |  32 +++
 ...fter-free-in-LanLinkProvider-connectError.patch |  28 ++
 ...20.04.3-04-Limit-identity-packets-to-8KiB.patch |  36 
 ...lanlink-connections-stay-open-for-long-wi.patch |  37 
 ...3-06-Don-t-brute-force-reading-the-socket.patch | 102 +
 ...r-of-connected-sockets-from-unpaired-devi.patch |  42 +
 ...mber-more-than-a-few-identity-packets-at-.patch |  54 +++
 ...orts-we-try-to-connect-to-to-the-port-ran.patch |  32 +++
 ...ace-connections-for-a-given-deviceId-if-t.patch |  58 
 kde-misc/kdeconnect/kdeconnect-20.04.3-r1.ebuild   |  98 
 kde-misc/kdeconnect/kdeconnect-20.08.1-r1.ebuild   |  99 
 12 files changed, 683 insertions(+)

diff --git 
a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-01-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch
 
b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-01-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch
new file mode 100644
index 000..cafeb9501cd
--- /dev/null
+++ 
b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-01-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch
@@ -0,0 +1,65 @@
+From f183b5447bad47655c21af87214579f03bf3a163 Mon Sep 17 00:00:00 2001
+From: Albert Vaca Cintora 
+Date: Thu, 24 Sep 2020 16:59:22 +0200
+Subject: [PATCH 01/10] Do not ignore SSL errors, except for self-signed cert
+ errors.
+
+Thanks Matthias Gerstner  for reporting this.
+---
+ core/backends/lan/lanlinkprovider.cpp | 24 +---
+ 1 file changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/core/backends/lan/lanlinkprovider.cpp 
b/core/backends/lan/lanlinkprovider.cpp
+index d9a7d8fa..fc005cee 100644
+--- a/core/backends/lan/lanlinkprovider.cpp
 b/core/backends/lan/lanlinkprovider.cpp
+@@ -297,9 +297,7 @@ void LanLinkProvider::tcpSocketConnected()
+ 
+ connect(socket, ::encrypted, this, 
::encrypted);
+ 
+-if (isDeviceTrusted) {
+-connect(socket, QOverload 
&>::of(::sslErrors), this, ::sslErrors);
+-}
++connect(socket, QOverload 
&>::of(::sslErrors), this, ::sslErrors);
+ 
+ socket->startServerEncryption();
+ 
+@@ -326,8 +324,6 @@ void LanLinkProvider::encrypted()
+ 
+ QSslSocket* socket = qobject_cast(sender());
+ if (!socket) return;
+-// TODO delete me?
+-disconnect(socket, QOverload 
&>::of(::sslErrors), this, ::sslErrors);
+ 
+ Q_ASSERT(socket->mode() != QSslSocket::UnencryptedMode);
+ LanDeviceLink::ConnectionStarted connectionOrigin = (socket->mode() == 
QSslSocket::SslClientMode)? LanDeviceLink::Locally : LanDeviceLink::Remotely;
+@@ -346,14 +342,20 @@ void LanLinkProvider::sslErrors(const QList& 
errors)
+ QSslSocket* socket = qobject_cast(sender());
+ if (!socket) return;
+ 
+-qCDebug(KDECONNECT_CORE) << "Failing due to " << errors;
+-Device* device = Daemon::instance()->getDevice(socket->peerVerifyName());
+-if (device) {
+-device->unpair();
++bool fatal = false;
++for (const QSslError& error : errors) {
++if (error.error() != QSslError::SelfSignedCertificate) {
++qCCritical(KDECONNECT_CORE) << "Disconnecting due to fatal SSL 
Error: " << error;
++fatal = true;
++} else {
++qCDebug(KDECONNECT_CORE) << "Ignoring self-signed cert error";
++}
+ }
+ 
+-delete m_receivedIdentityPackets.take(socket).np;
+-// Socket disconnects itself on ssl error and will be deleted by 
deleteLater slot, no need to delete manually
++if (fatal) {
++socket->disconnectFromHost();
++delete m_receivedIdentityPackets.take(socket).np;
++}
+ }
+ 
+ //I'm the new device and this is the answer to my UDP identity packet (no 
data received yet). They are connecting to us through TCP, and they should send 
an identity.
+-- 
+2.28.0
+

diff --git 
a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-02-Do-not-leak-the-local-user-in-the-device-name.patch
 
b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-02-Do-not-leak-the-local-user-in-the-device-name.patch
new file mode 100644
index 000..b374d001036
--- /dev/null
+++ 
b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-02-Do-not-leak-the-local-user-in-the-device-name.patch
@@ -0,0 +1,32 @@
+From

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdeconnect/, kde-misc/kdeconnect/files/

2018-04-10 Thread Johannes Huber 
commit: 403144c366b8149bf3f3dfbc3919adcbf44ae56a
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr 10 18:43:21 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Apr 10 18:43:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=403144c3

kde-misc/kdeconnect: Fix build w/o wayland/handbook

Reported-by: email200202  yahoo.com
Thanks-to: Andreas Sturmlechner  gentoo.org>
Closes: https://bugs.gentoo.org/652888
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 kde-misc/kdeconnect/files/kdeconnect-1.3.0-no-wayland.patch | 13 +
 kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild |  8 +---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/kde-misc/kdeconnect/files/kdeconnect-1.3.0-no-wayland.patch 
b/kde-misc/kdeconnect/files/kdeconnect-1.3.0-no-wayland.patch
new file mode 100644
index 000..a46c284a017
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-1.3.0-no-wayland.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/mousepad/CMakeLists.txt b/plugins/mousepad/CMakeLists.txt
+index ab9913ff..bfd52cd7 100644
+--- a/plugins/mousepad/CMakeLists.txt
 b/plugins/mousepad/CMakeLists.txt
+@@ -10,7 +10,7 @@ if (LibFakeKey_FOUND)
+ find_package(X11 REQUIRED)
+ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
+ endif()
+-find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Wayland)
++find_package(KF5Wayland ${KF5_MIN_VERSION} QUIET)
+ 
+ set(HAVE_X11 ${LibFakeKey_FOUND})
+ set(HAVE_WAYLAND ${KF5Wayland_FOUND})

diff --git a/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild 
b/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild
index 824a32a6085..b826ef6e3ba 100644
--- a/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 FRAMEWORKS_MINIMAL="5.42.0"
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 KMNAME="${PN}-kde"
 KDE_SELINUX_MODULE="${PN}"
@@ -55,12 +55,14 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-no-wayland.patch" )
+
 src_prepare() {
+   kde5_src_prepare
+
sed \
-e 's#${LIBEXEC_INSTALL_DIR}#@KDE_INSTALL_FULL_LIBEXECDIR@#' \
-i daemon/kdeconnectd.desktop.cmake || die
-
-   kde5_src_prepare
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdeconnect/, kde-misc/kdeconnect/files/

2016-11-19 Thread Johannes Huber 
commit: a8228efb97571d72189ca2b20c079a2fd448a5ab
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Nov 19 17:25:14 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Nov 19 17:25:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8228efb

kde-misc/kdeconnect: Drop slot 4

Exported to kde-sunset overlay.

Package-Manager: portage-2.3.2

 kde-misc/kdeconnect/Manifest   |  1 -
 .../kdeconnect/files/kdeconnect-0.8-ninja.patch| 36 --
 .../files/kdeconnect-0.8-openssh-7.0.patch | 32 
 kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild   | 58 --
 4 files changed, 127 deletions(-)

diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 8d8d978..06fc62b 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,2 +1 @@
-DIST kdeconnect-kde-0.8.tar.xz 141916 SHA256 
c33611c076a327a67f9974ffa5662f2c093dda6ad14024e434027f9f19d9a0ab SHA512 
7c7c460648960dde501596c85282eddd4d9add3b1be291b6d22a75f316cce6cdee0015d81b275eaa7c66758dcf16fa21da1be9b79f12b68c76bad343eef7250e
 WHIRLPOOL 
0d302b4c6005100db9bc44ca590ee330bc6f432af02bfd1d2f27b367f38b6d4993828a3726c2bf3acaafcaa00c1724a9592ee8a652152f6b811923c351d3f499
 DIST kdeconnect-kde-1.0.2.tar.xz 228656 SHA256 
84c8d6f79226ec6341567021b23e3d87ce2de6621ae879081340a8150a6832a1 SHA512 
26a0d267f7d0e7c06c317718d8f105b4ce5e3f782b478b8e34e2fc57b721c0f3860ce9d8f8552da390678175d39b2c1b7091ba382fcbb0ab95777a480f89cbc6
 WHIRLPOOL 
b1de9854e5d4269fd49f0e708e147271ea24fc682f1daabfe1d9b3b0dba7b2c0767a5647c90e0176d9481ebe21de6f0af2640535042284b5fa2b8f86fcffccd2

diff --git a/kde-misc/kdeconnect/files/kdeconnect-0.8-ninja.patch 
b/kde-misc/kdeconnect/files/kdeconnect-0.8-ninja.patch
deleted file mode 100644
index d482549..
--- a/kde-misc/kdeconnect/files/kdeconnect-0.8-ninja.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d9e0c61185a5ecbd9b013740fe73d21ba5adaa44 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka 
-Date: Thu, 10 Sep 2015 21:56:39 +1000
-Subject: [PATCH] Fix make with ninja.
-
-The custom command name must differ from the name of the generated file.
-
-REVIEW: 125137

- cmake/DbusInterfaceMacros.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/DbusInterfaceMacros.cmake b/cmake/DbusInterfaceMacros.cmake
-index 9d4810d..801452a 100644
 a/cmake/DbusInterfaceMacros.cmake
-+++ b/cmake/DbusInterfaceMacros.cmake
-@@ -12,7 +12,7 @@ macro (generate_and_install_dbus_interface 
main_project_target header_file outpu
- OPTIONS ${qdbus_options}
- )
- add_custom_target(
--${output_xml_file}
-+${output_xml_file}_target
- SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file}
- )
- install(
-@@ -21,6 +21,6 @@ macro (generate_and_install_dbus_interface 
main_project_target header_file outpu
- )
- add_dependencies(
- ${main_project_target}
--${output_xml_file}
-+${output_xml_file}_target
- )
- endmacro (generate_and_install_dbus_interface)
--- 
-2.4.6
-

diff --git a/kde-misc/kdeconnect/files/kdeconnect-0.8-openssh-7.0.patch 
b/kde-misc/kdeconnect/files/kdeconnect-0.8-openssh-7.0.patch
deleted file mode 100644
index 3689156..
--- a/kde-misc/kdeconnect/files/kdeconnect-0.8-openssh-7.0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 56028b694176d1f52475ac073b0feb842c71a894 Mon Sep 17 00:00:00 2001
-From: Albert Vaca 
-Date: Mon, 24 Aug 2015 21:27:24 -0700
-Subject: [PATCH] Fixed incompatibility with OpenSSH 7.0
-
-BUG: 351725
-
-Conflicts:
-   plugins/sftp/mounter.cpp

- plugins/sftp/mounter.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
-index c414f77..f13bb52 100644
 a/plugins/sftp/mounter.cpp
-+++ b/plugins/sftp/mounter.cpp
-@@ -136,8 +136,9 @@ void Mounter::onPakcageReceived(const NetworkPackage& np)
- << "-f"
- << "-o" << "IdentityFile=" + m_sftp->device()->privateKeyPath()
- << "-o" << "StrictHostKeyChecking=no" //Do not ask for confirmation 
because it is not a known host
--<< "-o" << "UserKnownHostsFile=/dev/null"; //Prevent storing as a 
known host
--
-+<< "-o" << "UserKnownHostsFile=/dev/null" //Prevent storing as a 
known host
-+<< "-o" << "HostKeyAlgorithms=+ssh-dss"; 
//https://bugs.kde.org/show_bug.cgi?id=351725
-+
- m_proc->setProgram(program, arguments);
- 
- //To debug
--- 
-2.4.9
-

diff --git a/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild 
b/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild
deleted file mode 100644
index 79c6c13..
--- a/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN}-kde"

[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdeconnect/, kde-misc/kdeconnect/files/

2015-09-10 Thread Michael Palimaka 
commit: 6065d16d88a1a0ce0d5638935e89a5f34b58ac3e
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Sep 10 12:08:47 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep 10 12:09:07 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6065d16d

kde-misc/kdeconnect: backport patch from upstream fixing build with 
dev-util/ninja.

Gentoo-bug: 559904

Package-Manager: portage-2.2.20.1

 .../kdeconnect/files/kdeconnect-0.8-ninja.patch| 36 ++
 kde-misc/kdeconnect/kdeconnect-0.8.ebuild  |  2 ++
 2 files changed, 38 insertions(+)

diff --git a/kde-misc/kdeconnect/files/kdeconnect-0.8-ninja.patch 
b/kde-misc/kdeconnect/files/kdeconnect-0.8-ninja.patch
new file mode 100644
index 000..d482549
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-0.8-ninja.patch
@@ -0,0 +1,36 @@
+From d9e0c61185a5ecbd9b013740fe73d21ba5adaa44 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka 
+Date: Thu, 10 Sep 2015 21:56:39 +1000
+Subject: [PATCH] Fix make with ninja.
+
+The custom command name must differ from the name of the generated file.
+
+REVIEW: 125137
+---
+ cmake/DbusInterfaceMacros.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/DbusInterfaceMacros.cmake b/cmake/DbusInterfaceMacros.cmake
+index 9d4810d..801452a 100644
+--- a/cmake/DbusInterfaceMacros.cmake
 b/cmake/DbusInterfaceMacros.cmake
+@@ -12,7 +12,7 @@ macro (generate_and_install_dbus_interface 
main_project_target header_file outpu
+ OPTIONS ${qdbus_options}
+ )
+ add_custom_target(
+-${output_xml_file}
++${output_xml_file}_target
+ SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file}
+ )
+ install(
+@@ -21,6 +21,6 @@ macro (generate_and_install_dbus_interface 
main_project_target header_file outpu
+ )
+ add_dependencies(
+ ${main_project_target}
+-${output_xml_file}
++${output_xml_file}_target
+ )
+ endmacro (generate_and_install_dbus_interface)
+-- 
+2.4.6
+

diff --git a/kde-misc/kdeconnect/kdeconnect-0.8.ebuild 
b/kde-misc/kdeconnect/kdeconnect-0.8.ebuild
index 07e7568..e27ce0c 100644
--- a/kde-misc/kdeconnect/kdeconnect-0.8.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-0.8.ebuild
@@ -42,6 +42,8 @@ DEPEND="${COMMON_DEPEND}
 
 [[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}/${P}-ninja.patch" )
+
 pkg_postinst(){
elog
elog "Optional dependency:"