bump version to 0.4.7

3 files changed, 7 insertions, 114 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4553e5dddf9f..8480c092b925 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nanopb
 	pkgdesc = Protocol Buffers with small code size
-	pkgver = 0.4.6
+	pkgver = 0.4.7
 	pkgrel = 1
 	url = https://jpa.kapsi.fi/nanopb/
 	arch = any
@@ -8,11 +8,9 @@ pkgbase = nanopb
 	checkdepends = scons
 	makedepends = pandoc
 	depends = python-protobuf
-	source = https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.6.tar.gz
+	source = https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.7.tar.gz
 	source = protoc-gen-nanopb
-	source = scons-4.2.x.patch
-	sha256sums = e379d9babd86b9cfd8f8900fd0da8705cbd9bea4491178fb2b8be5e217bf02ab
+	sha256sums = 87055a0d9a99a95429a95497e566e59d8d16103cfd90b7b6e8ee364b6559666a
 	sha256sums = cd1ff902034d8deabf2d8ad3fadcdc4860d0b5d3be746e2b4b7427b9a7aca9c0
-	sha256sums = 18c02afa90b6ad077b4944e2a6006d24a909a8fab1a322acddd4a4ad61011ff5
 
 pkgname = nanopb
diff --git a/PKGBUILD b/PKGBUILD
index 3eabe33a6471..64aa8912b652 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Baltazár Radics <baltazar.radics@gmail.com>
 pkgname=nanopb
-pkgver=0.4.6
+pkgver=0.4.7
 pkgrel=1
 pkgdesc='Protocol Buffers with small code size'
 arch=(any)
@@ -10,16 +10,9 @@ depends=(python-protobuf)
 makedepends=(pandoc)
 checkdepends=(scons)
 source=("https://jpa.kapsi.fi/$pkgname/download/$pkgname-$pkgver.tar.gz"
-        'protoc-gen-nanopb'
-        'scons-4.2.x.patch')
-sha256sums=('e379d9babd86b9cfd8f8900fd0da8705cbd9bea4491178fb2b8be5e217bf02ab'
-            'cd1ff902034d8deabf2d8ad3fadcdc4860d0b5d3be746e2b4b7427b9a7aca9c0'
-            '18c02afa90b6ad077b4944e2a6006d24a909a8fab1a322acddd4a4ad61011ff5')
-
-prepare() {
-	cd "$pkgname"
-	patch --forward --strip=1 --input="${srcdir}/scons-4.2.x.patch"
-}
+        'protoc-gen-nanopb')
+sha256sums=('87055a0d9a99a95429a95497e566e59d8d16103cfd90b7b6e8ee364b6559666a'
+            'cd1ff902034d8deabf2d8ad3fadcdc4860d0b5d3be746e2b4b7427b9a7aca9c0')
 
 build() {
 	cd $pkgname
diff --git a/scons-4.2.x.patch b/scons-4.2.x.patch
deleted file mode 100644
index 61e635044d15..000000000000
--- a/scons-4.2.x.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-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
-