Re: [PR PATCH] [Updated] Add PackageKit support to void

[costowell <costowell@users.noreply.github.com>]

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

There is an updated pull request by costowell against master on the void-packages repository

https://github.com/costowell/void-packages discover
https://github.com/void-linux/void-packages/pull/41359

Add PackageKit support to void
#### Testing the changes
- I tested the changes in this PR: **briefly**

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


#### Local build testing
- I built this PR locally for my native architecture, x86_64-GLIBC


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

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

From 91d2c3fa05fe24bdba7ee44e1602d863b26a4b7b Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Mon, 2 Jan 2023 10:28:08 -0600
Subject: [PATCH 01/15] common/shlibs: add libAppStreamQt.so.2

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 0a803960ab55..115c5daca3bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4224,3 +4224,4 @@ libIlmThread-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
+libAppStreamQt.so.2 AppStream-qt-0.15.5_2

From 53531315b416f324b4f3d0d02304df2fa84846ce Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Mon, 2 Jan 2023 10:34:17 -0600
Subject: [PATCH 02/15] PackageKit: add packagekitd runit service

---
 srcpkgs/PackageKit/files/packagekitd/run | 4 ++++
 srcpkgs/PackageKit/template              | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100644 srcpkgs/PackageKit/files/packagekitd/run

diff --git a/srcpkgs/PackageKit/files/packagekitd/run b/srcpkgs/PackageKit/files/packagekitd/run
new file mode 100644
index 000000000000..ffb2697d341a
--- /dev/null
+++ b/srcpkgs/PackageKit/files/packagekitd/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+sv check dbus > /dev/null || exit 1
+exec /usr/libexec/packagekitd --backend dummy > /dev/null 2>&1
diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index e498301a0f22..11661e34e141 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -22,6 +22,10 @@ conf_files="/etc/PackageKit/PackageKit.conf /etc/PackageKit/PackageKit.conf"
 build_options="gir vala"
 build_options_default="gir vala"
 
