Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Quentin Retornaz <gentoo@××××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/libressl:master commit in: kde-frameworks/kdelibs4support/files/, kde-frameworks/kdelibs4support/
Date: Thu, 01 Dec 2022 18:19:46
Message-Id: 1669918686.9e7b1f3cab6b925b1a12f1a7a034af7a6e24ea55.quentin@gentoo
1 commit: 9e7b1f3cab6b925b1a12f1a7a034af7a6e24ea55
2 Author: Saki Xi <space_raccoon <AT> riseup <DOT> net>
3 AuthorDate: Wed Nov 30 13:05:21 2022 +0000
4 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
5 CommitDate: Thu Dec 1 18:18:06 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=9e7b1f3c
7
8 Include patches from OpenBSD to build with 3.6.1
9
10 Signed-off-by: Saki Xi <space_raccoon <AT> riseup.net>
11 Closes: https://github.com/gentoo/libressl/pull/477
12 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
13
14 kde-frameworks/kdelibs4support/Manifest | 12 ++
15 ...kdelibs4support-5.80.0-no-kdesignerplugin.patch | 143 +++++++++++++++++++++
16 .../files/kdelibs4support-5.86.0-unused-dep.patch | 51 ++++++++
17 .../files/kdelibs4support-5.99.0-with_x11.patch | 98 ++++++++++++++
18 .../kdelibs4support-kssl_certificate-0.96.0.patch | 12 ++
19 .../kdelibs4support-kssl_openssl-5.96.0.patch | 138 ++++++++++++++++++++
20 .../kdelibs4support/kdelibs4support-5.100.0.ebuild | 106 +++++++++++++++
21 .../kdelibs4support/kdelibs4support-5.96.0.ebuild | 104 +++++++++++++++
22 .../kdelibs4support/kdelibs4support-5.99.0.ebuild | 109 ++++++++++++++++
23 kde-frameworks/kdelibs4support/metadata.xml | 16 +++
24 10 files changed, 789 insertions(+)
25
26 diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
27 new file mode 100644
28 index 0000000..751334a
29 --- /dev/null
30 +++ b/kde-frameworks/kdelibs4support/Manifest
31 @@ -0,0 +1,12 @@
32 +AUX kdelibs4support-5.80.0-no-kdesignerplugin.patch 5689 BLAKE2B 74771136992074f7e39eb110d7b838ed6ff3bb34ca8b44242d57359b3efc4bebde8ae615b27df31cba42d14349697ba303b3aa20b09c1d83d044cff2cd6700f0 SHA512 2a7a1c05c6ef7f440ca84eef7b65f65f92d780fa411301e2a8554115717cbe543127e1878ae5642f07f7ddcae4a62ed075468f85e7c7cdb13992b4bada270bff
33 +AUX kdelibs4support-5.86.0-unused-dep.patch 1693 BLAKE2B b310444effa8bf0a2a203cdc7e427ade52caceabc77b1dce96cbc739443c9d8429c2f1186f3d1e5180a0b8ef6323ea805a040ded435b2a0a3abdcef0e4dceee9 SHA512 bf7637791517739ebfa296beb91f3873d21165c4760374df8972fa75f237dfefb24cac7ea7895f359dcf368a18f974005b83646f9ba3cd6891ba6181880a4a6a
34 +AUX kdelibs4support-5.99.0-with_x11.patch 3483 BLAKE2B ab24a33b62d9221c9b6583d62273e3c641c2ceadc9db57cce6133c8a5d2351b804907c98f549d3ba957c3a2aa1a6104b85c188e87f271818c3f286572ce69487 SHA512 cb234fb1cc0f97e97a490c936b72f9121b6827f28d2ed8aa8886eb369f2ecad7be9ddf82c4cba4b158516d1e7f11b8361b8d101147fc893303642abbc3c0b0d2
35 +AUX kdelibs4support-kssl_certificate-0.96.0.patch 518 BLAKE2B 0fb34a66acba06cfd68cd46e7e9930c68b70e0e590048630f6cee3933144446dbe573c23c736a38db3b3a09816a8bd9a071d71b02f10d300063bd488a905fdea SHA512 d8e13f187053caedd592a76e3f1487c1e27ee164001cfa2572a6a484b57141527fa45c6826c265f056ea0824457e00b710b208e0b9a50ffa7863ff128caaed7e
36 +AUX kdelibs4support-kssl_openssl-5.96.0.patch 5847 BLAKE2B 9c240dcf65155193c29a3eb745bc1b2e7aaa92e997668171f474e0d3f378ebd0fcc069718270815dec4c9270364be5b420bea888507c7c91a9c3f70ccd04b261 SHA512 a334c5e84b1fd262d59f21238ee6bde5d2ed0b7d3e73632b24e0859ca54abea2b270e0c79bd35e61d5ed46a94ab57d80002bf6a9c5f134ba78233d0ab9094de1
37 +DIST kdelibs4support-5.100.0.tar.xz 3719636 BLAKE2B 83665e6f4d6f42a30ccd3a607037f49f85719f9313c4b819a1c577e5e49608918661e9610ec6030e783ed20378d1137f0c893805f3a51b4cead074bd9b444af2 SHA512 4ba555cb329ec04857d2bb23173999673e27830346557666c4a9b5a8db1b01c39575dc148f9cdc6537ece325ee0398a5bb25315456e3c579e7b467cff48930e6
38 +DIST kdelibs4support-5.96.0.tar.xz 3657280 BLAKE2B 5450ad4aced1e73b68dab9ce5f858f65765b96d98b2d977a796d13f148f31e8cb6d2562713569b4694afa163e3fac2d93ee94e6bd1592710e1141e6095320761 SHA512 25d80c003b6cc661058d24e3af4b9ef43c05029375c74ea2aedd1b4cbb8a09896404d2e2cb4eca884ad091f7d26b9afebd1a0ff13c96b9d793c40880300fb59d
39 +DIST kdelibs4support-5.99.0.tar.xz 3667732 BLAKE2B 371b9b96e1f99424d85034d20c79759b0d2a4796ed3771626c2623f9732b37d0f02451c44e9e42e78eddd211f6c4f24c3b0dfa20f21181d17124af28583299e9 SHA512 06716965e50d0adbfe57f3024045ee7f60b62f0ee9910e0ebcf92cf0592434631fae45d5be6ee4e91fdc9ca384bfedbedb9fb3c32acd09b81ce5ee37695f2676
40 +EBUILD kdelibs4support-5.100.0.ebuild 2759 BLAKE2B 72402920454e636ed571ee78e84c9394076d6657e3aa2b2584f27c2278371d971b0eb2b99f941dd42216d84a1e0f8f89e29ce858a7eae3e54431473c976e9bf7 SHA512 ffc34502889973cec51e2d2c98f59234c6d42789e095947e9e0f7db01ac8d81153a655a9fa46235764fc216d0a796b608b6c4b9b818de1a3e454885e2cd9d679
41 +EBUILD kdelibs4support-5.96.0.ebuild 2738 BLAKE2B a646845d9e016f0f4f94e2882bd72d93febf6ccb562fba65f7c6f67d180ea40fc7c5296212811c350877f7f03dfbaa10cee79b086670818a623ee142b8aef1d0 SHA512 6fc0f93a159a7e46d18de45d566bead2042201182fccdcd2591e21bda452450d2eb2f32f479764f6592701befdc6e7206c687e3b48ceffc9199e8de602253f48
42 +EBUILD kdelibs4support-5.99.0.ebuild 2887 BLAKE2B d391a25f9498866ae59a52b56b49be63d035418f0de7a2a92d7e1eb919a1e07e0a3735cf5eae6d6d4f8556e523d3f1cd67748c4cae605b71ff24f53b92fe6083 SHA512 3d92db0f0240d48accbe3271db53a5be1ce54b04b0493c7d0f9bda9f94f76c54f520a25a8595fbf4d131f8a6d0520b2781ae2088d1562545f1a99dd764f5694b
43 +MISC metadata.xml 476 BLAKE2B b4f3d33a4c4782267b4627a9de144e69274b3956f55d14335f2d0b22d4da63c4e3ee3581c4e908a2a60e7c01d91c2a39b7f75b856d6edb6d19c11cc7ca2a7e6b SHA512 b1c0cd7cb7b442dc75ba5972685060012ae220c3324511c4f65511547df15cd8f159db46f954ff8bd1d443505b88ff5db30ac4927d32f4c4006eb476bfe3279d
44
45 diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch
46 new file mode 100644
47 index 0000000..1165a53
48 --- /dev/null
49 +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch
50 @@ -0,0 +1,143 @@
51 +From 720711e3a4e69bcc6447c928bea243a81a777a07 Mon Sep 17 00:00:00 2001
52 +From: Andreas Sturmlechner <asturm@g.o>
53 +Date: Sun, 22 Nov 2020 00:25:06 +0100
54 +Subject: [PATCH 1/2] Drop KDE4_ADD_WIDGET_FILES macro and KF5DesignerPlugin
55 + dependency
56 +
57 +Signed-off-by: Andreas Sturmlechner <asturm@g.o>
58 +---
59 + CMakeLists.txt | 1 -
60 + KF5KDELibs4SupportConfig.cmake.in | 1 -
61 + cmake/modules/FindKDE4Internal.cmake | 4 ----
62 + cmake/modules/KDE4Macros.cmake | 2 --
63 + src/CMakeLists.txt | 19 -------------------
64 + src/KDEUIMacros.cmake | 25 -------------------------
65 + 6 files changed, 52 deletions(-)
66 +
67 +diff --git a/CMakeLists.txt b/CMakeLists.txt
68 +index a60c88a4..2a432591 100644
69 +--- a/CMakeLists.txt
70 ++++ b/CMakeLists.txt
71 +@@ -26,7 +26,6 @@ find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED)
72 + find_package(KF5Config ${KF_DEP_VERSION} REQUIRED)
73 + find_package(KF5ConfigWidgets ${KF_DEP_VERSION} REQUIRED)
74 + find_package(KF5Crash ${KF_DEP_VERSION} REQUIRED)
75 +-find_package(KF5DesignerPlugin ${KF_DEP_VERSION} REQUIRED)
76 + find_package(KF5GlobalAccel ${KF_DEP_VERSION} REQUIRED)
77 + find_package(KF5DocTools ${KF_DEP_VERSION} REQUIRED)
78 + find_package(KF5Emoticons ${KF_DEP_VERSION} REQUIRED)
79 +diff --git a/KF5KDELibs4SupportConfig.cmake.in b/KF5KDELibs4SupportConfig.cmake.in
80 +index 3de7d530..4fe2369e 100644
81 +--- a/KF5KDELibs4SupportConfig.cmake.in
82 ++++ b/KF5KDELibs4SupportConfig.cmake.in
83 +@@ -11,7 +11,6 @@ find_dependency(KF5Archive "@KF_DEP_VERSION@")
84 + find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@")
85 + find_dependency(KF5CoreAddons "@KF_DEP_VERSION@")
86 + find_dependency(KF5Crash "@KF_DEP_VERSION@")
87 +-find_dependency(KF5DesignerPlugin "@KF_DEP_VERSION@")
88 + find_dependency(KF5DocTools "@KF_DEP_VERSION@")
89 + find_dependency(KF5Emoticons "@KF_DEP_VERSION@")
90 + find_dependency(KF5GuiAddons "@KF_DEP_VERSION@")
91 +diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
92 +index 7e252a70..b9636036 100644
93 +--- a/cmake/modules/FindKDE4Internal.cmake
94 ++++ b/cmake/modules/FindKDE4Internal.cmake
95 +@@ -179,10 +179,6 @@
96 + # Use optional USE_RELATIVE_PATH to generate the classes in the build following the given
97 + # relative path to the file.
98 + #
99 +-# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
100 +-# Use this to add widget description files for the makekdewidgets code generator
101 +-# for Qt Designer plugins.
102 +-#
103 + # KDE4_ADD_PLUGIN ( name [WITH_PREFIX] file1 ... fileN )
104 + # Create a KDE plugin (KPart, kioslave, etc.) from the given source files.
105 + # If WITH_PREFIX is given, the resulting plugin will have the prefix "lib", otherwise it won't.
106 +diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
107 +index ca868ad9..27bb28f9 100644
108 +--- a/cmake/modules/KDE4Macros.cmake
109 ++++ b/cmake/modules/KDE4Macros.cmake
110 +@@ -10,7 +10,6 @@
111 + # KDE4_ADD_KDEINIT_EXECUTABLE
112 + # KDE4_ADD_UNIT_TEST
113 + # KDE4_ADD_EXECUTABLE
114 +-# KDE4_ADD_WIDGET_FILES
115 + # KDE4_UPDATE_ICONCACHE
116 + # KDE4_INSTALL_ICONS
117 + # KDE4_REMOVE_OBSOLETE_CMAKE_FILES
118 +@@ -486,7 +485,6 @@ include("${KF5Auth_DIR}/KF5AuthMacros.cmake")
119 + include("${CMAKE_CURRENT_LIST_DIR}/KDECoreMacros.cmake")
120 + include("${CMAKE_CURRENT_LIST_DIR}/KDEUIMacros.cmake")
121 + include("${KF5DocTools_DIR}/KF5DocToolsMacros.cmake")
122 +-include("${KF5DesignerPlugin_DIR}/KF5DesignerPluginMacros.cmake")
123 +
124 + # functions deprecated, they still should work
125 + macro (KDE4_AUTH_INSTALL_ACTIONS)
126 +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
127 +index cb8a3c2d..70829dd6 100644
128 +--- a/src/CMakeLists.txt
129 ++++ b/src/CMakeLists.txt
130 +@@ -371,25 +371,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES
131 + )
132 +
133 +
134 +-########## Designer plugin
135 +-
136 +-kf5designerplugin_add_plugin(kf5deprecatedwidgets
137 +- kdedeprecated.widgets
138 +- kdedeprecated.qrc
139 +- classpreviews.cpp
140 +-)
141 +-
142 +-target_link_libraries(kf5deprecatedwidgets KF5::KDELibs4Support
143 +- Qt5::Widgets
144 +- Qt5::Designer
145 +- KF5::ConfigCore
146 +- KF5::Completion
147 +- KF5::WidgetsAddons
148 +- KF5::Auth
149 +- )
150 +-
151 +-install(TARGETS kf5deprecatedwidgets DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/designer)
152 +-
153 + ##########
154 +
155 + add_subdirectory(pics)
156 +diff --git a/src/KDEUIMacros.cmake b/src/KDEUIMacros.cmake
157 +index 1570df34..e255960d 100644
158 +--- a/src/KDEUIMacros.cmake
159 ++++ b/src/KDEUIMacros.cmake
160 +@@ -163,31 +163,6 @@ macro (KDE4_INSTALL_ICONS _defaultpath )
161 + endmacro (KDE4_INSTALL_ICONS)
162 +
163 +
164 +-set(KDEWIDGETS_MAKEKDEWIDGETS_EXECUTABLE ${KF5DESIGNERPLUGIN_GENERATOR_EXECUTABLE})
165 +-set(_KDE4_MAKEKDEWIDGETS_DEP ${_KF5DESIGNERPLUGIN_GENERATOR_EXECUTABLE_DEP})
166 +-macro (KDE4_ADD_WIDGET_FILES _sources)
167 +- foreach (_current_FILE ${ARGN})
168 +-
169 +- get_filename_component(_input ${_current_FILE} ABSOLUTE)
170 +- get_filename_component(_basename ${_input} NAME_WE)
171 +- set(_source ${CMAKE_CURRENT_BINARY_DIR}/${_basename}widgets.cpp)
172 +- set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}widgets.moc)
173 +-
174 +- # create source file from the .widgets file
175 +- add_custom_command(OUTPUT ${_source}
176 +- COMMAND ${KDEWIDGETS_MAKEKDEWIDGETS_EXECUTABLE}
177 +- ARGS -o ${_source} ${_input}
178 +- MAIN_DEPENDENCY ${_input} DEPENDS ${_KDE4_MAKEKDEWIDGETS_DEP})
179 +-
180 +- # create moc file
181 +- qt5_generate_moc(${_source} ${_moc} )
182 +-
183 +- list(APPEND ${_sources} ${_source} ${_moc})
184 +-
185 +- endforeach (_current_FILE)
186 +-
187 +-endmacro (KDE4_ADD_WIDGET_FILES)
188 +-
189 + # adds application icon to target source list
190 + # 'appsources' - the sources of the application
191 + # 'pngfiles' - specifies the list of icon files
192 +--
193 +2.30.0
194
195 diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch
196 new file mode 100644
197 index 0000000..8614a84
198 --- /dev/null
199 +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch
200 @@ -0,0 +1,51 @@
201 +From b51d32df6a89e559871469178de1c6fd8c8a2882 Mon Sep 17 00:00:00 2001
202 +From: Andreas Sturmlechner <asturm@g.o>
203 +Date: Sun, 22 Nov 2020 00:27:55 +0100
204 +Subject: [PATCH 2/2] Drop Qt5Designer dependency
205 +
206 +Signed-off-by: Andreas Sturmlechner <asturm@g.o>
207 +---
208 + CMakeLists.txt | 2 +-
209 + cmake/modules/ECMQt4To5Porting.cmake | 1 -
210 + cmake/modules/FindQt5Transitional.cmake | 1 -
211 + 3 files changed, 1 insertion(+), 3 deletions(-)
212 +
213 +diff --git a/CMakeLists.txt b/CMakeLists.txt
214 +index 2a432591..e503999d 100644
215 +--- a/CMakeLists.txt
216 ++++ b/CMakeLists.txt
217 +@@ -20,7 +20,7 @@ include(GenerateExportHeader)
218 + include(CMakeFindFrameworks)
219 +
220 + set(REQUIRED_QT_VERSION 5.15.2)
221 +-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer)
222 ++find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport)
223 +
224 + find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED)
225 + find_package(KF5Config ${KF_DEP_VERSION} REQUIRED)
226 +diff --git a/cmake/modules/ECMQt4To5Porting.cmake b/cmake/modules/ECMQt4To5Porting.cmake
227 +index 4204fa54..01b8f995 100644
228 +--- a/cmake/modules/ECMQt4To5Porting.cmake
229 ++++ b/cmake/modules/ECMQt4To5Porting.cmake
230 +@@ -160,7 +160,6 @@ set(_qt_modules
231 + DBus
232 + Network
233 + Test
234 +- Designer
235 + Concurrent
236 + Xml
237 + UiTools
238 +diff --git a/cmake/modules/FindQt5Transitional.cmake b/cmake/modules/FindQt5Transitional.cmake
239 +index df354fc6..68fa6d47 100644
240 +--- a/cmake/modules/FindQt5Transitional.cmake
241 ++++ b/cmake/modules/FindQt5Transitional.cmake
242 +@@ -6,7 +6,6 @@ if (Qt5Core_FOUND)
243 + Core
244 + Gui
245 + DBus
246 +- Designer
247 + Declarative
248 + Script
249 + ScriptTools
250 +--
251 +2.30.0
252
253 diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.99.0-with_x11.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.99.0-with_x11.patch
254 new file mode 100644
255 index 0000000..24bcb1b
256 --- /dev/null
257 +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.99.0-with_x11.patch
258 @@ -0,0 +1,98 @@
259 +From 026571f37c990007be3d7e536b335c19ab98009e Mon Sep 17 00:00:00 2001
260 +From: Andreas Sturmlechner <asturm@g.o>
261 +Date: Sat, 6 Aug 2022 11:16:00 +0200
262 +Subject: [PATCH] Add CMake option to build WITH_X11
263 +
264 +We want to be able to build without X11 support even if some of the used
265 +libraries may not work w/o X11 themselves yet or need to be built with
266 +X11 support for other reverse dependencies.
267 +
268 +HAVE_X11 already exists and is set automagically so far, but using
269 +-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
270 +as required in their cmake config. This is a behavior change as previously
271 +it was silently disabled if X11 was not found.
272 +
273 +Signed-off-by: Andreas Sturmlechner <asturm@g.o>
274 +---
275 + CMakeLists.txt | 18 +++++++++++-------
276 + src/CMakeLists.txt | 6 +++---
277 + tests/CMakeLists.txt | 2 +-
278 + 3 files changed, 15 insertions(+), 11 deletions(-)
279 +
280 +diff --git a/CMakeLists.txt b/CMakeLists.txt
281 +index f577df45..378d23d4 100644
282 +--- a/CMakeLists.txt
283 ++++ b/CMakeLists.txt
284 +@@ -51,14 +51,18 @@ if(WIN32)
285 + endif()
286 +
287 + if (NOT APPLE AND NOT WIN32)
288 +- find_package(X11)
289 ++ option(WITH_X11 "Build with X11 integration and session management" ON)
290 ++ if(WITH_X11)
291 ++ find_package(X11)
292 ++ set(HAVE_X11 ${X11_FOUND})
293 ++ if (HAVE_X11)
294 ++ add_feature_info("X11 Session Management (libSM)" X11_SM_FOUND "Support for session management in KApplication")
295 ++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
296 ++ find_package(XCB REQUIRED COMPONENTS XCB)
297 ++ endif()
298 ++ endif()
299 + endif()
300 +-set(HAVE_X11 ${X11_FOUND})
301 +-if (HAVE_X11)
302 +- add_feature_info("X11 Session Management (libSM)" X11_SM_FOUND "Support for session management in KApplication")
303 +- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
304 +- find_package(XCB REQUIRED COMPONENTS XCB)
305 +-endif ()
306 ++
307 + if (APPLE)
308 + cmake_find_frameworks(CoreFoundation)
309 + endif ()
310 +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
311 +index 2096b355..4649a9d5 100644
312 +--- a/src/CMakeLists.txt
313 ++++ b/src/CMakeLists.txt
314 +@@ -226,7 +226,7 @@ if (NOT KIO_NO_NEPOMUK)
315 + )
316 + endif ()
317 +
318 +-if (X11_FOUND)
319 ++if (HAVE_X11)
320 + set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS} kdeui/kxerrorhandler.cpp )
321 + list(APPEND libkdelibs4support_OPTIONAL_LIBS Qt5::X11Extras ${X11_LIBRARIES})
322 + endif ()
323 +@@ -312,7 +312,7 @@ set(platformLinkLibraries)
324 + if (APPLE)
325 + set(platformLinkLibraries "-framework CoreFoundation -framework Carbon -lresolv")
326 + endif()
327 +-if (X11_FOUND)
328 ++if (HAVE_X11)
329 + set(platformLinkLibraries ${XCB_XCB_LIBRARY})
330 + endif()
331 +
332 +@@ -545,7 +545,7 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/all_languages DESTINATION ${KDE_INSTA
333 + install( FILES kdeui/40.colors kdeui/Oxygen.colors kdeui/Web.colors kdeui/Royal.colors kdeui/Rainbow.colors
334 + DESTINATION ${KDE_INSTALL_CONFDIR}/colors)
335 +
336 +-if (NOT X11_FOUND)
337 ++if (NOT HAVE_X11)
338 + # install our copy of the rgb.txt named colors list on systems without X11
339 + install(FILES kdeui/rgb.txt DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kdeui)
340 + endif ()
341 +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
342 +index 53f870ff..db4b28db 100644
343 +--- a/tests/CMakeLists.txt
344 ++++ b/tests/CMakeLists.txt
345 +@@ -63,7 +63,7 @@ target_link_libraries(networkingservice KF5::KDELibs4Support)
346 +
347 + ###### kxerrorhandlertest #####
348 +
349 +-if (X11_FOUND)
350 ++if (HAVE_X11)
351 + find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
352 + kdelibs4support_examples( kxerrorhandlertest )
353 +
354 +--
355 +2.35.1
356 +
357
358 diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-kssl_certificate-0.96.0.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-kssl_certificate-0.96.0.patch
359 new file mode 100644
360 index 0000000..c139c30
361 --- /dev/null
362 +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-kssl_certificate-0.96.0.patch
363 @@ -0,0 +1,12 @@
364 +Index: src/kssl/ksslcertificate.cpp
365 +--- a/src/kssl/ksslcertificate.cpp.orig
366 ++++ b/src/kssl/ksslcertificate.cpp
367 +@@ -1222,7 +1222,7 @@ QByteArray KSSLCertificate::toNetscape()
368 + {
369 + QByteArray qba;
370 + // no equivalent in OpenSSL 1.1.0 (?), so behave as if we had no OpenSSL at all
371 +-#if KSSL_HAVE_SSL && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
372 ++#if KSSL_HAVE_SSL && (OPENSSL_VERSION_NUMBER < 0x10100000L)
373 + NETSCAPE_X509 nx;
374 + ASN1_OCTET_STRING hdr;
375 + QTemporaryFile ktf;
376
377 diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-kssl_openssl-5.96.0.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-kssl_openssl-5.96.0.patch
378 new file mode 100644
379 index 0000000..a43267b
380 --- /dev/null
381 +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-kssl_openssl-5.96.0.patch
382 @@ -0,0 +1,138 @@
383 +Index: src/kssl/kopenssl.cpp
384 +--- a/src/kssl/kopenssl.cpp.orig
385 ++++ b/src/kssl/kopenssl.cpp
386 +@@ -269,7 +269,7 @@ static QString findMostRecentLib(QString dir, QString
387 + QString best = 0L;
388 + // where do we start
389 + uint s = filter.length() - 1;
390 +- for (QStringList::const_iterator it = l.begin(); it != l.end(); ++it) {
391 ++ for (QStringList::iterator it = l.begin(); it != l.end(); ++it) {
392 + QString numberpart = (*it).mid(s);
393 + uint endmaj = numberpart.indexOf('.');
394 + if (endmaj == -1) {
395 +@@ -484,7 +484,7 @@ KOpenSSLProxy::KOpenSSLProxy()
396 + K_X509_STORE_CTX_get_current_cert = (X509 * (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_current_cert");
397 + K_X509_STORE_CTX_set_error = (void (*)(X509_STORE_CTX *, int)) d->cryptoLib->resolve("X509_STORE_CTX_set_error");
398 + K_X509_STORE_CTX_get_error = (int (*)(X509_STORE_CTX *)) d->cryptoLib->resolve("X509_STORE_CTX_get_error");
399 +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
400 ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
401 + K_OPENSSL_sk_free = (void (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_free");
402 + K_OPENSSL_sk_num = (int (*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_num");
403 + K_OPENSSL_sk_pop = (char *(*)(STACK *)) d->cryptoLib->resolve("OPENSSL_sk_pop");
404 +@@ -978,7 +978,7 @@ void KOpenSSLProxy::X509_STORE_free(X509_STORE *v)
405 +
406 + void KOpenSSLProxy::X509_STORE_set_verify_cb(X509_STORE *store, int (*verify_cb)(int, X509_STORE_CTX *))
407 + {
408 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
409 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
410 + X509_STORE_set_verify_cb_func(store, verify_cb);
411 + #else
412 + if (K_X509_STORE_set_verify_cb) {
413 +@@ -1043,7 +1043,7 @@ X509_NAME *KOpenSSLProxy::X509_get_issuer_name(X509 *a
414 +
415 + void KOpenSSLProxy::X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **algor, const X509 *x)
416 + {
417 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
418 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
419 + if (psig) {
420 + *psig = x->signature;
421 + }
422 +@@ -1121,7 +1121,7 @@ X509 *KOpenSSLProxy::X509_dup(X509 *x509)
423 +
424 + ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x)
425 + {
426 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
427 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
428 + return X509_get_notBefore(x);
429 + #else
430 + if (K_X509_getm_notBefore) {
431 +@@ -1134,7 +1134,7 @@ ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X5
432 +
433 + ASN1_TIME *KOpenSSLProxy::X509_getm_notAfter(const X509 *x)
434 + {
435 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
436 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
437 + return X509_get_notAfter(x);
438 + #else
439 + if (K_X509_getm_notAfter) {
440 +@@ -1412,7 +1412,7 @@ void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_ST
441 +
442 + X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v)
443 + {
444 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
445 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
446 + return v->current_cert;
447 + #else
448 + if (K_X509_STORE_CTX_get_current_cert) {
449 +@@ -1425,7 +1425,7 @@ X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X
450 +
451 + void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error)
452 + {
453 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
454 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
455 + v->error = error;
456 + #else
457 + if (K_X509_STORE_CTX_set_error) {
458 +@@ -1436,7 +1436,7 @@ void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STOR
459 +
460 + int KOpenSSLProxy::X509_STORE_CTX_get_error(X509_STORE_CTX *v)
461 + {
462 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
463 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
464 + return v->error;
465 + #else
466 + if (K_X509_STORE_CTX_get_error) {
467 +@@ -1893,7 +1893,7 @@ int KOpenSSLProxy::EVP_PKEY_assign(EVP_PKEY *pkey, int
468 +
469 + int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey)
470 + {
471 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
472 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
473 + return pkey->type;
474 + #else
475 + if (K_EVP_PKEY_base_id) {
476 +@@ -1906,7 +1906,7 @@ int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey)
477 +
478 + RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
479 + {
480 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
481 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
482 + return pkey->pkey.rsa;
483 + #else
484 + if (K_EVP_PKEY_get0_RSA) {
485 +@@ -1919,7 +1919,7 @@ RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
486 +
487 + void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
488 + {
489 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
490 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
491 + if (n) {
492 + *n = rsa->n;
493 + }
494 +@@ -1938,7 +1938,7 @@ void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNU
495 +
496 + DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
497 + {
498 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
499 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
500 + return pkey->pkey.dsa;
501 + #else
502 + if (K_EVP_PKEY_get0_DSA) {
503 +@@ -1951,7 +1951,7 @@ DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
504 +
505 + void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
506 + {
507 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
508 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
509 + if (p) {
510 + *p = dsa->p;
511 + }
512 +@@ -1970,7 +1970,7 @@ void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNU
513 +
514 + void KOpenSSLProxy::DSA_get0_key(DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key)
515 + {
516 +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
517 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L
518 + if (pub_key) {
519 + *pub_key = dsa->pub_key;
520 + }
521
522 diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.100.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.100.0.ebuild
523 new file mode 100644
524 index 0000000..c42ff79
525 --- /dev/null
526 +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.100.0.ebuild
527 @@ -0,0 +1,106 @@
528 +# Copyright 1999-2022 Gentoo Authors
529 +# Distributed under the terms of the GNU General Public License v2
530 +
531 +EAPI=8
532 +
533 +ECM_HANDBOOK="true"
534 +ECM_QTHELP="false"
535 +PVCUT=$(ver_cut 1-2)
536 +QTMIN=5.15.5
537 +VIRTUALX_REQUIRED="test"
538 +inherit ecm frameworks.kde.org
539 +
540 +DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
541 +
542 +LICENSE="LGPL-2+"
543 +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
544 +IUSE="X"
545 +
546 +RESTRICT="test"
547 +
548 +COMMON_DEPEND="
549 + app-text/docbook-xml-dtd:4.2
550 + dev-libs/openssl:0
551 + >=dev-qt/qtdbus-${QTMIN}:5
552 + >=dev-qt/qtgui-${QTMIN}:5
553 + >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
554 + >=dev-qt/qtprintsupport-${QTMIN}:5
555 + >=dev-qt/qtsvg-${QTMIN}:5
556 + >=dev-qt/qttest-${QTMIN}:5
557 + >=dev-qt/qtwidgets-${QTMIN}:5
558 + =kde-frameworks/kauth-${PVCUT}*:5
559 + =kde-frameworks/kcodecs-${PVCUT}*:5
560 + =kde-frameworks/kcompletion-${PVCUT}*:5
561 + =kde-frameworks/kconfig-${PVCUT}*:5
562 + =kde-frameworks/kconfigwidgets-${PVCUT}*:5
563 + =kde-frameworks/kcoreaddons-${PVCUT}*:5
564 + =kde-frameworks/kcrash-${PVCUT}*:5
565 + =kde-frameworks/kdbusaddons-${PVCUT}*:5
566 + >=kde-frameworks/kded-${PVCUT}:5
567 + =kde-frameworks/kdoctools-${PVCUT}*:5
568 + =kde-frameworks/kemoticons-${PVCUT}*:5
569 + =kde-frameworks/kglobalaccel-${PVCUT}*:5
570 + =kde-frameworks/kguiaddons-${PVCUT}*:5
571 + =kde-frameworks/ki18n-${PVCUT}*:5
572 + =kde-frameworks/kiconthemes-${PVCUT}*:5
573 + =kde-frameworks/kio-${PVCUT}*:5
574 + =kde-frameworks/kitemviews-${PVCUT}*:5
575 + =kde-frameworks/kjobwidgets-${PVCUT}*:5
576 + =kde-frameworks/knotifications-${PVCUT}*:5[X?]
577 + =kde-frameworks/kparts-${PVCUT}*:5
578 + =kde-frameworks/kservice-${PVCUT}*:5
579 + =kde-frameworks/ktextwidgets-${PVCUT}*:5
580 + =kde-frameworks/kunitconversion-${PVCUT}*:5
581 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
582 + =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
583 + =kde-frameworks/kxmlgui-${PVCUT}*:5
584 + =kde-frameworks/solid-${PVCUT}*:5
585 + virtual/libintl
586 + X? (
587 + >=dev-qt/qtx11extras-${QTMIN}:5
588 + x11-libs/libICE
589 + x11-libs/libSM
590 + x11-libs/libX11
591 + x11-libs/libxcb
592 + )
593 +"
594 +DEPEND="${COMMON_DEPEND}
595 + test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
596 + X? ( x11-base/xorg-proto )
597 +"
598 +RDEPEND="${COMMON_DEPEND}
599 + >=dev-qt/qtxml-${QTMIN}:5
600 + >=kde-frameworks/countryflags-${PVCUT}:5
601 + =kde-frameworks/kinit-${PVCUT}*:5
602 + =kde-frameworks/kitemmodels-${PVCUT}*:5
603 +"
604 +BDEPEND="
605 + dev-lang/perl
606 + dev-perl/URI
607 +"
608 +
609 +PATCHES=(
610 + # downstream patches
611 + "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956
612 + "${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956
613 + "${FILESDIR}/${PN}-kssl_certificate-0.96.0.patch"
614 + "${FILESDIR}/${PN}-kssl_openssl-5.96.0.patch"
615 +)
616 +
617 +src_prepare() {
618 + ecm_src_prepare
619 +
620 + if ! use handbook; then
621 + sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
622 + fi
623 +
624 + cmake_run_in src cmake_comment_add_subdirectory l10n
625 +}
626 +
627 +src_configure() {
628 + local mycmakeargs=(
629 + -DWITH_X11=$(usex X)
630 + )
631 +
632 + ecm_src_configure
633 +}
634
635 diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.96.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.96.0.ebuild
636 new file mode 100644
637 index 0000000..b46adb8
638 --- /dev/null
639 +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.96.0.ebuild
640 @@ -0,0 +1,104 @@
641 +# Copyright 1999-2022 Gentoo Authors
642 +# Distributed under the terms of the GNU General Public License v2
643 +
644 +EAPI=8
645 +
646 +ECM_HANDBOOK="true"
647 +ECM_QTHELP="false"
648 +PVCUT=$(ver_cut 1-2)
649 +QTMIN=5.15.4
650 +VIRTUALX_REQUIRED="test"
651 +inherit ecm frameworks.kde.org
652 +
653 +DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
654 +LICENSE="LGPL-2+"
655 +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
656 +IUSE="X"
657 +
658 +RESTRICT="test"
659 +
660 +COMMON_DEPEND="
661 + app-text/docbook-xml-dtd:4.2
662 + dev-libs/openssl:0
663 + >=dev-qt/qtdbus-${QTMIN}:5
664 + >=dev-qt/qtgui-${QTMIN}:5
665 + >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
666 + >=dev-qt/qtprintsupport-${QTMIN}:5
667 + >=dev-qt/qtsvg-${QTMIN}:5
668 + >=dev-qt/qttest-${QTMIN}:5
669 + >=dev-qt/qtwidgets-${QTMIN}:5
670 + =kde-frameworks/kauth-${PVCUT}*:5
671 + =kde-frameworks/kcodecs-${PVCUT}*:5
672 + =kde-frameworks/kcompletion-${PVCUT}*:5
673 + =kde-frameworks/kconfig-${PVCUT}*:5
674 + =kde-frameworks/kconfigwidgets-${PVCUT}*:5
675 + =kde-frameworks/kcoreaddons-${PVCUT}*:5
676 + =kde-frameworks/kcrash-${PVCUT}*:5
677 + =kde-frameworks/kdbusaddons-${PVCUT}*:5
678 + >=kde-frameworks/kded-${PVCUT}:5
679 + =kde-frameworks/kdoctools-${PVCUT}*:5
680 + =kde-frameworks/kemoticons-${PVCUT}*:5
681 + =kde-frameworks/kglobalaccel-${PVCUT}*:5
682 + =kde-frameworks/kguiaddons-${PVCUT}*:5
683 + =kde-frameworks/ki18n-${PVCUT}*:5
684 + =kde-frameworks/kiconthemes-${PVCUT}*:5
685 + =kde-frameworks/kio-${PVCUT}*:5
686 + =kde-frameworks/kitemviews-${PVCUT}*:5
687 + =kde-frameworks/kjobwidgets-${PVCUT}*:5
688 + =kde-frameworks/knotifications-${PVCUT}*:5[X=]
689 + =kde-frameworks/kparts-${PVCUT}*:5
690 + =kde-frameworks/kservice-${PVCUT}*:5
691 + =kde-frameworks/ktextwidgets-${PVCUT}*:5
692 + =kde-frameworks/kunitconversion-${PVCUT}*:5
693 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
694 + =kde-frameworks/kwindowsystem-${PVCUT}*:5[X=]
695 + =kde-frameworks/kxmlgui-${PVCUT}*:5
696 + =kde-frameworks/solid-${PVCUT}*:5
697 + virtual/libintl
698 + X? (
699 + >=dev-qt/qtx11extras-${QTMIN}:5
700 + x11-libs/libICE
701 + x11-libs/libSM
702 + x11-libs/libX11
703 + x11-libs/libxcb
704 + )
705 +"
706 +DEPEND="${COMMON_DEPEND}
707 + test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
708 + X? ( x11-base/xorg-proto )
709 +"
710 +RDEPEND="${COMMON_DEPEND}
711 + >=dev-qt/qtxml-${QTMIN}:5
712 + >=kde-frameworks/countryflags-${PVCUT}:5
713 + =kde-frameworks/kinit-${PVCUT}*:5
714 + =kde-frameworks/kitemmodels-${PVCUT}*:5
715 +"
716 +BDEPEND="
717 + dev-lang/perl
718 + dev-perl/URI
719 +"
720 +
721 +PATCHES=(
722 + "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956
723 + "${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956
724 + "${FILESDIR}/${PN}-kssl_certificate-0.96.0.patch"
725 + "${FILESDIR}/${PN}-kssl_openssl-5.96.0.patch"
726 +)
727 +
728 +src_prepare() {
729 + ecm_src_prepare
730 +
731 + if ! use handbook; then
732 + sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
733 + fi
734 +
735 + cmake_run_in src cmake_comment_add_subdirectory l10n
736 +}
737 +
738 +src_configure() {
739 + local mycmakeargs=(
740 + $(cmake_use_find_package X X11)
741 + )
742 +
743 + ecm_src_configure
744 +}
745
746 diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.99.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.99.0.ebuild
747 new file mode 100644
748 index 0000000..383b90d
749 --- /dev/null
750 +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.99.0.ebuild
751 @@ -0,0 +1,109 @@
752 +# Copyright 1999-2022 Gentoo Authors
753 +# Distributed under the terms of the GNU General Public License v2
754 +
755 +EAPI=8
756 +
757 +ECM_HANDBOOK="true"
758 +ECM_QTHELP="false"
759 +PVCUT=$(ver_cut 1-2)
760 +QTMIN=5.15.5
761 +VIRTUALX_REQUIRED="test"
762 +inherit ecm frameworks.kde.org
763 +
764 +DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
765 +
766 +LICENSE="LGPL-2+"
767 +KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
768 +IUSE="X"
769 +
770 +RESTRICT="test"
771 +
772 +COMMON_DEPEND="
773 + app-text/docbook-xml-dtd:4.2
774 + dev-libs/openssl:0
775 + >=dev-qt/qtdbus-${QTMIN}:5
776 + >=dev-qt/qtgui-${QTMIN}:5
777 + >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
778 + >=dev-qt/qtprintsupport-${QTMIN}:5
779 + >=dev-qt/qtsvg-${QTMIN}:5
780 + >=dev-qt/qttest-${QTMIN}:5
781 + >=dev-qt/qtwidgets-${QTMIN}:5
782 + =kde-frameworks/kauth-${PVCUT}*:5
783 + =kde-frameworks/kcodecs-${PVCUT}*:5
784 + =kde-frameworks/kcompletion-${PVCUT}*:5
785 + =kde-frameworks/kconfig-${PVCUT}*:5
786 + =kde-frameworks/kconfigwidgets-${PVCUT}*:5
787 + =kde-frameworks/kcoreaddons-${PVCUT}*:5
788 + =kde-frameworks/kcrash-${PVCUT}*:5
789 + =kde-frameworks/kdbusaddons-${PVCUT}*:5
790 + >=kde-frameworks/kded-${PVCUT}:5
791 + =kde-frameworks/kdoctools-${PVCUT}*:5
792 + =kde-frameworks/kemoticons-${PVCUT}*:5
793 + =kde-frameworks/kglobalaccel-${PVCUT}*:5
794 + =kde-frameworks/kguiaddons-${PVCUT}*:5
795 + =kde-frameworks/ki18n-${PVCUT}*:5
796 + =kde-frameworks/kiconthemes-${PVCUT}*:5
797 + =kde-frameworks/kio-${PVCUT}*:5
798 + =kde-frameworks/kitemviews-${PVCUT}*:5
799 + =kde-frameworks/kjobwidgets-${PVCUT}*:5
800 + =kde-frameworks/knotifications-${PVCUT}*:5[X?]
801 + =kde-frameworks/kparts-${PVCUT}*:5
802 + =kde-frameworks/kservice-${PVCUT}*:5
803 + =kde-frameworks/ktextwidgets-${PVCUT}*:5
804 + =kde-frameworks/kunitconversion-${PVCUT}*:5
805 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
806 + =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
807 + =kde-frameworks/kxmlgui-${PVCUT}*:5
808 + =kde-frameworks/solid-${PVCUT}*:5
809 + virtual/libintl
810 + X? (
811 + >=dev-qt/qtx11extras-${QTMIN}:5
812 + x11-libs/libICE
813 + x11-libs/libSM
814 + x11-libs/libX11
815 + x11-libs/libxcb
816 + )
817 +"
818 +DEPEND="${COMMON_DEPEND}
819 + test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
820 + X? ( x11-base/xorg-proto )
821 +"
822 +RDEPEND="${COMMON_DEPEND}
823 + >=dev-qt/qtxml-${QTMIN}:5
824 + >=kde-frameworks/countryflags-${PVCUT}:5
825 + =kde-frameworks/kinit-${PVCUT}*:5
826 + =kde-frameworks/kitemmodels-${PVCUT}*:5
827 +"
828 +BDEPEND="
829 + dev-lang/perl
830 + dev-perl/URI
831 +"
832 +
833 +PATCHES=(
834 + # downstream patches
835 + "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956
836 + "${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956
837 + # pending upstream:
838 + # https://invent.kde.org/frameworks/kdelibs4support/-/merge_requests/21
839 + "${FILESDIR}/${P}-with_x11.patch"
840 + "${FILESDIR}/${PN}-kssl_certificate-0.96.0.patch"
841 + "${FILESDIR}/${PN}-kssl_openssl-5.96.0.patch"
842 +)
843 +
844 +src_prepare() {
845 + ecm_src_prepare
846 +
847 + if ! use handbook; then
848 + sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
849 + fi
850 +
851 + cmake_run_in src cmake_comment_add_subdirectory l10n
852 +}
853 +
854 +src_configure() {
855 + local mycmakeargs=(
856 + -DWITH_X11=$(usex X)
857 + )
858 +
859 + ecm_src_configure
860 +}
861
862 diff --git a/kde-frameworks/kdelibs4support/metadata.xml b/kde-frameworks/kdelibs4support/metadata.xml
863 new file mode 100644
864 index 0000000..f0d8686
865 --- /dev/null
866 +++ b/kde-frameworks/kdelibs4support/metadata.xml
867 @@ -0,0 +1,16 @@
868 +<?xml version="1.0" encoding="UTF-8"?>
869 +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
870 +<pkgmetadata>
871 + <maintainer type="project">
872 + <email>kde@g.o</email>
873 + <name>Gentoo KDE Project</name>
874 + </maintainer>
875 + <upstream>
876 + <bugs-to>https://github.com/gentoo/libressl/issues</bugs-to>
877 + </upstream>
878 + <slots>
879 + <subslots>
880 + Must only be used by packages that are known to use private parts of the Frameworks API.
881 + </subslots>
882 + </slots>
883 +</pkgmetadata>
Report Message
Find on MARC Find on Google Groups