From fe7173a45af393a766b808a9872d83249563f6b5 Mon Sep 17 00:00:00 2001 From: Cole Stowell Date: Fri, 30 Dec 2022 01:15:29 -0600 Subject: [PATCH 1/6] Add discover and PackageKit-qt --- common/shlibs | 2 ++ srcpkgs/PackageKit-qt/template | 23 +++++++++++++++++++++++ srcpkgs/discover/template | 23 +++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 srcpkgs/PackageKit-qt/template create mode 100644 srcpkgs/discover/template diff --git a/common/shlibs b/common/shlibs index 1c852ef3fdff..f48258c4b89c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4221,3 +4221,5 @@ 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 +libpackagekitqt5.so.1 PackageKit-qt-1.1.0_1 diff --git a/srcpkgs/PackageKit-qt/template b/srcpkgs/PackageKit-qt/template new file mode 100644 index 000000000000..93682d8c5a3e --- /dev/null +++ b/srcpkgs/PackageKit-qt/template @@ -0,0 +1,23 @@ +# Template file for 'PackageKit-qt' +pkgname=PackageKit-qt +version=1.1.0 +revision=1 +archs="x86_64" +#wrksrc= +#create_wrksrc=yes +build_style=cmake +#configure_args="" +#make_build_args="" +#make_install_args="" +#conf_files="" +#make_dirs="/var/log/dir 0755 root root" +hostmakedepends="" +makedepends="qt5-devel PackageKit" +depends="qt5 PackageKit" +short_desc="Qt bindings for PackageKit" +maintainer="Cole Stowell " +license="LGPL-2.1-only" +homepage="${FREEDESKTOP_SITE}/PackageKit/" +#changelog="" +distfiles="${FREEDESKTOP_SITE}/PackageKit/releases/PackageKit-Qt-${version}.tar.xz" +checksum=8a0ac393eb34c9b896be3f6f260247c067b2af8b54cb53e12b4c6163c1cfc98d diff --git a/srcpkgs/discover/template b/srcpkgs/discover/template new file mode 100644 index 000000000000..f4e75a22bf26 --- /dev/null +++ b/srcpkgs/discover/template @@ -0,0 +1,23 @@ +# Template file for 'discover' +pkgname=discover +version=5.26.4 +revision=1 +archs="x86_64" +#wrksrc= +#create_wrksrc=yes +build_style=cmake +#configure_args="" +#make_build_args="" +#make_install_args="" +#conf_files="" +#make_dirs="/var/log/dir 0755 root root" +hostmakedepends="" +makedepends="plasma-workspace-devel extra-cmake-modules pkg-config AppStream-devel AppStream-qt PackageKit-devel qt5-devel qt5-webview-devel gettext-devel purpose-devel PackageKit-qt" +depends="PackageKit AppStream AppStream-qt qt5 qt5-webview gettext purpose PackageKit-qt" +short_desc="KDE and Plasma resources management GUI" +maintainer="Cole Stowell " +license="LGPL" +homepage="https://invent.kde.org/plasma/discover" +#changelog="" +distfiles="https://invent.kde.org/plasma/discover/-/archive/v${version}/discover-v${version}.tar.gz" +checksum=234b05cccbcfe1bafaac1caef328588734f3ccfed217161c475bd6079a82863c From 2c69d6b18dda60b03867c0f60c5051c562733cd7 Mon Sep 17 00:00:00 2001 From: Cole Stowell Date: Fri, 30 Dec 2022 13:59:03 -0600 Subject: [PATCH 2/6] Fix xlint errors --- srcpkgs/PackageKit-qt/template | 6 +++--- srcpkgs/discover/template | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/PackageKit-qt/template b/srcpkgs/PackageKit-qt/template index 93682d8c5a3e..efc997642bfc 100644 --- a/srcpkgs/PackageKit-qt/template +++ b/srcpkgs/PackageKit-qt/template @@ -11,13 +11,13 @@ build_style=cmake #make_install_args="" #conf_files="" #make_dirs="/var/log/dir 0755 root root" -hostmakedepends="" -makedepends="qt5-devel PackageKit" +hostmakedepends="PackageKit" +makedepends="qt5-devel" depends="qt5 PackageKit" short_desc="Qt bindings for PackageKit" maintainer="Cole Stowell " license="LGPL-2.1-only" -homepage="${FREEDESKTOP_SITE}/PackageKit/" +homepage="https://www.freedesktop.org/software/PackageKit/" #changelog="" distfiles="${FREEDESKTOP_SITE}/PackageKit/releases/PackageKit-Qt-${version}.tar.xz" checksum=8a0ac393eb34c9b896be3f6f260247c067b2af8b54cb53e12b4c6163c1cfc98d diff --git a/srcpkgs/discover/template b/srcpkgs/discover/template index f4e75a22bf26..e0723028c373 100644 --- a/srcpkgs/discover/template +++ b/srcpkgs/discover/template @@ -11,12 +11,12 @@ build_style=cmake #make_install_args="" #conf_files="" #make_dirs="/var/log/dir 0755 root root" -hostmakedepends="" -makedepends="plasma-workspace-devel extra-cmake-modules pkg-config AppStream-devel AppStream-qt PackageKit-devel qt5-devel qt5-webview-devel gettext-devel purpose-devel PackageKit-qt" +hostmakedepends="pkg-config extra-cmake-modules" +makedepends="plasma-workspace-devel AppStream-devel AppStream-qt PackageKit-devel qt5-devel qt5-webview-devel gettext-devel purpose-devel" depends="PackageKit AppStream AppStream-qt qt5 qt5-webview gettext purpose PackageKit-qt" short_desc="KDE and Plasma resources management GUI" maintainer="Cole Stowell " -license="LGPL" +license="LGPL-2.0-or-later" homepage="https://invent.kde.org/plasma/discover" #changelog="" distfiles="https://invent.kde.org/plasma/discover/-/archive/v${version}/discover-v${version}.tar.gz" From ca68a19e60d952e56483b349ede7686b685163eb Mon Sep 17 00:00:00 2001 From: Cole Stowell Date: Fri, 30 Dec 2022 14:40:23 -0600 Subject: [PATCH 3/6] Cleanup --- srcpkgs/PackageKit-qt/template | 13 +------------ srcpkgs/discover/template | 9 --------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/srcpkgs/PackageKit-qt/template b/srcpkgs/PackageKit-qt/template index efc997642bfc..c8db4b3aa0c1 100644 --- a/srcpkgs/PackageKit-qt/template +++ b/srcpkgs/PackageKit-qt/template @@ -2,22 +2,11 @@ pkgname=PackageKit-qt version=1.1.0 revision=1 -archs="x86_64" -#wrksrc= -#create_wrksrc=yes build_style=cmake -#configure_args="" -#make_build_args="" -#make_install_args="" -#conf_files="" -#make_dirs="/var/log/dir 0755 root root" -hostmakedepends="PackageKit" -makedepends="qt5-devel" -depends="qt5 PackageKit" +makedepends="qt5-devel PackageKit-devel" short_desc="Qt bindings for PackageKit" maintainer="Cole Stowell " license="LGPL-2.1-only" homepage="https://www.freedesktop.org/software/PackageKit/" -#changelog="" distfiles="${FREEDESKTOP_SITE}/PackageKit/releases/PackageKit-Qt-${version}.tar.xz" checksum=8a0ac393eb34c9b896be3f6f260247c067b2af8b54cb53e12b4c6163c1cfc98d diff --git a/srcpkgs/discover/template b/srcpkgs/discover/template index e0723028c373..75ba969965b9 100644 --- a/srcpkgs/discover/template +++ b/srcpkgs/discover/template @@ -3,21 +3,12 @@ pkgname=discover version=5.26.4 revision=1 archs="x86_64" -#wrksrc= -#create_wrksrc=yes build_style=cmake -#configure_args="" -#make_build_args="" -#make_install_args="" -#conf_files="" -#make_dirs="/var/log/dir 0755 root root" hostmakedepends="pkg-config extra-cmake-modules" makedepends="plasma-workspace-devel AppStream-devel AppStream-qt PackageKit-devel qt5-devel qt5-webview-devel gettext-devel purpose-devel" -depends="PackageKit AppStream AppStream-qt qt5 qt5-webview gettext purpose PackageKit-qt" short_desc="KDE and Plasma resources management GUI" maintainer="Cole Stowell " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/plasma/discover" -#changelog="" distfiles="https://invent.kde.org/plasma/discover/-/archive/v${version}/discover-v${version}.tar.gz" checksum=234b05cccbcfe1bafaac1caef328588734f3ccfed217161c475bd6079a82863c From 77972d42678f38c26336fa626b73b5fdbaab3336 Mon Sep 17 00:00:00 2001 From: Cole Stowell Date: Fri, 30 Dec 2022 15:39:53 -0600 Subject: [PATCH 4/6] fix other archs not building by adding qmake to dps --- srcpkgs/PackageKit-qt/template | 1 + srcpkgs/discover/template | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/PackageKit-qt/template b/srcpkgs/PackageKit-qt/template index c8db4b3aa0c1..1adfb1e36fdc 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-qmake" makedepends="qt5-devel PackageKit-devel" short_desc="Qt bindings for PackageKit" maintainer="Cole Stowell " diff --git a/srcpkgs/discover/template b/srcpkgs/discover/template index 75ba969965b9..caaef71201c6 100644 --- a/srcpkgs/discover/template +++ b/srcpkgs/discover/template @@ -4,7 +4,7 @@ version=5.26.4 revision=1 archs="x86_64" build_style=cmake -hostmakedepends="pkg-config extra-cmake-modules" +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 " From 4d9346603bff196e770167d7edd6db57b19e9e55 Mon Sep 17 00:00:00 2001 From: Cole Stowell Date: Fri, 30 Dec 2022 15:42:56 -0600 Subject: [PATCH 5/6] Remove arch definition from discover --- srcpkgs/discover/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/discover/template b/srcpkgs/discover/template index caaef71201c6..e0daef520006 100644 --- a/srcpkgs/discover/template +++ b/srcpkgs/discover/template @@ -2,7 +2,6 @@ pkgname=discover version=5.26.4 revision=1 -archs="x86_64" 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" From 48d5ab1d1329d694a1c7a085f521a0420893b445 Mon Sep 17 00:00:00 2001 From: Cole Stowell Date: Fri, 30 Dec 2022 16:54:18 -0600 Subject: [PATCH 6/6] Add runit service for PackageKit --- 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"