diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2024-01-15 21:38:56 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-01-15 21:38:56 +0100 |
| commit | 65a0068393f38c2c474e3a2ba040601c6bb56d86 (patch) | |
| tree | b8884baf9b113fd32bc5fdb3aab7961907e7cdc1 | |
| parent | Documentation: Regenerate KDE 6th Megarelease RC1 (KF6/Gear/Plasma) (diff) | |
| download | kde-65a00683.tar.gz kde-65a00683.tar.bz2 kde-65a00683.zip | |
kde-apps/okular: Backport fixes by upstream request
See also: https://mail.kde.org/pipermail/distributions/2024-January/001476.html
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
3 files changed, 55 insertions, 0 deletions
diff --git a/kde-apps/okular/files/okular-24.01.90-fix-compile-path.patch b/kde-apps/okular/files/okular-24.01.90-fix-compile-path.patch new file mode 100644 index 0000000000..ef5b7e9c13 --- /dev/null +++ b/kde-apps/okular/files/okular-24.01.90-fix-compile-path.patch @@ -0,0 +1,25 @@ +From 7aac8a4f9aa8f1c296f6f5c3e68d0404e3925913 Mon Sep 17 00:00:00 2001 +From: Sune Vuorela <sune@vuorela.dk> +Date: Fri, 12 Jan 2024 09:43:16 +0100 +Subject: [PATCH] Also fix compile path + +(cherry picked from commit 478f6f24fbde4657b7bd13dbc4a58512cbd6eb2a) +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9cb9851731..0a56d74b5d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -615,6 +615,7 @@ if (KF6Purpose_FOUND) + endif() + + set_target_properties(okularpart PROPERTIES PREFIX "") ++set_target_properties(okularpart PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/kf6/parts) + + if (Qt6TextToSpeech_FOUND) + target_link_libraries(okularpart Qt6::TextToSpeech) +-- +GitLab + diff --git a/kde-apps/okular/files/okular-24.01.90-fix-loading-okularpart.patch b/kde-apps/okular/files/okular-24.01.90-fix-loading-okularpart.patch new file mode 100644 index 0000000000..41c1ad3225 --- /dev/null +++ b/kde-apps/okular/files/okular-24.01.90-fix-loading-okularpart.patch @@ -0,0 +1,28 @@ +From f23a2448b00e1aa83158bfdb66a1f981afe61938 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Fri, 12 Jan 2024 01:02:46 +0100 +Subject: [PATCH] Fix loading okularpart + +Adapt to the new location + +(cherry picked from commit 53fb06d6b4a931b87364a87fcced459b5824b678) +--- + shell/shell.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/shell/shell.cpp b/shell/shell.cpp +index 0a006d5cad..9074a16037 100644 +--- a/shell/shell.cpp ++++ b/shell/shell.cpp +@@ -201,7 +201,7 @@ Shell::Shell(const QString &serializedOptions) + // name which is a bad idea usually.. but it's alright in this + // case since our Part is made for this Shell + +- const auto result = KPluginFactory::loadFactory(KPluginMetaData(QStringLiteral("okularpart"))); ++ const auto result = KPluginFactory::loadFactory(KPluginMetaData(QStringLiteral("kf6/parts/okularpart"))); + + if (!result) { + // if we couldn't find our Part, we exit since the Shell by +-- +GitLab + diff --git a/kde-apps/okular/okular-24.01.90.ebuild b/kde-apps/okular/okular-24.01.90.ebuild index 80a7303bfa..dfc297c282 100644 --- a/kde-apps/okular/okular-24.01.90.ebuild +++ b/kde-apps/okular/okular-24.01.90.ebuild @@ -61,6 +61,8 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}/${PN}-24.01.80-tests.patch" # bug 734138 "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry + "${FILESDIR}/${P}-fix-compile-path.patch" + "${FILESDIR}/${P}-fix-loading-okularpart.patch" ) src_configure() { |