summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTorben2021-10-17 22:23:04 +0200
committerTorben2021-10-17 22:23:04 +0200
commit4f80dd78482c58d7b095d425fa725750c87802f0 (patch)
tree31524b0a6562556ff58dc3f370a7a90d42f31660
parent325b092a6b342bbe3e6b5c261bfe64aba5a2c98d (diff)
downloadaur-4f80dd78482c58d7b095d425fa725750c87802f0.tar.gz
Fix openjfx path
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--fix_theme_engine.patch2
-rw-r--r--use_system_libraries.patch14
4 files changed, 12 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 299b8a107507..7e31ff66d50f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -27,11 +27,11 @@ pkgbase = processing4-git
sha256sums = fabe7420a714f450a6b1430f13fc46f14ba52db57af360365c6a7fd96d0b642f
sha256sums = 500d00811031c0445416b6112972aa1f7a377092dd3b8565d79ead3fdfc62451
sha256sums = 35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30
- sha256sums = 24b8a3e18b6e3a0de9422e4dbde46cceb91385f7ad6bdc89ec0a9614e082c977
+ sha256sums = 1b4b61a1f0b771e5a80fc592b252c690594b8d88dafa1baa9b778aeafa88a362
sha256sums = b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126
sha256sums = 0ef5266575db0fe6bde436e5a3205ca848440b3006bccb4c20fe8d7b98951ee9
sha256sums = dc733c1cb5a41cb06ef0f9ea01d701fd9ac7713b5817b4fe79d7076a505a7c44
sha256sums = aa77c001eb5de9e211bb38d06c17483d81450fa0667748c44fba6d04fa329732
- sha256sums = 15119264b6ae7b154f033261ba93535c2d1b5e2b9d849f3999dd7881cc9e49cb
+ sha256sums = 7d5dc98c1c96ae817de604e203f8e77d53625a660a84729eb8f83ad36e150b9f
pkgname = processing4-git
diff --git a/PKGBUILD b/PKGBUILD
index c3fd77443e9a..0b0d929186af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,12 +24,12 @@ source=('https://download.processing.org/reference.zip'
sha256sums=('fabe7420a714f450a6b1430f13fc46f14ba52db57af360365c6a7fd96d0b642f'
'500d00811031c0445416b6112972aa1f7a377092dd3b8565d79ead3fdfc62451'
'35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30'
- '24b8a3e18b6e3a0de9422e4dbde46cceb91385f7ad6bdc89ec0a9614e082c977'
+ '1b4b61a1f0b771e5a80fc592b252c690594b8d88dafa1baa9b778aeafa88a362'
'b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126'
'0ef5266575db0fe6bde436e5a3205ca848440b3006bccb4c20fe8d7b98951ee9'
'dc733c1cb5a41cb06ef0f9ea01d701fd9ac7713b5817b4fe79d7076a505a7c44'
'aa77c001eb5de9e211bb38d06c17483d81450fa0667748c44fba6d04fa329732'
- '15119264b6ae7b154f033261ba93535c2d1b5e2b9d849f3999dd7881cc9e49cb')
+ '7d5dc98c1c96ae817de604e203f8e77d53625a660a84729eb8f83ad36e150b9f')
pkgver() {
cd "$srcdir/$pkgname"
diff --git a/fix_theme_engine.patch b/fix_theme_engine.patch
index 231d12d5ffc0..6094107e3197 100644
--- a/fix_theme_engine.patch
+++ b/fix_theme_engine.patch
@@ -5,7 +5,7 @@
<property name="javafx.path"
- location="../../../../java/libraries/javafx/library/macosx" />
-+ location="/usr/lib/jvm/java-17-openjdk/lib/" />
++ location="/usr/lib/jvm/java-11-openjfx/lib/" />
<target name="clean" description="Clean the build directories">
<delete dir="bin" />
diff --git a/use_system_libraries.patch b/use_system_libraries.patch
index 67d2871b301b..776244c18cba 100644
--- a/use_system_libraries.patch
+++ b/use_system_libraries.patch
@@ -11,16 +11,16 @@ index db633fff9..f984ae71c 100644
- <pathelement location="library/javafx.fxml.jar" />
- <pathelement location="library/javafx.graphics.jar" />
- <pathelement location="library/javafx.media.jar" />
-+ <pathelement location="/usr/lib/jvm/java-17-openjdk/lib/javafx.base.jar" />
-+ <pathelement location="/usr/lib/jvm/java-17-openjdk/lib/javafx.controls.jar" />
-+ <pathelement location="/usr/lib/jvm/java-17-openjdk/lib/javafx.fxml.jar" />
-+ <pathelement location="/usr/lib/jvm/java-17-openjdk/lib/javafx.graphics.jar" />
-+ <pathelement location="/usr/lib/jvm/java-17-openjdk/lib/javafx.media.jar" />
++ <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.base.jar" />
++ <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.controls.jar" />
++ <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.fxml.jar" />
++ <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.graphics.jar" />
++ <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.media.jar" />
<!-- error? it's not a .jar, but is this how config is handled? [fry 210619] -->
- <pathelement location="library/javafx.properties" />
- <pathelement location="library/javafx.swing.jar" />
-+ <pathelement location="/usr/lib/jvm/java-17-openjdk/lib/javafx.properties" />
-+ <pathelement location="/usr/lib/jvm/java-17-openjdk/lib/javafx.swing.jar" />
++ <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.properties" />
++ <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.swing.jar" />
<!-- <pathelement location="library/javafx.web.jar" /> -->
</path>