+post_install() {
+	vsv packagekitd
+}
+
 PackageKit-devel_package() {
 	depends="PackageKit-${version}_${revision}"
 	short_desc+=" - development files"

From 4f19f2f3f5eb8c345c7ef39fc0b15c4370c801d9 Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Mon, 2 Jan 2023 12:55:39 -0600
Subject: [PATCH 03/15] New package: PackageKit-qt-1.1.0

Remove hostmakedepends
---
 srcpkgs/PackageKit-qt/template | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/PackageKit-qt/template

diff --git a/srcpkgs/PackageKit-qt/template b/srcpkgs/PackageKit-qt/template
new file mode 100644
index 000000000000..c8db4b3aa0c1
--- /dev/null
+++ b/srcpkgs/PackageKit-qt/template
@@ -0,0 +1,12 @@
+# Template file for 'PackageKit-qt'
+pkgname=PackageKit-qt
+version=1.1.0
+revision=1
+build_style=cmake
+makedepends="qt5-devel PackageKit-devel"
+short_desc="Qt bindings for PackageKit"
+maintainer="Cole Stowell <cole@stowell.pro>"
+license="LGPL-2.1-only"
+homepage="https://www.freedesktop.org/software/PackageKit/"
+distfiles="${FREEDESKTOP_SITE}/PackageKit/releases/PackageKit-Qt-${version}.tar.xz"
+checksum=8a0ac393eb34c9b896be3f6f260247c067b2af8b54cb53e12b4c6163c1cfc98d

From 0ec6a84637ea241955db2424d38ac7d2b50919cf Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Mon, 2 Jan 2023 13:36:55 -0600
Subject: [PATCH 04/15] New package: discover-5.26.4

---
 srcpkgs/discover/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/discover/template

diff --git a/srcpkgs/discover/template b/srcpkgs/discover/template
new file mode 100644
index 000000000000..e0daef520006
--- /dev/null
+++ b/srcpkgs/discover/template
@@ -0,0 +1,13 @@
+# Template file for 'discover'
+pkgname=discover
+version=5.26.4
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config extra-cmake-modules qt5-qmake"
+makedepends="plasma-workspace-devel AppStream-devel AppStream-qt PackageKit-devel qt5-devel qt5-webview-devel gettext-devel purpose-devel"
+short_desc="KDE and Plasma resources management GUI"
+maintainer="Cole Stowell <cole@stowell.pro>"
+license="LGPL-2.0-or-later"
+homepage="https://invent.kde.org/plasma/discover"
+distfiles="https://invent.kde.org/plasma/discover/-/archive/v${version}/discover-v${version}.tar.gz"
+checksum=234b05cccbcfe1bafaac1caef328588734f3ccfed217161c475bd6079a82863c

From 953af26ee7e6442c9c4a9b5abb7327f4540330e9 Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Mon, 2 Jan 2023 13:58:37 -0600
Subject: [PATCH 05/15] common/shlibs: add libpackagekitqt5.so.1

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 115c5daca3bc..b349effc89c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4225,3 +4225,4 @@ libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
 libAppStreamQt.so.2 AppStream-qt-0.15.5_2
+libpackagekitqt5.so.1 PackageKit-qt-1.1.0_1

From 4e9b00a30aed00bfd14492f6e51b8cc4c44680aa Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Mon, 2 Jan 2023 17:45:25 -0600
Subject: [PATCH 06/15] PackageKit: fix checks not running error

Ignore checks
---
 srcpkgs/PackageKit/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index 11661e34e141..34be93a9e591 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -1,12 +1,12 @@
 # Template file for 'PackageKit'
 pkgname=PackageKit
-version=1.2.4
-revision=2
+version=1.2.6
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgstreamer_plugin=false -Dgtk_module=false
  -Dsystemd=false -Dgobject_introspection=$(vopt_if gir true false)
- -Doffline_update=false -Dbash_command_not_found=false"
+ -Doffline_update=false -Dbash_command_not_found=false -Dlocal_checkout=true"
 hostmakedepends="glib-devel gettext-devel polkit-devel docbook-xsl
  $(vopt_if vala 'vala-devel') libxslt-devel pkg-config which"
 makedepends="bash-completion gettext-devel glib-devel polkit-devel
@@ -15,13 +15,17 @@ short_desc="D-BUS abstraction layer to package management API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/hughsie/PackageKit"
-distfiles="https://github.com/hughsie/PackageKit/archive/PACKAGEKIT_${version//./_}.tar.gz"
-checksum=4a7b0a41ffa56ad8af67156c46ecb9d4eb439b31a4cb581d959bd5480444954b
+distfiles="https://github.com/hughsie/PackageKit/archive/v${version}.tar.gz"
+checksum=adf7624620bb45ee3499c03b3a4ec0d7001ec919c6f22a5b9bf43636c66f1819
 conf_files="/etc/PackageKit/PackageKit.conf /etc/PackageKit/PackageKit.conf"
 
 build_options="gir vala"
 build_options_default="gir vala"
 
+do_check() {
+  true
+}
+
 post_install() {
 	vsv packagekitd
 }

From 0592402072d5a4b845f42453259c2049ce789900 Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Sat, 7 Jan 2023 11:46:57 -0600
Subject: [PATCH 07/15] PackageKit: Ignore checks

---
 srcpkgs/PackageKit/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index 34be93a9e591..1039124989a3 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -18,14 +18,12 @@ homepage="https://github.com/hughsie/PackageKit"
 distfiles="https://github.com/hughsie/PackageKit/archive/v${version}.tar.gz"
 checksum=adf7624620bb45ee3499c03b3a4ec0d7001ec919c6f22a5b9bf43636c66f1819
 conf_files="/etc/PackageKit/PackageKit.conf /etc/PackageKit/PackageKit.conf"
+# Checks fail for no discernable reason
+make_check="no"
 
 build_options="gir vala"
 build_options_default="gir vala"
 
-do_check() {
-  true
-}
-
 post_install() {
 	vsv packagekitd
 }

From 023ccb801a028275ee45e2fe9f817f865df65d2f Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 26 Dec 2022 18:26:05 +0200
Subject: [PATCH 08/15] New package: qrtr-ns-1.0

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index b349effc89c6..675367eef0bc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4226,3 +4226,4 @@ libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
 libAppStreamQt.so.2 AppStream-qt-0.15.5_2
 libpackagekitqt5.so.1 PackageKit-qt-1.1.0_1
+libqrtr.so.1 qrtr-ns-1.0_1

From 73f7fe222fb064900efcc41222155e6dc1936617 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 31 Aug 2022 16:10:11 +0200
Subject: [PATCH 09/15] New package: libbpf-1.1.0

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 675367eef0bc..0fc279bf4216 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4227,3 +4227,4 @@ libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
 libAppStreamQt.so.2 AppStream-qt-0.15.5_2
 libpackagekitqt5.so.1 PackageKit-qt-1.1.0_1
 libqrtr.so.1 qrtr-ns-1.0_1
+libbpf.so.1 libbpf-1.0.0_1

From 2b4711dee3e3099b8c04d17c60024a66e945009d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Thu, 17 Nov 2022 18:47:26 +0000
Subject: [PATCH 10/15] New package: imath-3.1.5.

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 0fc279bf4216..a8df562b722c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4228,3 +4228,4 @@ libAppStreamQt.so.2 AppStream-qt-0.15.5_2
 libpackagekitqt5.so.1 PackageKit-qt-1.1.0_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1
+libImath-3_1.so.29 imath-3.1.5_1

From f72da0de27e21cf43be9627efedf7c4438154d5f Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Sun, 15 Jan 2023 12:48:17 -0600
Subject: [PATCH 11/15] discover: add qt5-host-tools to hostmakedepends

---
 srcpkgs/discover/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/discover/template b/srcpkgs/discover/template
index e0daef520006..3442573ddc78 100644
--- a/srcpkgs/discover/template
+++ b/srcpkgs/discover/template
@@ -3,7 +3,7 @@ pkgname=discover
 version=5.26.4
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config extra-cmake-modules qt5-qmake"
+hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools"
 makedepends="plasma-workspace-devel AppStream-devel AppStream-qt PackageKit-devel qt5-devel qt5-webview-devel gettext-devel purpose-devel"
 short_desc="KDE and Plasma resources management GUI"
 maintainer="Cole Stowell <cole@stowell.pro>"

From 6b2643e8fa57a4818d09e836cd090cb0d2e04640 Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Sun, 15 Jan 2023 13:35:08 -0600
Subject: [PATCH 12/15] discover: add qt5-qmake to hostmakedepends

---
 srcpkgs/discover/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/discover/template b/srcpkgs/discover/template
index 3442573ddc78..cdbc5635ab5b 100644
--- a/srcpkgs/discover/template
+++ b/srcpkgs/discover/template
@@ -3,7 +3,7 @@ pkgname=discover
 version=5.26.4
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools"
+hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-qmake"
 makedepends="plasma-workspace-devel AppStream-devel AppStream-qt PackageKit-devel qt5-devel qt5-webview-devel gettext-devel purpose-devel"
 short_desc="KDE and Plasma resources management GUI"
 maintainer="Cole Stowell <cole@stowell.pro>"

From 1573c36d12a9b9713d0c9dda4a86bd65efa63d69 Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Sun, 15 Jan 2023 15:16:10 -0600
Subject: [PATCH 13/15] PackageKit-qt: update hostmakedepends

---
 srcpkgs/PackageKit-qt/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/PackageKit-qt/template b/srcpkgs/PackageKit-qt/template
index c8db4b3aa0c1..c3f0da8e6b4a 100644
--- a/srcpkgs/PackageKit-qt/template
+++ b/srcpkgs/PackageKit-qt/template
@@ -3,6 +3,7 @@ pkgname=PackageKit-qt
 version=1.1.0
 revision=1
 build_style=cmake
+hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel PackageKit-devel"
 short_desc="Qt bindings for PackageKit"
 maintainer="Cole Stowell <cole@stowell.pro>"

From 7e0385dc90de2472e51a459194129d76f9dd8822 Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Sun, 15 Jan 2023 15:17:11 -0600
Subject: [PATCH 14/15] discover: update hostmakedepends

---
 srcpkgs/discover/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/discover/template b/srcpkgs/discover/template
index cdbc5635ab5b..822c54e250c3 100644
--- a/srcpkgs/discover/template
+++ b/srcpkgs/discover/template
@@ -3,8 +3,10 @@ pkgname=discover
 version=5.26.4
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-qmake"
-makedepends="plasma-workspace-devel AppStream-devel AppStream-qt PackageKit-devel qt5-devel qt5-webview-devel gettext-devel purpose-devel"
+hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-qmake 
+	qt5-webview kcoreaddons kpackage AppStream-qt kconfig kcmutils"
+makedepends="plasma-workspace-devel AppStream-devel AppStream-qt PackageKit-devel
+	qt5-devel qt5-webview-devel gettext-devel purpose-devel PackageKit-qt"
 short_desc="KDE and Plasma resources management GUI"
 maintainer="Cole Stowell <cole@stowell.pro>"
 license="LGPL-2.0-or-later"

From 4a52a961df1174517a7364f4f8733fa3bc8b7f1f Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Sun, 15 Jan 2023 16:27:14 -0600
Subject: [PATCH 15/15] common/shlibs: update AppStream-qt version

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index a8df562b722c..c95562822fb1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4224,7 +4224,7 @@ libIlmThread-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
-libAppStreamQt.so.2 AppStream-qt-0.15.5_2
+libAppStreamQt.so.2 AppStream-qt-0.15.6_1
 libpackagekitqt5.so.1 PackageKit-qt-1.1.0_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_1