From efd17dff054455523288e8b358466d4bd4c0bff0 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 5 Mar 2024 22:14:12 +1000 Subject: [PATCH] okular: bump version --- ...r-22.04.0.recipe => okular-23.08.5.recipe} | 49 ++++++++++--------- ....04.0.patchset => okular-23.08.5.patchset} | 45 ++++++++++++++++- 2 files changed, 69 insertions(+), 25 deletions(-) rename kde-apps/okular/{okular-22.04.0.recipe => okular-23.08.5.recipe} (86%) rename kde-apps/okular/patches/{okular-22.04.0.patchset => okular-23.08.5.patchset} (51%) diff --git a/kde-apps/okular/okular-22.04.0.recipe b/kde-apps/okular/okular-23.08.5.recipe similarity index 86% rename from kde-apps/okular/okular-22.04.0.recipe rename to kde-apps/okular/okular-23.08.5.recipe index 2b1f89368..4e70fdc38 100644 --- a/kde-apps/okular/okular-22.04.0.recipe +++ b/kde-apps/okular/okular-23.08.5.recipe @@ -7,12 +7,11 @@ Features: * Sidebar with contents, thumbnails, reviews and bookmarks * Annotations support" HOMEPAGE="https://okular.kde.org" -COPYRIGHT="2010-2022 KDE Organisation" +COPYRIGHT="2010-2024 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="47eebac10c3415b245907e572efe810348f6b51b8df89fe96254827aa8b2e3bf" -SOURCE_DIR="okular-$portVersion" +CHECKSUM_SHA256="d5d51f69b176a250907ee70e8f97143fc9d705cee3ef7ff448626c8a529ce364" PATCHES="okular-$portVersion.patchset" ADDITIONAL_FILES="okular.rdef.in" @@ -22,7 +21,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" okular$secondaryArchSuffix = $portVersion app:Okular$secondaryArchSuffix = $portVersion - lib:libOkular5Core$secondaryArchSuffix = 10.0.0 compat >= 10 + lib:libOkular5Core$secondaryArchSuffix = 11.0.0 compat >= 11 " REQUIRES=" haiku$secondaryArchSuffix @@ -42,7 +41,7 @@ REQUIRES=" lib:libKF5CoreAddons$secondaryArchSuffix lib:libKF5Crash$secondaryArchSuffix lib:libKF5DBusAddons$secondaryArchSuffix - lib:libKF5DocTools$secondaryArchSuffix + lib:libKF5DocTools$secondaryArchSuffix lib:libKF5GuiAddons$secondaryArchSuffix lib:libKF5I18n$secondaryArchSuffix lib:libKF5IconThemes$secondaryArchSuffix @@ -51,6 +50,7 @@ REQUIRES=" lib:libKF5JobWidgets$secondaryArchSuffix lib:libKF5JS$secondaryArchSuffix lib:libKF5JSApi$secondaryArchSuffix + lib:libKF5KExiv2$secondaryArchSuffix lib:libKF5KIOCore$secondaryArchSuffix lib:libKF5KIOFileWidgets$secondaryArchSuffix lib:libKF5KIOWidgets$secondaryArchSuffix @@ -58,6 +58,7 @@ REQUIRES=" lib:libKF5Notifications$secondaryArchSuffix lib:libKF5Parts$secondaryArchSuffix lib:libKF5Pty$secondaryArchSuffix + lib:libKF5Purpose$secondaryArchSuffix lib:libKF5Service$secondaryArchSuffix lib:libKF5Solid$secondaryArchSuffix lib:libKF5SonnetUi$secondaryArchSuffix @@ -74,6 +75,7 @@ REQUIRES=" lib:libpng16$secondaryArchSuffix lib:libpoppler_qt5$secondaryArchSuffix lib:libqca_qt5$secondaryArchSuffix + lib:libqmobipocket$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5DBus$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix @@ -81,6 +83,7 @@ REQUIRES=" lib:libQt5PrintSupport$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix lib:libQt5Xml$secondaryArchSuffix + lib:libspectre$secondaryArchSuffix lib:libtiff$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libzip$secondaryArchSuffix @@ -88,7 +91,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.93 + extra_cmake_modules$secondaryArchSuffix devel:libchm$secondaryArchSuffix devel:libdjvulibre$secondaryArchSuffix devel:libepub$secondaryArchSuffix @@ -113,6 +116,7 @@ BUILD_REQUIRES=" devel:libKF5ItemViews$secondaryArchSuffix devel:libKF5JobWidgets$secondaryArchSuffix devel:libKF5JS$secondaryArchSuffix + devel:libKF5KExiv2$secondaryArchSuffix devel:libKF5KIOCore$secondaryArchSuffix devel:libKF5KIOFileWidgets$secondaryArchSuffix devel:libKF5KIOWidgets$secondaryArchSuffix @@ -120,6 +124,7 @@ BUILD_REQUIRES=" devel:libKF5Notifications$secondaryArchSuffix devel:libKF5Parts$secondaryArchSuffix devel:libKF5Pty$secondaryArchSuffix + devel:libKF5Purpose$secondaryArchSuffix devel:libKF5Service$secondaryArchSuffix devel:libKF5Solid$secondaryArchSuffix devel:libKF5SonnetUi$secondaryArchSuffix @@ -134,10 +139,12 @@ BUILD_REQUIRES=" devel:libmarkdown$secondaryArchSuffix devel:libphonon4qt5$secondaryArchSuffix devel:libpng16$secondaryArchSuffix - devel:libpoppler$secondaryArchSuffix >= 117 - devel:libpoppler_qt5$secondaryArchSuffix >= 1.30 - devel:libqca$secondaryArchSuffix >= 2 + devel:libpoppler$secondaryArchSuffix >= 131 + devel:libpoppler_qt5$secondaryArchSuffix >= 1.33 + devel:libqca_qt5$secondaryArchSuffix >= 2 + devel:libqmobipocket$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix + devel:libspectre$secondaryArchSuffix devel:libtiff$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:libzip$secondaryArchSuffix @@ -145,7 +152,7 @@ BUILD_REQUIRES=" PROVIDES_devel=" okular${secondaryArchSuffix}_devel = $portVersion - devel:libOkular5Core$secondaryArchSuffix = 10.0.0 compat >= 10 + devel:libOkular5Core$secondaryArchSuffix = 11.0.0 compat >= 11 " REQUIRES_devel=" okular$secondaryArchSuffix == $portVersion base @@ -157,20 +164,17 @@ BUILD_PREREQUIRES=" cmd:lrelease$secondaryArchSuffix >= 5 cmd:make cmd:pkg_config$secondaryArchSuffix - cmd:python2 + cmd:python3 " BUILD() { - # disable docs generation - sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt - sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt + export LDFLAGS="-lbsd" - mkdir -p build - cd build - - cmake .. \ + cmake -Bbuild -S. \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS="-D_BSD_SOURCE -D_GNU_SOURCE" \ + -DCMAKE_CXX_FLAGS="-D_BSD_SOURCE -D_GNU_SOURCE" \ -DCMAKE_INSTALL_PREFIX=$appsDir \ -DCMAKE_INSTALL_INCLUDEDIR=$includeDir \ -DCMAKE_INSTALL_DATAROOTDIR=$dataDir \ @@ -178,16 +182,15 @@ BUILD() -DCMAKE_INSTALL_BINDIR=$appsDir \ -DSHARE_INSTALL_PREFIX=$dataDir \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake - make $jobArgs + make -C build $jobArgs } INSTALL() { mkdir -p $dataDir/Qt5 - cd build - make install + make -C build install mv $appsDir/okular $appsDir/Okular rm -rf \ diff --git a/kde-apps/okular/patches/okular-22.04.0.patchset b/kde-apps/okular/patches/okular-23.08.5.patchset similarity index 51% rename from kde-apps/okular/patches/okular-22.04.0.patchset rename to kde-apps/okular/patches/okular-23.08.5.patchset index 81ca63d4d..a9389a1a9 100644 --- a/kde-apps/okular/patches/okular-22.04.0.patchset +++ b/kde-apps/okular/patches/okular-23.08.5.patchset @@ -1,4 +1,4 @@ -From 23a891995568559f60e018038b43ae65daa882b1 Mon Sep 17 00:00:00 2001 +From 634ad79eb75eb43e1933e6573c511a243dc36e12 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 @@ -27,5 +27,46 @@ index 76ecb1d..f5ee8ee 100644 // read data if (TIFFReadRGBAImageOriented(d->tiff, width, height, data, ORIENTATION_TOPLEFT) != 0) { -- -2.30.2 +2.43.2 + + +From f1f62618be47ddacf59ce03744b62a9831974ef9 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 5 Mar 2024 22:06:55 +1000 +Subject: Disable X11 and docs + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c47d6ab..f51931a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,7 +184,7 @@ if (BUILD_MOBILE) + ) + endif() + +-if(NOT WIN32 AND NOT ANDROID AND NOT APPLE) ++if(NOT WIN32 AND NOT ANDROID AND NOT APPLE AND NOT HAIKU) + find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS + Activities + ) +@@ -316,7 +316,7 @@ if(BUILD_TESTING) + endif() + + if(KF5DocTools_FOUND) +- add_subdirectory(doc) ++# add_subdirectory(doc) + endif() + + include(OkularConfigureChecks.cmake) +@@ -627,7 +627,7 @@ install(FILES okular.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR + + ki18n_install(po) + if(KF5DocTools_FOUND) +- kdoctools_install(po) ++# kdoctools_install(po) + endif() + + ########### cmake files ################# +-- +2.43.2