Upgrading to version 116.0.5845.10, fixing xdg issues.

3 files changed, 39 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9bd99756410e..4b135e531e31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = chrome-remote-desktop
 	pkgdesc = Access other computers or allow another user to access your computer securely over the Internet
-	pkgver = 115.0.5790.10
+	pkgver = 116.0.5845.10
 	pkgrel = 1
 	url = https://remotedesktop.google.com
 	install = chrome-remote-desktop.install
@@ -10,19 +10,24 @@ pkgbase = chrome-remote-desktop
 	depends = libutempter
 	depends = libxss
 	depends = nss
+	depends = python-packaging
 	depends = python-psutil
+	depends = python-pyxdg
+	depends = xf86-video-dummy
 	depends = xorg-server-xvfb
 	depends = xorg-setxkbmap
 	depends = xorg-xauth
 	depends = xorg-xdpyinfo
 	depends = xorg-xrandr
-	source = chrome-remote-desktop-115.0.5790.10.deb::https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_115.0.5790.10_amd64.deb
+	source = chrome-remote-desktop-116.0.5845.10.deb::https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_116.0.5845.10_amd64.deb
 	source = chrome-remote-desktop.service
 	source = pamrule
 	source = crd
-	sha256sums = a49ac21281a220c17afcfdcdf4a274d1e094927aea135f53ee7eb39a2c1b07a4
+	source = xdg-base-directory.patch
+	sha256sums = 84396947d787cbe90073e944c272856871086c2671d82ac59f6ee9f460476459
 	sha256sums = e5da5ae89b5bc599f72f415d1523341b25357931b0de46159fce50ab83615a4b
 	sha256sums = fcc38269eb1cc902abff9688eda9377a22367e39b9f111f87c0dd8e77adb82e2
 	sha256sums = 021110f49d465294517eec92eeb24ebca41e264ef33cbdda78732add1f269d02
+	sha256sums = 993cff7024be6c4e3b2c0f84287adb51711a30c7dd965bb5b8687980f496e1a5
 
 pkgname = chrome-remote-desktop
diff --git a/PKGBUILD b/PKGBUILD
index de6cb79c3cae..3c1832a7e77f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,30 +5,32 @@
 # Contributor: Mateus Rodrigues Costa <charles [dot] costar [at] gmail [dot] com>
 
 pkgname=chrome-remote-desktop
-pkgver=115.0.5790.10
+pkgver=116.0.5845.10
 pkgrel=1
 pkgdesc="Access other computers or allow another user to access your computer securely over the Internet"
 arch=("x86_64")
 url="https://remotedesktop.google.com"
 license=("BSD")
-depends=("gtk3" "libutempter" "libxss" "nss" "python-psutil" "xorg-server-xvfb" "xorg-setxkbmap" "xorg-xauth" "xorg-xdpyinfo" "xorg-xrandr")
+depends=("gtk3" "libutempter" "libxss" "nss" "python-packaging" "python-psutil" "python-pyxdg" "xf86-video-dummy" "xorg-server-xvfb" "xorg-setxkbmap" "xorg-xauth" "xorg-xdpyinfo" "xorg-xrandr")
 install="${pkgname}.install"
 source=(
   "${pkgname}-${pkgver}.deb::https://dl.google.com/linux/${pkgname}/deb/pool/main/${pkgname:0:1}/${pkgname}/${pkgname}_${pkgver}_amd64.deb"
   "${pkgname}.service"
   "pamrule"
   "crd"
+  "xdg-base-directory.patch"
 )
 sha256sums=(
-  "a49ac21281a220c17afcfdcdf4a274d1e094927aea135f53ee7eb39a2c1b07a4"
+  "84396947d787cbe90073e944c272856871086c2671d82ac59f6ee9f460476459"
   "e5da5ae89b5bc599f72f415d1523341b25357931b0de46159fce50ab83615a4b"
   "fcc38269eb1cc902abff9688eda9377a22367e39b9f111f87c0dd8e77adb82e2"
   "021110f49d465294517eec92eeb24ebca41e264ef33cbdda78732add1f269d02"
+  "993cff7024be6c4e3b2c0f84287adb51711a30c7dd965bb5b8687980f496e1a5"
 )
 
 # curl -qs https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages | grep "^Version\|^SHA256" | awk '{print $2}'
 
-build() {
+prepare() {
   cd "${srcdir}"
 
   bsdtar -xf data.tar.xz -C .
@@ -37,6 +39,9 @@ build() {
   rm -R "${srcdir}/etc/cron.daily"
   rm -R "${srcdir}/etc/init.d"
   rm -R "${srcdir}/etc/pam.d"
+
+  # Fix problem with missing import xdg.BaseDirectory, fixing xorg_binary location
+  patch -Np1 -i "${srcdir}/xdg-base-directory.patch"
 }
 
 package() {
diff --git a/xdg-base-directory.patch b/xdg-base-directory.patch
new file mode 100644
index 000000000000..7ad82cf7ba03
--- /dev/null
+++ b/xdg-base-directory.patch
@@ -0,0 +1,22 @@
+diff --git a/opt/google/chrome-remote-desktop/chrome-remote-desktop b/opt/google/chrome-remote-desktop/chrome-remote-desktop
+index 685c912..58b61b0 100755
+--- a/opt/google/chrome-remote-desktop/chrome-remote-desktop
++++ b/opt/google/chrome-remote-desktop/chrome-remote-desktop
+@@ -43,7 +43,7 @@ import time
+ import uuid
+ 
+ import psutil
+-import xdg
++import xdg, xdg.BaseDirectory
+ from packaging import version
+ 
+ # If this env var is defined, extra host params will be loaded from this env var
+@@ -1444,7 +1444,7 @@ class XDesktop(Desktop):
+     self.randr_add_sizes = True
+     self.xorg_conf = config_file.name
+ 
+-    xorg_binary = "/usr/lib/xorg/Xorg";
++    xorg_binary = "/usr/lib/Xorg";
+     if not os.access(xorg_binary, os.X_OK):
+       xorg_binary = "Xorg";
+