From 0a0add38146b8b108829d5ad908481ddf6c659f2 Mon Sep 17 00:00:00 2001 From: joborun Date: Thu, 5 Oct 2023 22:17:10 +0300 Subject: [PATCH] rebuild due to new eudev colord fuse3 ndctl python-pyudev udisks2 umockdev --- colord/PKGBUILD | 14 ++++++--- colord/PKGBUILD-arch | 67 ++++++++++++++++++++++++++++++++---------- colord/deps | 4 +++ colord/time | 7 +++-- fuse3/PKGBUILD | 8 ++--- ndctl/PKGBUILD | 5 ++-- ndctl/deps | 2 +- python-pyudev/PKGBUILD | 5 ++-- python-pyudev/deps | 1 + udisks2/PKGBUILD | 6 ++-- udisks2/time | 6 ++-- umockdev/PKGBUILD | 4 +-- umockdev/deps | 2 ++ 13 files changed, 91 insertions(+), 40 deletions(-) diff --git a/colord/PKGBUILD b/colord/PKGBUILD index 0952823..5f8cb4f 100644 --- a/colord/PKGBUILD +++ b/colord/PKGBUILD @@ -8,10 +8,9 @@ pkgbase=colord pkgname=(colord colord-sane libcolord) pkgver=1.4.6 -pkgrel=01 -pkgdesc="System daemon for managing color devices" +pkgrel=02 +pkgdesc="System daemon for managing color devices w/o systemd" url="https://www.freedesktop.org/software/colord" -arch=(x86_64) depends=(lcms2 libgusb polkit sqlite dconf dbus libgudev shared-mime-info ) makedepends=(gobject-introspection vala sane bash-completion argyllcms git meson gtk-doc docbook-xsl) @@ -95,7 +94,9 @@ package_libcolord() { mv lib/* "$pkgdir" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(GPL2) @@ -104,3 +105,8 @@ validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17') # Richard Hughes sha256sums=(SKIP 737de4459587d85a35c29e8ac7f7feb2ad6b4d3546c0f87c8f3c7fefddbaa835 # colord.sysusers e7b6b72c59058f70e2a0f1c5f4f57cdbc2b60b187ae3c27c108e5f78a05eebc2) # colord.tmpfiles + +## c6f8729266b8a21c9a7785b7ccbd7b2e9109170516053ddd3f6a7e3dbbc668d1 colord-1.4.6-02-x86_64.pkg.tar.lz +## b1f4822ff9a249cd52076f9283950ab85a736df51968bfe411b83f0c13ee19aa colord-sane-1.4.6-02-x86_64.pkg.tar.lz +## c5a91ad67aa25221903cebd4753a51e781574202faf28221953707947d03e549 libcolord-1.4.6-02-x86_64.pkg.tar.lz + diff --git a/colord/PKGBUILD-arch b/colord/PKGBUILD-arch index 3506794..a6dea9d 100644 --- a/colord/PKGBUILD-arch +++ b/colord/PKGBUILD-arch @@ -2,21 +2,46 @@ # Contributor: Ionut Biru pkgbase=colord -pkgname=(colord colord-sane libcolord) +pkgname=( + colord + colord-sane + libcolord +) pkgver=1.4.6 pkgrel=1 pkgdesc="System daemon for managing color devices" url="https://www.freedesktop.org/software/colord" arch=(x86_64) license=(GPL2) -depends=(lcms2 libgusb polkit sqlite dconf dbus libgudev shared-mime-info systemd) -makedepends=(gobject-introspection vala sane bash-completion argyllcms git meson gtk-doc - docbook-xsl) +depends=( + dbus + dconf + lcms2 + libgudev + libgusb + polkit + shared-mime-info + sqlite + systemd +) +makedepends=( + argyllcms + bash-completion + docbook-xsl + git + gobject-introspection + gtk-doc + meson + sane + vala +) options=(!emptydirs) _commit=43c19fd019da5f69d2ebc00a9908b1dd83129485 # tags/1.4.6^0 source=("git+https://github.com/hughsie/colord#commit=$_commit") -sha256sums=('SKIP') -validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17') # Richard Hughes +b2sums=('SKIP') +validpgpkeys=( + 163EB50119225DB3DF8F49EA17ACBA8DFA970E17 # Richard Hughes +) pkgver() { cd colord @@ -28,12 +53,15 @@ prepare() { } build() { - arch-meson colord build \ - -D libcolordcompat=true \ - -D sane=true \ - -D vapi=true \ - -D print_profiles=true \ + local meson_options=( -D daemon_user=colord + -D libcolordcompat=true + -D print_profiles=true + -D sane=true + -D vapi=true + ) + + arch-meson colord build "${meson_options[@]}" meson compile -C build } @@ -53,8 +81,10 @@ _pick() { package_colord() { depends+=("libcolord=$pkgver-$pkgrel") - optdepends=('argyllcms: color profiling' - 'colord-sane: SANE support') + optdepends=( + 'argyllcms: color profiling' + 'colord-sane: SANE support' + ) provides=(libcolorhug.so) replaces=(shared-color-profiles) @@ -77,13 +107,20 @@ package_colord() { package_colord-sane() { pkgdesc+=" (SANE support)" - depends=("colord=$pkgver-$pkgrel" sane) + depends=( + "colord=$pkgver-$pkgrel" + sane + ) mv sane/* "$pkgdir" } package_libcolord() { pkgdesc+=" (client library)" - depends=(glib2 lcms2 systemd) + depends=( + glib2 + lcms2 + systemd + ) provides=(libcolord.so) mv lib/* "$pkgdir" } diff --git a/colord/deps b/colord/deps index 7f84d0e..994a2e4 100644 --- a/colord/deps +++ b/colord/deps @@ -17,3 +17,7 @@ eudev valgrind meson gettext +graphite +json-glib + + diff --git a/colord/time b/colord/time index dd702bf..10597e5 100644 --- a/colord/time +++ b/colord/time @@ -1,5 +1,6 @@ -real 2m48.512s -user 9m20.691s -sys 0m8.458s +real 5m31.859s +user 19m22.470s +sys 0m10.857s + diff --git a/fuse3/PKGBUILD b/fuse3/PKGBUILD index f9b2176..4c9191b 100644 --- a/fuse3/PKGBUILD +++ b/fuse3/PKGBUILD @@ -8,13 +8,13 @@ pkgbase=fuse3 pkgname=(fuse-common fuse3) pkgver=3.16.1 -pkgrel=01 +pkgrel=02 ## rebuild on new eudev pkgdesc='Interface for userspace programs to export a filesystem to the Linux kernel' url='https://github.com/libfuse/libfuse' makedepends=('pkg-config' 'meson' 'eudev') ## options=('!emptydirs' 'debug') ## uncomment this to produce the debug pkg options=(!emptydirs) -source=(https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.gz) # {,.asc}) +source=(https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.gz) ## {,.asc}) build() { cd fuse-$pkgver @@ -58,6 +58,6 @@ validpgpkeys=(ED31791B2C5C1613AF388B8AD113FCAC3C4E599F) # Nikolaus Rath