From bb0b111570413eb7357bf1cc03571e6d86e20d07 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 19 Apr 2020 16:45:23 +1000
Subject: [PATCH] Okular: bump version

---
 ...-19.12.0.recipe => okular-20.03.90.recipe} |  6 ++--
 .../okular/patches/okular-19.12.0.patchset    | 35 -------------------
 .../okular/patches/okular-20.03.90.patchset   | 35 +++++++++++++++++++
 3 files changed, 38 insertions(+), 38 deletions(-)
 rename kde-apps/okular/{okular-19.12.0.recipe => okular-20.03.90.recipe} (98%)
 delete mode 100644 kde-apps/okular/patches/okular-19.12.0.patchset
 create mode 100644 kde-apps/okular/patches/okular-20.03.90.patchset

diff --git a/kde-apps/okular/okular-19.12.0.recipe b/kde-apps/okular/okular-20.03.90.recipe
similarity index 98%
rename from kde-apps/okular/okular-19.12.0.recipe
rename to kde-apps/okular/okular-20.03.90.recipe
index 2ebe001f0..287fa6594 100644
--- a/kde-apps/okular/okular-19.12.0.recipe
+++ b/kde-apps/okular/okular-20.03.90.recipe
@@ -7,11 +7,11 @@ Features:
 * Sidebar with contents, thumbnails, reviews and bookmarks
 * Annotations support"
 HOMEPAGE="https://okular.kde.org"
-COPYRIGHT="2010-2019 KDE Organisation"
+COPYRIGHT="2010-2020 KDE Organisation"
 LICENSE="GNU LGPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/KDE/okular/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="1221ab6ed7218eb6d210ff8e59f2c39613059cd2bc27adfb109b36064124f397"
+CHECKSUM_SHA256="95a8e9b7aed663491e8883f3bb889b3141a02f5a6d53aff2a257116106b59a8f"
 SOURCE_DIR="okular-$portVersion"
 PATCHES="okular-$portVersion.patchset"
 ADDITIONAL_FILES="okular.rdef.in"
diff --git a/kde-apps/okular/patches/okular-19.12.0.patchset b/kde-apps/okular/patches/okular-19.12.0.patchset
deleted file mode 100644
index c5b666532..000000000
--- a/kde-apps/okular/patches/okular-19.12.0.patchset
+++ /dev/null
@@ -1,35 +0,0 @@
-From dc4887f975680991143765c28dc4e82271b790c4 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Wed, 23 Oct 2019 20:29:43 +1000
-Subject: Fix build for Haiku
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2998313..8bb8d3e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -150,7 +150,7 @@ if(BUILD_TESTING)
- endif()
- 
- if(KF5DocTools_FOUND)
--    add_subdirectory(doc)
-+#    add_subdirectory(doc)
- endif()
- 
- include(OkularConfigureChecks.cmake)
-diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt
-index ca8d09d..454b512 100644
---- a/generators/comicbook/CMakeLists.txt
-+++ b/generators/comicbook/CMakeLists.txt
-@@ -19,7 +19,7 @@ set( okularGenerator_comicbook_PART_SRCS
- 
- okular_add_generator(okularGenerator_comicbook ${okularGenerator_comicbook_PART_SRCS})
- target_link_libraries(okularGenerator_comicbook okularcore KF5::KIOCore KF5::I18n KF5::Archive)
--if (UNIX AND NOT ANDROID)
-+if (UNIX AND NOT ANDROID AND NOT HAIKU)
-    find_package(KF5Pty REQUIRED)
-    target_compile_definitions(okularGenerator_comicbook PRIVATE -DWITH_KPTY=1)
-    target_link_libraries(okularGenerator_comicbook KF5::Pty)
--- 
-2.23.0
-
diff --git a/kde-apps/okular/patches/okular-20.03.90.patchset b/kde-apps/okular/patches/okular-20.03.90.patchset
new file mode 100644
index 000000000..d16885187
--- /dev/null
+++ b/kde-apps/okular/patches/okular-20.03.90.patchset
@@ -0,0 +1,35 @@
+From 205ecbbb8e559613f851591bef1d8f2b5c2c0ffd Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sun, 19 Apr 2020 16:34:03 +1000
+Subject: Fix build for Haiku
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 36ac273..33954d9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -178,7 +178,7 @@ if(BUILD_TESTING)
+ endif()
+ 
+ if(KF5DocTools_FOUND)
+-    add_subdirectory(doc)
++#    add_subdirectory(doc)
+ endif()
+ 
+ include(OkularConfigureChecks.cmake)
+diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt
+index 9a07c71..3f4862c 100644
+--- a/generators/comicbook/CMakeLists.txt
++++ b/generators/comicbook/CMakeLists.txt
+@@ -19,7 +19,7 @@ target_link_libraries(okular_comicbook okularcore KF5::KIOCore KF5::I18n KF5::Ar
+ 
+ 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(KF5Pty REQUIRED)
+    target_compile_definitions(okular_comicbook PRIVATE -DWITH_KPTY=1)
+    target_link_libraries(okular_comicbook KF5::Pty)
+-- 
+2.26.0
+