net-misc/chrome-remote-desktop: get resizing working again

Mostly it's about adding documentation for how to trigger the randr Xvfb
behavior, but we also switch to a simpler method for passing in the size
options.

3 files changed, 9 insertions, 6 deletions

diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-45.0.2454.17.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-45.0.2454.17-r1.ebuild
index 52f80d8b26c..52f80d8b26c 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-45.0.2454.17.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-45.0.2454.17-r1.ebuild
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.conf.d b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.conf.d
index 9830f2cbda3..db24cdd4ab1 100644
--- a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.conf.d
+++ b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.conf.d
@@ -3,8 +3,12 @@
 # List of users to start Chrome Remote Desktop for.
 CHROME_REMOTING_USERS=''
 
-# Default resolutions to make available to the session.
-#CHROME_REMOTE_DESKTOP_DEFAULT_DESKTOP_SIZES='1600x1200,3840x1600'
+# Options to pass to chrome-remote-desktop.  Only the -s option is interesting.
+# Note: In order to support resizing, you need to:
+# (1) Apply this patch to xorg-server (via epatch_user):
+#     http://patchwork.freedesktop.org/patch/51428/
+# (2) Create a symlink /usr/bin/Xvfb-randr -> Xvfb
+#OPTIONS='-s 1600x1200 -s 3840x1600'
 
 # Directory to use for storing log files.
 #CHROME_REMOTE_DESKTOP_LOG_DIR='/var/log'
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc
index 4cd148d9506..d5701a8d60c 100644
--- a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc
+++ b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc
@@ -33,9 +33,6 @@ for_users() {
 	local user ret msg log
 	msg=$1; shift
 
-	set -- -- "$@"
-	[ "${CHROME_REMOTE_DESKTOP_DEFAULT_DESKTOP_SIZES+set}" = "set" ] \
-		&& set -- -e CHROME_REMOTE_DESKTOP_DEFAULT_DESKTOP_SIZES="${CHROME_REMOTE_DESKTOP_DEFAULT_DESKTOP_SIZES}" "$@"
 	: ${CHROME_REMOTE_DESKTOP_LOG_DIR:=/var/log}
 
 	for user in ${CHROME_REMOTING_USERS} ; do
@@ -51,9 +48,11 @@ for_users() {
 			-u "${user}" \
 			-x "${CRD}" \
 			-e "CHROME_REMOTE_DESKTOP_LOG_FILE=${log}" \
+			-- \
+			${OPTIONS} \
 			"$@"
 		eend $?
-		: $(( ret += $? ))
+		: $(( ret |= $? ))
 	done
 
 	return ${ret}