diff options
| author | Torben | 2021-10-14 22:05:09 +0200 |
|---|---|---|
| committer | Torben | 2021-10-17 21:48:48 +0200 |
| commit | c704e3c01e41d5c61a1fdd5951b57d6fd984b332 (patch) | |
| tree | cdedfeab1acbe3c2241a921573797bf47f13766f /no_jdk_download.patch | |
| parent | 3803aca5fb9b2cd0e05573b4bd09749378824117 (diff) | |
| download | aur-c704e3c01e41d5c61a1fdd5951b57d6fd984b332.tar.gz | |
Use system's JDK and JFX again
Squashed commit of the following:
commit f7d64a33e7c880ae63638bcb4a46ee6370cc7fa8
Author: Torben <git@letorbi.com>
Date: Thu Oct 14 21:48:33 2021 +0200
Use system's JFX and other fixes
commit 10c005c6da73ae1dbb7400a6e879ae64bc262d4b
Author: Torben <git@letorbi.com>
Date: Thu Oct 14 21:29:16 2021 +0200
Add .zst files to ignore file
commit 6a736e5b50d462165be8042b1b069fafaa343365
Author: Torben <git@letorbi.com>
Date: Tue Oct 12 00:32:35 2021 +0200
Disable native file dialog
commit 1f26bc8e1e4f6b8f7967be804a2286a72cad507c
Author: Torben <git@letorbi.com>
Date: Tue Oct 12 00:12:15 2021 +0200
Associate processing sketch files with application
commit a1458bb96c2b08fd30b3312d067c2ddc727bd0b1
Author: Torben <git@letorbi.com>
Date: Thu Oct 14 15:34:58 2021 +0200
Fix patch files to work with Java 17
commit 0ce2901087b481e73ff8114427041c4f99b7637c
Author: Torben <git@letorbi.com>
Date: Tue Oct 12 00:09:57 2021 +0200
Require and use java-openjdk-17
commit 5f9cb148df94cc56558fa915112e02c48df467e8
Author: Torben <git@letorbi.com>
Date: Tue Oct 12 00:09:08 2021 +0200
Use processing instead of processing4 as command name
commit 993af15aa871e52ed81423e88b98c476ee6d6fc3
Author: Torben <git@letorbi.com>
Date: Sat Jul 17 19:52:20 2021 +0200
Use official versioning scheme for VCS packages; Update .SRCINFO
Diffstat (limited to 'no_jdk_download.patch')
| -rw-r--r-- | no_jdk_download.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/no_jdk_download.patch b/no_jdk_download.patch new file mode 100644 index 000000000000..550c37374d96 --- /dev/null +++ b/no_jdk_download.patch @@ -0,0 +1,66 @@ +--- a/build/build.xml ++++ b/build/build.xml +@@ -1008,7 +1008,7 @@ + </if> + </target> + +- <target name="linux-build" depends="ignore-tools, check-linux-arm32, check-linux-arm64, revision-check, linux-check-os, jdk-download, subprojects-build, subprojects-build-linux-arm32, subprojects-build-linux-arm64" description="Build Linux version"> ++ <target name="linux-build" depends="ignore-tools, check-linux-arm32, check-linux-arm64, revision-check, linux-check-os, subprojects-build, subprojects-build-linux-arm32, subprojects-build-linux-arm64" description="Build Linux version"> + <mkdir dir="linux/work" /> + + <copy todir="linux/work" preservelastmodified="true"> +@@ -1098,54 +1098,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" /> +- +-<!-- +- Cannot use ant version of tar because it doesn't preserve properties. +- <untar compression="gzip" +- dest="linux/work" +- src="linux/jdk.tgz" +- overwrite="false"/> +---> +- +-<!-- +- http://www.gnu.org/software/tar/manual/html_section/transform.html +---> +- <exec executable="tar" dir="linux"> +- <!-- Change directory --> +- <!-- +- <arg value="-C" /> +- <arg value="linux/work" /> +- <arg value="-xzpf" /> +- --> +- <arg value="xfz" /> +- <arg value="../${jdk.tgz.path}"/> +- </exec> +- +- <property name="jdk.dir" value="jdk-${jdk.detail}+${jdk.build}/" /> +- +- <exec executable="rsync" dir="linux"> +- <arg value="-a" /> +- <arg value="--delete" /> +- <arg value="${jdk.dir}" /> +- <arg value="work/java/" /> +- </exec> +- +- <!-- Remove unused JRE bloat. --> +- <delete failonerror="true"> +- <fileset refid="jdk-optional-linux" /> +- </delete> +- +- <exec executable="rm"> +- <arg value="-r"/> +- <arg line="linux/jdk-${jdk.detail}+${jdk.build}"/> +- </exec> +- +- <!-- +- <exec executable="rm"> +- <arg value="-r"/> +- <arg line="${jfx.path.dist}"/> +- </exec> +- --> + </target> + + <target name="linux-run" depends="linux-build" |