Temporary fix to terminate hanging evelauncher binary in all setup variants added.

7 files changed, 20 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6fd36bccaf9d..6bf1b3937649 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -35,7 +35,6 @@ pkgbase = evesetup
 	source = evelauncher.sh
 	source = evelauncher.sh.in
 	source = evelauncher.sh.real
-	source = evelauncher.sh.real.patch
 	source = evesetup.shlib
 	source = everegedit.desktop
 	source = evewine
@@ -65,8 +64,7 @@ pkgbase = evesetup
 	sha256sums = ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4
 	sha256sums = 29b6f2cda542c8f3f3845fb3e1ff3e9ac2a645d389c1618bdac5fa69947a2b4b
 	sha256sums = 77b8a8d1cde800956dadf8abf35287c34b3c844c40dfa8f89ed01ca2cde345fb
-	sha256sums = 80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21
-	sha256sums = 740b8642e409524a07100fe1ce7806bef67d3f4642afa7f0841ace7290c01576
+	sha256sums = 168478fca0bc7be5be3ed2a44e3b64732d2b0ef0758f7d9bd51ec56b7e0713eb
 	sha256sums = fdb777d7f728681055f2038c9b04d153a131086665ca189814b013655465fc22
 	sha256sums = a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b
 	sha256sums = 66dd912ceb3073e6e210d7addc7d284fb5bdf2b746ac723c8b57ead19ffe75b4
@@ -78,9 +76,9 @@ pkgbase = evesetup
 	sha256sums = 261da84107168979d241c60cd7adbfee0f6675464675faaefd5f6140009d54d8
 	sha256sums = 609c021ee09ced450b1aeda9c3dd586ebfbc17d2bdccbb4be69de70d661d12c8
 	sha256sums = c53c6f09a0d2d12a4360bc4283d6259de1f47cfc29f708fdd9b960aab30af4ef
-	sha256sums = 8bb6f2a364e12a8e300eece2c051d7f1fb02d935ed455b2a839a0b3a6c0f891e
+	sha256sums = 5b77ced59ea81a4d4caf2e0f3a30beeab6f0ca584af1f7b297f99043a01b3773
 	sha256sums = d1364de23e651e2f187d53e9064d76d8d69b63dc9eaba9e65c99964cb39cecd9
-	sha256sums = a12addb72c7f84fc1e2e921e02c9bef2cc52b94148c85506ae7cb682f0e9ef13
+	sha256sums = 60b6f5175916c40ed355ef29fb637743227a2b25c446a9239df69d320f2667fa
 	sha256sums = 4e9083c96ada9c607b12fc1be77db595a6932d01d7c6b224a3c546aa98f37b32
 	sha256sums = 69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3
 	sha256sums = 762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422
diff --git a/PKGBUILD b/PKGBUILD
index 99b05526b10e..750e4a017682 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,7 +30,6 @@ source=("evelauncher.desktop"
         "evelauncher.sh"
         "evelauncher.sh.in"
         "evelauncher.sh.real"
-        "evelauncher.sh.real.patch"
         "evesetup.shlib"
         "everegedit.desktop"
         "evewine"
@@ -66,11 +65,6 @@ noextract=('eve-transl5.12-de.tar.gz'
            'eve-transl5.12-zh.tar.gz'
            'https://github.com/megastep/makeself/releases/download/release-2.4.0/makeself-2.4.0.run')
 
-prepare() {
-        rm ${srcdir}/evelauncher.sh.real
-        cp ${BUILDDIR:-..}/evelauncher.sh.real ${srcdir}
-        patch -p1 -i ${srcdir}/evelauncher.sh.real.patch
-}
 package() {
         install -d "${pkgdir}/opt/${pkgname}/bin"
         install -d "${pkgdir}/opt/${pkgname}/doc"
@@ -134,8 +128,7 @@ package() {
 sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4'
             '29b6f2cda542c8f3f3845fb3e1ff3e9ac2a645d389c1618bdac5fa69947a2b4b'
             '77b8a8d1cde800956dadf8abf35287c34b3c844c40dfa8f89ed01ca2cde345fb'
-            '80fceef0e28c2291cd4ba3924410211edd188717be093ffc329d18697583bd21'
-            '740b8642e409524a07100fe1ce7806bef67d3f4642afa7f0841ace7290c01576'
+            '168478fca0bc7be5be3ed2a44e3b64732d2b0ef0758f7d9bd51ec56b7e0713eb'
             'fdb777d7f728681055f2038c9b04d153a131086665ca189814b013655465fc22'
             'a8e604e6481b9a386269b6252852ee57812fc932f44f767982c4dbac168bb03b'
             '66dd912ceb3073e6e210d7addc7d284fb5bdf2b746ac723c8b57ead19ffe75b4'
@@ -147,9 +140,9 @@ sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4'
             '261da84107168979d241c60cd7adbfee0f6675464675faaefd5f6140009d54d8'
             '609c021ee09ced450b1aeda9c3dd586ebfbc17d2bdccbb4be69de70d661d12c8'
             'c53c6f09a0d2d12a4360bc4283d6259de1f47cfc29f708fdd9b960aab30af4ef'
-            '8bb6f2a364e12a8e300eece2c051d7f1fb02d935ed455b2a839a0b3a6c0f891e'
+            '5b77ced59ea81a4d4caf2e0f3a30beeab6f0ca584af1f7b297f99043a01b3773'
             'd1364de23e651e2f187d53e9064d76d8d69b63dc9eaba9e65c99964cb39cecd9'
-            'a12addb72c7f84fc1e2e921e02c9bef2cc52b94148c85506ae7cb682f0e9ef13'
+            '60b6f5175916c40ed355ef29fb637743227a2b25c446a9239df69d320f2667fa'
             '4e9083c96ada9c607b12fc1be77db595a6932d01d7c6b224a3c546aa98f37b32'
             '69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3'
             '762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422'
diff --git a/build_installer.sh b/build_installer.sh
index cf0ef9e28f37..eb13b98621ee 100755
--- a/build_installer.sh
+++ b/build_installer.sh
@@ -79,6 +79,7 @@ cp ../evesetup.shlib evesetup/
 cp ../evelauncher.kwinrule evesetup/
 cp ../evelauncher.lua evesetup/
 cp ../evelauncher.sh.in evesetup/evelauncher.sh
+cp ../evelauncher.sh.real evesetup/
 sed -i s,ELVER=\"\",ELVER=\"$version\", evesetup/evelauncher.sh
 cp ../setup.sh.in evesetup/setup.sh
 sed -i s,elver=\"\",elver=\"$version\", evesetup/setup.sh
diff --git a/evelauncher.sh.real b/evelauncher.sh.real
index 480748c25f56..06ce1aead71e 100644
--- a/evelauncher.sh.real
+++ b/evelauncher.sh.real
@@ -12,4 +12,14 @@ fi
 LD_LIBRARY_PATH="$dirname:$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
-"$dirname/$appname" "$@"
+"$dirname/$appname" "$@" &
+
+if [ -x "$(which lsof)" ] ;then
+	sleep 10
+	until [ "$(lsof -t -u $(whoami) -a -c /evelauncher$/ -- \
+			$HOME/.local/share/CCP/EVE/QtWebEngine/Default/IndexedDB/https_launcher.eveonline.com_0.indexeddb.leveldb/LOCK)" = "" ]
+	do
+		sleep 10
+	done
+	kill $(lsof -t -u $(whoami) -a -c /evelauncher$/)
+fi
diff --git a/evelauncher.sh.real.patch b/evelauncher.sh.real.patch
deleted file mode 100644
index 65aeb7e57a7d..000000000000
--- a/evelauncher.sh.real.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/evelauncher.sh.real b/evelauncher.sh.real
---- a/evelauncher.sh.real
-+++ b/evelauncher.sh.real
-@@ -12,4 +12,14 @@ fi
- LD_LIBRARY_PATH="$dirname:$LD_LIBRARY_PATH"
- export LD_LIBRARY_PATH
- 
--"$dirname/$appname" "$@"
-+"$dirname/$appname" "$@" &
-+
-+if [ -x "$(which lsof)" ] ;then
-+	sleep 10
-+	until [ "$(lsof -t -u $(whoami) -a -c /evelauncher$/ -- \
-+			$HOME/.local/share/CCP/EVE/QtWebEngine/Default/IndexedDB/https_launcher.eveonline.com_0.indexeddb.leveldb/LOCK)" = "" ]
-+	do
-+		sleep 10
-+	done
-+	kill $(lsof -t -u $(whoami) -a -c /evelauncher$/)
-+fi
diff --git a/evesetup.changelog b/evesetup.changelog
index 480e0492d1b6..c0eb27a892f5 100644
--- a/evesetup.changelog
+++ b/evesetup.changelog
@@ -1,2 +1 @@
-Update DXVK to version 1.8.1
-Website address changed.
+Temporary fix to terminate hanging evelauncher binary in all setup variants added.
diff --git a/setup.sh.in b/setup.sh.in
index afafff8b6902..9c54761db403 100644
--- a/setup.sh.in
+++ b/setup.sh.in
@@ -87,6 +87,7 @@ build_lib() {
 	printf "\nClean up evelauncher directory..."
 	cd evelauncher/
 	rm -f ./*.a ./*.la ./*.pem ./*.prl ./libxcb*
+	cp -f ../evelauncher.sh.real ./evelauncher.sh
 	chmod 0755 ./*
 	chmod 0644 ./*.qm ./*.conf ./errorpage/*
 	echo "done."