haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-21 19:20:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Okular: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2021-01-15 10:28:12 +10:00
parent bf33755034
commit a4389637be
2 changed files with 12 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
kde-apps/okular/okular-20.08.0.recipe → kde-apps/okular/okular-20.12.1.recipe
View File

@@ -10,10 +10,9 @@ HOMEPAGE="https://okular.kde.org"
COPYRIGHT="2010-2020 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://github.com/KDE/okular/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="0c7f284fb0069b68eae58bc941da5384aea86abd0cc9f637a4a47c1f403a200f"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/okular-$portVersion.tar.xz"
CHECKSUM_SHA256="2ca17ad0b2a1a0f9f70c7ca4bc1f44a9ed758b0ca6a8e5c9935a467f883df53e"
SOURCE_DIR="okular-$portVersion"
PATCHES="okular-$portVersion.patchset"
ADDITIONAL_FILES="okular.rdef.in"
ARCHITECTURES="x86_64"
@@ -57,6 +56,7 @@ REQUIRES="
lib:libKF5KHtml$secondaryArchSuffix
lib:libKF5Notifications$secondaryArchSuffix
lib:libKF5Parts$secondaryArchSuffix
lib:libKF5Pty$secondaryArchSuffix
lib:libKF5Service$secondaryArchSuffix
lib:libKF5Solid$secondaryArchSuffix
lib:libKF5SonnetUi$secondaryArchSuffix
@@ -71,7 +71,7 @@ REQUIRES="
lib:libmarkdown$secondaryArchSuffix
lib:libphonon4qt5$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libpoppler_qt5$secondaryArchSuffix >= 1.19
lib:libpoppler_qt5$secondaryArchSuffix >= 1.26
lib:libqca_qt5$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5DBus$secondaryArchSuffix
@@ -87,7 +87,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= 5.65
extra_cmake_modules$secondaryArchSuffix >= 5.77
devel:libchm$secondaryArchSuffix
devel:libdjvulibre$secondaryArchSuffix
devel:libepub$secondaryArchSuffix
@@ -118,6 +118,7 @@ BUILD_REQUIRES="
devel:libKF5KHtml$secondaryArchSuffix
devel:libKF5Notifications$secondaryArchSuffix
devel:libKF5Parts$secondaryArchSuffix
devel:libKF5Pty$secondaryArchSuffix
devel:libKF5Service$secondaryArchSuffix
devel:libKF5Solid$secondaryArchSuffix
devel:libKF5SonnetUi$secondaryArchSuffix
@@ -132,8 +133,8 @@ BUILD_REQUIRES="
devel:libmarkdown$secondaryArchSuffix
devel:libphonon4qt5$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libpoppler$secondaryArchSuffix >= 87
devel:libpoppler_qt5$secondaryArchSuffix >= 1.19
devel:libpoppler$secondaryArchSuffix >= 104
devel:libpoppler_qt5$secondaryArchSuffix >= 1.26
devel:libqca$secondaryArchSuffix >= 2
devel:libQt5Core$secondaryArchSuffix >= 5.14
devel:libtiff$secondaryArchSuffix
@@ -160,6 +161,10 @@ BUILD_PREREQUIRES="
BUILD()
{
# disable docs generation
sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
mkdir -p build
cd build

35
kde-apps/okular/patches/okular-20.08.0.patchset
View File

@@ -1,35 +0,0 @@
From 205ecbbb8e559613f851591bef1d8f2b5c2c0ffd Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 19 Apr 2020 16:34:03 +1000
Subject: Fix build for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36ac273..33954d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,7 +178,7 @@ if(BUILD_TESTING)
endif()
if(KF5DocTools_FOUND)
- add_subdirectory(doc)
+# add_subdirectory(doc)
endif()
include(OkularConfigureChecks.cmake)
diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt
index 9a07c71..3f4862c 100644
--- a/generators/comicbook/CMakeLists.txt
+++ b/generators/comicbook/CMakeLists.txt
@@ -19,7 +19,7 @@ target_link_libraries(okular_comicbook okularcore KF5::KIOCore KF5::I18n KF5::Ar
okular_add_generator(okularGenerator_comicbook generator_comicbook.cpp)
target_link_libraries(okularGenerator_comicbook okular_comicbook)
-if (UNIX AND NOT ANDROID)
+if (UNIX AND NOT ANDROID AND NOT HAIKU)
find_package(KF5Pty REQUIRED)
target_compile_definitions(okular_comicbook PRIVATE -DWITH_KPTY=1)
target_link_libraries(okular_comicbook KF5::Pty)
--
2.26.0