1 |
commit: 402a6d799aa06d0991e41a67f47e320d0b9d1a6a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 30 21:50:12 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 30 21:50:12 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=402a6d79 |
7 |
|
8 |
kde-frameworks/kdelibs4support: Rebase no-kdesignerplugin.patch |
9 |
|
10 |
Reported-by: jospezial <jospezial <AT> gmx.de> |
11 |
Closes: https://bugs.gentoo.org/768033 |
12 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
...delibs4support-5.79.0-no-kdesignerplugin.patch} | 52 +++++++++++----------- |
16 |
.../kdelibs4support/kdelibs4support-9999.ebuild | 2 +- |
17 |
2 files changed, 27 insertions(+), 27 deletions(-) |
18 |
|
19 |
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.78.0-no-kdesignerplugin.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.79.0-no-kdesignerplugin.patch |
20 |
similarity index 82% |
21 |
rename from kde-frameworks/kdelibs4support/files/kdelibs4support-5.78.0-no-kdesignerplugin.patch |
22 |
rename to kde-frameworks/kdelibs4support/files/kdelibs4support-5.79.0-no-kdesignerplugin.patch |
23 |
index be81bf04ef..a053114c39 100644 |
24 |
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.78.0-no-kdesignerplugin.patch |
25 |
+++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.79.0-no-kdesignerplugin.patch |
26 |
@@ -1,4 +1,4 @@ |
27 |
-From a97b01b220e6ef08d1517fea76fdaddb84a9773e Mon Sep 17 00:00:00 2001 |
28 |
+From 720711e3a4e69bcc6447c928bea243a81a777a07 Mon Sep 17 00:00:00 2001 |
29 |
From: Andreas Sturmlechner <asturm@g.o> |
30 |
Date: Sun, 22 Nov 2020 00:25:06 +0100 |
31 |
Subject: [PATCH 1/2] Drop KDE4_ADD_WIDGET_FILES macro and KF5DesignerPlugin |
32 |
@@ -15,29 +15,29 @@ Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
33 |
6 files changed, 52 deletions(-) |
34 |
|
35 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
36 |
-index 9f4b6d33..20a27b52 100644 |
37 |
+index a60c88a4..2a432591 100644 |
38 |
--- a/CMakeLists.txt |
39 |
+++ b/CMakeLists.txt |
40 |
-@@ -26,7 +26,6 @@ find_package(KF5Completion ${KF5_DEP_VERSION} REQUIRED) |
41 |
- find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) |
42 |
- find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED) |
43 |
- find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED) |
44 |
--find_package(KF5DesignerPlugin ${KF5_DEP_VERSION} REQUIRED) |
45 |
- find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED) |
46 |
- find_package(KF5DocTools ${KF5_DEP_VERSION} REQUIRED) |
47 |
- find_package(KF5Emoticons ${KF5_DEP_VERSION} REQUIRED) |
48 |
+@@ -26,7 +26,6 @@ find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED) |
49 |
+ find_package(KF5Config ${KF_DEP_VERSION} REQUIRED) |
50 |
+ find_package(KF5ConfigWidgets ${KF_DEP_VERSION} REQUIRED) |
51 |
+ find_package(KF5Crash ${KF_DEP_VERSION} REQUIRED) |
52 |
+-find_package(KF5DesignerPlugin ${KF_DEP_VERSION} REQUIRED) |
53 |
+ find_package(KF5GlobalAccel ${KF_DEP_VERSION} REQUIRED) |
54 |
+ find_package(KF5DocTools ${KF_DEP_VERSION} REQUIRED) |
55 |
+ find_package(KF5Emoticons ${KF_DEP_VERSION} REQUIRED) |
56 |
diff --git a/KF5KDELibs4SupportConfig.cmake.in b/KF5KDELibs4SupportConfig.cmake.in |
57 |
-index b5194f94..5e16c780 100644 |
58 |
+index 3de7d530..4fe2369e 100644 |
59 |
--- a/KF5KDELibs4SupportConfig.cmake.in |
60 |
+++ b/KF5KDELibs4SupportConfig.cmake.in |
61 |
-@@ -11,7 +11,6 @@ find_dependency(KF5Archive "@KF5_DEP_VERSION@") |
62 |
- find_dependency(KF5ConfigWidgets "@KF5_DEP_VERSION@") |
63 |
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@") |
64 |
- find_dependency(KF5Crash "@KF5_DEP_VERSION@") |
65 |
--find_dependency(KF5DesignerPlugin "@KF5_DEP_VERSION@") |
66 |
- find_dependency(KF5DocTools "@KF5_DEP_VERSION@") |
67 |
- find_dependency(KF5Emoticons "@KF5_DEP_VERSION@") |
68 |
- find_dependency(KF5GuiAddons "@KF5_DEP_VERSION@") |
69 |
+@@ -11,7 +11,6 @@ find_dependency(KF5Archive "@KF_DEP_VERSION@") |
70 |
+ find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") |
71 |
+ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") |
72 |
+ find_dependency(KF5Crash "@KF_DEP_VERSION@") |
73 |
+-find_dependency(KF5DesignerPlugin "@KF_DEP_VERSION@") |
74 |
+ find_dependency(KF5DocTools "@KF_DEP_VERSION@") |
75 |
+ find_dependency(KF5Emoticons "@KF_DEP_VERSION@") |
76 |
+ find_dependency(KF5GuiAddons "@KF_DEP_VERSION@") |
77 |
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake |
78 |
index 7e252a70..b9636036 100644 |
79 |
--- a/cmake/modules/FindKDE4Internal.cmake |
80 |
@@ -74,7 +74,7 @@ index ca868ad9..27bb28f9 100644 |
81 |
# functions deprecated, they still should work |
82 |
macro (KDE4_AUTH_INSTALL_ACTIONS) |
83 |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
84 |
-index b249bd53..3ed8114d 100644 |
85 |
+index cb8a3c2d..70829dd6 100644 |
86 |
--- a/src/CMakeLists.txt |
87 |
+++ b/src/CMakeLists.txt |
88 |
@@ -371,25 +371,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES |
89 |
@@ -140,10 +140,10 @@ index 1570df34..e255960d 100644 |
90 |
# 'appsources' - the sources of the application |
91 |
# 'pngfiles' - specifies the list of icon files |
92 |
-- |
93 |
-2.29.2 |
94 |
+2.30.0 |
95 |
|
96 |
|
97 |
-From 13277f3a50eee8ec2ebc5cd915a83b56c2613966 Mon Sep 17 00:00:00 2001 |
98 |
+From b51d32df6a89e559871469178de1c6fd8c8a2882 Mon Sep 17 00:00:00 2001 |
99 |
From: Andreas Sturmlechner <asturm@g.o> |
100 |
Date: Sun, 22 Nov 2020 00:27:55 +0100 |
101 |
Subject: [PATCH 2/2] Drop Qt5Designer dependency |
102 |
@@ -156,7 +156,7 @@ Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
103 |
3 files changed, 1 insertion(+), 3 deletions(-) |
104 |
|
105 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
106 |
-index 20a27b52..e09b93e2 100644 |
107 |
+index 2a432591..e503999d 100644 |
108 |
--- a/CMakeLists.txt |
109 |
+++ b/CMakeLists.txt |
110 |
@@ -20,7 +20,7 @@ include(GenerateExportHeader) |
111 |
@@ -166,8 +166,8 @@ index 20a27b52..e09b93e2 100644 |
112 |
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer) |
113 |
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport) |
114 |
|
115 |
- find_package(KF5Completion ${KF5_DEP_VERSION} REQUIRED) |
116 |
- find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) |
117 |
+ find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED) |
118 |
+ find_package(KF5Config ${KF_DEP_VERSION} REQUIRED) |
119 |
diff --git a/cmake/modules/ECMQt4To5Porting.cmake b/cmake/modules/ECMQt4To5Porting.cmake |
120 |
index 4204fa54..01b8f995 100644 |
121 |
--- a/cmake/modules/ECMQt4To5Porting.cmake |
122 |
@@ -193,5 +193,5 @@ index df354fc6..68fa6d47 100644 |
123 |
Script |
124 |
ScriptTools |
125 |
-- |
126 |
-2.29.2 |
127 |
+2.30.0 |
128 |
|
129 |
|
130 |
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild |
131 |
index d4613398be..79e7352fbb 100644 |
132 |
--- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild |
133 |
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild |
134 |
@@ -78,7 +78,7 @@ RDEPEND="${COMMON_DEPEND} |
135 |
=kde-frameworks/kitemmodels-${PVCUT}*:5 |
136 |
" |
137 |
|
138 |
-PATCHES=( "${FILESDIR}/${PN}-5.78.0-no-kdesignerplugin.patch" ) |
139 |
+PATCHES=( "${FILESDIR}/${PN}-5.79.0-no-kdesignerplugin.patch" ) |
140 |
|
141 |
src_prepare() { |
142 |
ecm_src_prepare |