[PR PATCH] Replace waf with waf3 where applicable

[PR PATCH] Replace waf with waf3 where applicable

[Chocimier]

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

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

https://github.com/Chocimier/void-packages-org waf3
https://github.com/void-linux/void-packages/pull/21227

Replace waf with waf3 where applicable
Intent is to remove waf build style.

Most of remaining packages use waf 1.6 that is incompatible with python3.
Ardour 6 will use newer waf.
lilv builds but installs some python modules that are to be checked for py3 compatibility.
flowcanvas is unmaintained and replacement is packaged, so will be removed, as well as already broken packages.
ladish won't use build style.

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

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

From 37b0c7929f8b478763eca06363f0a54c694f6600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 22 Apr 2020 00:16:42 +0200
Subject: [PATCH 01/11] aubio: build with waf3

---
 srcpkgs/aubio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aubio/template b/srcpkgs/aubio/template
index 89cb1911087..eaab3e9fdb7 100644
--- a/srcpkgs/aubio/template
+++ b/srcpkgs/aubio/template
@@ -2,9 +2,9 @@
 pkgname=aubio
 version=0.4.9
 revision=1
-build_style=waf
+build_style=waf3
 # XXX lash, pure and swig support.
-hostmakedepends="python pkg-config txt2man"
+hostmakedepends="pkg-config txt2man"
 makedepends="libsamplerate-devel fftw-devel jack-devel ffmpeg-devel"
 short_desc="Library for audio labelling"
 maintainer="Orphaned <orphan@voidlinux.org>"

From eccc2f8ede3b42626bec826ed5bd64d8837271f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 22 Apr 2020 00:16:42 +0200
Subject: [PATCH 02/11] glmark2: build with waf3

---
 srcpkgs/glmark2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glmark2/template b/srcpkgs/glmark2/template
index 098b2b1835a..a98fac3071f 100644
--- a/srcpkgs/glmark2/template
+++ b/srcpkgs/glmark2/template
@@ -1,16 +1,20 @@
 # Template file for 'glmark2'
 pkgname=glmark2
 version=0.0.20180208
-revision=1
+revision=2
 _commit=b195a2d37bd8bb55bb4cab30b93c84d6992a72a4
 wrksrc=${pkgname}-${_commit}
-build_style=waf
+build_style=waf3
 configure_args="--with-flavors=x11-gl,x11-glesv2,drm-gl,wayland-gl,wayland-glesv2,drm-glesv2"
 hostmakedepends="pkg-config"
 makedepends="libjpeg-turbo-devel libpng-devel libX11-devel MesaLib-devel wayland-devel"
 short_desc="OpenGL 2.0 and ES 2.0 benchmark"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/glmark2/glmark2"
 distfiles="https://github.com/glmark2/glmark2/archive/${_commit}.tar.gz"
 checksum=4173cca7d4e582997fa66b1289d5e3e0955463135ee49f3693cee4e7b813918b
+
+post_patch() {
+	sed -i waflib/Node.py -e '/raise StopIteration/d'
+}

From 0ec8afc2b5fcd672b99f30d22560acfc1bf86719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 22 Apr 2020 00:16:42 +0200
Subject: [PATCH 03/11] guitarix2: build with waf3

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

diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index 90d676554c8..95c6253c8da 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -3,7 +3,7 @@ pkgname=guitarix2
 version=0.39.0
 revision=1
 wrksrc="guitarix-${version}"
-build_style=waf
+build_style=waf3
 configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust
  $(vopt_if avahi '' '--no-avahi') $(vopt_if bluez '' '--no-bluez')"
 make_build_args="--progress"

From 03ec8a4021a7a69c2863fed29cb188a381ad693e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 22 Apr 2020 00:16:42 +0200
Subject: [PATCH 04/11] lv2: build with waf3

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

diff --git a/srcpkgs/lv2/template b/srcpkgs/lv2/template
index 5d231953aaa..ecb3af5b9e6 100644
--- a/srcpkgs/lv2/template
+++ b/srcpkgs/lv2/template
@@ -2,8 +2,7 @@
 pkgname=lv2
 version=1.16.0
 revision=1
