Version bump

5 files changed, 62 insertions, 314 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 426fb026c751..d40b397d09e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = uyap
-	pkgdesc = Uyap Belge Düzenleyici
-	pkgver = 4.1.10
-	pkgrel = 2
-	url = http://www.uyap.gov.tr/
+	pkgdesc = UYAP Dokuman Editor, UYAP Sablon Editor
+	pkgver = 5.4.0
+	pkgrel = 1
+	url = https://uyap.gov.tr/UYAP-Editor
 	arch = x86_64
-	license = GPL2
-	makedepends = innoextract
-	source = http://www.uyap.gov.tr/destek/uyap.zip
-	source = uyap-editor.png
-	source = product_logo_32.xpm
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
+	license = custom
+	depends = pcsclite
+	depends = java-environment
+	optdepends = akia: sign UYAP documents
+	optdepends = jre8: sign UYAP documents
+	source = https://rayp.adalet.gov.tr/resimler/2/dosya/uyap-pardus-5-4-0-amd6420-12-20219-21-am.zip
+	source = desktop-files.patch
+	sha256sums = 2394f9b712ca2e2d905901642992fd736e0c972b0e5f72303e06cf9cebd7b2f1
+	sha256sums = 19f36882522f236b3e48049c810079cf0ddfb21b76ad2da84e9b70550df4ac19
 
 pkgname = uyap
-
diff --git a/PKGBUILD b/PKGBUILD
index de8401e9046f..b2d21d930b25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,98 +1,31 @@
+# Maintainer: Osman Karagoz <osmank3[at]gmail[dot]com>
 # Maintainer: oltulu <cihanalk@gmail.com>
-pkgname=uyap
-pkgver=4.1.10
-pkgrel=2
-pkgdesc='Uyap Belge Düzenleyici'
-url='http://www.uyap.gov.tr/'
-arch=('x86_64')
-license=('GPL2')
-makedepends=('innoextract')
-depends=()
-source=("http://www.uyap.gov.tr/destek/uyap.zip"
-        "uyap-editor.png"
-        "product_logo_32.xpm")
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP')
+DLAGENTS=("https::/usr/bin/curl -k -o %o %u")
 
