diff options
author | Torben | 2021-07-06 00:33:50 +0200 |
---|---|---|
committer | Torben | 2021-07-06 00:33:50 +0200 |
commit | 84d18e560b108a2936a664cb60c0cb6d2c758d6e (patch) | |
tree | ed7c36feae666ab0f38ad4e533392e9527f1b56b | |
parent | b52ee0c613083003db137f17607f7499475c2ba9 (diff) | |
download | aur-84d18e560b108a2936a664cb60c0cb6d2c758d6e.tar.gz |
Remove unused patches
-rw-r--r-- | always_use_java-11-openjdk.patch | 12 | ||||
-rw-r--r-- | derive_jdk_from_path.patch | 11 | ||||
-rw-r--r-- | no_downloads.patch | 95 |
3 files changed, 0 insertions, 118 deletions
diff --git a/always_use_java-11-openjdk.patch b/always_use_java-11-openjdk.patch deleted file mode 100644 index 722254dcc156..000000000000 --- a/always_use_java-11-openjdk.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/build/linux/processing 2020-01-17 17:20:35.000000000 +0100 -+++ b/build/linux/processing 2020-06-13 14:02:40.924929084 +0200 -@@ -13,6 +13,9 @@ - # Thanks to Ferdinand Kasper for this build script. [fry] - - -+# Always use Oracle's JDK to run processing -+PATH="/usr/lib/jvm/java-11-openjdk/bin/:$PATH" -+ - # JARs required from JDK (anywhere in/below the JDK home directory) - JDKLIBS="rt.jar" - diff --git a/derive_jdk_from_path.patch b/derive_jdk_from_path.patch deleted file mode 100644 index 8e4b11584972..000000000000 --- a/derive_jdk_from_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/build/linux/processing 2020-01-17 17:20:35.000000000 +0100 -+++ b/build/linux/processing 2020-06-13 03:21:55.217817070 +0200 -@@ -68,7 +68,7 @@ - log APPDIR - - # Try using a local JDK from the same directory as this script --JDKDIR=`readlink -f "$APPDIR/java"` -+JDKDIR=`readlink -f $(dirname $(readlink -f $(which java)))/../../` - make_jdkcp "$JDKDIR" - log SUCCESS - diff --git a/no_downloads.patch b/no_downloads.patch deleted file mode 100644 index 5ae257d2358f..000000000000 --- a/no_downloads.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- build.xml.orig 2020-06-13 00:09:40.000000000 +0200 -+++ build.xml 2020-06-17 12:46:43.682413239 +0200 -@@ -1009,7 +1009,7 @@ - </if> - </target> - -- <target name="linux-build" depends="ignore-tools, check-linux-arm32, check-linux-arm64, revision-check, linux-check-os, jdk-download, jfx-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"> -@@ -1049,25 +1049,6 @@ - <fileset refid="runtime.jars" /> - </copy> - -- <preparejfx /> -- -- <!-- Pull in OpenJFX (separated from mainline Java in JDK 11). --> -- <if> -- <equals arg1="${jfx.available}" arg2="true" /> -- <then> -- <copy todir="linux/work/core/library" overwrite="true"> -- <fileset dir="${jfx.path.lib}" includes="*.jar"/> -- <fileset dir="${jfx.path.lib}" includes="*.so"/> -- </copy> -- -- <mkdir dir="linux/work/core/java/legal/openjfx" /> -- -- <copy todir="linux/work/core/java/legal/openjfx" overwrite="true"> -- <fileset dir="${jfx.path.dist}/legal" includes="**"/> -- </copy> -- </then> -- </if> -- - <copy file="linux/processing" todir="linux/work" /> - <chmod perm="ugo+x" file="linux/work/processing" /> - -@@ -1094,57 +1075,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.esoteric}+${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="javafx-basics" /> -- <fileset refid="javafx-linux-${jdk.data.model}" /> -- --> -- <fileset refid="jdk-optional-linux" /> -- </delete> -- -- <exec executable="rm"> -- <arg value="-r"/> -- <arg line="linux/jdk-${jdk.esoteric}+${jdk.build}"/> -- </exec> -- -- <exec executable="rm"> -- <arg value="-r"/> -- <arg line="${jfx.path.dist}"/> -- </exec> -- - </target> - - <target name="linux-run" depends="linux-build" |