diff --git a/0001-make-the-libssh-finder-ensure-the-new-ssh-target-is-.patch b/0001-make-the-libssh-finder-ensure-the-new-ssh-target-is-.patch deleted file mode 100644 index e29cdce..0000000 --- a/0001-make-the-libssh-finder-ensure-the-new-ssh-target-is-.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 8bd31391bbe592fd5d7f36b5d5bd378d773d0b4b Mon Sep 17 00:00:00 2001 -From: Harald Sitter -Date: Thu, 7 Nov 2019 21:57:00 +0100 -Subject: [PATCH] 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: asn, heikobecker, 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 bf6d797f..f37846f1 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 2f134c2c..f3b737c6 100644 ---- a/sftp/CMakeLists.txt -+++ b/sftp/CMakeLists.txt -@@ -20,7 +20,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) --- -2.23.0 - diff --git a/applications.keyring b/applications.keyring index 57c966e..48be415 100644 Binary files a/applications.keyring and b/applications.keyring differ diff --git a/kio-extras-19.08.3.tar.xz b/kio-extras-19.08.3.tar.xz deleted file mode 100644 index 6af0cb8..0000000 --- a/kio-extras-19.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e38e872f78ff24fe512ec7ff9ed4f6b6a8e1fef6111fdb0222c133bed0a8861f -size 577520 diff --git a/kio-extras-19.08.3.tar.xz.sig b/kio-extras-19.08.3.tar.xz.sig deleted file mode 100644 index c44358e..0000000 --- a/kio-extras-19.08.3.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl3A/OgACgkQ29LOiT4t -HIdUYgf+OSVMM0f+YQ9CWfXswPJ99CDWhd+kDx8TvIMkq/VJ6rTWAJvxjseNpdRP -9QeEVFhnRoF9qu9FNesDndwaz0GCcSfoxnbSx6qZTqY3TqEEGTnbVStDnzc6Dzgq -BrefOCPX/Th/c4p/po4VMNK+tetvKQ5yPPAeB57HTL0Wnw9YW8mPUaC4EjW9W7sT -zsdFNOor6jieyKiG5e4ssYoYEMD6ER4GGL2oVT5bVAElLJJd2I2Ojru23hFKAE2v -x7i/plBYe/VeMrWuZwzEL8Do3QVia5nUIb6LU/v7vPiah84zAhZk/UjDVKwvejLB -CzUmgd7jzLRwsq5H72uvdajw3oefFg== -=iSwp ------END PGP SIGNATURE----- diff --git a/kio-extras-19.11.80.tar.xz b/kio-extras-19.11.80.tar.xz new file mode 100644 index 0000000..b8a6299 --- /dev/null +++ b/kio-extras-19.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d487eee91e5156c82ce58f7699af329b9e6a58f4f5a8f55f987851b827ba1c5 +size 578944 diff --git a/kio-extras-19.11.80.tar.xz.sig b/kio-extras-19.11.80.tar.xz.sig new file mode 100644 index 0000000..665b11a --- /dev/null +++ b/kio-extras-19.11.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl3Obw8ACgkQOmpNuDnq +ptcwUA/9EuTMWik9takRM/xQoaoPgSZd81BldRYHi3r1SfmSzUIlCW9XLFVXWQo/ +f+y0A1eh5v5athVyX+PJWjzkhK5frfcvXahsovjcISSJeNw/viNc1YsOaBFwfcVJ +gg3vuHcgMuEP2iujs70PNACVKeZAky4mvVjupmh1qu8RoVDkY8Dy8kSqwAQi/llT +UEEeVTenhdIhsGiPr+P2XxlkKM0A26CF1vcvNifz1EPHyEoEDL2nz3HZol+0rXpe +MmbQ0GiHQn7YJX184wGGuXE0n1hvDpaom0YdD5LD8xEyn1LQLXxALYQkcXA7m75P +IC3P4CqEc91J4eQfuZ0Qhij4ZskiiGbK6TlbQkHrk009nlETrBRkmg0ye7m6Y+4o +lNBa6ScHvDCtzD8Zj7mxKuGXFtNuBP6S/hNZpV+OGS/K8A2UiNDvrx3LwaP4+0Z9 +d9wjKOKy8fQLQSWKn+l4IF2Cw0Ym5eHwF32vYDJgVhIYsepj+7C0kyRa61cB9m3p +FcJbBbZv8TM8AU0Dm946z0toFXIIr4mFihDg8caqA6w5NxkKrouUG2SOwK9vdmCV +PJGE98rIBSqj2yaPVb4+GQEb25OTmfxOOb+zyaern5cWX3+gWUG4sZRJfYMlXS/X +BM363YS8YDPEKHJvhdm/gzgOEEczvwZsWP5J7qtlxEL7uUdemvg= +=sfQM +-----END PGP SIGNATURE----- diff --git a/kio-extras5.changes b/kio-extras5.changes index e634b2e..37dea5e 100644 --- a/kio-extras5.changes +++ b/kio-extras5.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Nov 24 13:29:28 UTC 2019 - Luca Beltrame + +- Update to 19.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.12-beta.php +- Too many changes since 19.08.2, only listing bugfixes: + * [Comic Thumbnailer] Add support for 7zip-compressed comic books (kde#410696) +- Dropped patches, now upstream: + * 0001-make-the-libssh-finder-ensure-the-new-ssh-target-is-.patch + ------------------------------------------------------------------- Thu Nov 7 23:13:01 UTC 2019 - Luca Beltrame diff --git a/kio-extras5.spec b/kio-extras5.spec index d3e9c0b..16aa50d 100644 --- a/kio-extras5.spec +++ b/kio-extras5.spec @@ -17,59 +17,57 @@ %define rname kio-extras -%define kf5_version 5.26.0 +%define kf5_version 5.60.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kio-extras5 -Version: 19.08.3 +Version: 19.11.80 Release: 0 Summary: Additional KIO slaves for KDE applications License: GPL-2.0-or-later Group: System/GUI/KDE URL: https://www.kde.org -Source: https://download.kde.org/stable/applications/%{version}/src/%{rname}-%{version}.tar.xz +Source: https://download.kde.org/unstable/applications/%{version}/src/%{rname}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/applications/%{version}/src/%{rname}-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/applications/%{version}/src/%{rname}-%{version}.tar.xz.sig Source2: applications.keyring %endif Source99: %{name}-rpmlintrc -# PATCH-FIX-UPSTREAM -Patch0: 0001-make-the-libssh-finder-ensure-the-new-ssh-target-is-.patch BuildRequires: OpenEXR-devel BuildRequires: flac-devel BuildRequires: gperf -BuildRequires: kactivities5-devel -BuildRequires: karchive-devel -BuildRequires: kconfig-devel -BuildRequires: kconfigwidgets-devel -BuildRequires: kcoreaddons-devel -BuildRequires: kdbusaddons-devel -BuildRequires: kdelibs4support-devel -BuildRequires: kdnssd-framework-devel -BuildRequires: kdoctools-devel +BuildRequires: cmake(KF5Activities) +BuildRequires: cmake(KF5Archive) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5KDELibs4Support) +BuildRequires: cmake(KF5DNSSD) +BuildRequires: cmake(KF5DocTools) BuildRequires: kf5-filesystem -BuildRequires: khtml-devel -BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: kio-devel -BuildRequires: kpty-devel +BuildRequires: cmake(KF5KHtml) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Pty) BuildRequires: libjpeg-devel BuildRequires: libmtp-devel BuildRequires: libssh-devel BuildRequires: libtag-devel BuildRequires: openslp-devel -BuildRequires: phonon4qt5-devel +BuildRequires: cmake(Phonon4Qt5) BuildRequires: pkgconfig -BuildRequires: solid-devel -BuildRequires: syntax-highlighting-devel +BuildRequires: cmake(KF5Solid) +BuildRequires: cmake(KF5SyntaxHighlighting) BuildRequires: xz -BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Network) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5Svg) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.4.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 +BuildRequires: cmake(Qt5DBus) >= 5.4.0 +BuildRequires: cmake(Qt5Network) >= 5.4.0 +BuildRequires: cmake(Qt5Sql) +BuildRequires: cmake(Qt5Svg) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(exiv2) BuildRequires: pkgconfig(smbclient) @@ -108,8 +106,6 @@ This is the development package for libkioarchive %prep %setup -q -n %{rname}-%{version} -%autopatch -p1 - sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt %build