wine-devel-32bit can't be installed, missing wine-devel

[huglovefan]

System

• xuname: Void 4.19.18_1 x86_64 AuthenticAMD uptodate rrrrmdFFFFFFF
• package: wine-devel-32bit

Expected behavior

installing wine-devel-32bit should get you development headers usable for compiling winelib programs

Actual behavior

the package depends on a nonexistent wine-devel for the header files

$ xbps-query -Rf wine-devel-32bit
/usr/lib32/libwine.so -> /usr/lib32/libwine.so.1

Steps to reproduce the behavior

# xbps-install -S wine-devel-32bit 
[*] Updating `https://alpha.de.repo.voidlinux.org/current/x86_64-repodata' ...
[*] Updating `https://alpha.de.repo.voidlinux.org/current/multilib/x86_64-repodata' ...
[*] Updating `https://alpha.de.repo.voidlinux.org/current/nonfree/x86_64-repodata' ...
[*] Updating `https://alpha.de.repo.voidlinux.org/current/debug/x86_64-repodata' ...
MISSING: wine-devel-4.0_1
Transaction aborted due to unresolved dependencies.

---

i made a patch that fixes this but i don't know if it's the right way to do it

diff --git a/common/hooks/pre-pkg/05-prepare-32bit.sh b/common/hooks/pre-pkg/05-prepare-32bit.sh
index 1b6a5ae216..d150489224 100644
--- a/common/hooks/pre-pkg/05-prepare-32bit.sh
+++ b/common/hooks/pre-pkg/05-prepare-32bit.sh
@@ -159,8 +159,8 @@ hook() {
                mkdir -p ${destdir32}/usr/lib{,32}/$(dirname ${f})
                ln -sfr ${destdir32}/usr/lib32/$f ${destdir32}/usr/lib/$f
        done
-       # If it's a development pkg add a dependency to the 64bit pkg.
-       if [[ $pkgname =~ '-devel' ]]; then
+       # If it's a development pkg with a useful 64-bit counterpart, add a dependency to it.
+       if [ "$lib32mode" != "full" ] && [[ $pkgname =~ '-devel' ]]; then
                echo "   RDEP: ${pkgver}"
                printf "${pkgver} " >> ${destdir32}/rdeps
        fi
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index ebfc7e3d9f..ae5f873a42 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -49,6 +49,7 @@ libwine_package() {
        }
 }
 wine-devel_package() {
+       lib32mode=full
        depends="libwine-${version}_${revision}"
        short_desc+=" - development files"
        replaces="wine-unstable-devel>=0"

i couldn't find any other packages that would be affected by the change to the hook

[abenson]

It looks like wine is already lib32mode=full. I don't believe it has to be set in the sub-package if its set in the main package.

[abenson]

I don't believe this is still an issue; is it okay to close this?

[huglovefan]

seems to be working now