From 87f8ab3477f5b46c495b11e7bd8d92d990e55167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 21 Dec 2020 20:37:12 +0100 Subject: [PATCH] libktorrent: upgrade 2.2.0 -> 20.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-kde/apps/ktorrent/libktorrent.bb | 9 ++--- .../0001-Find-libgmp-with-pkgconfig.patch | 34 +++++++++---------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/recipes-kde/apps/ktorrent/libktorrent.bb b/recipes-kde/apps/ktorrent/libktorrent.bb index 17160b16..16540096 100644 --- a/recipes-kde/apps/ktorrent/libktorrent.bb +++ b/recipes-kde/apps/ktorrent/libktorrent.bb @@ -18,9 +18,6 @@ DEPENDS += " \ solid \ " -PV = "2.2.0" -SRC_URI = " \ - https://download.kde.org/stable/ktorrent/5.2.0/libktorrent-${PV}.tar.xz \ - file://0001-Find-libgmp-with-pkgconfig.patch \ -" -SRC_URI[sha256sum] = "77c1ddfb0a56c40227e0624c078836a8c22bf5a2fb4a3c0cbd53ee6b174c126e" +PV = "${KDE_APP_VERSION}" +SRC_URI[sha256sum] = "3780a29f401c02b1851d39fcad4697cc105371a70fefa28fde090830c66968e7" +SRC_URI += "file://0001-Find-libgmp-with-pkgconfig.patch" diff --git a/recipes-kde/apps/ktorrent/libktorrent/0001-Find-libgmp-with-pkgconfig.patch b/recipes-kde/apps/ktorrent/libktorrent/0001-Find-libgmp-with-pkgconfig.patch index f529f261..d459c3d4 100644 --- a/recipes-kde/apps/ktorrent/libktorrent/0001-Find-libgmp-with-pkgconfig.patch +++ b/recipes-kde/apps/ktorrent/libktorrent/0001-Find-libgmp-with-pkgconfig.patch @@ -18,32 +18,19 @@ Signed-off-by: Andreas Müller 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fad43c5..3871396 100644 +index 98f8158..858a437 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -55,7 +55,8 @@ find_package(KF5 "${KF5_MIN_VERSION}" REQUIRED COMPONENTS +@@ -66,7 +66,8 @@ find_package(KF5 "${KF5_MIN_VERSION}" REQUIRED COMPONENTS ) - find_package(Boost "${Boost_MIN_VERSION}" REQUIRED) + find_package(Boost "${Boost_MIN_VERSION}" MODULE REQUIRED) -find_package(LibGMP "${LibGMP_MIN_VERSION}" REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(LibGMP REQUIRED gmp>=${LibGMP_MIN_VERSION}) find_package(LibGcrypt "${LibGcrypt_MIN_VERSION}" REQUIRED) find_package(Qca-qt5 CONFIG REQUIRED) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d347e07..0645e95 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -242,7 +242,7 @@ PUBLIC - KF5::I18n - Qt5::Xml - LibGcrypt::LibGcrypt -- LibGMP::LibGMP -+ gmp - ) - - if(WIN32) diff --git a/KF5TorrentConfig.cmake.in b/KF5TorrentConfig.cmake.in index d40dc0b..b593917 100644 --- a/KF5TorrentConfig.cmake.in @@ -56,6 +43,19 @@ index d40dc0b..b593917 100644 find_dependency(LibGcrypt "@LibGcrypt_MIN_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5TorrentTargets.cmake") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index cecf522..1a5596b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -237,7 +237,7 @@ PUBLIC + KF5::I18n + Qt5::Xml + LibGcrypt::LibGcrypt +- LibGMP::LibGMP ++ gmp + ) + + if(WIN32) -- -2.21.1 +2.26.2