okular, bump to 25.04.0 (#12306)

This commit is contained in:
Schrijvers Luc
2025-05-02 15:49:24 +00:00
committed by GitHub
parent d0b8c0fcd0
commit dd98226bb4
2 changed files with 16 additions and 12 deletions

View File

@@ -10,9 +10,9 @@ Plucker, EPub, Fax
HOMEPAGE="https://okular.kde.org"
COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/okular-$portVersion.tar.xz"
CHECKSUM_SHA256="8d0894dc006b715dec2d8d57c228b8a9d5d9488e3144dd1af93b3b8363e466a0"
CHECKSUM_SHA256="4f41a2289e62a778c5d6e796e5846897e0161edd273ad9979b2060bb48e61b4f"
SOURCE_DIR="okular-$portVersion"
PATCHES="okular-$portVersion.patchset"
ADDITIONAL_FILES="okular.rdef.in"
@@ -94,10 +94,12 @@ BUILD_REQUIRES="
devel:libepub$secondaryArchSuffix
devel:libKExiv2Qt6$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libmarkdown$secondaryArchSuffix
devel:libphonon4Qt6$secondaryArchSuffix
devel:libpoppler$secondaryArchSuffix >= 146
devel:libpoppler_Qt6$secondaryArchSuffix >= 3.4.0
devel:libpng16$secondaryArchSuffix
devel:libpoppler$secondaryArchSuffix >= 148
devel:libpoppler_Qt6$secondaryArchSuffix >= 3.10.0
devel:libQMobipocket6$secondaryArchSuffix
devel:libspectre$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
@@ -124,6 +126,7 @@ BUILD_REQUIRES="
devel:libKF6XmlGui$secondaryArchSuffix
# Qt6
devel:libQt6Core$secondaryArchSuffix
devel:libQt6Multimedia$secondaryArchSuffix
devel:libQt6Svg$secondaryArchSuffix
devel:libQt6TextToSpeech$secondaryArchSuffix
"
@@ -160,6 +163,7 @@ BUILD()
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DBUILD_TESTING=OFF \
-DHAVE_MULTIMEDIA=ON \
-Wno-dev
make -C build $jobArgs

View File

@@ -1,4 +1,4 @@
From fb0aa36bbc5a835e122ab6bd919f1432445d133f Mon Sep 17 00:00:00 2001
From 0975fc074c1d3af6e4857b57c85f077bda540c3b Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 11 May 2022 19:29:57 +1000
Subject: Fix build for x86
@@ -30,17 +30,17 @@ index 1fce24c..fdea096 100644
2.48.1
From ff5364303c70db416efda917f04a277f42fee8b2 Mon Sep 17 00:00:00 2001
From 3566fc0f1275b08fef51f7f500e981a911a717c0 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Mon, 24 Feb 2025 09:39:11 +0100
Subject: Disable KF6Wallet, KF6Pty on Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8dd450..94d4a6d 100644
index 1102a1c..a94b0d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,7 @@ find_package(KF6 ${KF_REQUIRED_VERSION} REQUIRED COMPONENTS
@@ -123,7 +123,7 @@ find_package(KF6 ${KF_REQUIRED_VERSION} REQUIRED COMPONENTS
XmlGui
)
@@ -50,7 +50,7 @@ index b8dd450..94d4a6d 100644
set_okular_optional_package_properties(KF6Wallet PROPERTIES
PURPOSE "Required for document storing passwords in secure wallets.")
diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt
index fcc23b9..af78e8a 100644
index cbb7938..89c3a58 100644
--- a/generators/comicbook/CMakeLists.txt
+++ b/generators/comicbook/CMakeLists.txt
@@ -16,7 +16,7 @@ set_target_properties(okular_comicbook PROPERTIES POSITION_INDEPENDENT_CODE ON)
@@ -66,17 +66,17 @@ index fcc23b9..af78e8a 100644
2.48.1
From baf2211fef682f01f984697fdbf32f6e40b58872 Mon Sep 17 00:00:00 2001
From 9e102cb28dea774dbc16ac672c5f9820deb0a127 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Tue, 25 Mar 2025 09:18:34 +0100
Subject: Use system colors/icons
diff --git a/part/part.cpp b/part/part.cpp
index b946b8f..eb63a21 100644
index 3ac0bda..50d7b12 100644
--- a/part/part.cpp
+++ b/part/part.cpp
@@ -838,9 +838,11 @@ void Part::setupActions()
@@ -844,9 +844,11 @@ void Part::setupActions()
{
KActionCollection *ac = actionCollection();