Update to 2020.2.4_beta

4 files changed, 45 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 64d237ba152b..5b7692e462bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rapidwright
 	pkgdesc = Build Customized FPGA Implementations for Vivado
-	pkgver = 2020.2.2_beta
+	pkgver = 2020.2.4_beta
 	pkgrel = 1
 	url = http://www.rapidwright.io/
 	arch = any
@@ -9,15 +9,15 @@ pkgbase = rapidwright
 	makedepends = gradle
 	depends = java-runtime
 	depends = jython
-	source = rapidwright-2020.2.2_beta.tar.gz::https://github.com/Xilinx/RapidWright/archive/v2020.2.2-beta.tar.gz
-	source = rapidwright_data-2020.2.2_beta.zip::https://github.com/Xilinx/RapidWright/releases/download/v2020.2.2-beta/rapidwright_data.zip
-	source = rapidwright_jars-2020.2.2_beta.zip::https://github.com/Xilinx/RapidWright/releases/download/v2020.2.2-beta/rapidwright_jars.zip
-	source = fix-jar-build-issues.patch
+	source = rapidwright-2020.2.4_beta.tar.gz::https://github.com/Xilinx/RapidWright/archive/v2020.2.4-beta.tar.gz
+	source = rapidwright_data-2020.2.4_beta.zip::https://github.com/Xilinx/RapidWright/releases/download/v2020.2.4-beta/rapidwright_data.zip
+	source = rapidwright_jars-2020.2.4_beta.zip::https://github.com/Xilinx/RapidWright/releases/download/v2020.2.4-beta/rapidwright_jars.zip
+	source = 0001-build.gradle-replace-deprecated-compile-configuratio.patch
 	source = invoke_rapidwright
-	sha256sums = 7c9d6d878de6789a69cf0be62e1f4c7a4027ccb3dd239dd900820c33502aa8bc
-	sha256sums = 209034844725477742d1c484a171c3930b6df1a057d24dd423484429365f0907
-	sha256sums = f098785a7146a47892bf5af835202178b3bc34545571f8d1018dbf0eee2c19c8
-	sha256sums = e4f4e416882f33e0b5c9674cc5575782209895d47b719d2df45a4d5fd179dc1f
+	sha256sums = c1671f1c08b9b16da5c6c7f9e04ef772d99d973a9c2d6d3123521f1baa42d767
+	sha256sums = 35ad60693e9aba3f6fe362f06c0bf9a267e86915b1d54553620582be8bb2d4d6
+	sha256sums = 0e42d1c67911b943f8fe93dfcbc9c110e9b2b80bc306f546a0e20e34eb92e2b3
+	sha256sums = 3d9de7c0f43a830b076e6a9fb3e27f958680e684b15fb2e2d8ff3a6aa2c0c25c
 	sha256sums = a0c2f5577cd955cb81aec2839c3c060dc78c6ee48dc99406f67cc902e98f644f
 
 pkgname = rapidwright
diff --git a/0001-build.gradle-replace-deprecated-compile-configuratio.patch b/0001-build.gradle-replace-deprecated-compile-configuratio.patch
new file mode 100644
index 000000000000..43f88015453c
--- /dev/null
+++ b/0001-build.gradle-replace-deprecated-compile-configuratio.patch
@@ -0,0 +1,27 @@
+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 7a8724a60222..0673d687983f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: xiretza <xiretza+aur@xiretza.xyz>
 
 pkgname=rapidwright
-_pkgver=2020.2.2-beta
+_pkgver=2020.2.4-beta
 pkgver="${_pkgver//-/_}"
 pkgrel=1
 pkgdesc="Build Customized FPGA Implementations for Vivado"
@@ -14,14 +14,14 @@ 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"
-	"fix-jar-build-issues.patch"
+	"0001-build.gradle-replace-deprecated-compile-configuratio.patch"
 	"invoke_rapidwright"
 )
 
-sha256sums=('7c9d6d878de6789a69cf0be62e1f4c7a4027ccb3dd239dd900820c33502aa8bc'
-            '209034844725477742d1c484a171c3930b6df1a057d24dd423484429365f0907'
-            'f098785a7146a47892bf5af835202178b3bc34545571f8d1018dbf0eee2c19c8'
-            'e4f4e416882f33e0b5c9674cc5575782209895d47b719d2df45a4d5fd179dc1f'
+sha256sums=('c1671f1c08b9b16da5c6c7f9e04ef772d99d973a9c2d6d3123521f1baa42d767'
+            '35ad60693e9aba3f6fe362f06c0bf9a267e86915b1d54553620582be8bb2d4d6'
+            '0e42d1c67911b943f8fe93dfcbc9c110e9b2b80bc306f546a0e20e34eb92e2b3'
+            '3d9de7c0f43a830b076e6a9fb3e27f958680e684b15fb2e2d8ff3a6aa2c0c25c'
             'a0c2f5577cd955cb81aec2839c3c060dc78c6ee48dc99406f67cc902e98f644f')
 
 prepare() {
@@ -29,7 +29,7 @@ prepare() {
 
 	ln -s "$srcdir/jars" .
 
-	patch -p1 < "$srcdir/fix-jar-build-issues.patch"
+	patch -p1 < "$srcdir/0001-build.gradle-replace-deprecated-compile-configuratio.patch"
 }
 
 build() {
@@ -40,8 +40,8 @@ build() {
 
 package() {
 	cd "RapidWright-$_pkgver"
-	
-	install -Dm644 -t "$pkgdir/usr/share/java/$pkgname" "bin/libs/RapidWright-$_pkgver.jar" jars/*.jar
+
+	install -Dm644 -t "$pkgdir/usr/share/java/$pkgname" "build/libs/rapidwright.jar" jars/*.jar
 	rm "$pkgdir/usr/share/java/$pkgname/jython-standalone-2.7.2.jar"
 
 	mkdir "$pkgdir/usr/share/rapidwright/"
diff --git a/fix-jar-build-issues.patch b/fix-jar-build-issues.patch
deleted file mode 100644
index 01eaecc6eda2..000000000000
--- a/fix-jar-build-issues.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 38c640c5c6845e296d6dc69e74866cf7cb25fccc Mon Sep 17 00:00:00 2001
-From: Tim Dunham <tdunham@grc.internal>
-Date: Thu, 2 Apr 2020 10:29:50 -0400
-Subject: [PATCH 1/2] fix jar build issues
-
----
- build.gradle | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build.gradle b/build.gradle
-index 9d9a7fb..60cac47 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -1,11 +1,11 @@
- apply plugin: 'java'
--jar.enabled = false
-+jar.enabled = true
- 
- project.buildDir = 'bin'
- 
- sourceSets {
-   main {
--    java.outputDir = file('bin')
-+    java.outputDir = file('compiled')
-     java {
-       srcDirs = ['src']
-     }    
-
-From 37f67dffe3edab848a792d1aa019dfeb1a929959 Mon Sep 17 00:00:00 2001
-From: Tim Dunham <tdunham@grc.internal>
-Date: Fri, 3 Apr 2020 06:46:56 -0400
-Subject: [PATCH 2/2] change compilation directory
-
----
- build.gradle | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build.gradle b/build.gradle
-index 60cac47..c3dc20c 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -5,7 +5,7 @@ project.buildDir = 'bin'
- 
- sourceSets {
-   main {
--    java.outputDir = file('compiled')
-+    java.outputDir = file('bin/compiled')
-     java {
-       srcDirs = ['src']
-     }