summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2016-11-19 18:25:14 +0100
committerJohannes Huber <johu@gentoo.org>2016-11-19 18:25:38 +0100
commita8228efb97571d72189ca2b20c079a2fd448a5ab (patch)
treeef8eede778fbd89f0232f00fa8e0ae76d0f62e8f /kde-misc/kdeconnect/files
parentdev-java/icedtea-bin: Version bump to 7.2.6.8 wrt security bug #600224 (diff)
downloadgentoo-a8228efb97571d72189ca2b20c079a2fd448a5ab.tar.gz
gentoo-a8228efb97571d72189ca2b20c079a2fd448a5ab.tar.bz2
gentoo-a8228efb97571d72189ca2b20c079a2fd448a5ab.zip
kde-misc/kdeconnect: Drop slot 4
Exported to kde-sunset overlay. Package-Manager: portage-2.3.2
Diffstat (limited to 'kde-misc/kdeconnect/files')
-rw-r--r--kde-misc/kdeconnect/files/kdeconnect-0.8-ninja.patch36
-rw-r--r--kde-misc/kdeconnect/files/kdeconnect-0.8-openssh-7.0.patch32
2 files changed, 0 insertions, 68 deletions
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 d482549dab52..000000000000
--- 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 <kensington@gentoo.org>
-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 368915668212..000000000000
--- 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 <albertvaka@gmail.com>
-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
-