Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/polkit-qt/, sys-auth/polkit-qt/files/
Date: Mon, 21 Feb 2022 16:48:34
Message-Id: 1645461910.aa5f00e41dde6a854658fa8e13b3a9c6fbe94dea.asturm@gentoo
1 commit: aa5f00e41dde6a854658fa8e13b3a9c6fbe94dea
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 21 16:23:36 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 21 16:45:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa5f00e4
7
8 sys-auth/polkit-qt: EAPI-8 bump, two upstream backports
9
10 Drop IUSE debug no-op
11 Improve cmake (not perfect yet)
12 Drop glib no-op by depending on >=2.36
13
14 Package-Manager: Portage-3.0.30, Repoman-3.0.3
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 .../polkit-qt/files/polkit-qt-0.114.0-cmake.patch | 301 +++++++++++++++++++++
18 .../files/polkit-qt-0.114.0-glib-2.36.patch | 188 +++++++++++++
19 sys-auth/polkit-qt/polkit-qt-0.114.0-r1.ebuild | 45 +++
20 3 files changed, 534 insertions(+)
21
22 diff --git a/sys-auth/polkit-qt/files/polkit-qt-0.114.0-cmake.patch b/sys-auth/polkit-qt/files/polkit-qt-0.114.0-cmake.patch
23 new file mode 100644
24 index 000000000000..232dcb502604
25 --- /dev/null
26 +++ b/sys-auth/polkit-qt/files/polkit-qt-0.114.0-cmake.patch
27 @@ -0,0 +1,301 @@
28 +From 1f151d81381106c15084280f1e11209d259ae45c Mon Sep 17 00:00:00 2001
29 +From: John Zimmermann <me@×××××××××××.dev>
30 +Date: Sat, 19 Jun 2021 15:47:56 +0200
31 +Subject: [PATCH] Change installed .cmake and .pc files to contain realtive
32 + paths
33 +
34 +The LIB_DESTINATION and INCLUDE_DESTIONATION variables do hold little
35 +value, since one can just override the normal CMAKE variables as needed.
36 +Furthermore using CMAKE_INSTALL_FULL_LIBDIR is harmful, since this
37 +prevents CMake to use it's logic to install relocatable .cmake files.
38 +Also libdir and includedir in pkgconfig files need to be prefixed by
39 +either ${exec_prefix} or ${prefix} for the same relocation reasons.
40 +---
41 + CMakeLists.txt | 27 +++++++++++----------------
42 + PolkitQt-1Config.cmake.in | 4 ++--
43 + agent/CMakeLists.txt | 6 +++---
44 + core/CMakeLists.txt | 6 +++---
45 + gui/CMakeLists.txt | 6 +++---
46 + polkit-qt-1.pc.cmake | 4 ++--
47 + polkit-qt-agent-1.pc.cmake | 4 ++--
48 + polkit-qt-core-1.pc.cmake | 4 ++--
49 + polkit-qt-gui-1.pc.cmake | 4 ++--
50 + polkit-qt5-1.pc.cmake | 4 ++--
51 + polkit-qt5-agent-1.pc.cmake | 4 ++--
52 + polkit-qt5-core-1.pc.cmake | 4 ++--
53 + polkit-qt5-gui-1.pc.cmake | 4 ++--
54 + 13 files changed, 38 insertions(+), 43 deletions(-)
55 +
56 +diff --git a/CMakeLists.txt b/CMakeLists.txt
57 +index 32eb737..a82f8cb 100644
58 +--- a/CMakeLists.txt
59 ++++ b/CMakeLists.txt
60 +@@ -21,11 +21,6 @@ include(GNUInstallDirs)
61 +
62 + include(FeatureSummary)
63 +
64 +-# Set the different paths
65 +-set(LIB_DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Library directory name")
66 +-set(INCLUDE_DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}" CACHE PATH "The subdirectory to the header prefix")
67 +-
68 +-
69 + set(REQUIRED_QT_VERSION 5.5.0)
70 + set(CMAKE_CXX_STANDARD 11)
71 +
72 +@@ -103,7 +98,7 @@ install(FILES
73 + ${CMAKE_CURRENT_BINARY_DIR}/agent/polkitqt1-agent-export.h
74 +
75 + DESTINATION
76 +- ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH} COMPONENT Devel)
77 ++ ${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH} COMPONENT Devel)
78 +
79 + install(FILES
80 + includes/PolkitQt1/Authority
81 +@@ -113,40 +108,40 @@ install(FILES
82 + includes/PolkitQt1/TemporaryAuthorization
83 + includes/PolkitQt1/ActionDescription
84 + DESTINATION
85 +- ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1 COMPONENT Devel)
86 ++ ${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1 COMPONENT Devel)
87 +
88 + install(FILES
89 + includes/PolkitQt1/Gui/Action
90 + includes/PolkitQt1/Gui/ActionButton
91 + includes/PolkitQt1/Gui/ActionButtons
92 + DESTINATION
93 +- ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1/Gui COMPONENT Devel)
94 ++ ${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1/Gui COMPONENT Devel)
95 +
96 + install(FILES
97 + includes/PolkitQt1/Agent/Listener
98 + includes/PolkitQt1/Agent/Session
99 + DESTINATION
100 +- ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1/Agent COMPONENT Devel)
101 ++ ${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1/Agent COMPONENT Devel)
102 +
103 + if(NOT WIN32)
104 + # Pkgconfig
105 + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_PCNAME}.pc @ONLY)
106 +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig )
107 ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_PCNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
108 + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_CORE_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_CORE_PCNAME}.pc
109 + @ONLY)
110 +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_CORE_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig )
111 ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_CORE_PCNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
112 + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_GUI_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_GUI_PCNAME}.pc @ONLY)
113 +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_GUI_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig )
114 ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_GUI_PCNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
115 + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc
116 + @ONLY)
117 +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig )
118 ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
119 + endif(NOT WIN32)
120 +
121 +
122 + if(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
123 +- set(_PolkitQt-1Config_INSTALL_DIR ${LIB_DESTINATION}/cmake/${POLKITQT-1_CAMEL_NAME})
124 ++ set(_PolkitQt-1Config_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${POLKITQT-1_CAMEL_NAME})
125 + else(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
126 +- set(_PolkitQt-1Config_INSTALL_DIR ${LIB_DESTINATION}/${POLKITQT-1_CAMEL_NAME}/cmake)
127 ++ set(_PolkitQt-1Config_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${POLKITQT-1_CAMEL_NAME}/cmake)
128 + endif(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
129 +
130 +
131 +@@ -154,7 +149,7 @@ endif(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
132 + configure_package_config_file(PolkitQt-1Config.cmake.in
133 + ${CMAKE_BINARY_DIR}/${POLKITQT-1_CAMEL_NAME}Config.cmake
134 + INSTALL_DESTINATION ${_PolkitQt-1Config_INSTALL_DIR}
135 +- PATH_VARS LIB_DESTINATION INCLUDE_DESTINATION
136 ++ PATH_VARS CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR
137 + )
138 +
139 + write_basic_package_version_file(${CMAKE_BINARY_DIR}/${POLKITQT-1_CAMEL_NAME}ConfigVersion.cmake
140 +diff --git a/PolkitQt-1Config.cmake.in b/PolkitQt-1Config.cmake.in
141 +index f39480c..e09678c 100644
142 +--- a/PolkitQt-1Config.cmake.in
143 ++++ b/PolkitQt-1Config.cmake.in
144 +@@ -20,9 +20,9 @@ if(NOT POLKITQT-1_INSTALL_DIR)
145 + set(POLKITQT-1_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@")
146 + endif(NOT POLKITQT-1_INSTALL_DIR)
147 +
148 +-set_and_check(POLKITQT-1_INCLUDE_DIR "@PACKAGE_INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@")
149 ++set_and_check(POLKITQT-1_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@")
150 + set_and_check(POLKITQT-1_INCLUDE_DIRS "${POLKITQT-1_INCLUDE_DIR}")
151 +-set_and_check(POLKITQT-1_LIB_DIR "@PACKAGE_LIB_DESTINATION@")
152 ++set_and_check(POLKITQT-1_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
153 + set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions")
154 + ##################################
155 +
156 +diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt
157 +index ccf2711..1a86cd8 100644
158 +--- a/agent/CMakeLists.txt
159 ++++ b/agent/CMakeLists.txt
160 +@@ -29,11 +29,11 @@ set_target_properties(${POLKITQT-1_AGENT_PCNAME} PROPERTIES VERSION ${POLKITQT-1
161 +
162 + target_include_directories(${POLKITQT-1_AGENT_PCNAME}
163 + INTERFACE
164 +- $<INSTALL_INTERFACE:${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}>
165 ++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}>
166 + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
167 + $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
168 + )
169 +
170 +-install(TARGETS ${POLKITQT-1_AGENT_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${LIB_DESTINATION}
171 +- LIBRARY DESTINATION ${LIB_DESTINATION}
172 ++install(TARGETS ${POLKITQT-1_AGENT_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
173 ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
174 + RUNTIME DESTINATION bin)
175 +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
176 +index 3a80adc..8225871 100644
177 +--- a/core/CMakeLists.txt
178 ++++ b/core/CMakeLists.txt
179 +@@ -32,12 +32,12 @@ set_target_properties(${POLKITQT-1_CORE_PCNAME} PROPERTIES VERSION ${POLKITQT-1_
180 +
181 + target_include_directories(${POLKITQT-1_CORE_PCNAME}
182 + INTERFACE
183 +- $<INSTALL_INTERFACE:${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}>
184 ++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}>
185 + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
186 + $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
187 + )
188 +
189 +-install(TARGETS ${POLKITQT-1_CORE_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${LIB_DESTINATION}
190 +- LIBRARY DESTINATION ${LIB_DESTINATION}
191 ++install(TARGETS ${POLKITQT-1_CORE_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
192 ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
193 + RUNTIME DESTINATION bin)
194 +
195 +diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
196 +index d9d800d..c22deba 100644
197 +--- a/gui/CMakeLists.txt
198 ++++ b/gui/CMakeLists.txt
199 +@@ -28,11 +28,11 @@ set_target_properties(${POLKITQT-1_GUI_PCNAME} PROPERTIES VERSION ${POLKITQT-1_L
200 +
201 + target_include_directories(${POLKITQT-1_GUI_PCNAME}
202 + INTERFACE
203 +- $<INSTALL_INTERFACE:${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}>
204 ++ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}>
205 + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
206 + $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
207 + )
208 +
209 +-install(TARGETS ${POLKITQT-1_GUI_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${LIB_DESTINATION}
210 +- LIBRARY DESTINATION ${LIB_DESTINATION}
211 ++install(TARGETS ${POLKITQT-1_GUI_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
212 ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
213 + RUNTIME DESTINATION bin)
214 +diff --git a/polkit-qt-1.pc.cmake b/polkit-qt-1.pc.cmake
215 +index 7cc55a9..ba8e46e 100644
216 +--- a/polkit-qt-1.pc.cmake
217 ++++ b/polkit-qt-1.pc.cmake
218 +@@ -1,7 +1,7 @@
219 + prefix=@CMAKE_INSTALL_PREFIX@
220 + exec_prefix=@CMAKE_INSTALL_PREFIX@
221 +-libdir=@LIB_DESTINATION@
222 +-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
223 ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
224 ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
225 +
226 + Name: @POLKITQT-1_PCNAME@
227 + Description: Convenience library for using polkit with a Qt-styled API
228 +diff --git a/polkit-qt-agent-1.pc.cmake b/polkit-qt-agent-1.pc.cmake
229 +index 001925d..23b2cae 100644
230 +--- a/polkit-qt-agent-1.pc.cmake
231 ++++ b/polkit-qt-agent-1.pc.cmake
232 +@@ -1,7 +1,7 @@
233 + prefix=@CMAKE_INSTALL_PREFIX@
234 + exec_prefix=@CMAKE_INSTALL_PREFIX@
235 +-libdir=@LIB_DESTINATION@
236 +-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
237 ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
238 ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
239 +
240 + Name: @POLKITQT-1_AGENT_PCNAME@
241 + Description: Convenience library for using polkit Agent with a Qt-styled API
242 +diff --git a/polkit-qt-core-1.pc.cmake b/polkit-qt-core-1.pc.cmake
243 +index ca435a6..fa501f0 100644
244 +--- a/polkit-qt-core-1.pc.cmake
245 ++++ b/polkit-qt-core-1.pc.cmake
246 +@@ -1,7 +1,7 @@
247 + prefix=@CMAKE_INSTALL_PREFIX@
248 + exec_prefix=@CMAKE_INSTALL_PREFIX@
249 +-libdir=@LIB_DESTINATION@
250 +-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
251 ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
252 ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
253 +
254 + Name: @POLKITQT-1_CORE_PCNAME@
255 + Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes
256 +diff --git a/polkit-qt-gui-1.pc.cmake b/polkit-qt-gui-1.pc.cmake
257 +index e7279d1..7261b0c 100644
258 +--- a/polkit-qt-gui-1.pc.cmake
259 ++++ b/polkit-qt-gui-1.pc.cmake
260 +@@ -1,7 +1,7 @@
261 + prefix=@CMAKE_INSTALL_PREFIX@
262 + exec_prefix=@CMAKE_INSTALL_PREFIX@
263 +-libdir=@LIB_DESTINATION@
264 +-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
265 ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
266 ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
267 +
268 + Name: @POLKITQT-1_GUI_PCNAME@
269 + Description: Convenience library for using polkit with a Qt-styled API, GUI classes
270 +diff --git a/polkit-qt5-1.pc.cmake b/polkit-qt5-1.pc.cmake
271 +index 7cc55a9..ba8e46e 100644
272 +--- a/polkit-qt5-1.pc.cmake
273 ++++ b/polkit-qt5-1.pc.cmake
274 +@@ -1,7 +1,7 @@
275 + prefix=@CMAKE_INSTALL_PREFIX@
276 + exec_prefix=@CMAKE_INSTALL_PREFIX@
277 +-libdir=@LIB_DESTINATION@
278 +-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
279 ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
280 ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
281 +
282 + Name: @POLKITQT-1_PCNAME@
283 + Description: Convenience library for using polkit with a Qt-styled API
284 +diff --git a/polkit-qt5-agent-1.pc.cmake b/polkit-qt5-agent-1.pc.cmake
285 +index fabc0db..709a24e 100644
286 +--- a/polkit-qt5-agent-1.pc.cmake
287 ++++ b/polkit-qt5-agent-1.pc.cmake
288 +@@ -1,7 +1,7 @@
289 + prefix=@CMAKE_INSTALL_PREFIX@
290 + exec_prefix=@CMAKE_INSTALL_PREFIX@
291 +-libdir=@LIB_DESTINATION@
292 +-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
293 ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
294 ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
295 +
296 + Name: @POLKITQT-1_AGENT_PCNAME@
297 + Description: Convenience library for using polkit Agent with a Qt-styled API
298 +diff --git a/polkit-qt5-core-1.pc.cmake b/polkit-qt5-core-1.pc.cmake
299 +index 33687c2..588f267 100644
300 +--- a/polkit-qt5-core-1.pc.cmake
301 ++++ b/polkit-qt5-core-1.pc.cmake
302 +@@ -1,7 +1,7 @@
303 + prefix=@CMAKE_INSTALL_PREFIX@
304 + exec_prefix=@CMAKE_INSTALL_PREFIX@
305 +-libdir=@LIB_DESTINATION@
306 +-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
307 ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
308 ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
309 +
310 + Name: @POLKITQT-1_CORE_PCNAME@
311 + Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes
312 +diff --git a/polkit-qt5-gui-1.pc.cmake b/polkit-qt5-gui-1.pc.cmake
313 +index 4280226..1c012dd 100644
314 +--- a/polkit-qt5-gui-1.pc.cmake
315 ++++ b/polkit-qt5-gui-1.pc.cmake
316 +@@ -1,7 +1,7 @@
317 + prefix=@CMAKE_INSTALL_PREFIX@
318 + exec_prefix=@CMAKE_INSTALL_PREFIX@
319 +-libdir=@LIB_DESTINATION@
320 +-includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
321 ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
322 ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
323 +
324 + Name: @POLKITQT-1_GUI_PCNAME@
325 + Description: Convenience library for using polkit with a Qt-styled API, GUI classes
326 +--
327 +GitLab
328 +
329
330 diff --git a/sys-auth/polkit-qt/files/polkit-qt-0.114.0-glib-2.36.patch b/sys-auth/polkit-qt/files/polkit-qt-0.114.0-glib-2.36.patch
331 new file mode 100644
332 index 000000000000..bc9da1c4dc4f
333 --- /dev/null
334 +++ b/sys-auth/polkit-qt/files/polkit-qt-0.114.0-glib-2.36.patch
335 @@ -0,0 +1,188 @@
336 +From 2656bf02e19f282ee963309a48ba497873e9fa40 Mon Sep 17 00:00:00 2001
337 +From: Albert Astals Cid <aacid@×××.org>
338 +Date: Fri, 6 Aug 2021 11:57:43 +0200
339 +Subject: [PATCH] Require glib 2.36 and remove "do nothing" g_type_init
340 +
341 +g_type_init deprecated and a no-op since glib 2.36
342 +
343 +glib 2.36 was released in 2013, i think it's a reasonable min dependency
344 +nowadays
345 +---
346 + CMakeLists.txt | 2 +-
347 + agent/polkitqt1-agent-listener.cpp | 4 ----
348 + agent/polkitqtlistener.cpp | 1 -
349 + core/polkitqt1-actiondescription.cpp | 2 --
350 + core/polkitqt1-authority.cpp | 2 --
351 + core/polkitqt1-details.cpp | 2 --
352 + core/polkitqt1-identity.cpp | 2 --
353 + core/polkitqt1-subject.cpp | 5 -----
354 + core/polkitqt1-temporaryauthorization.cpp | 1 -
355 + examples/agent/pkagentexample.cpp | 2 --
356 + 10 files changed, 1 insertion(+), 22 deletions(-)
357 +
358 +diff --git a/CMakeLists.txt b/CMakeLists.txt
359 +index a82f8cb..dd0977e 100644
360 +--- a/CMakeLists.txt
361 ++++ b/CMakeLists.txt
362 +@@ -40,7 +40,7 @@ set(POLKITQT-1_INCLUDE_PATH "polkit-qt5-1")
363 +
364 + pkg_check_modules(POLKIT_GOBJECT polkit-gobject-1 REQUIRED IMPORTED_TARGET)
365 + pkg_check_modules(POLKIT_AGENT polkit-agent-1 REQUIRED IMPORTED_TARGET)
366 +-pkg_check_modules(GLIB2 glib-2.0 REQUIRED IMPORTED_TARGET)
367 ++pkg_check_modules(GLIB2 glib-2.0>=2.36 REQUIRED IMPORTED_TARGET)
368 + pkg_check_modules(GOBJECT gobject-2.0 REQUIRED IMPORTED_TARGET)
369 +
370 + add_definitions(-DQT_NO_KEYWORDS)
371 +diff --git a/agent/polkitqt1-agent-listener.cpp b/agent/polkitqt1-agent-listener.cpp
372 +index cb99299..27348b1 100644
373 +--- a/agent/polkitqt1-agent-listener.cpp
374 ++++ b/agent/polkitqt1-agent-listener.cpp
375 +@@ -34,8 +34,6 @@ public:
376 + Listener::Listener(QObject *parent)
377 + : QObject(parent), d(new ListenerPrivate)
378 + {
379 +- g_type_init();
380 +-
381 + d->listener = polkit_qt_listener_new();
382 +
383 + qDebug() << "New PolkitAgentListener " << d->listener;
384 +@@ -46,8 +44,6 @@ Listener::Listener(QObject *parent)
385 + Listener::Listener(PolkitAgentListener *listener, QObject *parent)
386 + : QObject(parent), d(new ListenerPrivate)
387 + {
388 +- g_type_init();
389 +-
390 + d->listener = listener;
391 +
392 + if (d->listener != nullptr) {
393 +diff --git a/agent/polkitqtlistener.cpp b/agent/polkitqtlistener.cpp
394 +index 69c4f8a..e8713b5 100644
395 +--- a/agent/polkitqtlistener.cpp
396 ++++ b/agent/polkitqtlistener.cpp
397 +@@ -49,7 +49,6 @@ G_DEFINE_TYPE(PolkitQtListener, polkit_qt_listener, POLKIT_AGENT_TYPE_LISTENER)
398 +
399 + static void polkit_qt_listener_init(PolkitQtListener *listener)
400 + {
401 +- g_type_init();
402 + }
403 +
404 + static void polkit_qt_listener_finalize(GObject *object)
405 +diff --git a/core/polkitqt1-actiondescription.cpp b/core/polkitqt1-actiondescription.cpp
406 +index f865c37..c08f5c4 100644
407 +--- a/core/polkitqt1-actiondescription.cpp
408 ++++ b/core/polkitqt1-actiondescription.cpp
409 +@@ -55,8 +55,6 @@ ActionDescription::ActionDescription()
410 + ActionDescription::ActionDescription(PolkitActionDescription *polkitActionDescription)
411 + : d(new Data)
412 + {
413 +- g_type_init();
414 +-
415 + d->actionId = QString::fromUtf8(polkit_action_description_get_action_id(polkitActionDescription));
416 + d->description = QString::fromUtf8(polkit_action_description_get_description(polkitActionDescription));
417 + d->message = QString::fromUtf8(polkit_action_description_get_message(polkitActionDescription));
418 +diff --git a/core/polkitqt1-authority.cpp b/core/polkitqt1-authority.cpp
419 +index a891b92..73dd97e 100644
420 +--- a/core/polkitqt1-authority.cpp
421 ++++ b/core/polkitqt1-authority.cpp
422 +@@ -172,8 +172,6 @@ void Authority::Private::init()
423 + QDBusError error;
424 + QDBusError dbus_error;
425 +
426 +- g_type_init();
427 +-
428 + m_systemBus = new QDBusConnection(QDBusConnection::connectToBus(QDBusConnection::SystemBus,
429 + QStringLiteral("polkit_qt_system_bus")));
430 +
431 +diff --git a/core/polkitqt1-details.cpp b/core/polkitqt1-details.cpp
432 +index b9494f0..ba107b1 100644
433 +--- a/core/polkitqt1-details.cpp
434 ++++ b/core/polkitqt1-details.cpp
435 +@@ -39,14 +39,12 @@ public:
436 + Details::Details()
437 + : d(new Data)
438 + {
439 +- g_type_init();
440 + d->polkitDetails = polkit_details_new();
441 + }
442 +
443 + Details::Details(PolkitDetails *pkDetails)
444 + : d(new Data)
445 + {
446 +- g_type_init();
447 + d->polkitDetails = pkDetails;
448 +
449 + if (d->polkitDetails != nullptr) {
450 +diff --git a/core/polkitqt1-identity.cpp b/core/polkitqt1-identity.cpp
451 +index 2489c33..0924c5a 100644
452 +--- a/core/polkitqt1-identity.cpp
453 ++++ b/core/polkitqt1-identity.cpp
454 +@@ -39,13 +39,11 @@ public:
455 + Identity::Identity()
456 + : d(new Data)
457 + {
458 +- g_type_init();
459 + }
460 +
461 + Identity::Identity(PolkitIdentity *polkitIdentity)
462 + : d(new Data)
463 + {
464 +- g_type_init();
465 + d->identity = polkitIdentity;
466 +
467 + if (d->identity) {
468 +diff --git a/core/polkitqt1-subject.cpp b/core/polkitqt1-subject.cpp
469 +index 3d86437..3dae3bd 100644
470 +--- a/core/polkitqt1-subject.cpp
471 ++++ b/core/polkitqt1-subject.cpp
472 +@@ -39,13 +39,11 @@ public:
473 + Subject::Subject()
474 + : d(new Data)
475 + {
476 +- g_type_init();
477 + }
478 +
479 + Subject::Subject(PolkitSubject *subject)
480 + : d(new Data)
481 + {
482 +- g_type_init();
483 + d->subject = subject;
484 +
485 + if (d->subject != nullptr) {
486 +@@ -95,9 +93,6 @@ QString Subject::toString() const
487 +
488 + Subject Subject::fromString(const QString &string)
489 + {
490 +- // should be in polkit library!!! but for strange reason it's necessary to have it here
491 +- g_type_init();
492 +-
493 + Subject subject;
494 + GError *error = nullptr;
495 + subject.d->subject = polkit_subject_from_string(string.toUtf8().data(), &error);
496 +diff --git a/core/polkitqt1-temporaryauthorization.cpp b/core/polkitqt1-temporaryauthorization.cpp
497 +index 64209ff..ae40f3b 100644
498 +--- a/core/polkitqt1-temporaryauthorization.cpp
499 ++++ b/core/polkitqt1-temporaryauthorization.cpp
500 +@@ -38,7 +38,6 @@ public:
501 + TemporaryAuthorization::TemporaryAuthorization(PolkitTemporaryAuthorization *pkTemporaryAuthorization)
502 + : d(new Data)
503 + {
504 +- g_type_init();
505 + d->id = QString::fromUtf8(polkit_temporary_authorization_get_id(pkTemporaryAuthorization));
506 + d->actionId = QString::fromUtf8(polkit_temporary_authorization_get_action_id(pkTemporaryAuthorization));
507 + d->subject = Subject::fromString(polkit_subject_to_string(polkit_temporary_authorization_get_subject(pkTemporaryAuthorization)));
508 +diff --git a/examples/agent/pkagentexample.cpp b/examples/agent/pkagentexample.cpp
509 +index 8b1128b..da555c7 100644
510 +--- a/examples/agent/pkagentexample.cpp
511 ++++ b/examples/agent/pkagentexample.cpp
512 +@@ -9,8 +9,6 @@
513 + PkAgentExample::PkAgentExample(int &argc, char **argv)
514 + : QCoreApplication(argc, argv)
515 + {
516 +- g_type_init();
517 +-
518 + PolkitQt1::UnixSessionSubject session(getpid());
519 +
520 + m_listener.registerListener(session, "/org/kde/PolicyKit1/AuthenticationAgent");
521 +--
522 +GitLab
523 +
524
525 diff --git a/sys-auth/polkit-qt/polkit-qt-0.114.0-r1.ebuild b/sys-auth/polkit-qt/polkit-qt-0.114.0-r1.ebuild
526 new file mode 100644
527 index 000000000000..d2ed0e07d44f
528 --- /dev/null
529 +++ b/sys-auth/polkit-qt/polkit-qt-0.114.0-r1.ebuild
530 @@ -0,0 +1,45 @@
531 +# Copyright 1999-2022 Gentoo Authors
532 +# Distributed under the terms of the GNU General Public License v2
533 +
534 +EAPI=8
535 +
536 +KDE_ORG_CATEGORY="libraries"
537 +KDE_ORG_NAME="polkit-qt-1"
538 +inherit cmake kde.org
539 +
540 +DESCRIPTION="Qt wrapper around polkit-1 client libraries"
541 +HOMEPAGE="https://api.kde.org/polkit-qt-1/html/"
542 +
543 +if [[ ${KDE_BUILD_TYPE} = release ]]; then
544 + SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${KDE_ORG_NAME}-${PV}.tar.xz"
545 + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
546 +fi
547 +
548 +LICENSE="LGPL-2"
549 +SLOT="0"
550 +IUSE=""
551 +
552 +RDEPEND="
553 + dev-libs/glib:2
554 + dev-qt/qtcore:5
555 + dev-qt/qtdbus:5
556 + dev-qt/qtgui:5
557 + dev-qt/qtwidgets:5
558 + >=sys-auth/polkit-0.103
559 +"
560 +DEPEND="${RDEPEND}"
561 +BDEPEND="virtual/pkgconfig"
562 +
563 +DOCS=( AUTHORS README README.porting TODO )
564 +
565 +PATCHES=(
566 + "${FILESDIR}/${P}-cmake.patch"
567 + "${FILESDIR}/${P}-glib-2.36.patch"
568 +)
569 +
570 +src_configure() {
571 + local mycmakeargs=(
572 + -DBUILD_EXAMPLES=OFF
573 + )
574 + cmake_src_configure
575 +}