-build_style=waf
-hostmakedepends="python3"
+build_style=waf3
 makedepends="libsndfile-devel gtk+-devel"
 short_desc="Plugin standard for audio systems"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c1bf36d233bb935fcfa8b1150945bd56b98a6a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 22 Apr 2020 00:16:42 +0200
Subject: [PATCH 05/11] mda-lv2: build with waf3

---
 srcpkgs/mda-lv2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mda-lv2/template b/srcpkgs/mda-lv2/template
index f10f2c9a8b3..c7e5c79415e 100644
--- a/srcpkgs/mda-lv2/template
+++ b/srcpkgs/mda-lv2/template
@@ -2,8 +2,8 @@
 pkgname=mda-lv2
 version=1.2.4
 revision=1
-build_style=waf
-hostmakedepends="pkg-config python"
+build_style=waf3
+hostmakedepends="pkg-config"
 makedepends="lv2"
 depends="lv2"
 short_desc="LV2 port of the MDA plugins by Paul Kellett"

From 97375c894a713c686013ad2bef080fa5b13cc3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 22 Apr 2020 00:16:42 +0200
Subject: [PATCH 06/11] saldl: build with waf3

---
 srcpkgs/saldl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/saldl/template b/srcpkgs/saldl/template
index 4d8c4a2f638..0e30b2f9688 100644
--- a/srcpkgs/saldl/template
+++ b/srcpkgs/saldl/template
@@ -1,8 +1,8 @@
 # Template file for 'saldl'
 pkgname=saldl
 version=40
-revision=2
-build_style=waf
+revision=3
+build_style=waf3
 configure_args="--saldl-version v${version} --no-werror"
 hostmakedepends="pkg-config asciidoc"
 makedepends="libevent-devel libcurl-devel"

From 2b72c507f1df30343fc8793ae757b226fe10e332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 22 Apr 2020 00:16:42 +0200
Subject: [PATCH 07/11] serd: build with waf3

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

diff --git a/srcpkgs/serd/template b/srcpkgs/serd/template
index c5f072d4151..346533faf69 100644
--- a/srcpkgs/serd/template
+++ b/srcpkgs/serd/template
@@ -2,8 +2,7 @@
 pkgname=serd
 version=0.30.2
 revision=1
-build_style=waf
-hostmakedepends="python"
+build_style=waf3
 short_desc="Lightweight C library for RDF syntax"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"

From c58c7a64229367561c232335ea060bc18f25eb3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 22 Apr 2020 00:16:42 +0200
Subject: [PATCH 08/11] sord: build with waf3

---
 srcpkgs/sord/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sord/template b/srcpkgs/sord/template
index c62d2debb56..800c9abb832 100644
--- a/srcpkgs/sord/template
+++ b/srcpkgs/sord/template
@@ -2,8 +2,8 @@
 pkgname=sord
 version=0.16.4
 revision=1
-build_style=waf
-hostmakedepends="pkg-config python"
+build_style=waf3
+hostmakedepends="pkg-config"
 makedepends="serd-devel pcre-devel"
 short_desc="Lightweight C library for storing RDF data in memory"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a273ac9a29158f1aaf60e2f3e1331bc301793358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 22 Apr 2020 00:16:42 +0200
Subject: [PATCH 09/11] sratom: build with waf3

---
 srcpkgs/sratom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sratom/template b/srcpkgs/sratom/template
index 0bed81b3087..bc81b525a80 100644
--- a/srcpkgs/sratom/template
+++ b/srcpkgs/sratom/template
@@ -2,8 +2,8 @@
 pkgname=sratom
 version=0.6.4
 revision=1
-build_style=waf
-hostmakedepends="pkg-config python"
+build_style=waf3
+hostmakedepends="pkg-config"
 makedepends="serd-devel sord-devel lv2"
 short_desc="Library for serialising LV2 atoms to/from RDF (Turtle syntax)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5ad3b194ae9b14e568620d30d04af509db2b321e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 22 Apr 2020 00:16:43 +0200
Subject: [PATCH 10/11] suil: build with waf3

---
 srcpkgs/suil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/suil/template b/srcpkgs/suil/template
index 43bdd9e235f..18dd4e42a9e 100644
--- a/srcpkgs/suil/template
+++ b/srcpkgs/suil/template
@@ -2,8 +2,8 @@
 pkgname=suil
 version=0.10.6
 revision=1
-build_style=waf
-hostmakedepends="pkg-config python lv2"
+build_style=waf3
+hostmakedepends="pkg-config lv2"
 makedepends="gtk+-devel qt5-devel gtk+3-devel"
 short_desc="Lightweight C library for loading and wrapping LV2 plugin UIs"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 2bf65cc0690363af9e14fd4fcd90f95168d7444b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 22 Apr 2020 00:16:43 +0200
Subject: [PATCH 11/11] termbox: build with waf3

---
 srcpkgs/termbox/template | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/termbox/template b/srcpkgs/termbox/template
index e69191084d6..31fa5c89aaa 100644
--- a/srcpkgs/termbox/template
+++ b/srcpkgs/termbox/template
@@ -2,8 +2,7 @@
 pkgname=termbox
 version=1.1.2
 revision=2
-build_style=waf
-hostmakedepends="python"
+build_style=waf3
 short_desc="Library for writing text-based user interfaces"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
@@ -11,6 +10,17 @@ homepage="https://github.com/nsf/termbox/"
 distfiles="https://github.com/nsf/termbox/archive/v${version}.tar.gz"
 checksum=61c9940b42b3ac44bf0cba67eacba75e3c02088b8c695149528c77def04d69b1
 
+pre_configure() {
+	# waf file is self extracting archive written in python
+	# it self extracts in top level, then runs extracted module in __main__
+	# importing allows to patch contents of archive
+	mv waf waf.py
+	python3 -c 'import waf; print(waf.wafdir + "/waflib/Node.py")' > node
+	sed -i "$(cat node)" -e '/raise StopIteration/d'
+	rm node
+	mv waf.py waf
+}
+
 post_install() {
 	vlicense COPYING
 }

Re: [PR PATCH] [Updated] Replace waf with waf3 where applicable

[Chocimier]

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

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

https://github.com/Chocimier/void-packages-org waf3
https://github.com/void-linux/void-packages/pull/21227

Replace waf with waf3 where applicable
Intent is to remove waf build style.

Most of remaining packages use waf 1.6 that is incompatible with python3.
Ardour 6 will use newer waf.
lilv builds but installs some python modules that are to be checked for py3 compatibility.
flowcanvas is unmaintained and replacement is packaged, so will be removed, as well as already broken packages.
ladish won't use build style.

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

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

From c0f563c7aa069957a17ee265809bc78649e1a024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 20 Jun 2020 22:17:07 +0200
Subject: [PATCH 01/13] aubio: build with waf3

---
 srcpkgs/aubio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aubio/template b/srcpkgs/aubio/template
index 89cb1911087..eaab3e9fdb7 100644
--- a/srcpkgs/aubio/template
+++ b/srcpkgs/aubio/template
@@ -2,9 +2,9 @@
 pkgname=aubio
 version=0.4.9
 revision=1
-build_style=waf
+build_style=waf3
 # XXX lash, pure and swig support.
-hostmakedepends="python pkg-config txt2man"
+hostmakedepends="pkg-config txt2man"
 makedepends="libsamplerate-devel fftw-devel jack-devel ffmpeg-devel"
 short_desc="Library for audio labelling"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 761c78498362b26780bc3896ad92993afaf1189d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 20 Jun 2020 22:17:07 +0200
Subject: [PATCH 02/13] glmark2: build with waf3

---
 .../glmark2-2020.04-Build:-Fix-Python-3.patch | 22 +++++++++++++++++++
 srcpkgs/glmark2/template                      |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/glmark2/patches/glmark2-2020.04-Build:-Fix-Python-3.patch

