Attempt to add a package based dependency solution for lite installer.

Wine dependency are now optional to use other sources if desired.
Minor changes in evelauncher.kwinrule and evelauncher.lua

7 files changed, 96 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ef4bac3525c..3e5332098238 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,21 @@
 pkgbase = evesetup
 	pkgdesc = An inofficial EVE Online Launcher Setup Tool.
 	pkgver = 1747682
-	pkgrel = 9
+	pkgrel = 10
 	url = https://forums.eveonline.com/t/299030
 	changelog = evesetup.changelog
 	arch = x86_64
 	license = zlib
-	depends = icu
 	depends = lsof
 	depends = openssl
 	depends = openssl-1.0
 	depends = p7zip
-	depends = qt5-base
-	depends = qt5-declarative
 	depends = qt5-translations
-	depends = qt5-location
-	depends = qt5-webchannel
 	depends = qt5-webengine
 	depends = qt5-websockets
 	depends = vulkan-icd-loader
-	depends = wine
 	optdepends = libnotify
+	optdepends = wine
 	optdepends = winetricks
 	conflicts = evelauncher
 	conflicts = evesetup_dev
@@ -74,12 +69,12 @@ pkgbase = evesetup
 	sha256sums = 30b6440b842c19df64892cc560c274a7cc4f5de910a9f81e12dd0d76da561474
 	sha256sums = ebdeaa2a143b8d247d94b4a57a45065c299253c074f5d741870a78dd384c29f0
 	sha256sums = 261da84107168979d241c60cd7adbfee0f6675464675faaefd5f6140009d54d8
-	sha256sums = 609c021ee09ced450b1aeda9c3dd586ebfbc17d2bdccbb4be69de70d661d12c8
-	sha256sums = c53c6f09a0d2d12a4360bc4283d6259de1f47cfc29f708fdd9b960aab30af4ef
+	sha256sums = d5822f8c1234c3b9a4c83994ae84d4d234ca7083a7a7e193ef749117155d68f7
+	sha256sums = d4610df883778f91e0ea5feba84720dfe814af0b9960677e3861809d70de24b2
 	sha256sums = 675da37e1a26862914fb7900c974892ecdd8946c53ff96d322c204f5e410d14a
 	sha256sums = 0029ffaccda6e48d1b601ef7fc5f7cb7ce01b4064885caf314e97cfcadad2973
-	sha256sums = dbe32af6b0925fe110aa91a7d49337083a16010fc0d1c3bad17acec06f7e47f1
-	sha256sums = 6b1d665ba4187f265d04c5b34506d52e72dbb36ba1b9583e7cc30b5757e70f9e
+	sha256sums = b546c00ad2329f9be557ebb17214170b4eb820986179da8217f286f63f149804
+	sha256sums = 3c77f28d282a2319eb049967a92565fcb77c49ca847027425b7f035bdd7e894d
 	sha256sums = 69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3
 	sha256sums = 762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422
 	sha256sums = 980d68abd6f4a662b69efd19145112e88f349044fa1ed5cb6d0a840a92cb42e4
diff --git a/PKGBUILD b/PKGBUILD
index 709f521eafce..541b25fa9cd9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,23 @@
 #Maintainer: Jernuh Zakalwe <jzakalwe1st@gmail.com>
 pkgname=evesetup
 pkgver=1747682
-pkgrel=9
+pkgrel=10
 pkgdesc="An inofficial EVE Online Launcher Setup Tool."
 changelog=$pkgname.changelog
 arch=(x86_64)
 url="https://forums.eveonline.com/t/299030"
 license=('zlib')
 
-depends=('icu'
-         'lsof'
+depends=('lsof'
          'openssl'
          'openssl-1.0'
          'p7zip'
-         'qt5-base'
-         'qt5-declarative'
          'qt5-translations'
-         'qt5-location'
-         'qt5-webchannel'
          'qt5-webengine'
          'qt5-websockets'
-         'vulkan-icd-loader'
-         'wine')
+         'vulkan-icd-loader')
 
-optdepends=('libnotify' 'winetricks')
+optdepends=('libnotify' 'wine' 'winetricks')
 
 conflicts=('evelauncher' 'evesetup_dev' 'evesetup-beta')
 
