Update to 2020.2.6_beta

3 files changed, 11 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 55fdb51dc311..ab6767481418 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rapidwright
 	pkgdesc = Build Customized FPGA Implementations for Vivado
-	pkgver = 2020.2.5_beta
+	pkgver = 2020.2.6_beta
 	pkgrel = 1
 	url = http://www.rapidwright.io/
 	arch = any
@@ -9,16 +9,13 @@ pkgbase = rapidwright
 	makedepends = gradle
 	depends = java-runtime
 	depends = jython
-	source = rapidwright-2020.2.5_beta.tar.gz::https://github.com/Xilinx/RapidWright/archive/v2020.2.5-beta.tar.gz
-	source = rapidwright_data-2020.2.5_beta.zip::https://github.com/Xilinx/RapidWright/releases/download/v2020.2.5-beta/rapidwright_data.zip
-	source = rapidwright_jars-2020.2.5_beta.zip::https://github.com/Xilinx/RapidWright/releases/download/v2020.2.5-beta/rapidwright_jars.zip
-	source = 0001-build.gradle-replace-deprecated-compile-configuratio.patch
+	source = rapidwright-2020.2.6_beta.tar.gz::https://github.com/Xilinx/RapidWright/archive/v2020.2.6-beta.tar.gz
+	source = rapidwright_data-2020.2.6_beta.zip::https://github.com/Xilinx/RapidWright/releases/download/v2020.2.6-beta/rapidwright_data.zip
+	source = rapidwright_jars-2020.2.6_beta.zip::https://github.com/Xilinx/RapidWright/releases/download/v2020.2.6-beta/rapidwright_jars.zip
 	source = invoke_rapidwright
-	sha256sums = 77839103eba44239b7167c10595e0f1c9adc1fe66dfd90b6ffb1a8ef3fec431e
-	sha256sums = de0402d738911db0cb9dd3342a7ed20bbb43ef87e1768ed669fc1611e74f4031
-	sha256sums = 6f369a18819b91e03c9a9c471dd09a596f14aa0b9a4c8f4541cfb9ecf168df50
-	sha256sums = 3d9de7c0f43a830b076e6a9fb3e27f958680e684b15fb2e2d8ff3a6aa2c0c25c
+	sha256sums = c48727499dad87687f90c7788adcd16c9c7ce4710cd2d26312ee436779ccd9b8
+	sha256sums = 3f4c549499ddcdfcb43878d960f351c9d406374b0a47180e51bb55ebf580a56b
+	sha256sums = 43ff56e12f840e6749578cbfea62ad4e604545747b7797fa94ea0d9bbf7a0d07
 	sha256sums = a0c2f5577cd955cb81aec2839c3c060dc78c6ee48dc99406f67cc902e98f644f
 
 pkgname = rapidwright
-
diff --git a/0001-build.gradle-replace-deprecated-compile-configuratio.patch b/0001-build.gradle-replace-deprecated-compile-configuratio.patch
deleted file mode 100644
index 43f88015453c..000000000000
--- a/0001-build.gradle-replace-deprecated-compile-configuratio.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f48e41d1ae5fb24e63db0316e8368523acc9a8b0 Mon Sep 17 00:00:00 2001
-From: Xiretza <xiretza@xiretza.xyz>
-Date: Sat, 1 May 2021 22:01:22 +0200
-Subject: [PATCH] build.gradle: replace deprecated "compile" configuration
-
-It was deprecated in gradle 4.10 and removed in gradle 7.0, see
-https://stackoverflow.com/a/66910991/11853962.
----
- build.gradle | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build.gradle b/build.gradle
-index 2bfb4fb..477ad1f 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -14,7 +14,7 @@ sourceCompatibility = 8
- targetCompatibility = 8
- 
- dependencies {
--  compile fileTree(dir: 'jars', include: ['*.jar'])
-+  implementation fileTree(dir: 'jars', include: ['*.jar'])
- 
- }
- 
--- 
-2.31.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 71227c27088e..4d29bae2dda6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: xiretza <xiretza+aur@xiretza.xyz>
 
 pkgname=rapidwright
-_pkgver=2020.2.5-beta
+_pkgver=2020.2.6-beta
 pkgver="${_pkgver//-/_}"
 pkgrel=1
 pkgdesc="Build Customized FPGA Implementations for Vivado"
@@ -14,22 +14,18 @@ source=(
 	"$pkgname-$pkgver.tar.gz::https://github.com/Xilinx/RapidWright/archive/v$_pkgver.tar.gz"
 	"rapidwright_data-${pkgver}.zip::https://github.com/Xilinx/RapidWright/releases/download/v$_pkgver/rapidwright_data.zip"
 	"rapidwright_jars-${pkgver}.zip::https://github.com/Xilinx/RapidWright/releases/download/v$_pkgver/rapidwright_jars.zip"
-	"0001-build.gradle-replace-deprecated-compile-configuratio.patch"
 	"invoke_rapidwright"
 )
 
-sha256sums=('77839103eba44239b7167c10595e0f1c9adc1fe66dfd90b6ffb1a8ef3fec431e'
-            'de0402d738911db0cb9dd3342a7ed20bbb43ef87e1768ed669fc1611e74f4031'
-            '6f369a18819b91e03c9a9c471dd09a596f14aa0b9a4c8f4541cfb9ecf168df50'
-            '3d9de7c0f43a830b076e6a9fb3e27f958680e684b15fb2e2d8ff3a6aa2c0c25c'
+sha256sums=('c48727499dad87687f90c7788adcd16c9c7ce4710cd2d26312ee436779ccd9b8'
+            '3f4c549499ddcdfcb43878d960f351c9d406374b0a47180e51bb55ebf580a56b'
+            '43ff56e12f840e6749578cbfea62ad4e604545747b7797fa94ea0d9bbf7a0d07'
             'a0c2f5577cd955cb81aec2839c3c060dc78c6ee48dc99406f67cc902e98f644f')
 
 prepare() {
 	cd "RapidWright-$_pkgver"
 
 	ln -s "$srcdir/jars" .
-
-	patch -p1 < "$srcdir/0001-build.gradle-replace-deprecated-compile-configuratio.patch"
 }
 
 build() {