Fix java version issue

5 files changed, 42 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d930ad3ec2fe..c4fbe6cd7480 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dataexplorer
 	pkgdesc = Graphical tool to analyze data, gathered from various hardware devices.
-	pkgver = 3.7.4
-	pkgrel = 3
+	pkgver = 3.7.5
+	pkgrel = 1
 	url = http://savannah.nongnu.org/projects/dataexplorer
 	install = dataexplorer.install
 	arch = i686
@@ -9,8 +9,8 @@ pkgbase = dataexplorer
 	license = GPL3
 	makedepends = apache-ant
 	makedepends = jdk17-openjdk
-	depends = java-runtime
-	noextract = dataexplorer-3.7.4-src.tar.gz.sig
+	depends = jdk17-openjdk
+	noextract = dataexplorer-3.7.5-src.tar.gz.sig
 	noextract = 40-FTDI.rules
 	noextract = 40-FTDI.rules.sig
 	noextract = 40-MosChip.rules
@@ -19,8 +19,8 @@ pkgbase = dataexplorer
 	noextract = 40-ProfilicTechnology.rules.sig
 	noextract = 40-SiliconLabs.rules
 	noextract = 40-SiliconLabs.rules.sig
-	source = http://download.savannah.gnu.org/releases/dataexplorer/dataexplorer-3.7.4-src.tar.gz
-	source = http://download.savannah.gnu.org/releases/dataexplorer/dataexplorer-3.7.4-src.tar.gz.sig
+	source = http://download.savannah.gnu.org/releases/dataexplorer/dataexplorer-3.7.5-src.tar.gz
+	source = http://download.savannah.gnu.org/releases/dataexplorer/dataexplorer-3.7.5-src.tar.gz.sig
 	source = http://download.savannah.gnu.org/releases/dataexplorer/udev_rules/40-FTDI.rules
 	source = http://download.savannah.gnu.org/releases/dataexplorer/udev_rules/40-FTDI.rules.sig
 	source = http://download.savannah.gnu.org/releases/dataexplorer/udev_rules/40-MosChip.rules
@@ -29,10 +29,9 @@ pkgbase = dataexplorer
 	source = http://download.savannah.gnu.org/releases/dataexplorer/udev_rules/40-ProfilicTechnology.rules.sig
 	source = http://download.savannah.gnu.org/releases/dataexplorer/udev_rules/40-SiliconLabs.rules
 	source = http://download.savannah.gnu.org/releases/dataexplorer/udev_rules/40-SiliconLabs.rules.sig
-	source = window.patch
 	validpgpkeys = 3F0CC709ECF91C5CC0BE9E601D295C19C9C06AF6
-	sha512sums = 4984408484b2cdeec2e5d2711fa84ec594739b59bae96706d6b7c9b634658c2fe83b266fb4ab3d566e1d334c12fd3892eb906d1e8430cf057c9ab5b83d4b03e3
-	sha512sums = f4643c9907651616812ecdfa5f4c4873dec383bbbb44ce881f540d685dbf3d1bd32a6c5380fdbc88f0c05f87912e0fd24c42e92d1037d431f94916dd34349b29
+	sha512sums = 63d20037542efc6686bf9156ce5782676fd3468e903f8b873239999aa2288123272d7f0b218ea78fe4ba4af8da5d74cad5f3d947614654758bd599631790c8fe
+	sha512sums = 8fca73217b4b0ca78f82f77b28e969f8c77a01b1b072f10a37836d9f768c35238459af461a98e6a0759d83ea350ccaa73260d6869f01d594ea5fc36edd3ec5ac
 	sha512sums = adc0d042c68970d21c3e44faa29015e6d916a14587ea73c2273e7b15351d161d4d54ccc94293a67e53d63d97a70e0dbee6a2b5af30e6e1f8df6f12cb27516036
 	sha512sums = 176304b8c28aa8db49afaac2a8f7769d3635343e696bde173123905d432ea8375059e2911b1ba137157bd70ca83dbedd2ad0b865d2f080bf552f7d5a6aadfdd4
 	sha512sums = 8bb9d77e86e47a5a42bfdf661ea35a4543b3a22336ae4f718657e12089091cf1d6664fd1090e194da4c56f34c5febef960f50692246a1109ded19921854b9e5f