-build() {
-innoextract UKI_V$pkgver/UKI_V$pkgver.exe
+pkgname=uyap
+pkgver=5.4.0
+pkgrel=1
+pkgdesc="UYAP Dokuman Editor, UYAP Sablon Editor"
+arch=("x86_64")
+url="https://uyap.gov.tr/UYAP-Editor"
+license=("custom")
+depends=("pcsclite" "java-environment")
+optdepends=("akia: sign UYAP documents"
+	    "jre8: sign UYAP documents")
+source=("https://rayp.adalet.gov.tr/resimler/2/dosya/uyap-pardus-5-4-0-amd6420-12-20219-21-am.zip"
+        desktop-files.patch)
+sha256sums=("2394f9b712ca2e2d905901642992fd736e0c972b0e5f72303e06cf9cebd7b2f1"
+            "19f36882522f236b3e48049c810079cf0ddfb21b76ad2da84e9b70550df4ac19")
+
+prepare() {
+    ar x uyap_pardus_5_4_0_amd64/uyapeditor_5.4.0_amd64.deb
+    tar -Jxf ${srcdir}/data.tar.xz -C "${srcdir}"
+    patch --forward --strip=1 --input="desktop-files.patch"
+    mkdir -p "${srcdir}"/usr/bin
+    mv "${srcdir}"/usr/share/UYAPEditor/dokuman.sh "${srcdir}"/usr/bin/uyapeditor
+    mv "${srcdir}"/usr/share/UYAPEditor/sablon.sh "${srcdir}"/usr/bin/uyapsablon
 }
 
 package() {
-mkdir -p $pkgdir/opt/uki
-cp -r app/*.jar /$pkgdir/opt/uki/
-
-# Başlatıcı 
-mkdir -pv $pkgdir/usr/share/applications &&
-cat > $pkgdir/usr/share/applications/$pkgname.desktop << "EOF" &&
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Uyap Document Editor
-Name[tr]=Uyap Belge Düzenleyici
-Comment=Uyap Document Editor
-Comment[tr]=Uyap Belge Düzenleyici
-GenericName=Metin Düzenleyici
-TryExec=uyap
-Exec=uyap %U
-Terminal=false
-Icon=uyap-editor
-Categories=TextEditor;Office;
-StartupNotify=true
-Actions=Window;Document;
-MimeType=application/udf;
-EOF
-
-# Bin Dosyası 
-mkdir -pv $pkgdir/usr/bin &&
-cat > $pkgdir/usr/bin/$pkgname << "EOF" &&
-java -Xmx512m -Duser.language=tr -Duser.region=TR -cp .:/opt/uki/editor_lib2.jar:/opt/uki/editor_lib.jar:/opt/uki/editor_laf.jar:/opt/uki/jai_hvl.jar:/opt/uki/editor_utility.jar:/opt/uki/jdom.jar:/opt/uki/updater.jar tr.com.havelsan.uyap.system.editor.common.WPAppManager "getNewWPInstance" "EDITOR_TYPE_DOCUMENT" "$1" "$2"
-EOF
-
-# Uyap Menü 
-mkdir -pv $pkgdir/usr/share/menu &&
-cat > $pkgdir/usr/share/menu/$pkgname.menu << "EOF" &&
-?package(uyap):needs="x11" \
-  section="Office" \
-  hints="Metin Düzenleyici" \
-  title="Uyap Belge Düzenleyici" \
-  icon="/opt/uki/product_logo_32.xpm" \
-  command="/usr/bin/uyap"
-EOF
-
-# Uyap Mime 
-mkdir -pv $pkgdir/usr/share/mime/packages &&
-cat > $pkgdir/usr/share/mime/packages/udf.xml << "EOF" &&
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-	<mime-type type="application/udf">
-		<comment>Uyap Document File</comment>
-  		<comment xml:lang="tr">Uyap Belge Dosyası</comment>
-  		<acronym>UDF</acronym>
-  		<expanded-acronym>Uyap Document File</expanded-acronym>
-  		<generic-icon name="uyap-editor"/>
-  		<glob pattern="*.udf"/>
-	</mime-type>
-
-	<mime-type type="application/usf">
-		<comment>Uyap Template File</comment>
-  		<comment xml:lang="tr">Uyap Şablon Dosyası</comment>
-  		<acronym>USF</acronym>
-  		<expanded-acronym>Uyap Template File</expanded-acronym>
-  		<generic-icon name="uyap-editor"/>
-  		<glob pattern="*.usf"/>
-	</mime-type>
-</mime-info>
-EOF
-
-	# Icon Stuff
-	srcdir_LOC="$srcdir/"
-	DEST_LOC="$pkgdir/usr/share/icons/hicolor"
-	for i in 16 32 48 128 256
-	do
-		install -Dm644 "$srcdir_LOC"/uyap-editor.png "$DEST_LOC/${i}x${i}/apps/uyap-editor.png"
-	done
-	install -m644 "$srcdir/product_logo_32.xpm" "$pkgdir/opt/uki/product_logo_32.xpm"
-chmod +x $pkgdir/usr/bin/uyap
+    mv "${srcdir}"/usr "${pkgdir}"/usr
 }
diff --git a/desktop-files.patch b/desktop-files.patch
new file mode 100644
index 000000000000..66760a619874
--- /dev/null
+++ b/desktop-files.patch
@@ -0,0 +1,24 @@
+diff --unified --recursive --text package.orig/usr/share/applications/dokuman.desktop package.new/usr/share/applications/dokuman.desktop
+--- package.orig/usr/share/applications/dokuman.desktop	2021-02-12 22:23:32.000000000 +0300
++++ package.new/usr/share/applications/dokuman.desktop	2022-01-04 22:16:56.008811348 +0300
+@@ -2,7 +2,7 @@
+ [Desktop Entry]
+ Comment[tr]=
+ Comment=
+-Exec=/usr/share/UYAPEditor/dokuman.sh
++Exec=uyapeditor
+ Icon=uyap-editor
+ GenericName[tr]=UYAP DOKUMAN EDITOR
+ GenericName=UYAP DOKUMAN EDITOR
+diff --unified --recursive --text package.orig/usr/share/applications/sablon.desktop package.new/usr/share/applications/sablon.desktop
+--- package.orig/usr/share/applications/sablon.desktop	2021-02-12 22:23:32.000000000 +0300
++++ package.new/usr/share/applications/sablon.desktop	2022-01-04 22:17:29.293052895 +0300
+@@ -2,7 +2,7 @@
+ [Desktop Entry]
+ Comment[tr]=
+ Comment=
+-Exec=/usr/share/UYAPEditor/sablon.sh
++Exec=uyapsablon
+ Icon=uyap-editor
+ GenericName[tr]=UYAP SABLON EDITOR
+ GenericName=UYAP SABLON EDITOR 
diff --git a/product_logo_32.xpm b/product_logo_32.xpm
deleted file mode 100644
index cd43fd6db742..000000000000
--- a/product_logo_32.xpm
+++ /dev/null
@@ -1,209 +0,0 @@
-/* XPM */
-static char *product_logo___[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 171 2",
-"   c #171615",
-".  c #222120",
-"X  c #292827",
-"o  c #2B2A29",
-"O  c #373635",
-"+  c #3F3E3D",
-"@  c #434342",
-"#  c #484746",
-"$  c #494847",
-"%  c #4C4C4B",
-"&  c #525250",
-"*  c #585756",
-"=  c #5E5D5C",
-"-  c #605F5F",
-";  c #61605F",
-":  c #636261",
-">  c #6C6B6B",
-",  c #706F6E",
-"<  c #70706F",
-"1  c #727271",
-"2  c #7C7B7B",
-"3  c #851C1A",
-"4  c #8A1E1C",
-"5  c #911F1D",
-"6  c #9E1D1B",
-"7  c #A20504",
-"8  c #AB0606",
-"9  c #A60D0C",
-"0  c #AC1615",
-"q  c #A31C1A",
-"w  c #AC1C1C",
-"e  c #B31D1E",
-"r  c #B81F1F",
-"t  c #9A211F",
-"y  c #A3201F",
-"u  c #AB201F",
-"i  c #B41F20",
-"p  c #BA1E20",
-"a  c #A32220",
-"s  c #AA2220",
-"d  c #B32121",
-"f  c #BB2022",
-"g  c #BB2929",
-"h  c #B53232",
-"j  c #BA3636",
-"k  c #BD3E3E",
-"l  c #C31618",
-"z  c #C01B1D",
-"x  c #CF1B1F",
-"c  c #C21E21",
-"v  c #CC1F23",
-"b  c #D31F23",
-"n  c #C32022",
-"m  c #CB2023",
-"M  c #D52427",
-"N  c #D82228",
-"B  c #D22F33",
-"V  c #C53A3C",
-"C  c #DB3E42",
-"Z  c #B14443",
-"A  c #BD4242",
-"S  c #BF4F4F",
-"D  c #BF4F53",
-"F  c #BB5C5B",
-"G  c #BD6D6F",
-"H  c #DB494C",
-"J  c #C95656",
-"K  c #C45D5D",
-"L  c #CD5B5C",
-"P  c #DF5255",
-"I  c #D45458",
-"U  c #DA5458",
-"Y  c #D25B5D",
-"T  c #E04C51",
-"R  c #E15559",
-"E  c #E3595E",
-"W  c #D05F60",
-"Q  c #E55D61",
-"!  c #C56464",
-"~  c #C96464",
-"^  c #C56A68",
-"/  c #CD686A",
-"(  c #D36364",
-")  c #D66769",
-"_  c #D76D6E",
-"`  c #DD6C6E",
-"'  c #C57474",
-"]  c #CE7374",
-"[  c #D17777",
-"{  c #D97374",
-"}  c #DC7A7B",
-"|  c #E66165",
-" . c #EA6165",
-".. c #E56568",
-"X. c #E96A6E",
-"o. c #E66E72",
-"O. c #EB6D71",
-"+. c #EA7176",
-"@. c #EC767A",
-"#. c #E37B7D",
-"$. c #EC7A7E",
-"%. c #F07A7D",
-"&. c #D67F81",
-"*. c #E57E80",
-"=. c #ED7D81",
-"-. c #868585",
-";. c #898787",
-":. c #888887",
-">. c #8C8B8B",
-",. c #908F8F",
-"<. c #8F908F",
-"1. c #8F9190",
-"2. c #949494",
-"3. c #9C9D9C",
-"4. c #A5A5A4",
-"5. c #A8A8A7",
-"6. c #A6A9A9",
-"7. c #ADACAB",
-"8. c #AFB1B0",
-"9. c #B4B3B3",
-"0. c #B8B7B7",
-"q. c #B7BAB9",
-"w. c #BEBEBD",
-"e. c #CD8280",
-"r. c #D28080",
-"t. c #DB8284",
-"y. c #DB8788",
-"u. c #D78C8C",
-"i. c #DA8B8B",
-"p. c #D69B9A",
-"a. c #E38285",
-"s. c #EF8386",
-"d. c #E78B8E",
-"f. c #EC8A8D",
-"g. c #F18689",
-"h. c #F28A8D",
-"j. c #E98F92",
-"k. c #F38D91",
-"l. c #EF9396",
-"z. c #E99698",
-"x. c #E79899",
-"c. c #F19093",
-"v. c #E89FA0",
-"b. c #DFA8A8",
-"n. c #C0BFBF",
-"m. c #EFA2A4",
-"M. c #EDA6A8",
-"N. c #F1A3A6",
-"B. c #E5B5B5",
-"V. c #ECB6B7",
-"C. c #E4BFBF",
-"Z. c #ECBFBF",
-"A. c #F3B1B3",
-"S. c #C2C1C1",
-"D. c #C9C9C8",
-"F. c #CED0D0",
-"G. c #DADADA",
-"H. c #EAC5C4",
-"J. c #F5C2C3",
-"K. c #F4DADA",
-"L. c #F9DDDE",
-"P. c #E3E3E3",
-"I. c #F5E3E3",
-"U. c #FAE7E8",
-"Y. c #F6EBEB",
-"T. c #FBEDED",
-"R. c #F6F6F6",
-"E. c #FAF5F6",
-"W. c #F7F8F8",
-"Q. c #FEFEFE",
-"!. c None",
-/* pixels */
-"!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.",
-"!.!.!.!.!.!.!.!.!.!.!.!.!.!.} *.#.{ !.!.!.!.!.!.!.!.!.!.!.!.!.!.",
-"!.!.!.!.!.!.!.!.!.!.!.t.k.h.g.s.=.%.%.%.) !.!.!.!.!.!.!.!.!.!.!.",
-"!.!.!.!.!.!.!.!.' d.f.f.s.=.$.$.$.@.+.+.O.X...D !.!.!.!.!.!.!.!.",
-"!.!.!.!.!.!.!.t.c.f.l.N.A.J.J.N.l.=.X.X.X...|  .I !.!.!.!.!.!.!.",
-"!.!.!.!.!.!.d.f.f.L.E.Q.Q.Q.Q.Q.Q.T.J.| ..| Q E E C !.!.!.!.!.!.",
-"!.!.!.!.!.d.f.m.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.L.o.E E R T N b !.!.!.!.!.",
-"!.!.!.!.&.f.M.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.T...R P M b b c !.!.!.!.",
-"!.!.!.G f.j.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.K.H M b b b b w !.!.!.",
-"!.!.!.a.a.U.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.M.x b b b b v !.!.!.",
-"!.!.!.a.z.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.U.B v v v v v !.!.!.",
-"!.!.] #.V.8.G.Q.Q.9.7.7.>.>.>.P.Q.Q.9.> : - 3.U v v v v v p !.!.",
-"!.!.#.` I.>.D.Q.Q.2.>.:., 2.-.# P.2.@ > > > 6.` v v v v v m !.!.",
-"!.!.} ( Q.:.D.Q.Q.2.;.-.;.Q.Q.2 1 + 4.3.>.;.q.x.l n n n n m !.!.",
-"!.! { Y Q.-.n.Q.Q.>.-.>.<.Q.Q.1 % O 5.> = = 3.v.l n n n n n e !.",
-"!./ _ Y E.3.1 9.5.& S.w.7.9.2.  S.; @ 5.7.7.F.} z n n n n n p !.",
-"!.~ ) Y Z.Q.,.< 1 0.Q.:.= # $ 4.Q.Q.: $ # @ 1.Y c n n n n n p !.",
-"!.F ( Y y.Q.Q.R.W.Q.Q.W.R.W.W.Q.Q.Q.Q.W.W.W.Y.V f f f f f f i !.",
-"!.!.W L ( T.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.H.f f f f f f f i !.",
-"!.!.L J J i.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.g r f f f f f f d !.",
-"!.!.Z k d 8 B.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.J r r e e d d d d s !.",
-"!.!.!.d d d d B.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.~ d e j i.[ 0 e d d s !.",
-"!.!.!.s d d d 8 r.Y.Q.Q.Q.Q.Q.Q.Q.Q.K.k w w ] Q.Q.Q.W.A e d s !.",
-"!.!.!.!.d s s s w h K b.E.Q.Q.I.u.S d w w ! Q.G.* < Q.E.9 s s !.",
-"!.!.!.!.6 s s s s s u 0 7 7 7 9 w s s s w H.W.# o . 2 Q.! w y !.",
-"!.!.!.!.!.y s s s s s s s s s s s s s s u H.R.# o X : Q.^ w y !.",
-"!.!.!.!.!.!.y s s s s s s s s s s s s s q e.Q.7.% % Q.Q.q s y !.",
-"!.!.!.!.!.!.!.t s a a a a a a a a a a a a q p.Q.W.Q.Q.F q a t !.",
-"!.!.!.!.!.!.!.!.3 t a a a a a a a a a a a a q ' C.B.Z q a a !.!.",
-"!.!.!.!.!.!.!.!.!.!.!.5 a a a a a a a a a a a 6 6 6 y a a 5 !.!.",
-"!.!.!.!.!.!.!.!.!.!.!.!.!.!.5 t t t t t t t t t t t t t 4 !.!.!.",
-"!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!.!."
-};
diff --git a/uyap-editor.png b/uyap-editor.png
deleted file mode 100644
index 66b0167507a6..000000000000
--- a/uyap-editor.png
+++ /dev/null