mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
okular, bump to 25.08.0 (#12760)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -12,7 +12,7 @@ COPYRIGHT="2010-2025 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/okular-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="4f41a2289e62a778c5d6e796e5846897e0161edd273ad9979b2060bb48e61b4f"
|
||||
CHECKSUM_SHA256="8c70c448e8aa8c55c3623024ee1d70930888672a503c40c60af2de702ffe64fc"
|
||||
SOURCE_DIR="okular-$portVersion"
|
||||
PATCHES="okular-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="okular.rdef.in"
|
||||
@@ -20,7 +20,7 @@ ADDITIONAL_FILES="okular.rdef.in"
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion="3.0.0"
|
||||
libVersion="4.0.0"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
@@ -163,7 +163,6 @@ 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
|
||||
@@ -1,107 +0,0 @@
|
||||
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
|
||||
|
||||
|
||||
diff --git a/generators/tiff/generator_tiff.cpp b/generators/tiff/generator_tiff.cpp
|
||||
index 1fce24c..fdea096 100644
|
||||
--- a/generators/tiff/generator_tiff.cpp
|
||||
+++ b/generators/tiff/generator_tiff.cpp
|
||||
@@ -243,7 +243,7 @@ QImage TIFFGenerator::image(Okular::PixmapRequest *request)
|
||||
}
|
||||
|
||||
QImage image(width, height, QImage::Format_RGB32);
|
||||
- uint32_t *data = reinterpret_cast<uint32_t *>(image.bits());
|
||||
+ uint32 *data = reinterpret_cast<uint32 *>(image.bits());
|
||||
|
||||
// read data
|
||||
if (TIFFReadRGBAImageOriented(d->tiff, width, height, data, orientation) != 0) {
|
||||
@@ -373,7 +373,7 @@ Okular::Document::PrintError TIFFGenerator::print(QPrinter &printer)
|
||||
}
|
||||
|
||||
QImage image(width, height, QImage::Format_RGB32);
|
||||
- uint32_t *data = reinterpret_cast<uint32_t *>(image.bits());
|
||||
+ uint32 *data = reinterpret_cast<uint32 *>(image.bits());
|
||||
|
||||
// read data
|
||||
if (TIFFReadRGBAImageOriented(d->tiff, width, height, data, ORIENTATION_TOPLEFT) != 0) {
|
||||
--
|
||||
2.48.1
|
||||
|
||||
|
||||
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 1102a1c..a94b0d7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -123,7 +123,7 @@ find_package(KF6 ${KF_REQUIRED_VERSION} REQUIRED COMPONENTS
|
||||
XmlGui
|
||||
)
|
||||
|
||||
-if (NOT WIN32)
|
||||
+if (NOT WIN32 AND NOT HAIKU)
|
||||
find_package(KF6Wallet ${KF_REQUIRED_VERSION})
|
||||
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 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)
|
||||
|
||||
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(KF6Pty REQUIRED)
|
||||
target_compile_definitions(okular_comicbook PRIVATE -DWITH_KPTY=1)
|
||||
target_link_libraries(okular_comicbook KF6::Pty)
|
||||
--
|
||||
2.48.1
|
||||
|
||||
|
||||
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 3ac0bda..50d7b12 100644
|
||||
--- a/part/part.cpp
|
||||
+++ b/part/part.cpp
|
||||
@@ -844,9 +844,11 @@ void Part::setupActions()
|
||||
{
|
||||
KActionCollection *ac = actionCollection();
|
||||
|
||||
+#ifndef Q_OS_HAIKU
|
||||
auto manager = new KColorSchemeManager(this);
|
||||
KActionMenu *schemeMenu = KColorSchemeMenu::createMenu(manager, this);
|
||||
ac->addAction(QStringLiteral("colorscheme_menu"), schemeMenu->menu()->menuAction());
|
||||
+#endif
|
||||
|
||||
m_copy = KStandardAction::create(KStandardAction::Copy, m_pageView, SLOT(copyTextSelection()), ac);
|
||||
|
||||
diff --git a/shell/main.cpp b/shell/main.cpp
|
||||
index d98af8c..aa15f8b 100644
|
||||
--- a/shell/main.cpp
|
||||
+++ b/shell/main.cpp
|
||||
@@ -37,7 +37,9 @@ int main(int argc, char **argv)
|
||||
* trigger initialisation of proper icon theme
|
||||
*/
|
||||
#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 3, 0)
|
||||
+#ifndef Q_OS_HAIKU
|
||||
KIconTheme::initTheme();
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
/**
|
||||
--
|
||||
2.48.1
|
||||
|
||||
71
kde-apps/okular/patches/okular-25.08.0.patchset
Normal file
71
kde-apps/okular/patches/okular-25.08.0.patchset
Normal file
@@ -0,0 +1,71 @@
|
||||
From 05efbbcd98216cc10ed2dc538c31c12f2c233523 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
|
||||
|
||||
|
||||
diff --git a/generators/tiff/generator_tiff.cpp b/generators/tiff/generator_tiff.cpp
|
||||
index ab7073c..33fcaaa 100644
|
||||
--- a/generators/tiff/generator_tiff.cpp
|
||||
+++ b/generators/tiff/generator_tiff.cpp
|
||||
@@ -240,7 +240,7 @@ QImage TIFFGenerator::image(Okular::PixmapRequest *request)
|
||||
}
|
||||
|
||||
QImage img(width, height, QImage::Format_RGB32);
|
||||
- uint32_t *data = reinterpret_cast<uint32_t *>(img.bits());
|
||||
+ uint32 *data = reinterpret_cast<uint32 *>(img.bits());
|
||||
|
||||
// read data
|
||||
if (TIFFReadRGBAImageOriented(d->tiff, width, height, data, orientation) != 0) {
|
||||
@@ -365,7 +365,7 @@ Okular::Document::PrintError TIFFGenerator::print(QPrinter &printer)
|
||||
}
|
||||
|
||||
QImage printImage(width, height, QImage::Format_RGB32);
|
||||
- uint32_t *data = reinterpret_cast<uint32_t *>(printImage.bits());
|
||||
+ uint32 *data = reinterpret_cast<uint32 *>(printImage.bits());
|
||||
|
||||
// read data
|
||||
if (TIFFReadRGBAImageOriented(d->tiff, width, height, data, ORIENTATION_TOPLEFT) != 0) {
|
||||
--
|
||||
2.50.1
|
||||
|
||||
|
||||
From 76b418b5553792d1c6b654d834fb2849609e2fe8 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 6f5e49f..8741ab6 100644
|
||||
--- a/part/part.cpp
|
||||
+++ b/part/part.cpp
|
||||
@@ -845,9 +845,11 @@ void Part::setupActions()
|
||||
{
|
||||
KActionCollection *ac = actionCollection();
|
||||
|
||||
+#ifndef Q_OS_HAIKU
|
||||
auto manager = new KColorSchemeManager(this);
|
||||
KActionMenu *schemeMenu = KColorSchemeMenu::createMenu(manager, this);
|
||||
ac->addAction(QStringLiteral("colorscheme_menu"), schemeMenu->menu()->menuAction());
|
||||
+#endif
|
||||
|
||||
m_copy = KStandardAction::create(KStandardAction::Copy, m_pageView, SLOT(copyTextSelection()), ac);
|
||||
|
||||
diff --git a/shell/main.cpp b/shell/main.cpp
|
||||
index d98af8c..aa15f8b 100644
|
||||
--- a/shell/main.cpp
|
||||
+++ b/shell/main.cpp
|
||||
@@ -37,7 +37,9 @@ int main(int argc, char **argv)
|
||||
* trigger initialisation of proper icon theme
|
||||
*/
|
||||
#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 3, 0)
|
||||
+#ifndef Q_OS_HAIKU
|
||||
KIconTheme::initTheme();
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
/**
|
||||
--
|
||||
2.50.1
|
||||
|
||||
Reference in New Issue
Block a user