Re: hooks/prepare-32bit: create packages from all *-devel

Re: hooks/prepare-32bit: create packages from all *-devel

[Chocimier]

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/30731#issuecomment-873452632

Comment:
Added missing required devel-32bit packages, and some rebuilds where dependencies moved since build time.

Re: [PR PATCH] [Updated] hooks/prepare-32bit: create packages from all *-devel

[Chocimier]

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

There is an updated pull request by Chocimier against master on the void-packages repository

https://github.com/Chocimier/void-packages-org devel-32bit
https://github.com/void-linux/void-packages/pull/30731

hooks/prepare-32bit: create packages from all *-devel


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-devel-32bit-30731.patch --]
[-- Type: text/x-diff, Size: 15569 bytes --]

From 2c8c1d84efb0325b8af434ede5330d25719d9344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 7 May 2021 21:39:12 +0200
Subject: [PATCH 01/17] hooks/prepare-32bit: correct devel packages matching

fixes cases like 'ruby-devel-doc'
---
 common/hooks/pre-pkg/05-prepare-32bit.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/hooks/pre-pkg/05-prepare-32bit.sh b/common/hooks/pre-pkg/05-prepare-32bit.sh
index c293222586fd..9aa6cae7dc74 100644
--- a/common/hooks/pre-pkg/05-prepare-32bit.sh
+++ b/common/hooks/pre-pkg/05-prepare-32bit.sh
@@ -97,7 +97,7 @@ hook() {
 				pkgv="$($XBPS_UHELPER_CMD getpkgdepversion ${f})"
 			fi
 			# If dependency is a development pkg switch it to 32bit.
-			if [[ $pkgn =~ '-devel' ]]; then
+			if [[ $pkgn == *-devel ]]; then
 				echo "   RDEP: $f -> ${pkgn}-32bit${pkgv} (development)"
 				printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps
 				continue
@@ -153,7 +153,7 @@ hook() {
 		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 [[ $pkgn == *-devel ]]; then
 		echo "   RDEP: ${pkgver}"
 		printf "${pkgver} " >> ${destdir32}/rdeps
 	fi

From db13d0aeed97ff4ed5303cb61ab086d302a31798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 29 May 2021 19:41:17 +0200
Subject: [PATCH 02/17] base-devel: lib32disabled

for following changes in hook
---
 srcpkgs/base-devel/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/base-devel/template b/srcpkgs/base-devel/template
index cf4d2f27cbef..570f699ca960 100644
--- a/srcpkgs/base-devel/template
+++ b/srcpkgs/base-devel/template
@@ -9,6 +9,7 @@ short_desc="Void Linux development tools meta package"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://www.voidlinux.org/"
+lib32disabled=yes
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) depends+=" musl-devel";;

From e506ff02f8d6bfcce311973f90b0bb6a69847c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 29 May 2021 19:43:09 +0200
Subject: [PATCH 03/17] hooks/prepare-32bit: create packages from all *-devel

All *-devel dependencies of 32bit packages are replaced
with *-devel-32bit. Missing dependencies made some
uninstallable.
---
 common/hooks/pre-pkg/05-prepare-32bit.sh | 11 +++++++++--
 common/hooks/pre-pkg/99-pkglint.sh       |  6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/common/hooks/pre-pkg/05-prepare-32bit.sh b/common/hooks/pre-pkg/05-prepare-32bit.sh
index 9aa6cae7dc74..d0e0565babd5 100644
--- a/common/hooks/pre-pkg/05-prepare-32bit.sh
+++ b/common/hooks/pre-pkg/05-prepare-32bit.sh
@@ -24,11 +24,15 @@ hook() {
 		# Library mode, copy only relevant files to new destdir.
 		#
 		# If /usr/lib does not exist don't continue...
-		if [ ! -d ${PKGDESTDIR}/usr/lib ]; then
+		# except for devel packages, for which empty 32bit package will be created
+		if ! [ -d ${PKGDESTDIR}/usr/lib ] && ! [[ ${pkgname} == *-devel ]]; then
 			return
 		fi
+
 		mkdir -p ${destdir32}/usr/lib32
-		cp -a ${PKGDESTDIR}/usr/lib/* ${destdir32}/usr/lib32
+		if [ -d ${PKGDESTDIR}/usr/lib ]; then
+			cp -a ${PKGDESTDIR}/usr/lib/* ${destdir32}/usr/lib32
+		fi
 
 		# Only keep shared libs, static libs, and pkg-config files.
 		find "${destdir32}" -not \( \
@@ -67,6 +71,9 @@ hook() {
 			mv ${destdir32}/usr/lib ${destdir32}/usr/lib32
 		fi
 	fi
+	if [[ ${pkgname} == *-devel ]]; then
+		mkdir -p ${destdir32}
+	fi
 	if [ ! -d ${destdir32} ]; then
 		return
 	fi
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index ada06c485ea9..ea73c961ec5b 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -21,7 +21,7 @@ hook() {
 			error=1
 		fi
 	done
-	
+
 	for f in var/run usr/local; do
 		if [ -d ${PKGDESTDIR}/${f} ]; then
 			msg_red "${pkgver}: /${f} directory is not allowed, remove it!\n"
@@ -54,8 +54,8 @@ hook() {
 		esac
 	done
 
-	# Forbid empty packages unless build_style=meta
-	if [ "$build_style" != meta -a "$emptypkg" != no ]; then
+	# Forbid empty packages unless build_style=meta or it is 32bit devel package
+	if [ "$build_style" != meta ] && [ "$emptypkg" != no ] && [[ ${pkgname} != *-devel-32bit ]]; then
 		msg_red "${pkgver}: PKGDESTDIR is empty and build_style != meta\n"
 		error=1
 	fi

From 2b05db3a89e1f5886298443a8fa74042a5ddf93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 3 Jul 2021 20:41:23 +0200
Subject: [PATCH 04/17] glib: build glib-devel-32bit

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

diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index b19f88a6ab3d..666b0cc86ad3 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
 # Template file for 'glib'
 pkgname=glib
 version=2.68.3
-revision=1
+revision=2
 build_style=meson
 # static version is necessary for qemu-user-static;
 # also disable LTO, otherwise there are multiple failures when linking qemu

From c88b35769a156a6912865028f223e8d9b04c7da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 3 Jul 2021 20:41:23 +0200
Subject: [PATCH 05/17] toluapp: build toluapp-devel-32bit

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

diff --git a/srcpkgs/toluapp/template b/srcpkgs/toluapp/template
index d07536814e9b..6bf83f80a63f 100644
--- a/srcpkgs/toluapp/template
+++ b/srcpkgs/toluapp/template
@@ -1,7 +1,7 @@
 # Template file for 'toluapp'
 pkgname=toluapp
 version=1.0.93
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="lua51-devel"

From 0f7a246e0305b70fa507261d2559c31bef6f0631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 3 Jul 2021 20:41:23 +0200
Subject: [PATCH 06/17] protobuf28: build protobuf-devel-32bit

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

diff --git a/srcpkgs/protobuf28/template b/srcpkgs/protobuf28/template
index c293c0d4f55d..7fcf2e2fa707 100644
--- a/srcpkgs/protobuf28/template
+++ b/srcpkgs/protobuf28/template
@@ -1,7 +1,7 @@
 # Template file for 'protobuf28'
 pkgname=protobuf28
 version=3.17.3
-revision=1
+revision=2
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"

From 2695534b78dbb9391a6c070ff71873516a1e9d9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 3 Jul 2021 20:41:23 +0200
Subject: [PATCH 07/17] python3-cairo: build python3-cairo-devel-32bit

---
 srcpkgs/python3-cairo/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-cairo/template b/srcpkgs/python3-cairo/template
index 6f410b7ee75a..4d33cd8af84f 100644
--- a/srcpkgs/python3-cairo/template
+++ b/srcpkgs/python3-cairo/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cairo'
 pkgname=python3-cairo
 version=1.20.1
-revision=1
+revision=2
 wrksrc="pycairo-${version}"
 build_style=python3-module
 hostmakedepends="pkg-config python3"
@@ -22,6 +22,7 @@ do_check() {
 python3-cairo-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
+	lib32disabled= # override build style
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

From bc07480ce71c47e874d46b504ec21947c76a4b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 3 Jul 2021 20:41:23 +0200
Subject: [PATCH 08/17] python-cairo: build python-cairo-devel-32bit

---
 srcpkgs/python-cairo/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python-cairo/template b/srcpkgs/python-cairo/template
index ebc6ebac3c02..0268a8c048ca 100644
--- a/srcpkgs/python-cairo/template
+++ b/srcpkgs/python-cairo/template
@@ -1,7 +1,7 @@
 # Template file for 'python-cairo'
 pkgname=python-cairo
 version=1.18.2
-revision=1
+revision=2
 wrksrc="pycairo-${version}"
 build_style=python2-module
 hostmakedepends="pkg-config python"
@@ -16,6 +16,7 @@ checksum=dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531
 python-cairo-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
+	lib32disabled= # override build style
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

From 0b5a6e305559a11b6150fc7f3b6b81d8f01b38b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 3 Jul 2021 20:41:24 +0200
Subject: [PATCH 09/17] kdesignerplugin: build kdesignerplugin-devel-32bit

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

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 2659fed1db0d..c44263bf7e1b 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
 version=5.83.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
 makedepends="kdoctools-devel kplotting-devel kcoreaddons-devel

From 3b5ef980e29b3cad943e0f2834508822136072b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 3 Jul 2021 20:41:24 +0200
Subject: [PATCH 10/17] gnome-autoar: build gnome-autoar-32bit

---
 srcpkgs/gnome-autoar/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-autoar/template b/srcpkgs/gnome-autoar/template
index 71d789a4d579..106eb8c746f9 100644
--- a/srcpkgs/gnome-autoar/template
+++ b/srcpkgs/gnome-autoar/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-autoar'
 pkgname=gnome-autoar
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile"
@@ -13,7 +13,6 @@ license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/TingweiLan/GSoC2013Final"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=f2c112c0120cca2bf5a82c5b0ac8cba90ce10d21fec78f50a3bc513fdd64586b
-lib32disabled=yes
 
 build_options="gir"
 build_options_default="gir"

From c304a446771c62e97cd84ead1db1e9075ef3e3d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 3 Jul 2021 20:41:24 +0200
Subject: [PATCH 11/17] kded: build kded-devel-32bit

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

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index a2d07c4c0a06..f0fb3ae2208d 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,7 +1,7 @@
 # Template file for 'kded'
 pkgname=kded
 version=5.83.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
 makedepends="kdoctools-devel kinit-devel"

From 48131dfb34ed80c67511622393651d8be6dc4312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 3 Jul 2021 20:41:24 +0200
Subject: [PATCH 12/17] kinit: build kinit-devel-32bit

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

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 0989761f1150..d441c857781e 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,7 +1,7 @@
 # Template file for 'kinit'
 pkgname=kinit
 version=5.83.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
  gettext qt5-host-tools qt5-qmake python kdoctools"

From 250d5170bab87e71b057d28e7200c70e887d867c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 3 Jul 2021 20:41:24 +0200
Subject: [PATCH 13/17] gsettings-desktop-schemas: build
 gsettings-desktop-schemas-devel-32bit

---
 srcpkgs/gsettings-desktop-schemas/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 9aa049052172..88433e8dfd11 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,7 +1,7 @@
 # Template file for 'gsettings-desktop-schemas'
 pkgname=gsettings-desktop-schemas
 version=40.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=meson
 configure_args="-Dintrospection=$(vopt_if gir true false)"

From 5eb9a96e3fe4f6b9c655f8617086aeb7ecea1098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 3 Jul 2021 20:41:24 +0200
Subject: [PATCH 14/17] wildmidi: build WildMidi-devel-32bit

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

diff --git a/srcpkgs/wildmidi/template b/srcpkgs/wildmidi/template
index 634ad5bc88a5..1f2395f66cbb 100644
--- a/srcpkgs/wildmidi/template
+++ b/srcpkgs/wildmidi/template
@@ -1,7 +1,7 @@
 # Template file for 'wildmidi'
 pkgname=wildmidi
 version=0.4.4
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cmake
 configure_args="-DWANT_ALSA=1 -DWANT_OSS=1 -DWANT_OPENAL=1"

From e4b959f1b6a1e69d1021393ae9cca607eb5b4293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 3 Jul 2021 20:41:24 +0200
Subject: [PATCH 15/17] attica: build attica-qt5-devel-32bit

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

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index ac77fce7c923..a61ed660356b 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,7 +1,7 @@
 # Template file for 'attica'
 pkgname=attica
 version=5.83.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
 makedepends="qt5-devel"

From edb4c0fb24a2e4fa52e9ac8acdf644fb89a9e870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 3 Jul 2021 20:41:24 +0200
Subject: [PATCH 16/17] fwknop: rebuild for libgpgme split

see d367fc7c8b5a9b337bd6f6f90869b640d2f15410
---
 srcpkgs/fwknop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index 099c265403c4..dddd275b19ac 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
 # Template file for 'fwknop'
 pkgname=fwknop
 version=2.6.10
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
 hostmakedepends="iptables"

From 7088f6d7807be1502fada642f5c72eaa81d7ea30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 3 Jul 2021 20:41:24 +0200
Subject: [PATCH 17/17] pidgin-gpg: rebuild for libgpgme split

see d367fc7c8b5a9b337bd6f6f90869b640d2f15410
---
 srcpkgs/pidgin-gpg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pidgin-gpg/template b/srcpkgs/pidgin-gpg/template
index 2442f04ea12f..f23c33e0fb4a 100644
--- a/srcpkgs/pidgin-gpg/template
+++ b/srcpkgs/pidgin-gpg/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin-gpg'
 pkgname=pidgin-gpg
 version=0.9
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libpurple-devel gpgme-devel"

Re: [PR PATCH] [Merged]: hooks/prepare-32bit: create packages from all *-devel

[Chocimier]

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

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

hooks/prepare-32bit: create packages from all *-devel
https://github.com/void-linux/void-packages/pull/30731

Description: