New upstream version 1.6.4-focal

3 files changed, 37 insertions, 174 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ccfb16c431dc..a0af4788ed7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = eparakstitajs3
 	pkgdesc = Application software to sign and validate documents in EDOC and PDF formats.
-	pkgver = 1.6.3
+	pkgver = 1.6.4
 	pkgrel = 1
 	url = https://www.eparaksts.lv
 	arch = x86_64
@@ -14,11 +14,11 @@ pkgbase = eparakstitajs3
 	optdepends = python-nautilus: Nautilus context menu integration
 	optdepends = eparaksts-token-signing: eParaksts browser plugins
 	optdepends = latvia-eid-middleware: libraries for Latvia eID cards
-	source = https://www.eparaksts.lv/files/ep3updates/debian/pool/eparaksts/e/eparakstitajs3/eparakstitajs3_1.6.3_amd64.deb
+	source = https://www.eparaksts.lv/files/ep3updates/debian/pool/eparaksts/e/eparakstitajs3/eparakstitajs3_1.6.4-focal_amd64.deb
 	source = dpkg
 	source = eparakstitajs3.patch
-	sha512sums = 5ad97b8ac830eb13892c1a3ebce95a683ad3471135a10f35bc589816b1aed169e4f5d53dfe025fb56e99b77898f4bbf5061f93a193ab0816d71ec1e1ac064bfa
+	sha512sums = 00b4a4c81ba28ce77d6c2b2b50cd8133a368686d0d4702cafbce24026bdcad758dce96da57e59c8235307816846428fa36e0a27cbfdb73e23e8fe2227a7d762a
 	sha512sums = 2831607d41e6480620869264866711341917de093bdd0228c2b8efb041c9c9ae8861ca0564f1e9917dab888cad69eb81c97a7a5509b58adb2ce61eb7a95a3d4a
-	sha512sums = 7f7a8884c72b291c9e83bb84d9d3ce74cf27e953acab6833d7c9a21341e9fe6f29ffcfc9022ff60cc8ecf8b07c2240ba0dca48b4e8ac05a82594129a8abd7387
+	sha512sums = 95e24c268c023cb52b710752e71922947a956ed07b1e75e90c6ce05124ac6b4b8759ab32b516daf2bf8d73f620ecd2eef637ed9b7b58f9360c445fdcad74ea9b
 
 pkgname = eparakstitajs3
diff --git a/PKGBUILD b/PKGBUILD
index c8a4b01771aa..899d0b748d4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Māris Vilks <kaaposc@gmail.com>
 pkgname=eparakstitajs3
-pkgver=1.6.3
+pkgver=1.6.4
 pkgrel=1
 pkgdesc="Application software to sign and validate documents in EDOC and PDF formats."
 arch=('x86_64')
@@ -11,12 +11,12 @@ depends=('gtk2' 'gtk3' 'java-environment' 'libnet' 'alsa-lib')
 optdepends=('python-nautilus: Nautilus context menu integration'
             'eparaksts-token-signing: eParaksts browser plugins'
             'latvia-eid-middleware: libraries for Latvia eID cards')