@@ -103,8 +97,8 @@ package() {
         echo "1.8.1" >${pkgdir}/opt/${pkgname}/lib/dxvk/version
         cp -r ${srcdir}/icons ${pkgdir}/usr/share/
         rm -rf ${srcdir}/evelauncher/resources/ ${srcdir}/evelauncher/plugins/
-        rm -f ${srcdir}/evelauncher/*[Qq]t* ${srcdir}/evelauncher/libcrypto*
-        rm -f ${srcdir}/evelauncher/libicu* ${srcdir}/evelauncher/libssl*
+        rm -f ${srcdir}/evelauncher/*[Qq]t* ${srcdir}/evelauncher/libicu*
+        rm -f ${srcdir}/evelauncher/libcrypto* ${srcdir}/evelauncher/libssl*
         rm -f ${srcdir}/evelauncher/libpng* ${srcdir}/evelauncher/libxcb*
         rm -f ${srcdir}/evelauncher/roots.pem
         cp -f ${srcdir}/evelauncher.sh.real ${srcdir}/evelauncher/evelauncher.sh
@@ -138,12 +132,12 @@ sha256sums=('ce85defa2698ea72e88221d72424fb953f86836494ecc0e4006f41ec89682af4'
             '30b6440b842c19df64892cc560c274a7cc4f5de910a9f81e12dd0d76da561474'
             'ebdeaa2a143b8d247d94b4a57a45065c299253c074f5d741870a78dd384c29f0'
             '261da84107168979d241c60cd7adbfee0f6675464675faaefd5f6140009d54d8'
-            '609c021ee09ced450b1aeda9c3dd586ebfbc17d2bdccbb4be69de70d661d12c8'
-            'c53c6f09a0d2d12a4360bc4283d6259de1f47cfc29f708fdd9b960aab30af4ef'
+            'd5822f8c1234c3b9a4c83994ae84d4d234ca7083a7a7e193ef749117155d68f7'
+            'd4610df883778f91e0ea5feba84720dfe814af0b9960677e3861809d70de24b2'
             '675da37e1a26862914fb7900c974892ecdd8946c53ff96d322c204f5e410d14a'
             '0029ffaccda6e48d1b601ef7fc5f7cb7ce01b4064885caf314e97cfcadad2973'
-            'dbe32af6b0925fe110aa91a7d49337083a16010fc0d1c3bad17acec06f7e47f1'
-            '6b1d665ba4187f265d04c5b34506d52e72dbb36ba1b9583e7cc30b5757e70f9e'
+            'b546c00ad2329f9be557ebb17214170b4eb820986179da8217f286f63f149804'
+            '3c77f28d282a2319eb049967a92565fcb77c49ca847027425b7f035bdd7e894d'
             '69b98d923c08c6fb035c0c6905ec5e9c73273b694f8f3497777d44597dbe63e3'
             '762db1df07dfcf526fe634b4b589a08e8affefb2f79f02cff2624c70e0820422'
             '980d68abd6f4a662b69efd19145112e88f349044fa1ed5cb6d0a840a92cb42e4'
diff --git a/evelauncher.kwinrule b/evelauncher.kwinrule
index 9689901f72bb..6d90f541ee30 100644
--- a/evelauncher.kwinrule
+++ b/evelauncher.kwinrule
@@ -1,12 +1,10 @@
-[Rule for EVE Launcher]
+[Rules for EVE Launcher]
 Description=Rules for EVE Launcher
-clientmachine=localhost
-clientmachinematch=0
 ignoregeometry=true
 ignoregeometryrule=3
 noborder=true
 noborderrule=3
-placement=Centered
+placement=6
 placementrule=2
 size=1280,720
 sizerule=3
diff --git a/evelauncher.lua b/evelauncher.lua
index 96e9d6a76808..b79b5f87bbaa 100644
--- a/evelauncher.lua
+++ b/evelauncher.lua
@@ -1,4 +1,4 @@
--- Devilspie2 Rule for EVE Launcher
+-- Devilspie2 Rules for EVE Launcher
 if (get_window_name() == "EVE Launcher - version 1548102") then
     undecorate_window();
     set_window_size(1280,720);
diff --git a/evesetup.changelog b/evesetup.changelog
index 75f5519a1cbd..d3b32c631184 100644
--- a/evesetup.changelog
+++ b/evesetup.changelog
@@ -1,2 +1,3 @@
-In PKGBUILD lsof as dependency added.
-Typo in build script fixed.
+Attempt to add a package based dependency solution for lite installer.
+Wine dependency are now optional to use other sources if desired.
+Minor changes in evelauncher.kwinrule and evelauncher.lua
diff --git a/setup.sh.in b/setup.sh.in
index 16edc04f5454..a3078de1088d 100644
--- a/setup.sh.in
+++ b/setup.sh.in
@@ -134,6 +134,7 @@ get_dxvk() {
 }
 
 check_req() {
+	dltool=$(which curl 2>/dev/null || which wget 2>/dev/null  || true)
 	case ${dltool##*/} in
 		curl)	dltool="$dltool -L -O" ;;
 		wget)	dltool="$dltool -nc" ;;
@@ -148,12 +149,6 @@ check_req() {
 	if [ ! -x "$(which lsof 2>/dev/null)" ] ;then
 		req="${req}lsof\n"
 	fi
-	if [ ! -x "$(which wine 2>/dev/null)" ] ;then
-		req="${req}wine\n"
-	fi
-	if [ ! -r "$(find /usr/lib -type f -name 'libxcb-xinerama*' 2>/dev/null)" ] ;then
-		req="${req}libxcb-xinerama\n"
-	fi
 	if [ "x$req" != "x" ] ;then
 		printf "\nError: Following requirements are missing:\n"
 		printf "\n$req\n"
@@ -178,11 +173,8 @@ dvcsum=""
 rcsum=""
 key=""
 
-dltool=$(which curl 2>/dev/null || which wget 2>/dev/null  || true)
-
 if [ $(id -u) -ne 0 ] ;then
-	printf "\nEVE Online Launcher Setup need root permissions."
-	printf "\nLeaving.\n\n"
+	printf "\nEVE Online Launcher Setup need root permissions.\n\n"
 	exit 0
 fi
 
diff --git a/setup_lite.sh.in b/setup_lite.sh.in
index 73c49a55cb47..10d03e2641b5 100644
--- a/setup_lite.sh.in
+++ b/setup_lite.sh.in
@@ -9,12 +9,14 @@ bootstrap_install() {
 	install -dv "$docdir"
 	install -d "$prefix/bin/"
 	install -d "$prefix/share/applications/"
+	if [ -f "./packages.list" ] ;then
+		install -m 0644 "./packages.list" "$libdir"
+	fi
 	if [ -f "./dxvk-$dvver.tar.gz" ] ;then
 		install -d "$libdir/dxvk/"
 		echo "$dvver" >"$libdir/dxvk/version"
 		chmod 0644 "$libdir/dxvk/version"
-		tar xf ./dxvk-$dvver.tar.gz -C $libdir/dxvk/ --no-same-owner \
-			--strip-components=1 dxvk-$dvver/x32 dxvk-$dvver/x64
+		tar xf ./dxvk-$dvver.tar.gz -C $libdir/dxvk/ --no-same-owner --strip-components=1 dxvk-$dvver/x32 dxvk-$dvver/x64
 	fi
 	install -m 0644 "./evesetup.shlib" "$libdir"
 	install -m 0644 "./evelauncher-${elver}.tar.gz" "$libdir"
@@ -66,35 +68,74 @@ bootstrap_remove() {
 	rm -rf "$destdir"
 }
 
-check_req() {
-	if [ ! -x "$(which 7z 2>/dev/null)" ] ;then
-		req="${req}7z\n"
-	fi
-	if [ ! -x "$(which lsof 2>/dev/null)" ] ;then
-		req="${req}lsof\n"
-	fi
-	if [ ! -x "$(which wine 2>/dev/null)" ] ;then
-		req="${req}wine\n"
-	fi
-	if [ ! -r "$(find /usr/lib -type f -name 'libxcb-xinerama*' 2>/dev/null)" ] ;then
-		req="${req}libxcb-xinerama\n"
-	fi
-	tar xf evelauncher-$elver.tar.gz
-	cd evelauncher/
-	req="${req}$(LD_LIBRARY_PATH=$(pwd) ldd ./evelauncher | grep -i not | sed 's,\t,,;s,.so.*,,')\n"
-	cd ../
-	rm -rf evelauncher/
-	if [ "x$req" != "x" ] ;then
-		printf "\nError: Following requirements are missing:\n"
-		printf "\n$req\n"
-		read -p 'Install anyway? (y/N) ' key
-		if [ "x$(echo $key | tr [:upper:] [:lower:])" != "xy" ] ;then
-			printf "\nLeaving.\n\n"
-			exit 0
-		fi
+pkg_install() {
+	set +e
+	until [ -z "$req" ];do
+		i=${req%% *}
+		[ $($qrycmd $i >/dev/null; echo $?) -ne 0 ] && mreq="$mreq$i "
+		req=${req#* }
+	done
+	set -e
+	if [ ! -z "$mreq" ] ;then
+		printf "$distro\n$mreq\n" >packages.list
+		printf "\n"
+		$inscmd $mreq
 	fi
 }
 
+check_req() {
+	printf "\nChecking requirements...\n\n"
+	case $distro in
+		"Arch Linux"|"Manjaro Linux")
+			qrycmd="pacman -Q"
+			inscmd="pacman -S"
+			req="lsof openssl p7zip qt5-translations qt5-webengine qt5-websockets vulkan-icd-loader "
+			pkg_install
+			;;
+		"Fedora")
+			qrycmd="rpm -q"
+			inscmd="dnf install"
+			req="lsof openssl-libs p7zip qt5-qttranslations qt5-qtwebengine qt5-qtwebsockets vulkan-loader "
+			pkg_install
+			;;
+		*"buntu"|"Linux Mint"|"Pop!_OS"|"KDE neon"|"elementary OS"|"Zorin OS")
+			qrycmd="dpkg-query -W -f='\${Status}'"
+			inscmd="apt install"
+			req="lsof openssl p7zip-full qttranslations5-l10n libqt5concurrent5 libqt5webengine5 libqt5webenginewidgets5 libqt5websockets5 vulkan-icd "
+			pkg_install
+			;;
+		"openSUSE Leap"|"openSUSE Tumbleweed")
+			qrycmd="rpm -q"
+			inscmd="zypper install"
+			req="lsof libopenssl1_1 p7zip-full libqt5-qttranslations libqt5-qtwebengine libQt5Concurrent5 libQt5WebSockets5 libvulkan1 "
+			pkg_install
+			;;
+		*)
+			req="\n"
+			if [ ! -x "$(which 7z 2>/dev/null)" ] ;then
+				req="${req}7z\n"
+			fi
+			if [ ! -x "$(which lsof 2>/dev/null)" ] ;then
+				req="${req}lsof\n"
+			fi
+			tar xf evelauncher-$elver.tar.gz
+			cd evelauncher/
+			req="${req}$(LD_LIBRARY_PATH=$(pwd) ldd ./evelauncher | grep -i not | sed 's,\t,,;s,.so.*,,')\n"
+			cd ../
+			rm -rf evelauncher/
+			if [ "$req" != "\n" ] ;then
+				printf "\nFollowing requirements are missing:\n"
+				printf "$req\n"
+				read -p 'Install anyway? (y/N) ' key
+				if [ "x$(echo $key | tr [:upper:] [:lower:])" != "xy" ] ;then
+					printf "\nLeaving.\n\n"
+					exit 0
+				fi
+			fi
+			;;
+	esac
+}
+
 prefix="/usr"
 destdir="/opt/evesetup"
 bindir="$destdir/bin"
@@ -105,11 +146,12 @@ dvver=""
 key=""
 
 if [ $(id -u) -ne 0 ] ;then
-	printf "\nEVE Online Launcher Setup need root permissions."
-	printf "\nLeaving.\n\n"
+	printf "\nEVE Online Launcher Setup need root permissions.\n\n"
 	exit 0
 fi
 
+distro=$(sed -rn 's,^NAME=(.+),\1,p' /etc/os-release 2>/dev/null | tr -d \") #'
+
 if [ -d "$destdir" ] ;then
 	printf "\n"
 	read -p 'Remove EVE Online Launcher Setup? (Y/n) ' key