diff options
Diffstat (limited to 'kde-apps/okular/files')
3 files changed, 75 insertions, 30 deletions
diff --git a/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch b/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch deleted file mode 100644 index 610f36663d27..000000000000 --- a/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d25eaebc8004aa69b4eca3cacfef2701e728c8ef Mon Sep 17 00:00:00 2001 -From: Jonathan Esk-Riddell <jr@jriddell.org> -Date: Fri, 21 Oct 2022 11:47:53 +0100 -Subject: [PATCH] remove ecm_version check which breaks on 5.100, we already - depend on ecm 5.68 anyway so it serves no purpose - ---- - CMakeLists.txt | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 98cfd2b17..3817078c2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -611,11 +611,7 @@ install(FILES okular.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}) - install( FILES okular_part.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) - install( FILES part/part.rc part/part-viewermode.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/okular ) - --if (${ECM_VERSION} STRGREATER "5.58.0") -- install(FILES okular.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) --else() -- install(FILES okular.categories DESTINATION ${KDE_INSTALL_CONFDIR}) --endif() -+install(FILES okular.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - - ki18n_install(po) - if(KF5DocTools_FOUND) --- -GitLab - diff --git a/kde-apps/okular/files/okular-23.08.5-implicit-vasprintf.patch b/kde-apps/okular/files/okular-23.08.5-implicit-vasprintf.patch new file mode 100644 index 000000000000..685da3112291 --- /dev/null +++ b/kde-apps/okular/files/okular-23.08.5-implicit-vasprintf.patch @@ -0,0 +1,29 @@ +From a0f57bf7f984289c5b0ceefa2a784f97cd58428a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Germ=C3=A1n=20Poo-Caama=C3=B1o?= <gpoo@gnome.org> +Date: Sat, 30 May 2020 16:15:27 -0400 +Subject: [PATCH] Fix implicit declaration of vasprintf + +Fix build when compiling with `-Werror=implicit-function-declaration`. +--- + core/synctex/synctex_parser.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/core/synctex/synctex_parser.c b/core/synctex/synctex_parser.c +index 9eed566b3..a67006d39 100644 +--- a/core/synctex/synctex_parser.c ++++ b/core/synctex/synctex_parser.c +@@ -55,6 +55,11 @@ + * First level objects are sheets and forms, containing boxes, glues, kerns... + * The third tree allows to browse leaves according to tag and line. + */ ++/* Declare _GNU_SOURCE for accessing vasprintf. For MSC compiler, vasprintf is ++ * defined in this file ++ */ ++#define _GNU_SOURCE ++ + #if defined(SYNCTEX_USE_LOCAL_HEADER) + #include "synctex_parser_local.h" + #else +-- +2.44.0 + diff --git a/kde-apps/okular/files/okular-24.04.80-tests.patch b/kde-apps/okular/files/okular-24.04.80-tests.patch new file mode 100644 index 000000000000..b36ab68432c9 --- /dev/null +++ b/kde-apps/okular/files/okular-24.04.80-tests.patch @@ -0,0 +1,46 @@ +From 3f90abab39233c2fb56b7cb3b95d552c0ca1146d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 19 Dec 2023 10:13:52 +0100 +Subject: [PATCH] Move tests into existing (auto)tests subdirectories + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + generators/comicbook/CMakeLists.txt | 9 +++------ + generators/comicbook/autotests/CMakeLists.txt | 5 +++++ + 2 files changed, 8 insertions(+), 6 deletions(-) + create mode 100644 generators/comicbook/autotests/CMakeLists.txt + +diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt +index 53075836d..c601e9d7b 100644 +--- a/generators/comicbook/CMakeLists.txt ++++ b/generators/comicbook/CMakeLists.txt +@@ -29,12 +29,9 @@ else() + endif() + + ########### autotests ############### +- +-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" ) +-ecm_add_test(autotests/comicbooktest.cpp +- TEST_NAME "comicbooktest" +- LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore okular_comicbook +-) ++if(BUILD_TESTING) ++ add_subdirectory(autotests) ++endif() + + ########### install files ############### + install( PROGRAMS okularApplication_comicbook.desktop org.kde.mobile.okular_comicbook.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) +diff --git a/generators/comicbook/autotests/CMakeLists.txt b/generators/comicbook/autotests/CMakeLists.txt +new file mode 100644 +index 000000000..6426105e4 +--- /dev/null ++++ b/generators/comicbook/autotests/CMakeLists.txt +@@ -0,0 +1,5 @@ ++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" ) ++ecm_add_test(comicbooktest.cpp ++ TEST_NAME "comicbooktest" ++ LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore okular_comicbook ++) +-- +2.44.0 + |