summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTorben2022-04-23 22:51:59 +0200
committerTorben2022-04-23 22:51:59 +0200
commit98bd029f98efa9d6d306f479c41867518985afbc (patch)
tree76763070f3dd9c43cd88ef710a57e7a123a71281
parentc4e7f5fb2a08d63eea4444cc1da6d1fb68b026df (diff)
downloadaur-98bd029f98efa9d6d306f479c41867518985afbc.tar.gz
Remove HTTPS download patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--get_reference_via_https.patch24
3 files changed, 2 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b954f82f96fb..c35546773f7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = processing4-git
pkgdesc = Programming environment for creating images, animations and interactions
- pkgver = 4.0b5.r1.gea13574ce
+ pkgver = 4.0b8.r0.g951d38eb3
pkgrel = 1
url = https://github.com/processing/processing4
arch = x86_64
@@ -16,11 +16,9 @@ pkgbase = processing4-git
conflicts = processing
options = !strip
source = disable_update_check.patch
- source = get_reference_via_https.patch
source = no_ffmpeg_download.patch
source = no_jdk_download.patch
sha256sums = 35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30
- sha256sums = 1d549cf94d033e572050f85a59c6ba526aee2bce6b4c96e8b55764136e6c21b5
sha256sums = b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126
sha256sums = 5c3314d6a63955fa472aa87c6c99a9675eed3db9c589b784593c9f14432ef201
diff --git a/PKGBUILD b/PKGBUILD
index 022e9a157adf..bab184eb65dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Torben <git at letorbi dot com>
pkgname=processing4-git
-pkgver=4.0b5.r1.gea13574ce
+pkgver=4.0b8.r0.g951d38eb3
pkgrel=1
arch=(x86_64)
pkgdesc='Programming environment for creating images, animations and interactions'
@@ -13,11 +13,9 @@ depends=('java-environment-openjdk=17')
makedepends=('ant' 'gendesk' 'rsync' 'unzip')
options=(!strip)
source=(disable_update_check.patch
- get_reference_via_https.patch
no_ffmpeg_download.patch
no_jdk_download.patch)
sha256sums=('35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30'
- '1d549cf94d033e572050f85a59c6ba526aee2bce6b4c96e8b55764136e6c21b5'
'b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126'
'5c3314d6a63955fa472aa87c6c99a9675eed3db9c589b784593c9f14432ef201')
@@ -40,9 +38,6 @@ prepare() {
patch $pkgname/build/build.xml < no_jdk_download.patch
patch $pkgname/build/shared/tools/MovieMaker/build.xml < no_ffmpeg_download.patch
- # Ensure that reference.zip is downloaded via HTTPS
- patch -p0 < get_reference_via_https.patch
-
# Disable update check in default preferences
patch $pkgname/build/shared/lib/defaults.txt < disable_update_check.patch
}
diff --git a/get_reference_via_https.patch b/get_reference_via_https.patch
deleted file mode 100644
index bc43271e310f..000000000000
--- a/get_reference_via_https.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN processing4-git/build/build.xml processing4-git-patched/build/build.xml
---- processing4-git/build/build.xml 2022-01-31 13:24:21.300634689 +0100
-+++ processing4-git-patched/build/build.xml 2022-01-31 13:25:53.194256000 +0100
-@@ -369,7 +369,7 @@
- </condition>
-
- <!--<echo message="ref ignoreable? ${reference.ignorable}" />-->
-- <get src="http://download.processing.org/reference.zip"
-+ <get src="https://download.processing.org/reference.zip"
- dest="../java/reference.zip"
- ignoreerrors="${reference.ignorable}"
- usetimestamp="true" />
-diff -ruN processing4-git/java/libraries/io/build.xml processing4-git-patched/java/libraries/io/build.xml
---- processing4-git/java/libraries/io/build.xml 2022-01-31 13:24:21.483968605 +0100
-+++ processing4-git-patched/java/libraries/io/build.xml 2022-01-31 13:25:06.487444000 +0100
-@@ -43,7 +43,7 @@
- <replaceregexp file="library.properties" match="version = .*" replace="version = ${revision}" flags="g" />
- <replaceregexp file="library.properties" match="prettyVersion = .*" replace="prettyVersion = ${revision}" flags="g" />
-
-- <get src="http://download.processing.org/reference.zip"
-+ <get src="https://download.processing.org/reference.zip"
- dest="reference.zip"
- usetimestamp="true" />
- <mkdir dir="reference" />