Page MenuHome GnuPG
Files F36623962

No OneTemporary
Actions

View Options

diff --git a/patches-appimage/okular/0001-Make-KF6Pty-dependency-optional.patch b/patches-appimage/okular/0001-Make-KF6Pty-dependency-optional.patch
deleted file mode 100755
index d35807d2..00000000
--- a/patches-appimage/okular/0001-Make-KF6Pty-dependency-optional.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From f4bccca1e371e8c850dd34c8376ab67d30515174 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@gnupg.org>
-Date: Wed, 17 Jul 2024 18:44:34 +0200
-Subject: [PATCH] Make KF6Pty dependency optional
-
-This dependency is only needed for the Comic Book generator. Effectively,
-this change makes the Comic Book generator optional on Unix (!= Android).
----
- CMakeLists.txt | 11 +++++++++--
- generators/CMakeLists.txt | 4 +++-
- generators/comicbook/CMakeLists.txt | 1 -
- 3 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ba05e4c35..1d4a4fa8c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -199,8 +199,8 @@ endif()
-
- if(NOT WIN32 AND NOT ANDROID AND NOT APPLE)
- find_package(Qt6Gui REQUIRED COMPONENTS Private)
-- find_package(PlasmaActivities REQUIRED)
-- set_package_properties("PlasmaActivities" PROPERTIES
-+ find_package(PlasmaActivities CONFIG)
-+ set_okular_optional_package_properties("PlasmaActivities" PROPERTIES
- DESCRIPTION "Activities interface library"
- URL "https://invent.kde.org/plasma/plasma-activities"
- PURPOSE "Required for Activities integration."
-@@ -290,6 +290,13 @@ set_okular_optional_package_properties(Discount PROPERTIES
- URL "https://www.pell.portland.or.us/~orc/Code/discount/"
- PURPOSE "Support for Markdown documents in Okular.")
-
-+if (UNIX AND NOT ANDROID)
-+ find_package(KF6Pty CONFIG)
-+ set_okular_optional_package_properties(KF6Pty PROPERTIES
-+ DESCRIPTION "A library for interfacing with pseudo terminal devices"
-+ PURPOSE "Support for Comic Book files in Okular.")
-+endif()
-+
- add_definitions(-DTRANSLATION_DOMAIN="okular")
- add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060600)
- add_definitions(-DKF_DEPRECATED_WARNINGS_SINCE=0x05F000)
-diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
-index e4b815275..331b086e7 100644
---- a/generators/CMakeLists.txt
-+++ b/generators/CMakeLists.txt
-@@ -35,7 +35,9 @@ add_subdirectory(xps)
-
- add_subdirectory(fictionbook)
-
--add_subdirectory(comicbook)
-+if (KF6Pty_FOUND OR ANDROID OR NOT UNIX)
-+ add_subdirectory(comicbook)
-+endif()
-
- add_subdirectory(fax)
-
-diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt
-index 53075836d..b9bc8948f 100644
---- a/generators/comicbook/CMakeLists.txt
-+++ b/generators/comicbook/CMakeLists.txt
-@@ -17,7 +17,6 @@ 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)
-- find_package(KF6Pty REQUIRED)
- target_compile_definitions(okular_comicbook PRIVATE -DWITH_KPTY=1)
- target_link_libraries(okular_comicbook KF6::Pty)
- endif ()
---
-2.45.2
diff --git a/patches-appimage/okular/lower-cmake-requirement.patch b/patches-appimage/okular/lower-cmake-requirement.patch
deleted file mode 100755
index 85f538ab..00000000
--- a/patches-appimage/okular/lower-cmake-requirement.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b66bd756f..b5a9c6072 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.22)
-+cmake_minimum_required(VERSION 3.17)
-
- # KDE Application Version, managed by release script
- set (RELEASE_SERVICE_VERSION_MAJOR "23")

File Metadata

Mime Type
text/x-diff
Expires
Thu, Feb 26, 7:04 PM (21 h, 59 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
82/3a/7ac64ee2c6331a94ef94801c882c

Event Timeline