@@ -41,6 +40,5 @@ pkgbase = dataexplorer
 	sha512sums = e18675e1e020bf03a5a05621b1dfbc5847f2a5d881715fda59bb5662b53a2a6ddd846cab8878edc3f71da838b3760909338cd9bdaaf7871ec06bdd64e9ae1dfe
 	sha512sums = 8d969524ae67b5170976efd408ab4c28b23d8a33bc0d671d1b968a6cab4ebfbc80067561f1837470c8cd92e711df136851fec85e683ddf7fd1a33f93b6e39210
 	sha512sums = 4d392d1e673e68b7ae14d0c696bee762587ddc5f188c03f47f920f5d474b4f9dd9d50854fbc331755fb56d6d5ca5b55306fa5109881961c1b913bb8260f0d0e4
-	sha512sums = 1a356a34c6a17fc8708a366b7a1331c1e9743b69ced0c0a55e6b2dc17c68868f81ab1b633d5ae4f01396fe7feba1b5f9b49a701e6c951c222dccd3a055fd5f2b
 
 pkgname = dataexplorer
diff --git a/PKGBUILD b/PKGBUILD
index 5e657916d222..80d8231df49f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Aaron Fischer <mail@aaron-fischer.net>
 
 pkgname=dataexplorer
-pkgver=3.7.4
-pkgrel=3
+pkgver=3.7.5
+pkgrel=1
 pkgdesc="Graphical tool to analyze data, gathered from various hardware devices."
 url="http://savannah.nongnu.org/projects/dataexplorer"
 arch=("i686" "x86_64")
 license=("GPL3")
 install=$pkgname.install
 makedepends=("apache-ant" "jdk17-openjdk")
