Using different way to alter PATH for executable

3 files changed, 16 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 67a4205cbd63..1ab8368ae634 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = eparakstitajs3
 	pkgdesc = Application software to sign and validate documents in EDOC and PDF formats.
 	pkgver = 1.5.13
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.eparaksts.lv
 	arch = x86_64
 	groups = eparaksts
@@ -18,7 +18,7 @@ pkgbase = eparakstitajs3
 	source = eparakstitajs3.patch
 	sha512sums = 9e2ea6e038bbc7c56e9ce3c7cbae4c4bb2470e5416c39d5ad337cac4bba3e81860cce4a5702a2fd2b1e93937321ac5da24d0966b21fabc8d043ff917e273992c
 	sha512sums = 2831607d41e6480620869264866711341917de093bdd0228c2b8efb041c9c9ae8861ca0564f1e9917dab888cad69eb81c97a7a5509b58adb2ce61eb7a95a3d4a
-	sha512sums = 67b54637f08abb7b6b2b810cab9db76db41d94df887c56efe84d83b39052936a2a3b37f15f7b33b1fd9a29fafb9dec9ea03895770e6b15bbda5dff7ccc6d2f63
+	sha512sums = 4b361882fd9701544afb7c68bb6aa3807cb9ecbe6026e76727e9c37ebe4dff69946f92bd55addb8bf8b0b7c30d846d2aeaad11b84391881378c7a20680fdc8ba
 
 pkgname = eparakstitajs3
 
diff --git a/PKGBUILD b/PKGBUILD
index 41b5ced5467d..a8a14d1773c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Māris Vilks <kaaposc@gmail.com>
 pkgname=eparakstitajs3
 pkgver=1.5.13
-pkgrel=2
+pkgrel=3
 pkgdesc="Application software to sign and validate documents in EDOC and PDF formats."
 arch=('x86_64')
 url="https://www.eparaksts.lv"
@@ -16,7 +16,7 @@ source=("https://www.eparaksts.lv/files/ep3updates/debian/pool/eparaksts/e/${pkg
         'eparakstitajs3.patch')
 sha512sums=('9e2ea6e038bbc7c56e9ce3c7cbae4c4bb2470e5416c39d5ad337cac4bba3e81860cce4a5702a2fd2b1e93937321ac5da24d0966b21fabc8d043ff917e273992c'
             '2831607d41e6480620869264866711341917de093bdd0228c2b8efb041c9c9ae8861ca0564f1e9917dab888cad69eb81c97a7a5509b58adb2ce61eb7a95a3d4a'
-            '67b54637f08abb7b6b2b810cab9db76db41d94df887c56efe84d83b39052936a2a3b37f15f7b33b1fd9a29fafb9dec9ea03895770e6b15bbda5dff7ccc6d2f63')
+            '4b361882fd9701544afb7c68bb6aa3807cb9ecbe6026e76727e9c37ebe4dff69946f92bd55addb8bf8b0b7c30d846d2aeaad11b84391881378c7a20680fdc8ba')
 
 package() {
 
@@ -27,7 +27,7 @@ package() {
   install -D "${srcdir}/dpkg" "${pkgdir}/opt/eparakstitajs3/dpkg"
 
   cd "${pkgdir}"
-  patch --forward --strip=1 < "${srcdir}/${pkgname}.patch"
+  patch --forward --strip=2 < "${srcdir}/${pkgname}.patch"
   
 }
 
diff --git a/eparakstitajs3.patch b/eparakstitajs3.patch
index 5ec2116bde0d..d5aad56d2178 100644
--- a/eparakstitajs3.patch
+++ b/eparakstitajs3.patch
@@ -1,28 +1,28 @@
-diff --color --unified --recursive --text --color eparakstitajs3.orig/usr/share/applications/eparakstitajs3.desktop eparakstitajs3.new/usr/share/applications/eparakstitajs3.desktop
---- eparakstitajs3.orig/usr/share/applications/eparakstitajs3.desktop	2021-02-13 12:00:00.000000000 +0200
-+++ eparakstitajs3.new/usr/share/applications/eparakstitajs3.desktop	2021-02-14 16:03:48.412307112 +0200
+diff --color --unified --recursive --text --color src/eparakstitajs3.orig/usr/share/applications/eparakstitajs3.desktop src/eparakstitajs3.new/usr/share/applications/eparakstitajs3.desktop
+--- src/eparakstitajs3.orig/usr/share/applications/eparakstitajs3.desktop	2021-02-13 12:00:00.000000000 +0200
++++ src/eparakstitajs3.new/usr/share/applications/eparakstitajs3.desktop	2021-02-14 17:48:58.580140002 +0200
 @@ -4,7 +4,7 @@
  Icon=eparakstitajs3
  Type=Application
  Categories=Application;Office;Viewer;
 -Exec=/opt/eparakstitajs3/eparakstitajs3 %F
-+Exec=env PATH=/opt/eparakstitajs3:$PATH /opt/eparakstitajs3/eparakstitajs3 %F
++Exec=/bin/sh -c "export PATH=/opt/eparakstitajs3:$PATH; /opt/eparakstitajs3/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 eparakstitajs3.orig/usr/share/menu/eparakstitajs3 eparakstitajs3.new/usr/share/menu/eparakstitajs3
---- eparakstitajs3.orig/usr/share/menu/eparakstitajs3	2021-02-13 12:00:00.000000000 +0200
-+++ eparakstitajs3.new/usr/share/menu/eparakstitajs3	2021-02-14 16:04:21.924916639 +0200
+diff --color --unified --recursive --text --color src/eparakstitajs3.orig/usr/share/menu/eparakstitajs3 src/eparakstitajs3.new/usr/share/menu/eparakstitajs3
+--- src/eparakstitajs3.orig/usr/share/menu/eparakstitajs3	2021-02-13 12:00:00.000000000 +0200
++++ src/eparakstitajs3.new/usr/share/menu/eparakstitajs3	2021-02-14 17:49:28.566161954 +0200
 @@ -1,5 +1,5 @@
  ?package(eparakstitajs3):needs="X11" section="Applications/Viewers"\

 -  title="eParakstītājs 3.0" command="/opt/eparakstitajs3/eparakstitajs3"\

-+  title="eParakstītājs 3.0" command="env PATH=/opt/eparakstitajs3:$PATH /opt/eparakstitajs3/eparakstitajs3"\

++  title="eParakstītājs 3.0" command="/bin/sh -c \"export PATH=/opt/eparakstitajs3:$PATH; /opt/eparakstitajs3/eparakstitajs3\""\

    hints="eParakstītājs 3.0"\

    kderemove="y"\

    icon="/usr/share/icons/hicolor/32x32/apps/eparakstitajs3.png"

-diff --color --unified --recursive --text --color eparakstitajs3.orig/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py eparakstitajs3.new/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py
---- eparakstitajs3.orig/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py	2021-02-13 12:00:00.000000000 +0200
-+++ eparakstitajs3.new/usr/share/nautilus-python/extensions/eparakstitajs3-ctx-menu.py	2021-02-14 16:13:33.916358188 +0200
+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
 @@ -1,7 +1,10 @@
  from gi.repository import Nautilus, GObject
  import subprocess