-source=("https://www.eparaksts.lv/files/ep3updates/debian/pool/eparaksts/e/${pkgname}/${pkgname}_${pkgver}_amd64.deb"
+source=("https://www.eparaksts.lv/files/ep3updates/debian/pool/eparaksts/e/${pkgname}/${pkgname}_${pkgver}-focal_amd64.deb"
         'dpkg'
         'eparakstitajs3.patch')
-sha512sums=('5ad97b8ac830eb13892c1a3ebce95a683ad3471135a10f35bc589816b1aed169e4f5d53dfe025fb56e99b77898f4bbf5061f93a193ab0816d71ec1e1ac064bfa'
+sha512sums=('00b4a4c81ba28ce77d6c2b2b50cd8133a368686d0d4702cafbce24026bdcad758dce96da57e59c8235307816846428fa36e0a27cbfdb73e23e8fe2227a7d762a'
             '2831607d41e6480620869264866711341917de093bdd0228c2b8efb041c9c9ae8861ca0564f1e9917dab888cad69eb81c97a7a5509b58adb2ce61eb7a95a3d4a'
-            '7f7a8884c72b291c9e83bb84d9d3ce74cf27e953acab6833d7c9a21341e9fe6f29ffcfc9022ff60cc8ecf8b07c2240ba0dca48b4e8ac05a82594129a8abd7387')
+            '95e24c268c023cb52b710752e71922947a956ed07b1e75e90c6ce05124ac6b4b8759ab32b516daf2bf8d73f620ecd2eef637ed9b7b58f9360c445fdcad74ea9b')
 
 package() {
 
@@ -24,10 +24,10 @@ package() {
 
   install -D "${pkgdir}/usr/share/doc/eparakstitajs3/copyright" "${pkgdir}/usr/share/licenses/$pkgname/copyright"
 
-  install -D "${srcdir}/dpkg" "${pkgdir}/opt/eparakstitajs3/dpkg"
+  install -D "${srcdir}/dpkg" "${pkgdir}/usr/lib/eparakstitajs3/bin/dpkg"
 
   cd "${pkgdir}"
-  patch --forward --strip=2 < "${srcdir}/${pkgname}.patch"
+  patch --forward --strip=0 < "${srcdir}/${pkgname}.patch"
   
 }
 
diff --git a/eparakstitajs3.patch b/eparakstitajs3.patch
index 2b338242bf6b..4c321a895835 100644
--- a/eparakstitajs3.patch
+++ b/eparakstitajs3.patch
@@ -1,170 +1,33 @@
-diff --color --unified --recursive --text --color ./eparakstitajs3.desktop.orig ./eparakstitajs3.desktop
---- src/eparakstitajs3/usr/share/applications/eparakstitajs3.desktop.orig	2022-01-10 15:11:50.060249053 +0200
-+++ src/eparakstitajs3/usr/share/applications/eparakstitajs3.desktop	2022-01-10 15:13:29.724741854 +0200
+diff --color --unified --recursive --text --color usr/share/applications/eparakstitajs3.desktop.orig usr/share/applications/eparakstitajs3.desktop
+--- usr/share/applications/eparakstitajs3.desktop.orig  2022-07-07 10:17:17.342286524 +0300
++++ usr/share/applications/eparakstitajs3.desktop       2022-07-07 10:18:26.850828336 +0300
 @@ -4,7 +4,7 @@
- Icon=eparakstitajs3
+ Icon=/usr/share/eparakstitajs3/eparakstitajs3.xpm
  Type=Application
- Categories=Application;Office;Viewer;
--Exec=/opt/eparakstitajs3/bin/eparakstitajs3 %F
-+Exec=/bin/sh -c "export PATH=/opt/eparakstitajs3:$PATH; /opt/eparakstitajs3/bin/eparakstitajs3 %F"
+ Categories=Application;Viewer;
+-Exec=/usr/bin/eparakstitajs3 %F
++Exec=/bin/sh -c "export PATH=/usr/lib/eparakstitajs3/bin:$PATH; /usr/bin/eparakstitajs3 %F"
  MimeType=application/pdf;application/lv.eme.edoc;application/vnd.etsi.asic-e+zip;
  StartupWMClass=lv.euso.signanywhere.SignAnywhere
  
-diff --color --unified --recursive --text --color src/eparakstitajs3.orig/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py src/eparakstitajs3.new/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py
---- src/eparakstitajs3.orig/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py	2021-02-13 12:00:00.000000000 +0200
-+++ src/eparakstitajs3.new/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py	2021-02-14 16:13:33.916358188 +0200
-@@ -4,84 +4,93 @@
- import os
- import urllib
- 
-+
- class eParakstsContextMenu(GObject.GObject, Nautilus.MenuProvider):
- 
-     def __init__(self):
-         pass
- 
-     def open_eparakstitajs(self, menu, command, files):
--        print "menu_activate_cb", command
--	bash_string=["/opt/eparakstitajs3/bin/eparakstitajs3", command]
--	for file in files:
--		bash_string.append(file.get_location().get_path())
--	
--	subprocess.Popen(bash_string)
+diff --color --unified --recursive --text --color usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py.orig usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py
+--- usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py.orig        2022-07-07 10:18:32.064051467 +0300
++++ usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py     2022-07-07 10:46:57.945442317 +0300
+@@ -11,11 +11,14 @@
+ 
+    def open_eparakstitajs(self, menu, command, files):
+       #print "menu_activate_cb", command
+-      bash_string=["eparakstitajs3", command]
++      bash_string = ["/usr/bin/eparakstitajs3", command]
+       for file in files:
+          bash_string.append(file.get_location().get_path())
+-      subprocess.Popen(bash_string)
 -    
-+        print("menu_activate_cb"), command
-+        bash_string = ["/opt/eparakstitajs3/bin/eparakstitajs3", command]
-+        for file in files:
-+            bash_string.append(file.get_location().get_path())
-+
-+        subprocess.Popen(bash_string)
-+
-     def dir_count(self, files):
--	dirCount = 0
--	for file in files:
--		if (file.is_directory()):
--			dirCount += 1
--	return dirCount
-+        dirCount = 0
-+        for file in files:
-+            if (file.is_directory()):
-+                dirCount += 1
-+        return dirCount
- 
-     def enable_sign(self, files):
--	noDirs = (self.dir_count(files) == 0)
--	return noDirs
-+        noDirs = (self.dir_count(files) == 0)
-+        return noDirs
- 
-     def enable_signpdf(self, files):
--	noDirs = (self.dir_count(files) == 0)
--	multiplePDFFiles = True
--	for file in files:
--		if ((file.get_mime_type() != "application/pdf")):
--			multiplePDFFiles = False
--			break
--	return (noDirs and multiplePDFFiles)
--   
-+        noDirs = (self.dir_count(files) == 0)
-+        multiplePDFFiles = True
-+        for file in files:
-+            if ((file.get_mime_type() != "application/pdf")):
-+                multiplePDFFiles = False
-+                break
-+        return (noDirs and multiplePDFFiles)
-+
-     def enable_new(self, files):
--	singleDir = (self.dir_count(files) == 1 and len(files) == 1)
--	noDirs = (self.dir_count(files) == 0)
--	return (singleDir or noDirs)
--   
-+        singleDir = (self.dir_count(files) == 1 and len(files) == 1)
-+        noDirs = (self.dir_count(files) == 0)
-+        return (singleDir or noDirs)
-+
-     def enable_batch(self, files):
--	singleDir = (self.dir_count(files) == 1 and len(files) == 1)
--	multipleFiles = (self.dir_count(files) == 0 and  len(files) > 1)
--	return (singleDir or multipleFiles)
-+        singleDir = (self.dir_count(files) == 1 and len(files) == 1)
-+        multipleFiles = (self.dir_count(files) == 0 and len(files) > 1)
-+        return (singleDir or multipleFiles)
- 
-     def get_file_items(self, window, files):
--	if (len(files) > 0):
--		# Top menu  eParakstitajs
--        	top_menuitem = Nautilus.MenuItem(name='eParakstsContextMenuProvider::eParakstitajs', label='eParakstitajs', tip='', icon='')
--        	submenu = Nautilus.Menu()
--        	top_menuitem.set_submenu(submenu)
--
--		# Sign as eDOC
--		if (self.enable_sign(files)):
--        		sub_menuitem = Nautilus.MenuItem(name='eParakstsContextMenuProvider::SignEDOC',label='Sign as eDOC', tip='', icon='')
--			submenu.append_item(sub_menuitem)
--			sub_menuitem.connect('activate', self.open_eparakstitajs, "-sign", files)
--        
--		# Sign as PDF
--		if (self.enable_signpdf(files)):
--        		sub_menuitem = Nautilus.MenuItem(name='eParakstsContextMenuProvider::SignPDF',	label='Sign as PDF', tip='', icon='')
--       			submenu.append_item(sub_menuitem)
--			sub_menuitem.connect('activate', self.open_eparakstitajs, "-signpdf", files)
--
--		# New with eParakstitajs
--		if (self.enable_new(files)):
--        		sub_menuitem = Nautilus.MenuItem(name='eParakstsContextMenuProvider::New', 	label='New with eParakstitajs', tip='', icon='')
--        		submenu.append_item(sub_menuitem)
--			sub_menuitem.connect('activate', self.open_eparakstitajs, "-new", files)
--
--		# Batch with eParakstitajs
--		if (self.enable_batch(files)):
--        		sub_menuitem = Nautilus.MenuItem(name='eParakstsContextMenuProvider::Batch',	label='Batch with eParakstitajs', tip='', icon='')
--        		submenu.append_item(sub_menuitem)
--			sub_menuitem.connect('activate', self.open_eparakstitajs, "-batch", files)
-- 		
--		return [top_menuitem]
-+        if (len(files) > 0):
-+            # Top menu  eParakstitajs
-+            top_menuitem = Nautilus.MenuItem(
-+                name='eParakstsContextMenuProvider::eParakstitajs', label='eParakstitajs', tip='', icon='')
-+            submenu = Nautilus.Menu()
-+            top_menuitem.set_submenu(submenu)
-+
-+            # Sign as eDOC
-+            if (self.enable_sign(files)):
-+                sub_menuitem = Nautilus.MenuItem(
-+                    name='eParakstsContextMenuProvider::SignEDOC', label='Sign as eDOC', tip='', icon='')
-+                submenu.append_item(sub_menuitem)
-+                sub_menuitem.connect(
-+                    'activate', self.open_eparakstitajs, "-sign", files)
-+
-+            # Sign as PDF
-+            if (self.enable_signpdf(files)):
-+                sub_menuitem = Nautilus.MenuItem(
-+                    name='eParakstsContextMenuProvider::SignPDF',	label='Sign as PDF', tip='', icon='')
-+                submenu.append_item(sub_menuitem)
-+                sub_menuitem.connect(
-+                    'activate', self.open_eparakstitajs, "-signpdf", files)
-+
-+            # New with eParakstitajs
-+            if (self.enable_new(files)):
-+                sub_menuitem = Nautilus.MenuItem(
-+                    name='eParakstsContextMenuProvider::New', 	label='New with eParakstitajs', tip='', icon='')
-+                submenu.append_item(sub_menuitem)
-+                sub_menuitem.connect(
-+                    'activate', self.open_eparakstitajs, "-new", files)
-+
-+            # Batch with eParakstitajs
-+            if (self.enable_batch(files)):
-+                sub_menuitem = Nautilus.MenuItem(
-+                    name='eParakstsContextMenuProvider::Batch',	label='Batch with eParakstitajs', tip='', icon='')
-+                submenu.append_item(sub_menuitem)
-+                sub_menuitem.connect(
-+                    'activate', self.open_eparakstitajs, "-batch", files)
-+
-+            return [top_menuitem]
- 
-         return
- 
-     def get_background_items(self, window, file):
-         return
--
++      modified_env = os.environ.copy()
++      modified_env['PATH'] = '/usr/lib/eparakstitajs3/bin:' + \
++         modified_env['PATH']
++      subprocess.Popen(bash_string, env=modified_env)
++
+    def dir_count(self, files):
+       dirCount = 0
+       for file in files: