Rebuild for scons 4.2.0

2 files changed, 25 insertions, 2 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 586791f..3daf7f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,23 +9,25 @@
 
 pkgname=xboxdrv
 pkgver=0.8.8
-pkgrel=6
+pkgrel=7
 pkgdesc='Userspace gamepad driver for Linux'
 url='http://pingus.seul.org/~grumbel/xboxdrv'
 arch=('x86_64')
 license=('GPL3')
-depends=('libx11' 'dbus-glib' 'libusb' 'dbus-python' 'eudev')
+depends=('libx11' 'dbus-glib' 'dbus-python' 'libusb' 'eudev')
 makedepends=('scons' 'boost' 'pkg-config' 'libx11' 'python')
 backup=("etc/default/xboxdrv")
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xboxdrv/${pkgname}/archive/v${pkgver}.tar.gz
         xboxdrv.default
         fix-60-sec-delay.patch
         scons-py3.patch
+        scons-v4.2.0.patch
         xboxdrvctl-py3.patch)
 sha512sums=('3f27856da211a14e27a84fa5919da7965262adc36da16c75eed9bae891098183b5751a3e707573b4ab64e69096ea74d455e8f64827c88b38b65af94cc13b34ad'
             '4f6e9a12b208254e19daba477dd7787147a8b2c8a83007d92f8cfce6212c21ce3306f23a2669080f0e46986ca102ab08c262b42c678caf1a891326b4e2c40b5f'
             '58170b3f96f02e5ba0af5f6641482fb1c612ca70650e475d68b55c05a62ec0831033190b90e591d593fd6b25c2a155e6c4975f37eef1534245947156a5e3285f'
             'b3a3bbb51fa1c4ad4dd898136c3bf7c0f13193bdd07bbcb5c8243edb747c68223fe8c5bd2fd578f6c2b18844827524abb0533ce98b6e0e60fe936597cdba811d'
+            'b7d9911bd52fb59f5dd655a4f81e61848ea2637ebd44768d963a525e62c4592d00f7f40d6eb4e14a184fbd0d6517df182ffb2cafd1e9a66406b86672ad63cdea'
             '4e6de460523c1ddfc608b3bd6fb211a7ca0516b64a2d91e01b51deaa4fcc57d64985bb2ccfca43873efef4987e0d04741f0e97dbd6b77037a4417a97cb8d0bf9')
 
 prepare() {
@@ -33,6 +35,7 @@ prepare() {
   sed 's|python|python2|g' -i examples/*.py
   patch -p1 < "${srcdir}/fix-60-sec-delay.patch"
   patch -p1 < "${srcdir}/scons-py3.patch"
+  patch -p1 < "${srcdir}/scons-v4.2.0.patch"
   patch -p1 < "${srcdir}/xboxdrvctl-py3.patch"
 }
 
diff --git a/scons-v4.2.0.patch b/scons-v4.2.0.patch
new file mode 100644
index 0000000..04b05e8
--- /dev/null
+++ b/scons-v4.2.0.patch
@@ -0,0 +1,20 @@
+--- a/SConstruct	2021-10-31 20:42:44.232084185 -0400
++++ b/SConstruct	2021-10-31 20:42:54.063024444 -0400
+@@ -36,7 +36,7 @@
+     with open(target[0].get_path(), "w") as fout:
+         fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n")
+ 
+-        if env.has_key("BIN2H_NAMESPACE"):
++        if "BIN2H_NAMESPACE" in env:
+             fout.write("namespace %s {\n\n" % env["BIN2H_NAMESPACE"])
+             
+         # write down data
+@@ -62,7 +62,7 @@
+                                     for src in source], ",\n"))
+             fout.write("\n}\n\n")
+ 
+-        if env.has_key("BIN2H_NAMESPACE"):
++        if "BIN2H_NAMESPACE" in env:
+             fout.write("} // namespace %s\n\n" % env["BIN2H_NAMESPACE"])
+                 
+         fout.write("/* EOF */\n")