bump version to 0.4.5

3 files changed, 118 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b7af6a6e665..e83d1ebcf88c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = nanopb
 	pkgdesc = Protocol Buffers with small code size
-	pkgver = 0.4.2
-	pkgrel = 2
+	pkgver = 0.4.5
+	pkgrel = 1
 	url = https://jpa.kapsi.fi/nanopb/
 	arch = any
 	license = zlib
 	checkdepends = scons
-	makedepends = python-docutils
+	makedepends = pandoc
 	depends = python-protobuf
-	source = https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.2.tar.gz
+	source = https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.5.tar.gz
 	source = protoc-gen-nanopb
-	sha256sums = 3fae3a8efb61cf06124732fc775088389f259f0c8d85f1ca3330da295282f912
+	source = scons-4.2.x.patch
+	sha256sums = 7efc553d3d861bceb1221f79d29b03e4353f0df2db690cbced0f4a81882d95fd
 	sha256sums = cd1ff902034d8deabf2d8ad3fadcdc4860d0b5d3be746e2b4b7427b9a7aca9c0
+	sha256sums = 18c02afa90b6ad077b4944e2a6006d24a909a8fab1a322acddd4a4ad61011ff5
 
 pkgname = nanopb
-
diff --git a/PKGBUILD b/PKGBUILD
index 2ae7d221cb25..9b74d21c75ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,25 @@
 # Maintainer: Baltazár Radics <baltazar.radics@gmail.com>
 pkgname=nanopb
-pkgver=0.4.2
-pkgrel=2
+pkgver=0.4.5
+pkgrel=1
 pkgdesc='Protocol Buffers with small code size'
 arch=(any)
 url='https://jpa.kapsi.fi/nanopb/'
 license=(zlib)
 depends=(python-protobuf)
-makedepends=(python-docutils)
+makedepends=(pandoc)
 checkdepends=(scons)
 source=("https://jpa.kapsi.fi/$pkgname/download/$pkgname-$pkgver.tar.gz"
-        'protoc-gen-nanopb')
-sha256sums=('3fae3a8efb61cf06124732fc775088389f259f0c8d85f1ca3330da295282f912'
-            'cd1ff902034d8deabf2d8ad3fadcdc4860d0b5d3be746e2b4b7427b9a7aca9c0')
+        'protoc-gen-nanopb'
+        'scons-4.2.x.patch')
+sha256sums=('7efc553d3d861bceb1221f79d29b03e4353f0df2db690cbced0f4a81882d95fd'
+            'cd1ff902034d8deabf2d8ad3fadcdc4860d0b5d3be746e2b4b7427b9a7aca9c0'
+            '18c02afa90b6ad077b4944e2a6006d24a909a8fab1a322acddd4a4ad61011ff5')
+
+prepare() {
+	cd "$pkgname"
+	patch --forward --strip=1 --input="${srcdir}/scons-4.2.x.patch"
+}
 
 build() {
 	cd $pkgname
diff --git a/scons-4.2.x.patch b/scons-4.2.x.patch
new file mode 100644
index 000000000000..61e635044d15
--- /dev/null
+++ b/scons-4.2.x.patch
@@ -0,0 +1,98 @@
+From bdfaeaa09501f520953372e4d6043c9dad533c79 Mon Sep 17 00:00:00 2001
+From: Petteri Aimonen <jpa@git.mail.kapsi.fi>
+Date: Mon, 2 Aug 2021 17:28:45 +0300
+Subject: [PATCH] Fix problems running tests with newer SCons version
+ (deprecated env.has_key())
+
+---
+ tests/fuzztest/SConscript             | 6 +++---
+ tests/site_scons/site_init.py         | 6 +++---
+ tests/site_scons/site_tools/nanopb.py | 8 ++++----
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/tests/fuzztest/SConscript b/tests/fuzztest/SConscript
+index 7c0d6e2..a5df905 100644
+--- a/tests/fuzztest/SConscript
++++ b/tests/fuzztest/SConscript
+@@ -80,12 +80,12 @@ def run_against_corpus(target, source, env):
+     count = 0
+     args = [str(source[0])]
+ 
+-    if env.has_key("TEST_RUNNER"):
++    if "TEST_RUNNER" in env:
+         args = [env["TEST_RUNNER"]] + args
+ 
+-    if env.has_key("FUZZTEST_CORPUS_SAMPLESIZE"):
++    if "FUZZTEST_CORPUS_SAMPLESIZE" in env:
+         samplesize = int(env["FUZZTEST_CORPUS_SAMPLESIZE"])
+-    elif env.has_key("EMBEDDED"):
++    elif env.get('EMBEDDED'):
+         samplesize = 100
+     else:
+         samplesize = 4096
+diff --git a/tests/site_scons/site_init.py b/tests/site_scons/site_init.py
+index ce8f7e1..676b0fb 100644
+--- a/tests/site_scons/site_init.py
++++ b/tests/site_scons/site_init.py
+@@ -32,15 +32,15 @@ def add_nanopb_builders(env):
+         else:
+             infile = None
+         
+-        if env.has_key("COMMAND"):
++        if "COMMAND" in env:
+             args = [env["COMMAND"]]
+         else:
+             args = [str(source[0])]
+         
+-        if env.has_key('ARGS'):
++        if 'ARGS' in env:
+             args.extend(env['ARGS'])
+ 
+-        if env.has_key("TEST_RUNNER"):
++        if "TEST_RUNNER" in env:
+             args = [env["TEST_RUNNER"]] + args
+         
+         print('Command line: ' + str(args))
+diff --git a/tests/site_scons/site_tools/nanopb.py b/tests/site_scons/site_tools/nanopb.py
+index 1a25808..37b8e20 100644
+--- a/tests/site_scons/site_tools/nanopb.py
++++ b/tests/site_scons/site_tools/nanopb.py
+@@ -46,7 +46,7 @@ SCons.Warnings.enableWarningClass(NanopbWarning)
+ 
+ def _detect_nanopb(env):
+     '''Find the path to nanopb root directory.'''
+-    if env.has_key('NANOPB'):
++    if 'NANOPB' in env:
+         # Use nanopb dir given by user
+         return env['NANOPB']
+ 
+@@ -60,7 +60,7 @@ def _detect_nanopb(env):
+ 
+ def _detect_python(env):
+     '''Find Python executable to use.'''
+-    if env.has_key('PYTHON'):
++    if 'PYTHON' in env:
+         return env['PYTHON']
+ 
+     p = env.WhereIs('python3')
+@@ -85,7 +85,7 @@ def _detect_nanopb_generator(env):
+ 
+ def _detect_protoc(env):
+     '''Find the path to the protoc compiler.'''
+-    if env.has_key('PROTOC'):
++    if 'PROTOC' in env:
+         # Use protoc defined by user
+         return env['PROTOC']
+ 
+@@ -113,7 +113,7 @@ def _detect_protoc(env):
+ 
+ def _detect_protocflags(env):
+     '''Find the options to use for protoc.'''
+-    if env.has_key('PROTOCFLAGS'):
++    if 'PROTOCFLAGS' in env:
+         return env['PROTOCFLAGS']
+ 
+     p = _detect_protoc(env)
+-- 
+2.32.0
+