Version bump to 5.4.7

Java location fixed.

3 files changed, 43 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 36caf29b4274..af30d2f09ef5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = uyap
 	pkgdesc = UYAP Dokuman Editor, UYAP Sablon Editor
-	pkgver = 5.4.6
-	pkgrel = 2
+	pkgver = 5.4.7
+	pkgrel = 1
 	url = https://uyap.gov.tr/UYAP-Editor
 	install = uyap.install
 	arch = x86_64
@@ -11,9 +11,11 @@ pkgbase = uyap
 	optdepends = akia: sign UYAP documents
 	optdepends = jre8: sign UYAP documents
 	optdepends = cups: print documents
-	source = http://depo.pardus.org.tr/pardus/pool/non-free/u/uyapeditor/uyapeditor_5.4.6_amd64.deb
+	source = http://depo.pardus.org.tr/pardus/pool/non-free/u/uyapeditor/uyapeditor_5.4.7_amd64.deb
 	source = desktop-files.patch
-	sha256sums = 390bc1b49a7eb607e2c0751475b9a00268001cbcfcb6735794f72d110975a909
+	source = java-location.patch
+	sha256sums = dfb95dca8690e60ba8a81b069c5e5c69e1264528f0a8e18fe16895107d4f72e5
 	sha256sums = 19f36882522f236b3e48049c810079cf0ddfb21b76ad2da84e9b70550df4ac19
+	sha256sums = 50a2339b4a467218fd614cb95ebd12b34a2c8d52cf61e6f10a2286605e47c126
 
 pkgname = uyap
diff --git a/PKGBUILD b/PKGBUILD
index 981ffa62c5f9..d1d5c6da87ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: oltulu <cihanalk@gmail.com>
 
 pkgname=uyap
-pkgver=5.4.6
-pkgrel=2
+pkgver=5.4.7
+pkgrel=1
 pkgdesc="UYAP Dokuman Editor, UYAP Sablon Editor"
 arch=("x86_64")
 url="https://uyap.gov.tr/UYAP-Editor"
@@ -14,14 +14,17 @@ optdepends=("akia: sign UYAP documents"
 	    "jre8: sign UYAP documents"
 	    "cups: print documents")
 source=("http://depo.pardus.org.tr/pardus/pool/non-free/u/uyapeditor/uyapeditor_${pkgver}_amd64.deb"
-        desktop-files.patch)
-sha256sums=("390bc1b49a7eb607e2c0751475b9a00268001cbcfcb6735794f72d110975a909"
-            "19f36882522f236b3e48049c810079cf0ddfb21b76ad2da84e9b70550df4ac19")
+        desktop-files.patch
+        java-location.patch)
+sha256sums=("dfb95dca8690e60ba8a81b069c5e5c69e1264528f0a8e18fe16895107d4f72e5"
+            "19f36882522f236b3e48049c810079cf0ddfb21b76ad2da84e9b70550df4ac19"
+            "50a2339b4a467218fd614cb95ebd12b34a2c8d52cf61e6f10a2286605e47c126")
 
 prepare() {
     ar x uyapeditor_${pkgver}_amd64.deb
     tar -Jxf ${srcdir}/data.tar.xz -C "${srcdir}"
     patch --forward --strip=1 --input="desktop-files.patch"
+    patch --forward --strip=1 --input="java-location.patch"
 }
 
 package() {
diff --git a/java-location.patch b/java-location.patch
new file mode 100644
index 000000000000..c800e101a291
--- /dev/null
+++ b/java-location.patch
@@ -0,0 +1,29 @@
+diff --unified --recursive --text uyap-5.4.{7,6}-2-x86_64.pkg/usr/share/UYAPEditor/dokuman.sh
+--- package.orig/usr/share/UYAPEditor/dokuman.sh	2023-10-15 20:52:43.000000000 +0300
++++ package.new/usr/share/UYAPEditor/dokuman.sh	2023-10-15 20:57:43.000000000 +0300
+@@ -11,8 +11,8 @@
+ 
+ if [ $# -eq 0 ];
+   then
+-    /usr/lib/jvm/java-11-openjdk-amd64/bin/java -Xmx200m -cp  $cppath tr.com.havelsan.uyap.system.editor.common.WPAppManager "getNewWPInstance" "EDITOR_TYPE_DOCUMENT"
++    java -Xmx200m -cp  $cppath tr.com.havelsan.uyap.system.editor.common.WPAppManager "getNewWPInstance" "EDITOR_TYPE_DOCUMENT"
+   else
+-    /usr/lib/jvm/java-11-openjdk-amd64/bin/java -Xmx200m -cp  $cppath tr.com.havelsan.uyap.system.editor.common.WPAppManager "getNewWPInstance" "EDITOR_TYPE_DOCUMENT" "$1"
++    java -Xmx200m -cp  $cppath tr.com.havelsan.uyap.system.editor.common.WPAppManager "getNewWPInstance" "EDITOR_TYPE_DOCUMENT" "$1"
+ fi
+ exit;
+
+diff --unified --recursive --text uyap-5.4.{7,6}-2-x86_64.pkg/usr/share/UYAPEditor/sablon.sh
+--- package.orig/usr/share/UYAPEditor/sablon.sh	2023-10-15 20:52:43.000000000 +0300
++++ package.new/usr/share/UYAPEditor/sablon.sh	2023-10-15 20:57:43.000000000 +0300
+@@ -11,8 +11,8 @@
+ 
+ if [ $# -eq 0 ];
+   then
+-    /usr/lib/jvm/java-11-openjdk-amd64/bin/java -Xmx200m -cp  $cppath tr.com.havelsan.uyap.system.editor.common.WPAppManager "getNewWPInstance" "EDITOR_TYPE_TEMPLATE" 
++	java -Xmx200m -cp  $cppath tr.com.havelsan.uyap.system.editor.common.WPAppManager "getNewWPInstance" "EDITOR_TYPE_TEMPLATE" 
+   else
+-    /usr/lib/jvm/java-11-openjdk-amd64/bin/java -Xmx200m -cp  $cppath tr.com.havelsan.uyap.system.editor.common.WPAppManager "getNewWPInstance" "EDITOR_TYPE_TEMPLATE" "$1"
++	java -Xmx200m -cp  $cppath tr.com.havelsan.uyap.system.editor.common.WPAppManager "getNewWPInstance" "EDITOR_TYPE_TEMPLATE" "$1"
+ fi
+ exit;