[PR PATCH] Fix dependencies so show-build-deps won't fail

[PR PATCH] Fix dependencies so show-build-deps won't fail

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 2541 bytes --]

There is a new pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages fix-deps
https://github.com/void-linux/void-packages/pull/47910

Fix dependencies so show-build-deps won't fail 
<!-- Uncomment relevant sections and delete options which are not applicable -->
Split up from #47888 to avoid long CI in that PR.

This fixes dependencies in four packages and also fixes handling of `*-32bit` deps.

Before this change:
```
$ for p in bcachefs-tools brother-dcp197c-lpr gcc-multilib nvidia nvidia470 python3-QtPy python3-google-api-python-client qgis ; do ./xbps-src show-build-deps -K $p > /dev/null; done
=> ERROR: bcachefs-tools-1.3.6_1: dependency 'libudev-devel' does not exist!
=> ERROR: brother-dcp197c-lpr-1.1.3_6: dependency 'glibc-32bit' does not exist!
=> ERROR: gcc-multilib-12.2.0_2: dependency 'glibc-32bit' does not exist!
=> ERROR: nvidia-535.146.02_1: dependency 'glibc-32bit' does not exist!
=> ERROR: nvidia470-470.223.02_1: dependency 'glibc-32bit' does not exist!
=> ERROR: python3-QtPy-2.4.1_1: dependency 'font-liberation-ttf' does not exist!
=> ERROR: python3-google-api-python-client-2.80.0_2: dependency 'python3-Django' does not exist!
=> ERROR: qgis-3.34.1_1: dependency 'opencl-clhpp' does not exist!
```

After this change, there is no error. Also running `common/scripts/xbps-cycles.py` will do every package (Those 8 are all the failures I got).

Note that the errors for `python3-QtPy` and `python3-google-api-python-client` show only if #47888 is applied, since they are for checkdepends.

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/47910.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-deps-47910.patch --]
[-- Type: text/x-diff, Size: 5622 bytes --]

From 5f4d598fd4d14abc7f49b6a528b9add701b216a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 25 Dec 2023 19:09:51 -0300
Subject: [PATCH 1/5] python3-QtPy: adjust one check dependency

---
 srcpkgs/python3-QtPy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-QtPy/template b/srcpkgs/python3-QtPy/template
index 5a77ca425b5d3..79e4016fb0236 100644
--- a/srcpkgs/python3-QtPy/template
+++ b/srcpkgs/python3-QtPy/template
@@ -16,7 +16,7 @@ _qt5check="${_qtcommon} :location :opengl :quick :x11extras :xmlpatterns
 _qt6check="${_qtcommon} :dbus :declarative :devel-tools :gui :network
  :opengl-widgets :printsupport :quick3d :remoteobjects :test :widgets :xml
  qt6-plugin-sqlite"
-checkdepends="python3-pytest-cov python3-pytest-qt font-liberation-ttf
+checkdepends="python3-pytest-cov python3-pytest-qt liberation-fonts-ttf
  ${_qt5check//:/python3-PyQt5-} ${_qt6check//:/python3-pyqt6-}"
 short_desc="Abstraction layer on top of various Python Qt bindings"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"

From 675e70ac465c61a32c73ffeff4f252170df465b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 25 Dec 2023 22:43:07 -0300
Subject: [PATCH 2/5] bcachefs-tools: adjust one make dependency

---
 srcpkgs/bcachefs-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bcachefs-tools/template b/srcpkgs/bcachefs-tools/template
index 35fa36d13a37e..5c67e9aa9f9fe 100644
--- a/srcpkgs/bcachefs-tools/template
+++ b/srcpkgs/bcachefs-tools/template
@@ -8,7 +8,7 @@ make_install_args="ROOT_SBINDIR=/usr/bin"
 make_use_env=yes
 hostmakedepends="pkg-config cargo clang liburcu-devel"
 makedepends="rust attr-devel keyutils-devel libaio-devel libblkid-devel
- liblz4-devel libscrypt-devel libsodium-devel libudev-devel liburcu-devel
+ liblz4-devel libscrypt-devel libsodium-devel eudev-libudev-devel liburcu-devel
  libuuid-devel libzstd-devel zlib-devel"
 short_desc="Userspace tools for bcachefs"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From ab33a3bde2509129d5d99032e4bdbd1c27eaa5d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 25 Dec 2023 22:44:02 -0300
Subject: [PATCH 3/5] qgis: don't makedepend on opencl-clhpp (removed pkg)

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index 3c7edb573363e..f066720f06ea4 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -9,7 +9,7 @@ hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
 makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
  gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
  libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
- minizip-devel netcdf-devel ocl-icd-devel opencl-clhpp postgresql-libs-devel
+ minizip-devel netcdf-devel ocl-icd-devel postgresql-libs-devel
  proj-devel protobuf-devel python3-devel python3-PyQt-builder
  python3-PyQt5-devel python3-PyQt5-devel-tools python3-PyQt5-multimedia
  python3-pyqt5-qsci-devel python3-PyQt5-webkit python3-sip-PyQt5 qca-qt5-devel

From 99d44377dbedb9ffd08dca0f4c7a04d43ed90c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 25 Dec 2023 22:44:42 -0300
Subject: [PATCH 4/5] python3-google-api-python-client: remove checkdepend on
 python3-Django

---
 srcpkgs/python3-google-api-python-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-google-api-python-client/template b/srcpkgs/python3-google-api-python-client/template
index b2f3f446d4489..dfca76ef2fc27 100644
--- a/srcpkgs/python3-google-api-python-client/template
+++ b/srcpkgs/python3-google-api-python-client/template
@@ -8,7 +8,7 @@ make_check_args="--deselect=tests/test__helpers.py::PositionalTests::test_usage
 hostmakedepends="python3-setuptools"
 depends="python3-httplib2 python3-google-auth python3-google-auth-httplib2
  python3-google-api-core python3-uritemplate"
-checkdepends="${depends} python3-Django python3-parameterized python3-openssl
+checkdepends="${depends} python3-parameterized python3-openssl
  python3-oauth2client python3-pytest-xdist"
 short_desc="Google API client library for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fe02ae30689cc674de29d8d8712920fccf1fbf69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 25 Dec 2023 23:55:08 -0300
Subject: [PATCH 5/5] common/xbps-src/shutils/show.sh: fix show-build-deps for
 *-32bit deps

---
 common/xbps-src/shutils/show.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/common/xbps-src/shutils/show.sh b/common/xbps-src/shutils/show.sh
index 606396d2b4b1a..4671a1317449b 100644
--- a/common/xbps-src/shutils/show.sh
+++ b/common/xbps-src/shutils/show.sh
@@ -75,7 +75,7 @@ show_avail() {
 
 show_eval_dep() {
     local f x _pkgname _srcpkg found
-    local _dep="$1"
+    local _dep="${1%-32bit}"
     local _host="$2"
     if [ -z "$CROSS_BUILD" ] || [ -z "$_host" ]; then
         # ignore dependency on itself
@@ -92,8 +92,7 @@ show_eval_dep() {
         [[ $_dep == $x ]] && found=1 && break
     done
     [[ $found ]] && return
-    _pkgname=${_dep/-32bit}
-    _srcpkg=$(readlink -f ${XBPS_SRCPKGDIR}/${_pkgname})
+    _srcpkg=$(readlink -f ${XBPS_SRCPKGDIR}/${_dep})
     _srcpkg=${_srcpkg##*/}
     echo $_srcpkg
 }

Re: [PR PATCH] [Merged]: Fix dependencies so show-build-deps won't fail

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 2387 bytes --]

There's a merged pull request on the void-packages repository

Fix dependencies so show-build-deps won't fail 
https://github.com/void-linux/void-packages/pull/47910

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
Split up from #47888 to avoid long CI in that PR.

This fixes dependencies in four packages and also fixes handling of `*-32bit` deps.

Before this change:
```
$ for p in bcachefs-tools brother-dcp197c-lpr gcc-multilib nvidia nvidia470 python3-QtPy python3-google-api-python-client qgis ; do ./xbps-src show-build-deps -K $p > /dev/null; done
=> ERROR: bcachefs-tools-1.3.6_1: dependency 'libudev-devel' does not exist!
=> ERROR: brother-dcp197c-lpr-1.1.3_6: dependency 'glibc-32bit' does not exist!
=> ERROR: gcc-multilib-12.2.0_2: dependency 'glibc-32bit' does not exist!
=> ERROR: nvidia-535.146.02_1: dependency 'glibc-32bit' does not exist!
=> ERROR: nvidia470-470.223.02_1: dependency 'glibc-32bit' does not exist!
=> ERROR: python3-QtPy-2.4.1_1: dependency 'font-liberation-ttf' does not exist!
=> ERROR: python3-google-api-python-client-2.80.0_2: dependency 'python3-Django' does not exist!
=> ERROR: qgis-3.34.1_1: dependency 'opencl-clhpp' does not exist!
```

After this change, there is no error. Also running `common/scripts/xbps-cycles.py` will do every package (Those 8 are all the failures I got).

Note that the errors for `python3-QtPy` and `python3-google-api-python-client` show only if #47888 is applied, since they are for checkdepends.

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->