aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-11-22 19:50:41 +0100
committerLeo <thinkabit.ukim@gmail.com>2019-11-22 19:50:41 +0100
commit89c9731d5449794b71583d2976ed0cb77d651faa (patch)
tree9e9e64b6e38aebc8c2572c85d46bf8bb9f5defdf
parent5d3ac4365ecd43dbd797638db43542d5ab2436c6 (diff)
downloadaports-89c9731d5449794b71583d2976ed0cb77d651faa.tar.gz
aports-89c9731d5449794b71583d2976ed0cb77d651faa.tar.bz2
aports-89c9731d5449794b71583d2976ed0cb77d651faa.tar.xz
community/kio-extras: fix build with newer libssh
-rw-r--r--community/kio-extras/APKBUILD9
-rw-r--r--community/kio-extras/libssh09.patch15
2 files changed, 21 insertions, 3 deletions
diff --git a/community/kio-extras/APKBUILD b/community/kio-extras/APKBUILD
index 285e7c10c7..672d7c6b4f 100644
--- a/community/kio-extras/APKBUILD
+++ b/community/kio-extras/APKBUILD
@@ -9,8 +9,10 @@ pkgdesc="Additional components to increase the functionality of KIO"
license="GPL-2.0-or-later (LGPL-2.1-only OR LGPL-3.0-only)"
depends="kinit"
makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev karchive-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kdoctools-dev kdnssd-dev kiconthemes-dev ki18n-dev kio-dev solid-dev kbookmarks-dev kguiaddons-dev syntax-highlighting-dev kpty-dev kactivities-dev phonon-dev samba-dev libssh-dev libmtp-dev gperf khtml-dev shared-mime-info nfs-utils-dev"
-checkdepends="xvfb-run kinit"
-source="https://download.kde.org/stable/applications/$pkgver/src/kio-extras-$pkgver.tar.xz"
+checkdepends="xvfb-run"
+source="https://download.kde.org/stable/applications/$pkgver/src/kio-extras-$pkgver.tar.xz
+ libssh09.patch
+ "
subpackages="$pkgname-doc $pkgname-lang"
options="!check" # Requires running dbus-server
@@ -39,4 +41,5 @@ package() {
DESTDIR="$pkgdir" make install
}
-sha512sums="e2e5c6e3a8487c7251b77283c63eae75ea071f9d9f5f4544690083ab7f834abf6b10c715cad4fb49fbbfa34d2fbf9de358a4c606b299b2f4bf44444a57cadba6 kio-extras-19.08.3.tar.xz"
+sha512sums="e2e5c6e3a8487c7251b77283c63eae75ea071f9d9f5f4544690083ab7f834abf6b10c715cad4fb49fbbfa34d2fbf9de358a4c606b299b2f4bf44444a57cadba6 kio-extras-19.08.3.tar.xz
+61384020012ec9840e0cdf4a4f8eff20d86feacb5b2c885059ba28a4b6511e8fa4e3c269c8a9a8684fa1c73aaddc768c0087e4c2f032e793a4b89d3b9b783b03 libssh09.patch"
diff --git a/community/kio-extras/libssh09.patch b/community/kio-extras/libssh09.patch
new file mode 100644
index 0000000000..ecdb50d822
--- /dev/null
+++ b/community/kio-extras/libssh09.patch
@@ -0,0 +1,15 @@
+diff --git a/sftp/CMakeLists.txt b/sftp/CMakeLists.txt
+index 5e8d2cb1..aa88f054 100644
+--- a/sftp/CMakeLists.txt
++++ b/sftp/CMakeLists.txt
+@@ -9,6 +9,9 @@ target_link_libraries(kio_sftp
+ KF5::I18n
+ Qt5::Network
+ ${LIBSSH_LIBRARIES})
++if(TARGET ssh) # libssh 0.9
++ target_link_libraries(kio_sftp ssh)
++endif()
+ set_target_properties(kio_sftp PROPERTIES OUTPUT_NAME "sftp")
+
+ install(TARGETS kio_sftp DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kio)
+