From b284a3168fa91a038925d2ecf5e4791011ea5e7d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Nov 2019 10:15:03 +0000 Subject: gentoo resync : 18.11.2019 --- kde-apps/kio-extras/Manifest | 5 +- .../files/kio-extras-19.08.3-libssh-0.9.2.patch | 88 ++++++++++++++++++++++ kde-apps/kio-extras/kio-extras-19.08.2.ebuild | 76 ------------------- kde-apps/kio-extras/kio-extras-19.08.3.ebuild | 83 ++++++++++++++++++++ 4 files changed, 174 insertions(+), 78 deletions(-) create mode 100644 kde-apps/kio-extras/files/kio-extras-19.08.3-libssh-0.9.2.patch delete mode 100644 kde-apps/kio-extras/kio-extras-19.08.2.ebuild create mode 100644 kde-apps/kio-extras/kio-extras-19.08.3.ebuild (limited to 'kde-apps/kio-extras') diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest index 4efb9d1fb696..919ff16ae4fe 100644 --- a/kde-apps/kio-extras/Manifest +++ b/kde-apps/kio-extras/Manifest @@ -1,5 +1,6 @@ +AUX kio-extras-19.08.3-libssh-0.9.2.patch 3114 BLAKE2B c09e9ab0d42bb51c8b7f2edc4c6dc00bad03de719610e95e45fae888bb2603139bbf801dfa891384c68612a215fb783367987dd13fed4da8846ae223d1828a0c SHA512 6c347691eed1154088feb7d4cac761478b7111ebea13d777a8058c1c2b701b1183f4e1a9d339e77423315252326fdecc825279def616c1f6bd0fce8ecfb8a0d9 DIST kio-extras-19.04.3.tar.xz 570436 BLAKE2B d506bae6c5ef9b14600f0dd05e26dde7e9ae75a086dfc047ee9e0dcf5baac03694a75f8547b47550a2a37e9bfad040051abbc7b316965e0c7690d94f161e034c SHA512 68b9218ef86c4aabbf9d6df21da087b954469494fe50061d2e61da7d3a121da5afe9da967281626b0f17c19e7b5078a789c29dc08dbc37196a07a67660951ad2 -DIST kio-extras-19.08.2.tar.xz 578324 BLAKE2B 08ab700d42dfde386bfbb7e5739834d85b5f0f55679792397d0c2961854ffcd251851c6ebc3e9e51faed6e5e6f400e9a40d1e3d24720607a82817378d52da6dd SHA512 a7a7e9c0ef5e9539b810484027ef7febf81487ea258d5e2e857b2cfa1d59ba1fed52245a0f18fabf9c79c67b3ec3825e32ee1415b818a0ef942067d9516f39fc +DIST kio-extras-19.08.3.tar.xz 577520 BLAKE2B 2ceb208b1860e83b818935d6890194d27ad05c2d058d1d03167969539c41a99172b08c7196ade159e332e562c5573614e79f920415dccf16e4e1918471d92c22 SHA512 e2e5c6e3a8487c7251b77283c63eae75ea071f9d9f5f4544690083ab7f834abf6b10c715cad4fb49fbbfa34d2fbf9de358a4c606b299b2f4bf44444a57cadba6 EBUILD kio-extras-19.04.3.ebuild 2088 BLAKE2B c3e7b417859ce8b7a8ebea7c17a1b2a499dafdb87b60b0ac26938d77b9b0b57e45c55de5cf4aeddfa8c8d3a982baf7c282a5003813ed9b6a2efbdcf0da43e9ef SHA512 47ea42d25654f064d11329c135db3fb1516dec3b34cd4ddb64060b8146132b3b93af0eda2ff4f5804cb536d6597b5afdf2325f3439a63912a021fec051b5d10d -EBUILD kio-extras-19.08.2.ebuild 2091 BLAKE2B ecab8666df53a419fc696e1e776004df446b08daa015bf57e7bf00247932e1ba497622e5837d42992e705433da1edf78e1584fd53231c20c33b5c1d0dacdf101 SHA512 1500f85c5697f63c132e42c4c3c1d800f949cd2203f5f330d4cc0c52b20b2b500990a4d7f4a7961ed258a6b1e3c467f8c50944140bd73d7b26c3f02f274323ea +EBUILD kio-extras-19.08.3.ebuild 2381 BLAKE2B d78b356c4d8f947ec03051750482eea41f65976d79f366c0971d923f9125262e155466e81f7f4055957e8a9da5907feed8a39daaaa7bce72cd95adc6cd146b61 SHA512 8d76662e9d9a628a3b1002074d579817a9a2f621959c2946f2f146a661888a5920049ef5e671a24ee2d88a56245c1deefdef3da24cf20db6f3d198d5d84b6c72 MISC metadata.xml 667 BLAKE2B 7f837cd50d37a8692d57859a3328770578e13052392bcee145c327e6a07d147f8194ae09ab0c6933fe15eb6964640e8b82495417b3776cac3fce0825fd1fd989 SHA512 3c14222010c942ec878bc049e2e92dc6180305de69804bc024bba1f159d08c97eb61b3e9ad68e14188515bde2b21a026c8068ab465ce8ca22e8e3e0190649154 diff --git a/kde-apps/kio-extras/files/kio-extras-19.08.3-libssh-0.9.2.patch b/kde-apps/kio-extras/files/kio-extras-19.08.3-libssh-0.9.2.patch new file mode 100644 index 000000000000..b133140ac269 --- /dev/null +++ b/kde-apps/kio-extras/files/kio-extras-19.08.3-libssh-0.9.2.patch @@ -0,0 +1,88 @@ +From 24506c2af8d1904a99538543804306c6c2b81ca2 Mon Sep 17 00:00:00 2001 +From: Harald Sitter +Date: Wed, 6 Nov 2019 13:57:20 +0100 +Subject: make the libssh finder ensure the new ssh target is set + +Summary: +starting with 0.9.2 the libssh cmake config defines a new ssh imported +target, use this as the new gold standard and ensure older versions +are compatible + +broken ubuntu: no cmake config -> manual finder -> target injected +0.9.0 and earlier: cmake config -> target injected +0.9.2: cmake config -> target already defined; noop + +(0.9.1 is broken as it neither matches the old nor the new expectation) + +Test Plan: +no cmake config -> target injected +older cmake config -> target injected +newer cmake config (with merge request) -> noop + +Subscribers: kde-frameworks-devel, kfm-devel + +Tags: #dolphin, #frameworks + +Differential Revision: https://phabricator.kde.org/D25170 +--- + cmake/Findlibssh.cmake | 18 ++++++++++++++++++ + sftp/CMakeLists.txt | 2 +- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/cmake/Findlibssh.cmake b/cmake/Findlibssh.cmake +index bf6d797..f37846f 100644 +--- a/cmake/Findlibssh.cmake ++++ b/cmake/Findlibssh.cmake +@@ -32,6 +32,19 @@ + # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + ++# Define an imported target to have compatibility with newer libssh and so ++# we have a single target to use regardless of the code path taken in the ++# finder and the actual libssh version defining the target. ++macro(libssh_ensure_imported_target) ++ if(NOT TARGET ssh) ++ add_library(ssh SHARED IMPORTED) ++ set_target_properties(ssh PROPERTIES ++ IMPORTED_LOCATION "${LIBSSH_LIBRARIES}" ++ INTERFACE_INCLUDE_DIRECTORIES "${LIBSSH_INCLUDE_DIR}" ++ ) ++ endif() ++endmacro() ++ + # We prefer the config, but on Ubuntu 18.04 LTS (and to some extent later + # versions it seems) they've not packaged the config properly. So, go for the + # config by default and fall back to manual lookup iff the config was not found. +@@ -39,6 +52,9 @@ + # https://bugs.launchpad.net/ubuntu/+source/libssh/+bug/1800135 + find_package(libssh ${libssh_FIND_VERSION} NO_MODULE QUIET) + if(libssh_FOUND) ++ # Certain versions with config may not have the target, so make sure it's ++ # defined. ++ libssh_ensure_imported_target() + return() + endif() + +@@ -109,5 +125,7 @@ find_package_handle_standard_args(libssh + VERSION_VAR + LIBSSH_VERSION) + ++libssh_ensure_imported_target() ++ + # show the LIBSSH_INCLUDE_DIRS and LIBSSH_LIBRARIES variables only in the advanced view + mark_as_advanced(LIBSSH_INCLUDE_DIR LIBSSH_LIBRARIES) +diff --git a/sftp/CMakeLists.txt b/sftp/CMakeLists.txt +index cd09cd3..5d1eccb 100644 +--- a/sftp/CMakeLists.txt ++++ b/sftp/CMakeLists.txt +@@ -22,7 +22,7 @@ target_link_libraries(kio_sftp + KF5::WidgetsAddons # KMessageBox + KF5::I18n + Qt5::Network +- ${LIBSSH_LIBRARIES}) ++ ssh) + set_target_properties(kio_sftp PROPERTIES OUTPUT_NAME "sftp") + + install(TARGETS kio_sftp DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio) +-- +cgit v1.1 diff --git a/kde-apps/kio-extras/kio-extras-19.08.2.ebuild b/kde-apps/kio-extras/kio-extras-19.08.2.ebuild deleted file mode 100644 index ed12668f1418..000000000000 --- a/kde-apps/kio-extras/kio-extras-19.08.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="optional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data" -HOMEPAGE="https://cgit.kde.org/kio-extras.git" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="activities +man mtp openexr phonon samba +sftp taglib" - -BDEPEND=" - man? ( dev-util/gperf ) -" -DEPEND=" - $(add_frameworks_dep karchive 'bzip2,lzma') - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdnssd) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kpty) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_frameworks_dep syntax-highlighting) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - activities? ( - $(add_frameworks_dep kactivities) - $(add_qt_dep qtsql) - ) - man? ( $(add_frameworks_dep khtml) ) - mtp? ( >=media-libs/libmtp-1.1.16:= ) - openexr? ( media-libs/openexr:= ) - phonon? ( media-libs/phonon[qt5(+)] ) - samba? ( net-fs/samba[client] ) - sftp? ( net-libs/libssh:=[sftp] ) - taglib? ( >=media-libs/taglib-1.11.1 ) -" -RDEPEND="${DEPEND} - $(add_frameworks_dep kded) -" - -# requires running kde environment -RESTRICT+=" test" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package activities KF5Activities) - $(cmake-utils_use_find_package man Gperf) - $(cmake-utils_use_find_package mtp Mtp) - $(cmake-utils_use_find_package openexr OpenEXR) - $(cmake-utils_use_find_package phonon Phonon4Qt5) - $(cmake-utils_use_find_package samba Samba) - $(cmake-utils_use_find_package sftp libssh) - $(cmake-utils_use_find_package taglib Taglib) - ) - - kde5_src_configure -} diff --git a/kde-apps/kio-extras/kio-extras-19.08.3.ebuild b/kde-apps/kio-extras/kio-extras-19.08.3.ebuild new file mode 100644 index 000000000000..8b8ae07f60d7 --- /dev/null +++ b/kde-apps/kio-extras/kio-extras-19.08.3.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="optional" +KFMIN=5.60.0 +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data" +HOMEPAGE="https://cgit.kde.org/kio-extras.git" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="activities +man mtp openexr phonon samba +sftp taglib" + +BDEPEND=" + man? ( dev-util/gperf ) +" +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5[bzip2,lzma] + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdnssd-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kpty-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + >=kde-frameworks/syntax-highlighting-${KFMIN}:5 + activities? ( + >=dev-qt/qtsql-${QTMIN}:5 + >=kde-frameworks/kactivities-${KFMIN}:5 + ) + man? ( >=kde-frameworks/khtml-${KFMIN}:5 ) + mtp? ( >=media-libs/libmtp-1.1.16:= ) + openexr? ( media-libs/openexr:= ) + phonon? ( media-libs/phonon[qt5(+)] ) + samba? ( net-fs/samba[client] ) + sftp? ( net-libs/libssh:=[sftp] ) + taglib? ( >=media-libs/taglib-1.11.1 ) +" +RDEPEND="${DEPEND} + >=kde-frameworks/kded-${KFMIN}:5 +" + +# requires running kde environment +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${P}-libssh-0.9.2.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package activities KF5Activities) + $(cmake-utils_use_find_package man Gperf) + $(cmake-utils_use_find_package mtp Mtp) + $(cmake-utils_use_find_package openexr OpenEXR) + $(cmake-utils_use_find_package phonon Phonon4Qt5) + $(cmake-utils_use_find_package samba Samba) + $(cmake-utils_use_find_package sftp libssh) + $(cmake-utils_use_find_package taglib Taglib) + ) + + ecm_src_configure +} -- cgit v1.2.3