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: 7777 bytes --]

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

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

diff --git a/common/shlibs b/common/shlibs
index 1c852ef3fdff..247624776c22 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4221,3 +4221,4 @@ libfst.so.25 openfst-1.8.2_1
 libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
+libAppStreamQt.so.2 AppStream-qt-0.15.5_2

From 7814e7e18147b6ad60e8613e64fd0211fd8b1a77 Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Mon, 2 Jan 2023 10:33:05 -0600
Subject: [PATCH 2/8] AppStream: bump AppStream-qt

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

diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index 7642218bc50c..5817bf034135 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -1,7 +1,7 @@
 # Template file for 'AppStream'
 pkgname=AppStream
 version=0.15.5
-revision=2
+revision=3
 build_style=meson
 build_helper="gir qemu"
 configure_args="$(vopt_bool gir gir) $(vopt_bool vala vapi)

From 5347479c84e2a13c64464c52314a1a26f676f78a Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Mon, 2 Jan 2023 10:34:17 -0600
Subject: [PATCH 3/8] 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 c63fc8379fb9d27651c8ae4912b18f657e1df061 Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Mon, 2 Jan 2023 12:55:39 -0600
Subject: [PATCH 4/8] 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 26c43d10627fcc75e65efdf59bada26dda5ba1fc Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Mon, 2 Jan 2023 13:36:55 -0600
Subject: [PATCH 5/8] 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 bbb83e8c478449abcf8a5dabdfac2740f6ead254 Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Mon, 2 Jan 2023 13:58:37 -0600
Subject: [PATCH 6/8] common/shlibs: add libpackagekitqt5.so.1

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

diff --git a/common/shlibs b/common/shlibs
index 247624776c22..f48258c4b89c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4222,3 +4222,4 @@ libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libAppStreamQt.so.2 AppStream-qt-0.15.5_2
+libpackagekitqt5.so.1 PackageKit-qt-1.1.0_1

From 38fcf388847e7f2a304c701e3e31782dc9a251f0 Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Mon, 2 Jan 2023 17:45:25 -0600
Subject: [PATCH 7/8] 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 ac256a7430f5896a38a9c0095975403bd6ab293a Mon Sep 17 00:00:00 2001
From: Cole Stowell <cole@stowell.pro>
Date: Thu, 5 Jan 2023 14:42:45 -0600
Subject: [PATCH 8/8] PackageKit: Fix xlint errors

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

diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template
index 34be93a9e591..5872beef23df 100644
--- a/srcpkgs/PackageKit/template
+++ b/srcpkgs/PackageKit/template
@@ -23,7 +23,7 @@ build_options="gir vala"
 build_options_default="gir vala"
 
 do_check() {
-  true
+	true
 }
 
 post_install() {