Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] polkit-qt5: update to 0.200.0., add qt6 version
@ 2024-03-05 15:56 Johnnynator
  2024-03-05 17:01 ` [PR PATCH] [Merged]: " Johnnynator
  0 siblings, 1 reply; 2+ messages in thread
From: Johnnynator @ 2024-03-05 15:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages polkit-qt
https://github.com/void-linux/void-packages/pull/49132

polkit-qt5: update to 0.200.0., add qt6 version
- **polkit-qt5: update to 0.200.0.**
- **New package: polkit-qt6-0.200.0**

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/49132.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-polkit-qt-49132.patch --]
[-- Type: text/x-diff, Size: 18374 bytes --]

From 829571a8792108df1f5c6d6bf6716603aad1f031 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 16:51:53 +0100
Subject: [PATCH 1/2] polkit-qt5: update to 0.200.0.

---
 ...ed-solution-to-get-find_package-work.patch | 296 ------------------
 srcpkgs/polkit-qt5/template                   |   4 +-
 2 files changed, 2 insertions(+), 298 deletions(-)
 delete mode 100644 srcpkgs/polkit-qt5/patches/0001-An-overcomplicated-solution-to-get-find_package-work.patch

diff --git a/srcpkgs/polkit-qt5/patches/0001-An-overcomplicated-solution-to-get-find_package-work.patch b/srcpkgs/polkit-qt5/patches/0001-An-overcomplicated-solution-to-get-find_package-work.patch
deleted file mode 100644
index a88b55eb8b0d94..00000000000000
--- a/srcpkgs/polkit-qt5/patches/0001-An-overcomplicated-solution-to-get-find_package-work.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From 4a3d7709baec95f1d6334fc8198977ff89fc5a35 Mon Sep 17 00:00:00 2001
-From: John Zimmermann <me@johnnynator.dev>
-Date: Sat, 19 Jun 2021 15:47:56 +0200
-Subject: [PATCH] An overcomplicated solution to get find_package working
- properly there used to be some absulte paths somewhere that broke the
- creation of the SmthTargets.cmake.
-
----
- CMakeLists.txt              | 27 +++++++++++----------------
- PolkitQt-1Config.cmake.in   |  4 ++--
- agent/CMakeLists.txt        |  6 +++---
- core/CMakeLists.txt         |  6 +++---
- gui/CMakeLists.txt          |  6 +++---
- polkit-qt-1.pc.cmake        |  4 ++--
- polkit-qt-agent-1.pc.cmake  |  4 ++--
- polkit-qt-core-1.pc.cmake   |  4 ++--
- polkit-qt-gui-1.pc.cmake    |  4 ++--
- polkit-qt5-1.pc.cmake       |  4 ++--
- polkit-qt5-agent-1.pc.cmake |  4 ++--
- polkit-qt5-core-1.pc.cmake  |  4 ++--
- polkit-qt5-gui-1.pc.cmake   |  4 ++--
- 13 files changed, 38 insertions(+), 43 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 32eb737..a82f8cb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,11 +21,6 @@ include(GNUInstallDirs)
- 
- include(FeatureSummary)
- 
--# Set the different paths
--set(LIB_DESTINATION         "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Library directory name")
--set(INCLUDE_DESTINATION     "${CMAKE_INSTALL_FULL_INCLUDEDIR}" CACHE PATH "The subdirectory to the header prefix")
--
--
- set(REQUIRED_QT_VERSION 5.5.0)
- set(CMAKE_CXX_STANDARD 11)
- 
-@@ -103,7 +98,7 @@ install(FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/agent/polkitqt1-agent-export.h
- 
-     DESTINATION
--    ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH} COMPONENT Devel)
-+    ${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH} COMPONENT Devel)
- 
- install(FILES
-     includes/PolkitQt1/Authority
-@@ -113,40 +108,40 @@ install(FILES
-     includes/PolkitQt1/TemporaryAuthorization
-     includes/PolkitQt1/ActionDescription
-     DESTINATION
--    ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1 COMPONENT Devel)
-+    ${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1 COMPONENT Devel)
- 
- install(FILES
-     includes/PolkitQt1/Gui/Action
-     includes/PolkitQt1/Gui/ActionButton
-     includes/PolkitQt1/Gui/ActionButtons
-     DESTINATION
--    ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1/Gui COMPONENT Devel)
-+    ${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1/Gui COMPONENT Devel)
- 
- install(FILES
-     includes/PolkitQt1/Agent/Listener
-     includes/PolkitQt1/Agent/Session
-     DESTINATION
--    ${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1/Agent COMPONENT Devel)
-+    ${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}/PolkitQt1/Agent COMPONENT Devel)
- 
- if(NOT WIN32)
-     # Pkgconfig
-     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_PCNAME}.pc @ONLY)
--    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig )
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_PCNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_CORE_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_CORE_PCNAME}.pc
-                    @ONLY)
--    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_CORE_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig )
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_CORE_PCNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_GUI_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_GUI_PCNAME}.pc @ONLY)
--    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_GUI_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig )
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_GUI_PCNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc
-                    @ONLY)
--    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc DESTINATION ${LIB_DESTINATION}/pkgconfig )
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${POLKITQT-1_AGENT_PCNAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
- endif(NOT WIN32)
- 
- 
- if(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
--   set(_PolkitQt-1Config_INSTALL_DIR ${LIB_DESTINATION}/cmake/${POLKITQT-1_CAMEL_NAME})
-+   set(_PolkitQt-1Config_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${POLKITQT-1_CAMEL_NAME})
- else(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
--   set(_PolkitQt-1Config_INSTALL_DIR ${LIB_DESTINATION}/${POLKITQT-1_CAMEL_NAME}/cmake)
-+   set(_PolkitQt-1Config_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${POLKITQT-1_CAMEL_NAME}/cmake)
- endif(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
- 
- 
-@@ -154,7 +149,7 @@ endif(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
- configure_package_config_file(PolkitQt-1Config.cmake.in
-                               ${CMAKE_BINARY_DIR}/${POLKITQT-1_CAMEL_NAME}Config.cmake
-                               INSTALL_DESTINATION ${_PolkitQt-1Config_INSTALL_DIR}
--                              PATH_VARS LIB_DESTINATION INCLUDE_DESTINATION
-+                              PATH_VARS CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR
- )
- 
- write_basic_package_version_file(${CMAKE_BINARY_DIR}/${POLKITQT-1_CAMEL_NAME}ConfigVersion.cmake
-diff --git a/PolkitQt-1Config.cmake.in b/PolkitQt-1Config.cmake.in
-index f39480c..e09678c 100644
---- a/PolkitQt-1Config.cmake.in
-+++ b/PolkitQt-1Config.cmake.in
-@@ -20,9 +20,9 @@ if(NOT POLKITQT-1_INSTALL_DIR)
-    set(POLKITQT-1_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@")
- endif(NOT POLKITQT-1_INSTALL_DIR)
- 
--set_and_check(POLKITQT-1_INCLUDE_DIR "@PACKAGE_INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@")
-+set_and_check(POLKITQT-1_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@")
- set_and_check(POLKITQT-1_INCLUDE_DIRS "${POLKITQT-1_INCLUDE_DIR}")
--set_and_check(POLKITQT-1_LIB_DIR "@PACKAGE_LIB_DESTINATION@")
-+set_and_check(POLKITQT-1_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
- set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions")
- ##################################
- 
-diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt
-index ccf2711..1a86cd8 100644
---- a/agent/CMakeLists.txt
-+++ b/agent/CMakeLists.txt
-@@ -29,11 +29,11 @@ set_target_properties(${POLKITQT-1_AGENT_PCNAME} PROPERTIES VERSION ${POLKITQT-1
- 
- target_include_directories(${POLKITQT-1_AGENT_PCNAME}
-     INTERFACE
--        $<INSTALL_INTERFACE:${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}>
-+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}>
-         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
- )
- 
--install(TARGETS ${POLKITQT-1_AGENT_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${LIB_DESTINATION}
--                               LIBRARY DESTINATION ${LIB_DESTINATION}
-+install(TARGETS ${POLKITQT-1_AGENT_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+                               LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                                RUNTIME DESTINATION bin)
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 3a80adc..8225871 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -32,12 +32,12 @@ set_target_properties(${POLKITQT-1_CORE_PCNAME} PROPERTIES VERSION ${POLKITQT-1_
- 
- target_include_directories(${POLKITQT-1_CORE_PCNAME}
-     INTERFACE
--        $<INSTALL_INTERFACE:${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}>
-+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}>
-         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
- )
- 
--install(TARGETS ${POLKITQT-1_CORE_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${LIB_DESTINATION}
--                               LIBRARY DESTINATION ${LIB_DESTINATION}
-+install(TARGETS ${POLKITQT-1_CORE_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+                               LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                                RUNTIME DESTINATION bin)
- 
-diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
-index d9d800d..c22deba 100644
---- a/gui/CMakeLists.txt
-+++ b/gui/CMakeLists.txt
-@@ -28,11 +28,11 @@ set_target_properties(${POLKITQT-1_GUI_PCNAME} PROPERTIES VERSION ${POLKITQT-1_L
- 
- target_include_directories(${POLKITQT-1_GUI_PCNAME}
-     INTERFACE
--        $<INSTALL_INTERFACE:${INCLUDE_DESTINATION}/${POLKITQT-1_INCLUDE_PATH}>
-+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${POLKITQT-1_INCLUDE_PATH}>
-         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
- )
- 
--install(TARGETS ${POLKITQT-1_GUI_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${LIB_DESTINATION}
--                               LIBRARY DESTINATION ${LIB_DESTINATION}
-+install(TARGETS ${POLKITQT-1_GUI_PCNAME} EXPORT ${POLKITQT-1_CAMEL_NAME}Export ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+                               LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                                RUNTIME DESTINATION bin)
-diff --git a/polkit-qt-1.pc.cmake b/polkit-qt-1.pc.cmake
-index 7cc55a9..ba8e46e 100644
---- a/polkit-qt-1.pc.cmake
-+++ b/polkit-qt-1.pc.cmake
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_DESTINATION@
--includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
- 
- Name: @POLKITQT-1_PCNAME@
- Description: Convenience library for using polkit with a Qt-styled API
-diff --git a/polkit-qt-agent-1.pc.cmake b/polkit-qt-agent-1.pc.cmake
-index 001925d..23b2cae 100644
---- a/polkit-qt-agent-1.pc.cmake
-+++ b/polkit-qt-agent-1.pc.cmake
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_DESTINATION@
--includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
- 
- Name: @POLKITQT-1_AGENT_PCNAME@
- Description: Convenience library for using polkit Agent with a Qt-styled API
-diff --git a/polkit-qt-core-1.pc.cmake b/polkit-qt-core-1.pc.cmake
-index ca435a6..fa501f0 100644
---- a/polkit-qt-core-1.pc.cmake
-+++ b/polkit-qt-core-1.pc.cmake
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_DESTINATION@
--includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
- 
- Name: @POLKITQT-1_CORE_PCNAME@
- Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes
-diff --git a/polkit-qt-gui-1.pc.cmake b/polkit-qt-gui-1.pc.cmake
-index e7279d1..7261b0c 100644
---- a/polkit-qt-gui-1.pc.cmake
-+++ b/polkit-qt-gui-1.pc.cmake
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_DESTINATION@
--includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
- 
- Name: @POLKITQT-1_GUI_PCNAME@
- Description: Convenience library for using polkit with a Qt-styled API, GUI classes
-diff --git a/polkit-qt5-1.pc.cmake b/polkit-qt5-1.pc.cmake
-index 7cc55a9..ba8e46e 100644
---- a/polkit-qt5-1.pc.cmake
-+++ b/polkit-qt5-1.pc.cmake
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_DESTINATION@
--includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
- 
- Name: @POLKITQT-1_PCNAME@
- Description: Convenience library for using polkit with a Qt-styled API
-diff --git a/polkit-qt5-agent-1.pc.cmake b/polkit-qt5-agent-1.pc.cmake
-index fabc0db..709a24e 100644
---- a/polkit-qt5-agent-1.pc.cmake
-+++ b/polkit-qt5-agent-1.pc.cmake
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_DESTINATION@
--includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
- 
- Name: @POLKITQT-1_AGENT_PCNAME@
- Description: Convenience library for using polkit Agent with a Qt-styled API
-diff --git a/polkit-qt5-core-1.pc.cmake b/polkit-qt5-core-1.pc.cmake
-index 33687c2..588f267 100644
---- a/polkit-qt5-core-1.pc.cmake
-+++ b/polkit-qt5-core-1.pc.cmake
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_DESTINATION@
--includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
- 
- Name: @POLKITQT-1_CORE_PCNAME@
- Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes
-diff --git a/polkit-qt5-gui-1.pc.cmake b/polkit-qt5-gui-1.pc.cmake
-index 4280226..1c012dd 100644
---- a/polkit-qt5-gui-1.pc.cmake
-+++ b/polkit-qt5-gui-1.pc.cmake
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_DESTINATION@
--includedir=@INCLUDE_DESTINATION@/@POLKITQT-1_INCLUDE_PATH@
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@
- 
- Name: @POLKITQT-1_GUI_PCNAME@
- Description: Convenience library for using polkit with a Qt-styled API, GUI classes
--- 
-2.32.0
-
diff --git a/srcpkgs/polkit-qt5/template b/srcpkgs/polkit-qt5/template
index 098d9c085b17d4..9e54b4defc9ee2 100644
--- a/srcpkgs/polkit-qt5/template
+++ b/srcpkgs/polkit-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-qt5'
 pkgname=polkit-qt5
-version=0.114.0
+version=0.200.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config git qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/libraries/polkit-qt-1"
 distfiles="${KDE_SITE}/polkit-qt-1/polkit-qt-1-${version}.tar.xz"
-checksum=2eb0f22445888295ffa2bfbc0c3693847a0f973bb6b0c3e4cce0218be7e3907e
+checksum=5d3b611c062d2b76a93750bb10c907bfd21d1ff08d0a15dc2cf63e278e1677fb
 
 polkit-qt5-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 8507c726b78b8b960acd57e341d972f43cb5e070 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 5 Mar 2024 16:55:05 +0100
Subject: [PATCH 2/2] New package: polkit-qt6-0.200.0

---
 common/shlibs               |  3 +++
 srcpkgs/polkit-qt6-devel    |  1 +
 srcpkgs/polkit-qt6/template | 25 +++++++++++++++++++++++++
 srcpkgs/polkit-qt6/update   |  1 +
 4 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/polkit-qt6-devel
 create mode 100644 srcpkgs/polkit-qt6/template
 create mode 100644 srcpkgs/polkit-qt6/update

diff --git a/common/shlibs b/common/shlibs
index 27effd372a4cf6..42a267d4961567 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1944,6 +1944,9 @@ libsysstat-qt5.so.0 libsysstat-0.3.2_1
 libpolkit-qt5-agent-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
+libpolkit-qt6-core-1.so.1 polkit-qt6-0.200.0_1
+libpolkit-qt6-gui-1.so.1 polkit-qt6-0.200.0_1
+libpolkit-qt6-agent-1.so.1 polkit-qt6-0.200.0_1
 libfm-qt.so.14 libfm-qt-1.4.0_1
 libqtermwidget5.so.1 qtermwidget-1.0.0_1
 libmd4c.so.0 libmd4c-0.4.8_1
diff --git a/srcpkgs/polkit-qt6-devel b/srcpkgs/polkit-qt6-devel
new file mode 120000
index 00000000000000..ae9a5aeaba14cc
--- /dev/null
+++ b/srcpkgs/polkit-qt6-devel
@@ -0,0 +1 @@
+polkit-qt6
\ No newline at end of file
diff --git a/srcpkgs/polkit-qt6/template b/srcpkgs/polkit-qt6/template
new file mode 100644
index 00000000000000..73a6cce627d6bb
--- /dev/null
+++ b/srcpkgs/polkit-qt6/template
@@ -0,0 +1,25 @@
+# Template file for 'polkit-qt6'
+pkgname=polkit-qt6
+version=0.200.0
+revision=1
+build_style=cmake
+configure_args="-DQT_MAJOR_VERSION=6"
+hostmakedepends="pkg-config qt6-tools qt6-base"
+makedepends="polkit-devel qt6-base-devel"
+short_desc="Qt-style PolicyKit API (Qt6)"
+maintainer="John <me@johnnynator.dev>"
+license="LGPL-2.1-or-later"
+homepage="https://invent.kde.org/libraries/polkit-qt-1"
+distfiles="${KDE_SITE}/polkit-qt-1/polkit-qt-1-${version}.tar.xz"
+checksum=5d3b611c062d2b76a93750bb10c907bfd21d1ff08d0a15dc2cf63e278e1677fb
+
+polkit-qt6-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/polkit-qt6/update b/srcpkgs/polkit-qt6/update
new file mode 100644
index 00000000000000..64a01ae51ac29e
--- /dev/null
+++ b/srcpkgs/polkit-qt6/update
@@ -0,0 +1 @@
+pkgname=polkit-qt-1

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: polkit-qt5: update to 0.200.0., add qt6 version
  2024-03-05 15:56 [PR PATCH] polkit-qt5: update to 0.200.0., add qt6 version Johnnynator
@ 2024-03-05 17:01 ` Johnnynator
  0 siblings, 0 replies; 2+ messages in thread
From: Johnnynator @ 2024-03-05 17:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1180 bytes --]

There's a merged pull request on the void-packages repository

polkit-qt5: update to 0.200.0., add qt6 version
https://github.com/void-linux/void-packages/pull/49132

Description:
- **polkit-qt5: update to 0.200.0.**
- **New package: polkit-qt6-0.200.0**

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-03-05 17:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-05 15:56 [PR PATCH] polkit-qt5: update to 0.200.0., add qt6 version Johnnynator
2024-03-05 17:01 ` [PR PATCH] [Merged]: " Johnnynator

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).