summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTorben2022-08-09 22:29:22 +0200
committerTorben2022-08-09 22:29:22 +0200
commit7a80e1b59d75a796af6d2fe4e051154e39765222 (patch)
treeffa3405b9f8edd480da271bc22caf65c846713f7
parent98bd029f98efa9d6d306f479c41867518985afbc (diff)
downloadaur-7a80e1b59d75a796af6d2fe4e051154e39765222.tar.gz
Update no jdk download patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--no_jdk_download.patch14
3 files changed, 14 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c35546773f7c..0a2a67ee7f26 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = processing4-git
pkgdesc = Programming environment for creating images, animations and interactions
- pkgver = 4.0b8.r0.g951d38eb3
+ pkgver = 4.0.1.r0.g58ff6a3c
pkgrel = 1
url = https://github.com/processing/processing4
arch = x86_64
@@ -20,6 +20,6 @@ pkgbase = processing4-git
source = no_jdk_download.patch
sha256sums = 35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30
sha256sums = b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126
- sha256sums = 5c3314d6a63955fa472aa87c6c99a9675eed3db9c589b784593c9f14432ef201
+ sha256sums = f8bde916aa0c3c816ba6cc8c22d180001109982f1640f3bff140a57e5100fc64
pkgname = processing4-git
diff --git a/PKGBUILD b/PKGBUILD
index bab184eb65dc..df3fd50cb987 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Torben <git at letorbi dot com>
pkgname=processing4-git
-pkgver=4.0b8.r0.g951d38eb3
+pkgver=4.0.1.r0.g58ff6a3c
pkgrel=1
arch=(x86_64)
pkgdesc='Programming environment for creating images, animations and interactions'
@@ -17,7 +17,7 @@ source=(disable_update_check.patch
no_jdk_download.patch)
sha256sums=('35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30'
'b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126'
- '5c3314d6a63955fa472aa87c6c99a9675eed3db9c589b784593c9f14432ef201')
+ 'f8bde916aa0c3c816ba6cc8c22d180001109982f1640f3bff140a57e5100fc64')
pkgver() {
cd "$srcdir/$pkgname"
diff --git a/no_jdk_download.patch b/no_jdk_download.patch
index 314c954025b2..dc1b7fcf830f 100644
--- a/no_jdk_download.patch
+++ b/no_jdk_download.patch
@@ -1,6 +1,6 @@
---- a/build/build.xml 2022-01-31 12:44:46.824038995 +0100
-+++ b/build/build.xml 2022-01-31 12:47:21.567810435 +0100
-@@ -940,7 +940,7 @@
+--- a/build/build.xml 2022-08-09 21:02:32.341669755 +0200
++++ b/build/build.xml 2022-08-09 21:13:20.006613526 +0200
+@@ -970,7 +970,7 @@
</if>
</target>
@@ -9,7 +9,7 @@
<mkdir dir="linux/work" />
<copy todir="linux/work" preservelastmodified="true">
-@@ -1014,45 +1014,6 @@
+@@ -1044,51 +1044,6 @@
<copy file="linux/processing-pde.xml" todir="linux/work/lib" />
<copy file="linux/appdata.xml" todir="linux/work/lib" />
<copy file="linux/desktop.template" todir="linux/work/lib" />
@@ -48,6 +48,12 @@
- <fileset refid="jdk-optional-linux" />
- </delete>
-
+- <!-- Throw these 300(!) files into a single zip -->
+- <zip destfile="linux/work/java/legal.zip"
+- basedir="linux/work/java"
+- includes="legal/**" />
+- <delete dir="linux/work/java/legal" />
+-
- <exec executable="rm">
- <arg value="-r"/>
- <arg line="linux/${jdk.folder}"/>