| 1 |
commit: 3c88a4b530299899491dbb80ed00a09b8458f077 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 24 17:29:31 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 24 17:42:37 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c88a4b5 |
| 7 |
|
| 8 |
kde-apps/kate: Patch upstreamed; update after review |
| 9 |
|
| 10 |
Upstream commit: 93d8c2a1887ab70455f471d8e05f346921497a36 |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
.../kate/files/kate-21.04.0-implicit-dep.patch | 25 +++++++++++----------- |
| 16 |
kde-apps/kate/kate-21.04.0-r1.ebuild | 2 +- |
| 17 |
2 files changed, 13 insertions(+), 14 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch |
| 20 |
index 055a6bc9bec..482d9a872cd 100644 |
| 21 |
--- a/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch |
| 22 |
+++ b/kde-apps/kate/files/kate-21.04.0-implicit-dep.patch |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-From 07e6813244435c93a944cca17dc3c4364a579606 Mon Sep 17 00:00:00 2001 |
| 25 |
+From 93d8c2a1887ab70455f471d8e05f346921497a36 Mon Sep 17 00:00:00 2001 |
| 26 |
From: Andreas Sturmlechner <asturm@g.o> |
| 27 |
Date: Sat, 24 Apr 2021 18:08:33 +0200 |
| 28 |
Subject: [PATCH] addons: Add missing Qt5Concurrent to project and search |
| 29 |
@@ -9,12 +9,12 @@ See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426 |
| 30 |
|
| 31 |
Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
| 32 |
--- |
| 33 |
- addons/project/CMakeLists.txt | 5 ++++- |
| 34 |
- addons/search/CMakeLists.txt | 7 +++++-- |
| 35 |
- 2 files changed, 9 insertions(+), 3 deletions(-) |
| 36 |
+ addons/project/CMakeLists.txt | 4 +++- |
| 37 |
+ addons/search/CMakeLists.txt | 6 ++++-- |
| 38 |
+ 2 files changed, 7 insertions(+), 3 deletions(-) |
| 39 |
|
| 40 |
diff --git a/addons/project/CMakeLists.txt b/addons/project/CMakeLists.txt |
| 41 |
-index 16487f6cc..6fbf5a819 100644 |
| 42 |
+index 16487f6cc..b1f66ada3 100644 |
| 43 |
--- a/addons/project/CMakeLists.txt |
| 44 |
+++ b/addons/project/CMakeLists.txt |
| 45 |
@@ -1,3 +1,4 @@ |
| 46 |
@@ -31,17 +31,16 @@ index 16487f6cc..6fbf5a819 100644 |
| 47 |
return() |
| 48 |
endif() |
| 49 |
|
| 50 |
-@@ -18,6 +19,8 @@ target_compile_definitions(kateprojectplugin PRIVATE TRANSLATION_DOMAIN="katepro |
| 51 |
- |
| 52 |
+@@ -19,6 +20,7 @@ target_compile_definitions(kateprojectplugin PRIVATE TRANSLATION_DOMAIN="katepro |
| 53 |
target_link_libraries( |
| 54 |
kateprojectplugin |
| 55 |
-+ PUBLIC |
| 56 |
-+ Qt5::Concurrent |
| 57 |
PRIVATE |
| 58 |
++ Qt5::Concurrent |
| 59 |
KF5::GuiAddons |
| 60 |
KF5::NewStuff |
| 61 |
+ KF5::TextEditor |
| 62 |
diff --git a/addons/search/CMakeLists.txt b/addons/search/CMakeLists.txt |
| 63 |
-index 9bbe2c1c9..8dc18699b 100644 |
| 64 |
+index 9bbe2c1c9..a541f78b8 100644 |
| 65 |
--- a/addons/search/CMakeLists.txt |
| 66 |
+++ b/addons/search/CMakeLists.txt |
| 67 |
@@ -1,7 +1,8 @@ |
| 68 |
@@ -54,17 +53,17 @@ index 9bbe2c1c9..8dc18699b 100644 |
| 69 |
return() |
| 70 |
endif() |
| 71 |
|
| 72 |
-@@ -9,7 +10,9 @@ add_library(katesearchplugin MODULE "") |
| 73 |
+@@ -9,8 +10,9 @@ add_library(katesearchplugin MODULE "") |
| 74 |
target_compile_definitions(katesearchplugin PRIVATE TRANSLATION_DOMAIN="katesearch") |
| 75 |
|
| 76 |
target_link_libraries( |
| 77 |
- katesearchplugin |
| 78 |
+ katesearchplugin |
| 79 |
-+ PUBLIC |
| 80 |
-+ Qt5::Concurrent |
| 81 |
PRIVATE |
| 82 |
++ Qt5::Concurrent |
| 83 |
KF5::ItemViews |
| 84 |
KF5::TextEditor |
| 85 |
+ ) |
| 86 |
-- |
| 87 |
2.31.1 |
| 88 |
|
| 89 |
|
| 90 |
diff --git a/kde-apps/kate/kate-21.04.0-r1.ebuild b/kde-apps/kate/kate-21.04.0-r1.ebuild |
| 91 |
index 595730cc0ff..c453398ad30 100644 |
| 92 |
--- a/kde-apps/kate/kate-21.04.0-r1.ebuild |
| 93 |
+++ b/kde-apps/kate/kate-21.04.0-r1.ebuild |
| 94 |
@@ -62,7 +62,7 @@ DEPEND=" |
| 95 |
" |
| 96 |
RDEPEND="${DEPEND}" |
| 97 |
|
| 98 |
-PATCHES=( "${FILESDIR}/${P}-implicit-dep.patch" ) # bug 785412 |
| 99 |
+PATCHES=( "${FILESDIR}/${P}-implicit-dep.patch" ) # bug 785412, master/21.08 |
| 100 |
|
| 101 |
src_prepare() { |
| 102 |
ecm_src_prepare |
Archives