From 83799b8e2f61c3c110321c6a035f73c0b9b96692 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Dec 2019 23:47:35 +0100 Subject: [PATCH 1/4] procps-ng: update to 3.3.16. --- common/shlibs | 2 +- srcpkgs/procps-ng/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 8b1c87a98aa..611abc88b12 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2150,7 +2150,7 @@ libgsound.so.0 gsound-1.0.1_1 libgegl-0.3.so.0 gegl3-0.3.0_1 libgegl-npd-0.3.so gegl3-0.3.0_1 libgegl-sc-0.3.so gegl3-0.3.0_1 -libprocps.so.7 procps-ng-3.3.15_1 +libprocps.so.8 procps-ng-3.3.16_1 libgegl-0.4.so.0 gegl-0.4.16_1 libgegl-npd-0.4.so gegl-0.4.16_1 libgegl-sc-0.4.so gegl-0.4.16_1 diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template index f58374bf3f5..1ea3b6e3079 100644 --- a/srcpkgs/procps-ng/template +++ b/srcpkgs/procps-ng/template @@ -1,6 +1,6 @@ # Template file for 'procps-ng' pkgname=procps-ng -version=3.3.15 +version=3.3.16 revision=1 build_style=gnu-configure configure_args="--exec-prefix=/ --bindir=/usr/bin --sbindir=/usr/bin @@ -13,9 +13,9 @@ short_desc="Utilities for monitoring your system and its processes" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.com/procps-ng/procps" -#changelog="https://gitlab.com/procps-ng/procps/raw/master/NEWS" +changelog="https://gitlab.com/procps-ng/procps/raw/master/NEWS" distfiles="${SOURCEFORGE_SITE}/${pkgname}/Production/${pkgname}-${version}.tar.xz" -checksum=10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465 +checksum=925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af conf_files="/etc/sysctl.conf" From b0446d39fb9c8686a4c615f6d99ae4563a0b7a84 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Mon, 30 Dec 2019 13:27:08 -0600 Subject: [PATCH 2/4] CPU-X: revump against procps-ng --- srcpkgs/CPU-X/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template index de0f96811fb..fce5dd7659b 100644 --- a/srcpkgs/CPU-X/template +++ b/srcpkgs/CPU-X/template @@ -1,8 +1,11 @@ # Template file for 'CPU-X' pkgname=CPU-X version=3.2.4 -revision=1 -archs="i686* x86_64*" +revision=2 +# /usr/bin/ld: i386:x86-64 architecture of input file +# ../output/lib/libbandwidth.a(routines-x86-64bit.o)' +# is incompatible with i386 output +archs="x86_64*" build_style=cmake hostmakedepends="nasm pkg-config" makedepends="libcpuid-devel libcurl-devel ncurses-devel pciutils-devel From ed044cbc659e397ef4ee6b524c616eb87d7f4dfc Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Mon, 30 Dec 2019 13:27:45 -0600 Subject: [PATCH 3/4] deepin-system-monitor: revbump against procps-ng --- srcpkgs/deepin-system-monitor/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/deepin-system-monitor/template b/srcpkgs/deepin-system-monitor/template index 43c88f71077..f7eca081e10 100644 --- a/srcpkgs/deepin-system-monitor/template +++ b/srcpkgs/deepin-system-monitor/template @@ -1,7 +1,7 @@ # Template file for 'deepin-system-monitor' pkgname=deepin-system-monitor version=5.0.0 -revision=1 +revision=2 build_style=qmake hostmakedepends="qt5-qmake pkg-config qt5-host-tools" makedepends="dtkwm-devel dtkwidget-devel qt5-x11extras-devel libpcap-devel @@ -15,6 +15,8 @@ changelog="https://github.com/linuxdeepin/deepin-system-monitor/blob/${version}/ distfiles="https://github.com/linuxdeepin/deepin-system-monitor/archive/${version}.tar.gz" checksum=5af4f6c321719937f47a07929bc94dd4de8b64a977bcc32355620d2606ee0de9 +CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.16/DWm" + if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-x11extras-devel" fi From 59e004a969bfcbd0b213f05cedb750bcae2c90e2 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Mon, 30 Dec 2019 13:28:17 -0600 Subject: [PATCH 4/4] igt-gpu-tools: revbump against procps-ng --- srcpkgs/igt-gpu-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template index d7a51a1689a..8c7caa73a03 100644 --- a/srcpkgs/igt-gpu-tools/template +++ b/srcpkgs/igt-gpu-tools/template @@ -1,7 +1,7 @@ # Template file for 'igt-gpu-tools' pkgname=igt-gpu-tools version=1.24 -revision=1 +revision=2 build_style=meson configure_args="-Db_ndebug=false -Db_lto=false" # b_lto=true makes the build hang at a random point