diff options
Diffstat (limited to 'devel/kio-extras')
| -rw-r--r-- | devel/kio-extras/distinfo | 6 | ||||
| -rw-r--r-- | devel/kio-extras/files/patch-D25170 | 54 | ||||
| -rw-r--r-- | devel/kio-extras/pkg-plist | 2 |
3 files changed, 3 insertions, 59 deletions
diff --git a/devel/kio-extras/distinfo b/devel/kio-extras/distinfo index 0ff18fb9caac..b6a3be7896aa 100644 --- a/devel/kio-extras/distinfo +++ b/devel/kio-extras/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1572930748 -SHA256 (KDE/applications/19.08.3/kio-extras-19.08.3.tar.xz) = e38e872f78ff24fe512ec7ff9ed4f6b6a8e1fef6111fdb0222c133bed0a8861f -SIZE (KDE/applications/19.08.3/kio-extras-19.08.3.tar.xz) = 577520 +TIMESTAMP = 1575623555 +SHA256 (KDE/applications/19.12.0/kio-extras-19.12.0.tar.xz) = 7943c14a5a095a8d8d3ee868be085ddc59d6a0ec172637c3551e148fadc9ac6c +SIZE (KDE/applications/19.12.0/kio-extras-19.12.0.tar.xz) = 579188 diff --git a/devel/kio-extras/files/patch-D25170 b/devel/kio-extras/files/patch-D25170 deleted file mode 100644 index a119b428d9a4..000000000000 --- a/devel/kio-extras/files/patch-D25170 +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/cmake/Findlibssh.cmake b/cmake/Findlibssh.cmake ---- cmake/Findlibssh.cmake -+++ cmake/Findlibssh.cmake -@@ -32,13 +32,29 @@ - # 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. - # https://bugs.kde.org/show_bug.cgi?id=400291 - # 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 @@ - 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 ---- sftp/CMakeLists.txt -+++ sftp/CMakeLists.txt -@@ -22,7 +22,7 @@ - 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) - diff --git a/devel/kio-extras/pkg-plist b/devel/kio-extras/pkg-plist index 46d93ed733b5..23c58b7942ec 100644 --- a/devel/kio-extras/pkg-plist +++ b/devel/kio-extras/pkg-plist @@ -28,7 +28,6 @@ lib/libmolletnetwork5.so.%%KDE_APPLICATIONS_VERSION%% %%QT_PLUGINDIR%%/kf5/kio/filter.so %%QT_PLUGINDIR%%/kf5/kio/fish.so %%QT_PLUGINDIR%%/kf5/kio/info.so -%%QT_PLUGINDIR%%/kf5/parts/kmanpart.so %%QT_PLUGINDIR%%/kf5/kio/man.so %%MTP%%%%QT_PLUGINDIR%%/kf5/kio/mtp.so %%QT_PLUGINDIR%%/kf5/kio/network.so @@ -75,7 +74,6 @@ share/kservices5/imagethumbnail.desktop share/kservices5/info.protocol share/kservices5/jpegthumbnail.desktop share/kservices5/kactivitymanagerd_fileitem_linking_plugin.desktop -share/kservices5/kmanpart.desktop share/kservices5/kraorathumbnail.desktop share/kservices5/lzma.protocol share/kservices5/man.protocol |