Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / procps-ng
Commits: 749fd577 by Christian Hesse at 2023-08-31T15:13:17+02:00 upgpkg: 4.0.4-1: new upstream release - - - - - 2 changed files: - + 0001-build-sys-Add-systemd-elogind-to-w.patch - PKGBUILD Changes: ===================================== 0001-build-sys-Add-systemd-elogind-to-w.patch ===================================== @@ -0,0 +1,43 @@ +From ca004d4657d5e8b468a4552ede429be53193a3a9 Mon Sep 17 00:00:00 2001 +From: Craig Small <[email protected]> +Date: Thu, 31 Aug 2023 22:24:23 +1000 +Subject: build-sys: Add systemd/elogind to w + +Depending on the compiler flags, w needs to be explictly linked +to libsystemd or elogind even though libproc2 is linked to it. + +Signed-off-by: Craig Small <[email protected]> +--- + Makefile.am | 7 +++++++ + NEWS | 3 +++ + 2 files changed, 10 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index f70c8fb1..ddfc0141 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -149,6 +149,13 @@ endif + + dist_man_MANS += man/w.1 + src_w_SOURCES = src/w.c local/fileutils.c ++src_w_LDADD = $(LDADD) ++if WITH_SYSTEMD ++src_w_LDADD += @SYSTEMD_LIBS@ ++endif ++if WITH_ELOGIND ++src_w_LDADD += @ELOGIND_LIBS@ ++endif + else + EXTRA_DIST += man/w.1 + endif +diff --git a/NEWS b/NEWS +index 3f2158d4..4ad9f74e 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,6 @@ ++procps-ng-NEXT ++--------------- ++ + procps-ng-4.0.4 + --------------- + * library (API & ABI unchanged) ===================================== PKGBUILD ===================================== @@ -5,7 +5,7 @@ # Contributor: Eric Bélanger <[email protected]> pkgname=procps-ng -pkgver=4.0.3 +pkgver=4.0.4 pkgrel=1 pkgdesc='Utilities for monitoring your system and its processes' url='https://gitlab.com/procps-ng/procps' @@ -18,15 +18,20 @@ provides=(procps sysvinit-tools libproc2.so) replaces=(procps sysvinit-tools) options=('!emptydirs') validpgpkeys=('5D2FB320B825D93904D205193938F96BDF50FEA5') # Craig Small <[email protected]> -source=(https://downloads.sourceforge.net/project/$pkgname/Production/${pkgname}-${pkgver}.tar.xz{,.asc}) -sha256sums=('303c8ec4f96ae18d8eaef86c2bd0986938764a45dc505fe0a0af868c674dba92' - 'SKIP') -b2sums=('138995397aa2ae742a457a4b2ddd65f67ba29d2eb9bd330a6e44f3cb65e93fc87122f3bd4cc8d10c0d73c7981a3d0d0472949d2d3b83c582cd0376c713698d1f' - 'SKIP') +source=(https://downloads.sourceforge.net/project/$pkgname/Production/${pkgname}-${pkgver}.tar.xz{,.asc} + 0001-build-sys-Add-systemd-elogind-to-w.patch) +sha256sums=('22870d6feb2478adb617ce4f09a787addaf2d260c5a8aa7b17d889a962c5e42e' + 'SKIP' + '77ed82ad684c71319704080a09c7d65efa1b06db4f35b240de7c30fef4caafc5') +b2sums=('63b972666ef9e92042be96739ffa15c787d0346b2d3ffcb0d240b0a4e999dc90024b2c5b058df683dd9d2c436ceb812abd0b115cc877a6ca1023988b86de443f' + 'SKIP' + '021b64fac3b48175ec67d180fc294c674088ece483f0ab358c2cfbdbd519ac6dea13274a66624beda79b00c0c770441e7f8369f3a75a90f7cafd469508a81e16') prepare() { cd procps-ng-$pkgver sed 's:<ncursesw/:<:g' -i src/watch.c + patch -Np1 < ../0001-build-sys-Add-systemd-elogind-to-w.patch + autoreconf -fi } build() { View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/procps-ng/-/commit/749fd577af6fe8ca6218822039078a0c75e3d459 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/procps-ng/-/commit/749fd577af6fe8ca6218822039078a0c75e3d459 You're receiving this email because of your account on gitlab.archlinux.org.