diff --git a/srcpkgs/glmark2/patches/glmark2-2020.04-Build:-Fix-Python-3.patch b/srcpkgs/glmark2/patches/glmark2-2020.04-Build:-Fix-Python-3.patch
new file mode 100644
index 00000000000..7cdbe6c6044
--- /dev/null
+++ b/srcpkgs/glmark2/patches/glmark2-2020.04-Build:-Fix-Python-3.patch
@@ -0,0 +1,22 @@
+From 06e4728ba7312efa0fd595e30745e60ce88f1a4f Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Sun, 3 May 2020 18:20:05 +0200
+Subject: [PATCH] Build: Fix Python 3 incompatibility
+
+---
+ wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git wscript wscript
+index aefde70..e09fa78 100644
+--- wscript
++++ wscript
+@@ -20,7 +20,7 @@ FLAVORS = {
+     'x11-gl' : 'glmark2',
+     'x11-glesv2' : 'glmark2-es2',
+ }
+-FLAVORS_STR = ", ".join(sorted(FLAVORS.keys() + ['all-linux', 'all-win32']))
++FLAVORS_STR = ", ".join(sorted(list(FLAVORS) + ['all-linux', 'all-win32']))
+ 
+ def linux_flavors():
+     return [f for f in FLAVORS.keys() if not f.startswith('win32')]
diff --git a/srcpkgs/glmark2/template b/srcpkgs/glmark2/template
index a28cd1aa24d..cbc18ec4d8c 100644
--- a/srcpkgs/glmark2/template
+++ b/srcpkgs/glmark2/template
@@ -2,7 +2,7 @@
 pkgname=glmark2
 version=2020.04
 revision=1
-build_style=waf
+build_style=waf3
 configure_args="--with-flavors=x11-gl,x11-glesv2,drm-gl,wayland-gl,wayland-glesv2,drm-glesv2"
 hostmakedepends="pkg-config wayland-devel"
 makedepends="libjpeg-turbo-devel libpng12-devel libX11-devel MesaLib-devel wayland-devel

From 18796a716df6b2addf23e202ebbc5b3c8075c42e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 20 Jun 2020 22:17:08 +0200
Subject: [PATCH 03/13] guitarix2: build with waf3

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

diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index 90d676554c8..95c6253c8da 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -3,7 +3,7 @@ pkgname=guitarix2
 version=0.39.0
 revision=1
 wrksrc="guitarix-${version}"
-build_style=waf
+build_style=waf3
 configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust
  $(vopt_if avahi '' '--no-avahi') $(vopt_if bluez '' '--no-bluez')"
 make_build_args="--progress"

From 109343422294104d95b83565d3da3bccd998d3a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 20 Jun 2020 22:17:08 +0200
Subject: [PATCH 04/13] lv2: build with waf3

---
 srcpkgs/lv2/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lv2/template b/srcpkgs/lv2/template
index f4bc17d61c4..365e1602478 100644
--- a/srcpkgs/lv2/template
+++ b/srcpkgs/lv2/template
@@ -1,9 +1,8 @@
 # Template file for 'lv2'
 pkgname=lv2
 version=1.16.0
-revision=1
-build_style=waf
-hostmakedepends="python3"
+revision=2
+build_style=waf3
 makedepends="libsndfile-devel gtk+-devel"
 short_desc="Plugin standard for audio systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -11,7 +10,7 @@ license="ISC"
 homepage="http://lv2plug.in"
 distfiles="http://lv2plug.in/spec/${pkgname}-${version}.tar.bz2"
 checksum=dec3727d7bd34a413a344a820678848e7f657b5c6019a0571c61df76d7bdf1de
-python_version=2 #unverified
+python_version=3
 lib32disabled=yes
 
 post_install() {

From f90d3b900f7132d397aeb2b49a9dd506779579a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 20 Jun 2020 22:17:08 +0200
Subject: [PATCH 05/13] mda-lv2: build with waf3

---
 srcpkgs/mda-lv2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mda-lv2/template b/srcpkgs/mda-lv2/template
index f10f2c9a8b3..c7e5c79415e 100644
--- a/srcpkgs/mda-lv2/template
+++ b/srcpkgs/mda-lv2/template
@@ -2,8 +2,8 @@
 pkgname=mda-lv2
 version=1.2.4
 revision=1
-build_style=waf
-hostmakedepends="pkg-config python"
+build_style=waf3
+hostmakedepends="pkg-config"
 makedepends="lv2"
 depends="lv2"
 short_desc="LV2 port of the MDA plugins by Paul Kellett"

From a31785aff9ff099c7fe6a60b27f3a6d241d35536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 20 Jun 2020 22:17:08 +0200
Subject: [PATCH 06/13] saldl: build with waf3

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

diff --git a/srcpkgs/saldl/template b/srcpkgs/saldl/template
index 7a703fb658d..9a741bb21b8 100644
--- a/srcpkgs/saldl/template
+++ b/srcpkgs/saldl/template
@@ -2,7 +2,7 @@
 pkgname=saldl
 version=40
 revision=2
-build_style=waf
+build_style=waf3
 configure_args="--saldl-version v${version} --no-werror"
 hostmakedepends="pkg-config asciidoc"
 makedepends="libevent-devel libcurl-devel"

From c14d5a873f8be465616595965085f45ef9658271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 20 Jun 2020 22:17:08 +0200
Subject: [PATCH 07/13] serd: build with waf3

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

diff --git a/srcpkgs/serd/template b/srcpkgs/serd/template
index c5f072d4151..346533faf69 100644
--- a/srcpkgs/serd/template
+++ b/srcpkgs/serd/template
@@ -2,8 +2,7 @@
 pkgname=serd
 version=0.30.2
 revision=1
-build_style=waf
-hostmakedepends="python"
+build_style=waf3
 short_desc="Lightweight C library for RDF syntax"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"

From faa10d1198d6741e030184499f61ad520fcc897e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 20 Jun 2020 22:17:08 +0200
Subject: [PATCH 08/13] sord: build with waf3

---
 srcpkgs/sord/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sord/template b/srcpkgs/sord/template
index c62d2debb56..800c9abb832 100644
--- a/srcpkgs/sord/template
+++ b/srcpkgs/sord/template
@@ -2,8 +2,8 @@
 pkgname=sord
 version=0.16.4
 revision=1
-build_style=waf
-hostmakedepends="pkg-config python"
+build_style=waf3
+hostmakedepends="pkg-config"
 makedepends="serd-devel pcre-devel"
 short_desc="Lightweight C library for storing RDF data in memory"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 15da9ee2e463c936b6876956bab0ede28a9241ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 20 Jun 2020 22:17:08 +0200
Subject: [PATCH 09/13] sratom: build with waf3

---
 srcpkgs/sratom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sratom/template b/srcpkgs/sratom/template
index 0bed81b3087..bc81b525a80 100644
--- a/srcpkgs/sratom/template
+++ b/srcpkgs/sratom/template
@@ -2,8 +2,8 @@
 pkgname=sratom
 version=0.6.4
 revision=1
-build_style=waf
-hostmakedepends="pkg-config python"
+build_style=waf3
+hostmakedepends="pkg-config"
 makedepends="serd-devel sord-devel lv2"
 short_desc="Library for serialising LV2 atoms to/from RDF (Turtle syntax)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From eddd5a0808aac4a4a7202b4f82b744a479869045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 20 Jun 2020 22:17:08 +0200
Subject: [PATCH 10/13] suil: build with waf3

---
 srcpkgs/suil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/suil/template b/srcpkgs/suil/template
index 43bdd9e235f..18dd4e42a9e 100644
--- a/srcpkgs/suil/template
+++ b/srcpkgs/suil/template
@@ -2,8 +2,8 @@
 pkgname=suil
 version=0.10.6
 revision=1
-build_style=waf
-hostmakedepends="pkg-config python lv2"
+build_style=waf3
+hostmakedepends="pkg-config lv2"
 makedepends="gtk+-devel qt5-devel gtk+3-devel"
 short_desc="Lightweight C library for loading and wrapping LV2 plugin UIs"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 70e68aacbd66d32be0777e2049e01d35aa31b67c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 20 Jun 2020 22:17:08 +0200
Subject: [PATCH 11/13] termbox: build with waf3

---
 srcpkgs/termbox/template | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/termbox/template b/srcpkgs/termbox/template
index e69191084d6..f1c4f8b2727 100644
--- a/srcpkgs/termbox/template
+++ b/srcpkgs/termbox/template
@@ -2,8 +2,7 @@
 pkgname=termbox
 version=1.1.2
 revision=2
-build_style=waf
-hostmakedepends="python"
+build_style=waf3
 short_desc="Library for writing text-based user interfaces"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"
@@ -11,6 +10,17 @@ homepage="https://github.com/nsf/termbox/"
 distfiles="https://github.com/nsf/termbox/archive/v${version}.tar.gz"
 checksum=61c9940b42b3ac44bf0cba67eacba75e3c02088b8c695149528c77def04d69b1
 
+pre_configure() {
+	# waf file is self extracting archive written in python
+	# it self extracts in top level, then runs extracted module in __main__
+	# importing allows to patch contents of archive
+	mv waf waf.py
+	python3 -c 'import waf; print(waf.wafdir + "/waflib/Node.py")' > node
+	vsed -i "$(cat node)" -e '/raise StopIteration/d'
+	rm node
+	mv waf.py waf
+}
+
 post_install() {
 	vlicense COPYING
 }

From 1cc8672dd8828ad244d6da31354144b505d4e29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 20 Jun 2020 22:17:09 +0200
Subject: [PATCH 12/13] lilv: build with waf3

---
 srcpkgs/lilv/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lilv/template b/srcpkgs/lilv/template
index 8d3b9d53782..8b3388595d3 100644
--- a/srcpkgs/lilv/template
+++ b/srcpkgs/lilv/template
@@ -2,9 +2,9 @@
 pkgname=lilv
 version=0.24.6
 revision=1
-build_style=waf
+build_style=waf3
 configure_args="--dyn-manifest"
-hostmakedepends="pkg-config python"
+hostmakedepends="pkg-config"
 makedepends="python-devel serd-devel sord-devel sratom-devel lv2"
 short_desc="Simple yet powerful C API for using LV2 plugins"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,6 +16,7 @@ checksum=5f544cf79656e0782a03a2cc7ab1d31a93f36d71d4187bd427ade8d7b55370dc
 post_install() {
 	vmkdir usr/share/bash-completion/completions
 	mv ${DESTDIR}/usr/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions
+	mv ${DESTDIR}/${py3_lib} ${DESTDIR}/${py2_lib}
 	vlicense COPYING
 }
 

From fe365c790387b84dae9e4827136ea3cd24f1f160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 20 Jun 2020 22:17:09 +0200
Subject: [PATCH 13/13] weighttp: remove package

[ci skip]
---
 srcpkgs/weighttp/template | 17 -----------------
 srcpkgs/weighttp/update   |  1 -
 2 files changed, 18 deletions(-)
 delete mode 100644 srcpkgs/weighttp/template
 delete mode 100644 srcpkgs/weighttp/update

diff --git a/srcpkgs/weighttp/template b/srcpkgs/weighttp/template
deleted file mode 100644
index d8607ddb888..00000000000
--- a/srcpkgs/weighttp/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'weighttp'
-pkgname=weighttp
-version=0.4
-revision=1
-build_style=waf
-makedepends="libev-devel"
-short_desc="Lightweight and small benchmarking tool for webservers"
-maintainer="DirectorX <void.directorx@protonmail.com>"
-license="MIT"
-homepage="https://redmine.lighttpd.net/projects/weighttp/wiki"
-distfiles="https://cgit.lighttpd.net/weighttp.git/snapshot/weighttp-${version}.tar.gz"
-checksum=1e28a837d330a45d39e99875795c8446378021ad7dbe7bcbb744d2e351c47751
-broken="bad waf options"
-
-post_install() {
-	vlicense COPYING
-}
diff --git a/srcpkgs/weighttp/update b/srcpkgs/weighttp/update
deleted file mode 100644
index 787cecfdc1c..00000000000
--- a/srcpkgs/weighttp/update
+++ /dev/null
@@ -1 +0,0 @@
-site=https://cgit.lighttpd.net/weighttp.git/refs/

Re: Replace waf with waf3 where applicable

[Chocimier]

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/21227#issuecomment-703120491

Comment:
So removing build style isn't practical with current version of ladish. It depends on flowcanvas, inlining build style into few templates would be needed.
However the less of this the better.

Re: [PR PATCH] [Merged]: Replace waf with waf3 where applicable

[Chocimier]

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

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

Replace waf with waf3 where applicable
https://github.com/void-linux/void-packages/pull/21227

Description:
~Intent is to remove waf build style.~

Most of remaining packages use waf 1.6 that is incompatible with python3.

- [x] Ardour 6 will use newer waf.
- [x] lilv builds but installs some python modules that are to be checked for py3 compatibility.

~flowcanvas is unmaintained and replacement is packaged, so will be removed, as well as already broken packages.~
~ladish won't use build style.~