processing: 4.3.2 -> 4.4.10 (#464235)

diff --git a/build/build.xml b/build/build.xml

index 8ad556c11..e61b6ae45 100644

--- a/build/build.xml

+++ b/build/build.xml

@@ -453,8 +453,6 @@

     <!-- the revision.base property won't be set

          if $revision wasn't found... -->

-    <fail unless="revision.correct"

-          message="Fix revision number in Base.java" />

   </target>

diff --git a/app/build.xml b/app/build.xml

index 37aa13d03..a495b4f7e 100644

--- a/app/build.xml

+++ b/app/build.xml

@@ -162,6 +162,7 @@

            encoding="UTF-8"

            includeAntRuntime="false"

            classpath="../core/library/core.jar;

+                      utils/library/utils.jar;

                       lib/ant.jar;

                       lib/ant-launcher.jar;

                       lib/flatlaf.jar;

diff --git a/app/utils/build.xml b/app/utils/build.xml

new file mode 100644

index 000000000..5a4b72e32

--- /dev/null

+++ b/app/utils/build.xml

@@ -0,0 +1,22 @@

+<?xml version="1.0"?>

+<project name="Processing Utils Library" default="build">

+  <target name="compile" description="Compile sources">

+    <mkdir dir="bin" />

+    <javac source="17"

+           target="17"

+           srcdir="src" destdir="bin"

+           encoding="UTF-8"

+           includeAntRuntime="false"

+           nowarn="true">

+    </javac>

+  </target>

+

+  <target name="build" depends="compile" description="Build utils library">

+    <jar basedir="bin" destfile="library/utils.jar" />

+  </target>

+

+  <target name="clean" description="Clean the build directories">

+    <delete dir="bin" />

+    <delete file="library/utils.jar" />

+  </target>

+</project>

diff --git a/build/build.xml b/build/build.xml

index f1247b511..2f1f22128 100644

--- a/build/build.xml

+++ b/build/build.xml

@@ -191,6 +191,7 @@

   <!-- also need to copy these to the bundleapp task for macos -->

   <fileset dir=".." id="runtime.jars">

     <include name="app/pde.jar" />

+    <include name="app/utils/library/utils.jar" />

     <include name="app/lib/jna.jar" />

     <include name="app/lib/jna-platform.jar" />

     <include name="app/lib/ant.jar" />

@@ -294,6 +295,7 @@

   <target name="subprojects-clean">

     <subant buildpath="../core" target="clean"/>

+    <subant buildpath="../app/utils" target="clean"/>

     <subant buildpath="../app" target="clean"/>

     <subant buildpath="../java/libraries/dxf" target="clean"/>

     <subant buildpath="../java/libraries/io" target="clean"/>

@@ -315,6 +317,7 @@

   <target name="subprojects-build">

     <subant buildpath="../core" target="build"/>

+    <subant buildpath="../app/utils" target="build"/>

     <subant buildpath="../app" target="build"/>

     <subant buildpath="../java/libraries/dxf" target="build"/>

     <subant buildpath="../java/libraries/net" target="build"/>

diff --git a/java/build.xml b/java/build.xml

index ca2e32f4f..5aeae7ac8 100644

--- a/java/build.xml

+++ b/java/build.xml

@@ -97,6 +97,7 @@

     <pathelement location="../app/lib/apple.jar" />

     <pathelement location="../app/lib/jna.jar" />

     <pathelement location="../app/lib/jna-platform.jar" />

+    <pathelement location="../app/utils/library/utils.jar" />

     <pathelement location="mode/antlr-4.7.2-complete.jar" />

     <pathelement location="mode/classpath-explorer-1.0.jar" />

}:

let

  jdk = jdk17;

  buildNumber = "1295";

  buildNumber = "1310";

  vaqua = fetchurl {

    name = "VAqua9.jar";

    url = "https://violetlib.org/release/vaqua/9/VAqua9.jar";

in

stdenv.mkDerivation rec {

  pname = "processing";

  version = "4.3.2";

  version = "4.4.10";

  src = fetchFromGitHub {

    owner = "processing";

    repo = "processing4";

    rev = "processing-${buildNumber}-${version}";

    sha256 = "sha256-jUkWnkP8up5vpaXfgFJ/jQjN1KfeX5EuYXSb+W6NEms=";

    sha256 = "sha256-u2wQl/VGCNJPd+k3DX2eW7gkA/RARMTSNGcoQuS/Oh8=";

  };

  # Processing did not update the todo.txt file before tagging this release, so

  # the "revision-check" Ant target fails.

  patches = [ ./disable-revision-check.patch ];

  patches = [ ./fix-ant-build.patch ];

  nativeBuildInputs = [

    ant

    echo "tarring jdk"

    tar --checkpoint=10000 -czf build/linux/jdk-17.0.8-${arch}.tgz ${jdk}

    mkdir -p app/lib core/library

    cp ${ant.home}/lib/{ant.jar,ant-launcher.jar} app/lib/

    mkdir -p core/library

    ln -s ${jogl}/share/java/* core/library/

    ln -s ${vaqua} app/lib/VAqua9.jar

    ln -s ${flatlaf} app/lib/flatlaf.jar

    cp -dpr build/linux/work $out/share/${pname}

    rmdir $out/share/${pname}/java

    ln -s ${jdk} $out/share/${pname}/java

    runHook postInstall

  '';

  preFixup = ''

    makeWrapper $out/share/${pname}/processing $out/bin/processing \

      ''${gappsWrapperArgs[@]} \

      "''${gappsWrapperArgs[@]}" \

      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \

      --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"

    makeWrapper $out/share/${pname}/processing-java $out/bin/processing-java \

      ''${gappsWrapperArgs[@]} \

      "''${gappsWrapperArgs[@]}" \

      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \

      --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"

    runHook postInstall

  '';

  meta = with lib; {