diff options
author | Torben | 2022-01-31 13:59:04 +0100 |
---|---|---|
committer | Torben | 2022-01-31 13:59:04 +0100 |
commit | c6c0db3cd2bbb551756cea45eec5f9ca3ceecfa8 (patch) | |
tree | 7513e0700eaa4e0e525e3908245818609ae0f0ea | |
parent | 217e091ac2b07c5e0a40dca5f8d159effe58513f (diff) | |
download | aur-c6c0db3cd2bbb551756cea45eec5f9ca3ceecfa8.tar.gz |
Download reference during regular build process
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 13 | ||||
-rw-r--r-- | get_reference_via_https.patch | 24 |
3 files changed, 33 insertions, 10 deletions
@@ -1,7 +1,7 @@ pkgbase = processing4 pkgdesc = Programming environment for creating images, animations and interactions pkgver = 4.0b3 - pkgrel = 2 + pkgrel = 3 url = https://github.com/processing/processing4 arch = x86_64 license = GPL @@ -17,8 +17,8 @@ pkgbase = processing4 conflicts = processing options = !strip source = https://github.com/processing/processing4/archive/processing-1278-4.0b3.tar.gz - source = https://download.processing.org/reference.zip source = disable_update_check.patch + source = get_reference_via_https.patch source = fix_theme_engine.patch source = no_ffmpeg_download.patch source = no_jdk_download.patch @@ -26,8 +26,8 @@ pkgbase = processing4 source = use_system_jdk.patch source = use_system_libraries.patch sha256sums = 1f328895ca20b7b077f10faaac8d342f985c3ae80133b2384324c02ffbd185da - sha256sums = fabe7420a714f450a6b1430f13fc46f14ba52db57af360365c6a7fd96d0b642f sha256sums = 35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30 + sha256sums = 1d549cf94d033e572050f85a59c6ba526aee2bce6b4c96e8b55764136e6c21b5 sha256sums = 24b8a3e18b6e3a0de9422e4dbde46cceb91385f7ad6bdc89ec0a9614e082c977 sha256sums = b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126 sha256sums = c390900419ac9ad188700075a09b658f672d2f3471c8ced0be4f3008ee375d5f @@ -2,7 +2,7 @@ pkgname=processing4 pkgver=4.0b3 -pkgrel=2 +pkgrel=3 arch=(x86_64) pkgdesc='Programming environment for creating images, animations and interactions' url='https://github.com/processing/processing4' @@ -13,8 +13,8 @@ depends=( 'jdk-openjdk' 'java-openjfx') makedepends=('ant' 'gendesk' 'rsync' 'unzip') options=(!strip) source=("https://github.com/processing/processing4/archive/processing-$((1275+${pkgver##4.0b}))-$pkgver.tar.gz" - 'https://download.processing.org/reference.zip' disable_update_check.patch + get_reference_via_https.patch fix_theme_engine.patch no_ffmpeg_download.patch no_jdk_download.patch @@ -22,8 +22,8 @@ source=("https://github.com/processing/processing4/archive/processing-$((1275+${ use_system_jdk.patch use_system_libraries.patch) sha256sums=('1f328895ca20b7b077f10faaac8d342f985c3ae80133b2384324c02ffbd185da' - 'fabe7420a714f450a6b1430f13fc46f14ba52db57af360365c6a7fd96d0b642f' '35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30' + '1d549cf94d033e572050f85a59c6ba526aee2bce6b4c96e8b55764136e6c21b5' '24b8a3e18b6e3a0de9422e4dbde46cceb91385f7ad6bdc89ec0a9614e082c977' 'b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126' 'c390900419ac9ad188700075a09b658f672d2f3471c8ced0be4f3008ee375d5f' @@ -38,15 +38,14 @@ prepare() { # Create .desktop file gendesk -f -n --pkgname=processing --pkgdesc="$pkgdesc" --name="Processing" --exec="processing %f" --mimetypes="text/x-processing" - # Copy reference.zip to the java directory - mkdir -p $pkgname/java - cp reference.zip $pkgname/java/ - # Don't download JDK and JFX files during Ant's build process patch $pkgname/build/build.xml < no_jdk_download.patch patch $pkgname/java/libraries/javafx/build.xml < no_jfx_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 + # Use system libraries during build process patch $pkgname/core/build.xml < use_system_libraries.patch patch $pkgname/build/shared/tools/ThemeEngine/build.xml < fix_theme_engine.patch diff --git a/get_reference_via_https.patch b/get_reference_via_https.patch new file mode 100644 index 000000000000..ea2dac733f3e --- /dev/null +++ b/get_reference_via_https.patch @@ -0,0 +1,24 @@ +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" /> |