From c1835151d45b3280ff9d22942ac39155ae166220 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 11 May 2022 19:35:07 +1000 Subject: [PATCH] okular: fix build for x86 arch --- kde-apps/okular/okular-22.04.0.recipe | 3 +- .../okular/patches/okular-22.04.0.patchset | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 kde-apps/okular/patches/okular-22.04.0.patchset diff --git a/kde-apps/okular/okular-22.04.0.recipe b/kde-apps/okular/okular-22.04.0.recipe index 9359fe8a5..2b1f89368 100644 --- a/kde-apps/okular/okular-22.04.0.recipe +++ b/kde-apps/okular/okular-22.04.0.recipe @@ -9,10 +9,11 @@ Features: HOMEPAGE="https://okular.kde.org" COPYRIGHT="2010-2022 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/okular-$portVersion.tar.xz" CHECKSUM_SHA256="47eebac10c3415b245907e572efe810348f6b51b8df89fe96254827aa8b2e3bf" SOURCE_DIR="okular-$portVersion" +PATCHES="okular-$portVersion.patchset" ADDITIONAL_FILES="okular.rdef.in" ARCHITECTURES="all !x86_gcc2" diff --git a/kde-apps/okular/patches/okular-22.04.0.patchset b/kde-apps/okular/patches/okular-22.04.0.patchset new file mode 100644 index 000000000..81ca63d4d --- /dev/null +++ b/kde-apps/okular/patches/okular-22.04.0.patchset @@ -0,0 +1,31 @@ +From 23a891995568559f60e018038b43ae65daa882b1 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 76ecb1d..f5ee8ee 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(image.bits()); ++ uint32 *data = reinterpret_cast(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(image.bits()); ++ uint32 *data = reinterpret_cast(image.bits()); + + // read data + if (TIFFReadRGBAImageOriented(d->tiff, width, height, data, ORIENTATION_TOPLEFT) != 0) { +-- +2.30.2 +