From 2cfb61aec43d2c3f06fb121e82e0ccce413940c3 Mon Sep 17 00:00:00 2001 From: ObserverOfTime Date: Sat, 15 Jan 2022 13:17:39 +0200 Subject: [PATCH] Remove KF5::Archive lib --- .SRCINFO | 4 ++-- PKGBUILD | 23 ++++++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8f602c1..1b1d338 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = kde-thumbnailer-apk-libarchive - pkgdesc = Preview image generator plugin for Android Application Package files (libarchive branch) + pkgdesc = Preview image generator plugin for APK files (libarchive branch) pkgver = 1.1+libarchive - pkgrel = 1 + pkgrel = 2 url = https://github.com/z3ntu/kde-thumbnailer-apk arch = i686 arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index 696981b..8006fca 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,9 +3,8 @@ pkgname=kde-thumbnailer-apk-libarchive pkgver=1.1+libarchive -pkgrel=1 -pkgdesc="Preview image generator plugin for \ -Android Application Package files (libarchive branch)" +pkgrel=2 +pkgdesc="Preview image generator plugin for APK files (libarchive branch)" arch=('i686' 'x86_64') url="https://github.com/z3ntu/kde-thumbnailer-apk" license=('GPL') @@ -13,19 +12,33 @@ depends=('kio' 'libarchive') conflicts=('kde-thumbnailer-apk') provides=('kde-thumbnailer-apk=1.1') makedepends=('cmake' 'extra-cmake-modules' 'libarchive') -source=("$pkgname.tar.gz::https://github.com/z3ntu/kde-thumbnailer-apk/archive/libarchive.tar.gz") +source=("$pkgname.tar.gz::$url/archive/libarchive.tar.gz") sha256sums=('ca43a2dc7731ba3791b578da925d8ea9cd32ebdde5950c65b7dabc4072cfbfa7') prepare() { sed -i $pkgname/apkcreator.cpp -e \ '/#include /a #include ' + patch $pkgname/CMakeLists.txt <<'EOF' +@@ -2 +2 @@ project(kde-thumbnailer-apk) +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.16.0) +@@ -17 +17 @@ find_package(Qt5 REQUIRED COMPONENTS Widgets) +-find_package(KF5 REQUIRED COMPONENTS KIO Archive) ++find_package(KF5 REQUIRED COMPONENTS KIO) +@@ -25 +25 @@ target_link_libraries(apkthumbnail PRIVATE +- Qt5::Widgets KF5::KIOWidgets KF5::Archive ${LibArchive_LIBRARIES} ++ Qt5::Widgets KF5::KIOWidgets ${LibArchive_LIBRARIES} +@@ -30 +30 @@ target_link_libraries(apkthumbnail_test +- Qt5::Widgets KF5::KIOWidgets KF5::Archive ${LibArchive_LIBRARIES} ++ Qt5::Widgets KF5::KIOWidgets ${LibArchive_LIBRARIES} +EOF } build() { cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ - -B $pkgname/build -Wno-dev $pkgname + -B $pkgname/build $pkgname cmake --build $pkgname/build }