updated dependencies, add patch

3 files changed, 67 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0657ca623754..07d7b36036b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = guiscrcpy-git
-	pkgdesc = A full fledged GUI integration for the most award winning open-source Android screen mirroring system -- scrcpy
-	pkgver = 1.12.0.r1.ad3e12b
+	pkgdesc = Open Source GUI based Android Screen Mirroring System
+	pkgver = 2.0.r0.c6169d4
 	pkgrel = 1
 	url = https://srevinsaju.github.io/guiscrcpy
 	arch = i686
@@ -13,6 +13,8 @@ pkgbase = guiscrcpy-git
 	depends = python-psutil
 	depends = python-qdarkstyle
 	depends = python-gitpython
+	depends = python-pillow
+	depends = python-pynput
 	optdepends = python-pystray: for developers
 	optdepends = usbaudio: AOA audio, deprecated since Android 8.0
 	provides = guiscrcpy
@@ -20,9 +22,11 @@ pkgbase = guiscrcpy-git
 	source = git+https://github.com/srevinsaju/guiscrcpy.git
 	source = guiscrcpy.desktop
 	source = guiscrcpy.sh
+	source = guiscrcpy-git.patch
 	sha256sums = SKIP
 	sha256sums = a97ede5e1f363df0b3960c7cfbfdff69e8c2b2c39ef0abc522d5ff5ecb04061b
 	sha256sums = 7d85c9d18ee989efa9cec44924294a5775c00a0d1ca6c369fb43a216e1d6f19f
+	sha256sums = ea4260b593927008d6c57dd982b4fb2de5cf8579372f8daf5ef072cf70f27487
 
 pkgname = guiscrcpy-git
 
diff --git a/PKGBUILD b/PKGBUILD
index bdf1bcf0cc53..9dd9c7b59700 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,13 @@
 # Maintainer: Mark Wagie <yochanan dot marqos at gmail dot com>
 pkgname=guiscrcpy-git
-pkgver=1.12.0.r1.ad3e12b
+pkgver=2.0.r0.c6169d4
 pkgrel=1
-pkgdesc="A full fledged GUI integration for the most award winning open-source Android screen mirroring system -- scrcpy"
+pkgdesc="Open Source GUI based Android Screen Mirroring System"
 arch=('i686' 'x86_64')
 url="https://srevinsaju.github.io/guiscrcpy"
 license=('GPL3')
-depends=('scrcpy' 'python-pyqt5' 'python-psutil' 'python-qdarkstyle' 'python-gitpython')
+depends=('scrcpy' 'python-pyqt5' 'python-psutil' 'python-qdarkstyle' 'python-gitpython' 
+         'python-pillow' 'python-pynput')
 makedepends=('git' 'python-setuptools')
 optdepends=('python-pystray: for developers'
             'usbaudio: AOA audio, deprecated since Android 8.0')
@@ -14,10 +15,17 @@ provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=('git+https://github.com/srevinsaju/guiscrcpy.git'
         "${pkgname%-git}.desktop"
-        "${pkgname%-git}.sh")
+        "${pkgname%-git}.sh"
+        "$pkgname.patch")
 sha256sums=('SKIP'
             'a97ede5e1f363df0b3960c7cfbfdff69e8c2b2c39ef0abc522d5ff5ecb04061b'
-            '7d85c9d18ee989efa9cec44924294a5775c00a0d1ca6c369fb43a216e1d6f19f')
+            '7d85c9d18ee989efa9cec44924294a5775c00a0d1ca6c369fb43a216e1d6f19f'
+            'ea4260b593927008d6c57dd982b4fb2de5cf8579372f8daf5ef072cf70f27487')
+            
+prepare() {
+	cd "$srcdir/${pkgname%-git}"
+	patch -Np1 -i "$srcdir/$pkgname.patch"
+}
 
 pkgver() {
 	cd "$srcdir/${pkgname%-git}"
@@ -33,6 +41,8 @@ package() {
 	cd "$srcdir/${pkgname%-git}"
 	python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
 	install -Dm755 "$srcdir/${pkgname%-git}.sh" "$pkgdir/usr/bin/${pkgname%-git}"
-	install -Dm644 "$srcdir/${pkgname%-git}.desktop" "$pkgdir/usr/share/applications/${pkgname%-git}.desktop"
-	install -Dm644 "installers/linux/icons/${pkgname%-git}_logo.png" "$pkgdir/usr/share/pixmaps/${pkgname%-git}.png"
+	install -Dm644 "$srcdir/${pkgname%-git}.desktop" \
+		"$pkgdir/usr/share/applications/${pkgname%-git}.desktop"
+	install -Dm644 "installers/linux/icons/${pkgname%-git}_logo.png" \
+		"$pkgdir/usr/share/pixmaps/${pkgname%-git}.png"
 }
diff --git a/guiscrcpy-git.patch b/guiscrcpy-git.patch
new file mode 100644
index 000000000000..60dbe2c96082
--- /dev/null
+++ b/guiscrcpy-git.patch
@@ -0,0 +1,44 @@
+diff --unified --recursive --text guiscrcpy.orig/setup.py guiscrcpy.new/setup.py
+--- guiscrcpy.orig/setup.py	2019-11-06 16:17:04.137933911 -0700
++++ guiscrcpy.new/setup.py	2019-11-06 16:06:41.783311000 -0700
+@@ -2,7 +2,6 @@
+ import sys,os
+ from os import path
+ import git
+-from pyshortcuts import make_shortcut
+ import platform
+ from shutil import copyfile
+ repo = git.Repo(search_parent_directories=True)
+@@ -39,32 +38,3 @@
+             'Operating System :: POSIX',
+             'License :: OSI Approved :: GNU General Public License v3 (GPLv3)'],
+ )
+-
+-
+-print("CREATING SHORTCUTS...")
+-"""entry_points = {
+-        'console_scripts': [
+-            'guiscrcpy=guiscrcpy.__main__:launch_main']
+-            },"""
+-print("thanks to pyshortcuts by @newvile shortcuts for pip packages are easier than ever")
+-
+-if platform.platform()=="Windows":
+-    cfgpath = os.path.expanduser("~/AppData/Local/guiscrcpy/")
+-else:
+-    cfgpath = os.path.expanduser("~/.config/guiscrcpy/")
+-
+-def last_i():
+-    
+-    copyfile("./guiscrcpy/icons/guiscrcpy_logo_SRj_icon.ico", cfgpath+"logo.ico") 
+-    make_shortcut(
+-        script=os.path.expanduser("~/.local/bin/guiscrcpy"),
+-        name="guiscrcpy",
+-        description="Open Source GUI based Android Screen Mirroring System",
+-        icon=cfgpath + "logo.ico",
+-        desktop=True,
+-        startmenu=True,
+-        executable=None,
+-    )
+-
+-            
+-last_i()