diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | get_reference_via_https.patch | 24 |
3 files changed, 5 insertions, 36 deletions
@@ -1,6 +1,6 @@ pkgbase = processing4 pkgdesc = Programming environment for creating images, animations and interactions - pkgver = 4.0b7 + pkgver = 4.0b8 pkgrel = 1 url = https://github.com/processing/processing4 arch = x86_64 @@ -15,14 +15,12 @@ pkgbase = processing4 provides = processing4 conflicts = processing options = !strip - source = https://github.com/processing/processing4/archive/processing-1282-4.0b7.tar.gz + source = https://github.com/processing/processing4/archive/processing-1283-4.0b8.tar.gz source = disable_update_check.patch - source = get_reference_via_https.patch source = no_ffmpeg_download.patch source = no_jdk_download.patch - sha256sums = cc345f660ed00cf9e6c67748dbe1477c70f62e77de7ec82f165783ea67ede24d + sha256sums = e16c2d5e999119b816ab0f11b1d33dd6a57d48b21051542641fa8485e4a58893 sha256sums = 35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30 - sha256sums = 970cab09bb2d22f9a72415d626ab77714b31b2727c51e4d8992eeee4f7f3645d sha256sums = b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126 sha256sums = 5c3314d6a63955fa472aa87c6c99a9675eed3db9c589b784593c9f14432ef201 @@ -1,7 +1,7 @@ # Maintainer: Torben <git at letorbi dot com> pkgname=processing4 -pkgver=4.0b7 +pkgver=4.0b8 pkgrel=1 arch=(x86_64) pkgdesc='Programming environment for creating images, animations and interactions' @@ -14,12 +14,10 @@ makedepends=('ant' 'gendesk' 'rsync' 'unzip') options=(!strip) source=("https://github.com/processing/processing4/archive/processing-$((1275+${pkgver##4.0b}))-$pkgver.tar.gz" disable_update_check.patch - get_reference_via_https.patch no_ffmpeg_download.patch no_jdk_download.patch) -sha256sums=('cc345f660ed00cf9e6c67748dbe1477c70f62e77de7ec82f165783ea67ede24d' +sha256sums=('e16c2d5e999119b816ab0f11b1d33dd6a57d48b21051542641fa8485e4a58893' '35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30' - '970cab09bb2d22f9a72415d626ab77714b31b2727c51e4d8992eeee4f7f3645d' 'b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126' '5c3314d6a63955fa472aa87c6c99a9675eed3db9c589b784593c9f14432ef201') @@ -34,9 +32,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 ea2dac733f3e..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/build/build.xml 2022-01-31 13:24:21.300634689 +0100 -+++ processing4-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/java/libraries/io/build.xml 2022-01-31 13:24:21.483968605 +0100 -+++ processing4-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" /> |