commit: 4cf48ace2bbdb14b25ae96a1a7587225778aeba8 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Mar 15 11:54:16 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Mar 15 12:18:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cf48ace
app-editors/kile: Switch okularpart headers to okular5 Closes: https://bugs.gentoo.org/926748 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/kile-2.9.93_p20221123-okularpart.patch | 70 ++++++++++++++++++++++ app-editors/kile/kile-2.9.93_p20221123-r1.ebuild | 8 +++ 2 files changed, 78 insertions(+) diff --git a/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch b/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch new file mode 100644 index 000000000000..7a66dfcc4f80 --- /dev/null +++ b/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch @@ -0,0 +1,70 @@ +From 6cf4549217e95659c8dfd14f9166fb8b80bad333 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <ast...@gentoo.org> +Date: Fri, 15 Mar 2024 12:45:51 +0100 +Subject: [PATCH] Switch okular headers to okular5 + +Otherwise it will be using okular6's. + +Signed-off-by: Andreas Sturmlechner <ast...@gentoo.org> +--- + src/configtester.cpp | 2 +- + src/kileviewmanager.cpp | 2 +- + src/kileviewmanager.h | 2 +- + src/livepreview.cpp | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/configtester.cpp b/src/configtester.cpp +index 35ce3e71..cd7ed588 100644 +--- a/src/configtester.cpp ++++ b/src/configtester.cpp +@@ -14,7 +14,7 @@ + + #include "configtester.h" + +-#include <okular/interfaces/viewerinterface.h> ++#include <okular5/interfaces/viewerinterface.h> + + #include <QTimer> + +diff --git a/src/kileviewmanager.cpp b/src/kileviewmanager.cpp +index 34f84397..f5ac0cdc 100644 +--- a/src/kileviewmanager.cpp ++++ b/src/kileviewmanager.cpp +@@ -15,7 +15,7 @@ + #include "kileviewmanager.h" + #include <config.h> + +-#include <okular/interfaces/viewerinterface.h> ++#include <okular5/interfaces/viewerinterface.h> + + #include <KAcceleratorManager> + #include <KActionCollection> +diff --git a/src/kileviewmanager.h b/src/kileviewmanager.h +index 42367291..e0b3ca09 100644 +--- a/src/kileviewmanager.h ++++ b/src/kileviewmanager.h +@@ -15,7 +15,7 @@ + #ifndef KILEVIEWKILEVIEWMANAGER_H + #define KILEVIEWKILEVIEWMANAGER_H + +-#include <okular/interfaces/viewerinterface.h> ++#include <okular5/interfaces/viewerinterface.h> + + #include <KTextEditor/Cursor> + #include <KTextEditor/ModificationInterface> +diff --git a/src/livepreview.cpp b/src/livepreview.cpp +index dbd7ff13..fcfa2a6d 100644 +--- a/src/livepreview.cpp ++++ b/src/livepreview.cpp +@@ -40,7 +40,7 @@ + #include <KParts/MainWindow> + #include <KXMLGUIFactory> + +-#include <okular/interfaces/viewerinterface.h> ++#include <okular5/interfaces/viewerinterface.h> + + #include "errorhandler.h" + #include "kiledebug.h" +-- +2.44.0 + diff --git a/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild b/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild index 4da14337a591..3c11cf77aae7 100644 --- a/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild +++ b/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild @@ -63,6 +63,14 @@ DOCS=( kile-remote-control.txt ) PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) +src_prepare() { + if has_version "media-gfx/okularpart:5"; then + eapply "${FILESDIR}/${P}-okularpart.patch" + fi + + ecm_src_prepare +} + src_configure() { local mycmakeargs=( $(cmake_use_find_package pdf Poppler)
