From 982655e3ee1cdfa49458107c5ef7d22b0eee4c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 30 Aug 2021 10:09:22 +0700 Subject: [PATCH 1/4] sysprof-devel: fix dependencies --- srcpkgs/sysprof/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template index 2e24cd7de548..1c39cdefd4ff 100644 --- a/srcpkgs/sysprof/template +++ b/srcpkgs/sysprof/template @@ -1,7 +1,7 @@ # Template file for 'sysprof' pkgname=sysprof version=3.40.1 -revision=1 +revision=2 build_style=meson configure_args="-Denable_gtk=true -Dsystemdunitdir=deleteme" hostmakedepends="gettext pkg-config itstool glib-devel" @@ -23,7 +23,8 @@ post_install() { } sysprof-devel_package() { - depends="sysprof>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} libglib-devel + json-glib-devel polkit-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From 272c63d39733b1c0446e44475c46fe4643a85b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 6 Sep 2021 17:56:07 +0700 Subject: [PATCH 2/4] chroot-git: fix bugreport cpu --- srcpkgs/chroot-git/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index f9ab40f5ac04..cda37b356a55 100644 --- a/srcpkgs/chroot-git/template +++ b/srcpkgs/chroot-git/template @@ -1,7 +1,7 @@ # Template file for 'chroot-git' pkgname=chroot-git version=2.33.0 -revision=1 +revision=2 bootstrap=yes wrksrc="git-${version}" makedepends="zlib-devel" @@ -37,6 +37,8 @@ do_configure() { NO_TCLTK = Yes DEFAULT_TEST_TARGET = prove GIT_PROVE_OPTS = $makejobs + # firstword (uname -m) + HOST_CPU = ${XBPS_TARGET_MACHINE%-musl} EOF if [ "$XBPS_TARGET_LIBC" = musl ]; then From e279e7f4249ec1f796b072140a6a358880d876d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 6 Sep 2021 17:56:06 +0700 Subject: [PATCH 3/4] git: fix bugreport cpu --- srcpkgs/git/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 8a539a45e784..e8e56eb0a960 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,7 +1,7 @@ # Template file for 'git' pkgname=git version=2.33.0 -revision=1 +revision=2 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto" makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel" # Required by https:// @@ -36,6 +36,8 @@ do_configure() { PYTHON_PATH=/usr/bin/python3 DEFAULT_TEST_TARGET = prove GIT_PROVE_OPTS = $makejobs + # firstword (uname -m) + HOST_CPU = ${XBPS_TARGET_MACHINE%-musl} EOF if [ "$XBPS_TARGET_LIBC" = musl ]; then From 6a8839438fafeeb4761bed09f61039318f2b56e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 6 Sep 2021 22:28:47 +0700 Subject: [PATCH 4/4] nss: update to 3.70. --- srcpkgs/nss/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index 9512a55f958d..8abefcb9f580 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -3,7 +3,7 @@ _nsprver=4.32 pkgname=nss -version=3.69 +version=3.70 revision=1 hostmakedepends="perl" makedepends="nspr-devel sqlite-devel zlib-devel" @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="MPL-2.0" homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz" -checksum=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799 +checksum=2b89abb8601ee405be8ac5b5703d71f1fb38a51c3a64a3d834387f78b325511b export NS_USE_GCC=1 export LIBRUNPATH=