-depends=("java-runtime")
+depends=("jdk17-openjdk")
 source=("http://download.savannah.gnu.org/releases/dataexplorer/dataexplorer-$pkgver-src.tar.gz"
         "http://download.savannah.gnu.org/releases/dataexplorer/dataexplorer-$pkgver-src.tar.gz.sig"
         "http://download.savannah.gnu.org/releases/dataexplorer/udev_rules/40-FTDI.rules"
@@ -20,7 +20,6 @@ source=("http://download.savannah.gnu.org/releases/dataexplorer/dataexplorer-$pk
         "http://download.savannah.gnu.org/releases/dataexplorer/udev_rules/40-ProfilicTechnology.rules.sig"
         "http://download.savannah.gnu.org/releases/dataexplorer/udev_rules/40-SiliconLabs.rules"
         "http://download.savannah.gnu.org/releases/dataexplorer/udev_rules/40-SiliconLabs.rules.sig"
-        "window.patch"
         )
 noextract=("dataexplorer-$pkgver-src.tar.gz.sig"
            "40-FTDI.rules"
@@ -31,8 +30,8 @@ noextract=("dataexplorer-$pkgver-src.tar.gz.sig"
            "40-ProfilicTechnology.rules.sig"
            "40-SiliconLabs.rules"
            "40-SiliconLabs.rules.sig")
-sha512sums=("4984408484b2cdeec2e5d2711fa84ec594739b59bae96706d6b7c9b634658c2fe83b266fb4ab3d566e1d334c12fd3892eb906d1e8430cf057c9ab5b83d4b03e3"
-            "f4643c9907651616812ecdfa5f4c4873dec383bbbb44ce881f540d685dbf3d1bd32a6c5380fdbc88f0c05f87912e0fd24c42e92d1037d431f94916dd34349b29"
+sha512sums=("63d20037542efc6686bf9156ce5782676fd3468e903f8b873239999aa2288123272d7f0b218ea78fe4ba4af8da5d74cad5f3d947614654758bd599631790c8fe"
+            "8fca73217b4b0ca78f82f77b28e969f8c77a01b1b072f10a37836d9f768c35238459af461a98e6a0759d83ea350ccaa73260d6869f01d594ea5fc36edd3ec5ac"
             "adc0d042c68970d21c3e44faa29015e6d916a14587ea73c2273e7b15351d161d4d54ccc94293a67e53d63d97a70e0dbee6a2b5af30e6e1f8df6f12cb27516036"
             "176304b8c28aa8db49afaac2a8f7769d3635343e696bde173123905d432ea8375059e2911b1ba137157bd70ca83dbedd2ad0b865d2f080bf552f7d5a6aadfdd4"
             "8bb9d77e86e47a5a42bfdf661ea35a4543b3a22336ae4f718657e12089091cf1d6664fd1090e194da4c56f34c5febef960f50692246a1109ded19921854b9e5f"
@@ -40,20 +39,11 @@ sha512sums=("4984408484b2cdeec2e5d2711fa84ec594739b59bae96706d6b7c9b634658c2fe83
             "3174d20d0de4b8cf0756b1fe69563ca4c3133b108bdda2bd90a8b0163d3f35c826c1356544735181023f2cbaee71a3a7224f88221ad57fa187a52c4d04fe023a"
             "e18675e1e020bf03a5a05621b1dfbc5847f2a5d881715fda59bb5662b53a2a6ddd846cab8878edc3f71da838b3760909338cd9bdaaf7871ec06bdd64e9ae1dfe"
             "8d969524ae67b5170976efd408ab4c28b23d8a33bc0d671d1b968a6cab4ebfbc80067561f1837470c8cd92e711df136851fec85e683ddf7fd1a33f93b6e39210"
-            "4d392d1e673e68b7ae14d0c696bee762587ddc5f188c03f47f920f5d474b4f9dd9d50854fbc331755fb56d6d5ca5b55306fa5109881961c1b913bb8260f0d0e4"
-            "1a356a34c6a17fc8708a366b7a1331c1e9743b69ced0c0a55e6b2dc17c68868f81ab1b633d5ae4f01396fe7feba1b5f9b49a701e6c951c222dccd3a055fd5f2b")
+            "4d392d1e673e68b7ae14d0c696bee762587ddc5f188c03f47f920f5d474b4f9dd9d50854fbc331755fb56d6d5ca5b55306fa5109881961c1b913bb8260f0d0e4")
 
 validpgpkeys=("3F0CC709ECF91C5CC0BE9E601D295C19C9C06AF6") # Winfried Bruegmann
 
-# See https://savannah.nongnu.org/bugs/?63653
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch --forward --strip=1 --input="${srcdir}/window.patch"
-}
-
 build() {
-  echo $pkgdir
-
   cd "$srcdir/$pkgname-$pkgver"
 
   if [ ! -e "RXTXcomm" ]; then
@@ -62,10 +52,6 @@ build() {
 
   ./configure --prefix=$pkgdir/opt
   make
-
-  cd "$srcdir"
-  echo -e "#!/usr/bin/env sh\ncd /opt/DataExplorer && ./DataExplorer" > "dataexplorer.sh"
-  echo -e "#!/usr/bin/env sh\ncd /opt/DataExplorer && ./DevicePropertiesEditor" > "deviceproperties-editor.sh"
 }
 
 package() {
diff --git a/dataexplorer.sh b/dataexplorer.sh
new file mode 100755
index 000000000000..da34dbb04fe2
--- /dev/null
+++ b/dataexplorer.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# Check if we have openjdk17 installed
+for version in $(archlinux-java status); do
+    if [[ $version == "java-17-openjdk" ]]; then
+        export PATH="/usr/lib/jvm/java-17-openjdk/bin/:$PATH"
+        cd /opt/DataExplorer
+        ./DataExplorer
+        exit 0
+    fi
+done
+
+echo "You do not have java-17-openjdk installed."
+exit 1
diff --git a/deviceproperties-editor.sh b/deviceproperties-editor.sh
new file mode 100755
index 000000000000..0f6bc25bc0fd
--- /dev/null
+++ b/deviceproperties-editor.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# Check if we have openjdk17 installed
+for version in $(archlinux-java status); do
+    if [[ $version == "java-17-openjdk" ]]; then
+        export PATH="/usr/lib/jvm/java-17-openjdk/bin/:$PATH"
+        cd /opt/DataExplorer
+        ./DevicePropertiesEditor
+        exit 0
+    fi
+done
+
+echo "You do not have java-17-openjdk installed."
+exit 1
diff --git a/window.patch b/window.patch
deleted file mode 100644
index 529afb33ba99..000000000000
--- a/window.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --unified --recursive --text dataexplorer-3.7.4-orig/DataExplorer/src/gde/config/Settings.java dataexplorer-3.7.4/DataExplorer/src/gde/config/Settings.java
---- dataexplorer-3.7.4-orig/DataExplorer/src/gde/config/Settings.java	2023-01-17 14:13:35.830877909 +0100
-+++ dataexplorer-3.7.4/DataExplorer/src/gde/config/Settings.java	2023-01-17 14:14:49.131060464 +0100
-@@ -341,6 +341,9 @@
- 	private void initialize() throws SAXException, JAXBException {
- 		this.load();
- 
-+    // Fallback to always have a valid window
-+		this.window = new Rectangle(50, 50, 950, 600);
-+
- 		if (Analyzer.isWithBuilders()) {
- 			this.readMeasurementDiplayProperties();
- 		} else {