diff options
| author | Torben | 2020-06-18 10:32:57 +0200 |
|---|---|---|
| committer | Torben | 2020-06-18 10:32:57 +0200 |
| commit | bf0b4bc517543a8f6ebabe5d94330ea44b3caa6c (patch) | |
| tree | dbeef89084f1cba0a20001b26c15dca4953e41d8 /use_system_libraries.patch | |
| parent | 6d1412faf55b9c22eef430ce054196b93626d1ba (diff) | |
| download | aur-bf0b4bc517543a8f6ebabe5d94330ea44b3caa6c.tar.gz | |
Use the downloaded jogl packages in the build process again
Diffstat (limited to 'use_system_libraries.patch')
| -rw-r--r-- | use_system_libraries.patch | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/use_system_libraries.patch b/use_system_libraries.patch index 0d9a32c60c08..3357bb6162cc 100644 --- a/use_system_libraries.patch +++ b/use_system_libraries.patch @@ -1,20 +1,9 @@ --- build_core.xml.orig 2020-06-13 00:09:40.000000000 +0200 +++ build_core.xml 2020-06-17 15:54:22.945551353 +0200 -@@ -29,7 +29,7 @@ - <property name="jogl.url" - value="https://jogamp.org/deployment/archive/rc/v2.4.0-rc-20200307/jar" /> - -- <available file="library/jogl-all.jar" property="jogl.present" /> -+ <available file="/usr/share/java/jogl/jogl-all.jar" property="jogl.present" /> - - <!-- ok to ignore failed downloads if we at least have a version that's local --> - <condition property="jogl.ignorable" value="false" else="true"> -@@ -58,17 +58,17 @@ - </target> - +@@ -60,15 +60,15 @@ <path id="classpath.base"> -- <pathelement location="library/jogl-all.jar" /> -- <pathelement location="library/gluegen-rt.jar" /> + <pathelement location="library/jogl-all.jar" /> + <pathelement location="library/gluegen-rt.jar" /> - <pathelement location="library/javafx-swt.jar" /> - <pathelement location="library/javafx.base.jar" /> - <pathelement location="library/javafx.controls.jar" /> @@ -24,8 +13,6 @@ - <pathelement location="library/javafx.properties" /> - <pathelement location="library/javafx.swing.jar" /> - <pathelement location="library/javafx.web.jar" /> -+ <pathelement location="/usr/share/java/jogl/jogl-all.jar" /> -+ <pathelement location="/usr/share/java/jogl/gluegen-rt.jar" /> + <pathelement location="/usr/lib/jvm/java-11-openjdk/lib/javafx-swt.jar" /> + <pathelement location="/usr/lib/jvm/java-11-openjdk/lib/javafx.base.jar" /> + <pathelement location="/usr/lib/jvm/java-11-openjdk/lib/javafx.controls.jar" /> |