Skip to content
Snippets Groups Projects
Commit b8aa9506 authored by Celeste's avatar Celeste Committed by J0WI
Browse files

testing/sturmreader: upgrade to 3.7.1

parent 9f6c5e3a
No related branches found
No related tags found
1 merge request!52421testing/sturmreader: upgrade to 3.7.1
Pipeline #185258 skipped
# Contributor: Emanuele Sorce <emanuele.sorce@hotmail.com>
# Maintainer: Emanuele Sorce <emanuele.sorce@hotmail.com>
pkgname=sturmreader
pkgver=3.7.0
pkgver=3.7.1
pkgrel=0
pkgdesc="E-Book and comic reader for mobile devices"
url="https://gitlab.com/tronfortytwo/sturmreader"
......@@ -24,10 +24,11 @@ makedepends="
qt5-qtwebchannel-dev
qt5-qtwebengine-dev
quazip-dev
samurai
"
subpackages="$pkgname-lang"
source="https://gitlab.com/tronfortytwo/sturmreader/-/archive/$pkgver/sturmreader-$pkgver.tar.gz
quazip.patch
intl.patch
"
# Sturm reader has no testing! Not even a --version thing
......@@ -46,6 +47,6 @@ package() {
}
sha512sums="
4128d9f79614f83fc77692f4c0f83d6fb1fec30ab5baf208eaf757978db1ac4e204290bc0fd9420d1c09b0bd032b9a51edbe79b8fae61306ece52792a11d63bd sturmreader-3.7.0.tar.gz
4c89262dc1d1d19029342b80d99081cb75dfa4283aa882e1bafeaa3347b6943e9927b773819709af20457b90deb9e7728300078a9fec44681186ecd7222b1ee2 quazip.patch
cb3246e68735c5a13b80884307da8d631116a9e709698ef339300f3f2266104abfd4ba1a0d21424ca0908778c9d17eb1fe51ec8e3a4fae12f77160130672e091 sturmreader-3.7.1.tar.gz
287f48924bc3fb60c651e54d687872baf49882aa009c28a27de5fca60c586a7a6daf00c8dbfdfb45efaec6688253966a4c5de2973e7d0a75ceac197cfe879c60 intl.patch
"
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,9 +51,9 @@
find_package(ZLIB REQUIRED)
-# find_package(Intl REQUIRED)
+find_package(Intl REQUIRED)
find_package(QUAZIP REQUIRED)
#find_package(QuaZip-Qt5 REQUIRED)
if(CLICK_MODE)
# Find out the architecture for package building
instead of using a custom findquazip with hardcoded versions,
just use the provided system cmake file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6685ea4..13a1483 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,8 +51,8 @@ find_package(Qt5Concurrent REQUIRED)
find_package(ZLIB REQUIRED)
-# find_package(Intl REQUIRED)
-find_package(QUAZIP REQUIRED)
+find_package(Intl REQUIRED)
+find_package(QuaZip-Qt5 REQUIRED)
if(CLICK_MODE)
# Find out the architecture for package building
@@ -111,7 +111,7 @@ add_executable(sturmreader
ui/reader/comicreader.cpp
ui/resources.qrc
${QML_COMPILED_RES})
-target_include_directories(sturmreader SYSTEM PRIVATE ${QUAZIP_INCLUDE_DIR})
+target_include_directories(sturmreader SYSTEM PRIVATE QuaZip::QuaZip)
add_library(qtrarobjslib STATIC IMPORTED)
set_property(TARGET qtrarobjslib PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/libqtrarobjs.a)
@@ -122,7 +122,7 @@ set_property(TARGET qtrarlib PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_D
target_link_libraries(sturmreader
poppler-qt5
${Intl_LIBRARIES}
- ${QUAZIP_LIBRARIES}
+ QuaZip::QuaZip
qtrarlib qtrarobjslib
pthread
ZLIB::ZLIB
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment