Fixed the default if you haven't run rox-session before. Instead of just trying the first WM it sees, it presents you with a list to choose from (or you can specify your own). Bug #204239

Package-Manager: portage-2.1.4_rc14

6 files changed, 131 insertions, 14 deletions

diff --git a/rox-base/rox-session/ChangeLog b/rox-base/rox-session/ChangeLog
index 580833472da6..4ce14d4ce4ef 100644
--- a/rox-base/rox-session/ChangeLog
+++ b/rox-base/rox-session/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for rox-base/rox-session
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/ChangeLog,v 1.30 2008/01/03 18:49:26 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/ChangeLog,v 1.31 2008/01/04 20:55:23 lack Exp $
+
+*rox-session-0.30-r3 (04 Jan 2008)
+
+  04 Jan 2008; Jim Ramsay <lack@gentoo.org>
+  +files/rox-session-0.30-wmselect.patch, +files/ROX-Defaults.xml,
+  -rox-session-0.30-r2.ebuild, +rox-session-0.30-r3.ebuild:
+  Fixed the default if you haven't run rox-session before. Instead of just
+  trying the first WM it sees, it presents you with a list to choose from (or
+  you can specify your own). Bug #204239
 
 *rox-session-0.30-r2 (03 Jan 2008)
 
diff --git a/rox-base/rox-session/Manifest b/rox-base/rox-session/Manifest
index d29cba54e45b..48d6706bd556 100644
--- a/rox-base/rox-session/Manifest
+++ b/rox-base/rox-session/Manifest
@@ -1,3 +1,11 @@
+AUX ROX-Defaults.xml 696 RMD160 d3fe5408c3e29dac38c48b5959f7d6442274b02d SHA1 36f606d9c2b932b99f87f73d1d44a63e10d6c297 SHA256 e2da029d1d64e2803346e4f9270e8851cbd2d89fc27e893670fe3bd1e933bfb8
+MD5 697f1cce5b26af35643cf7abbd352e37 files/ROX-Defaults.xml 696
+RMD160 d3fe5408c3e29dac38c48b5959f7d6442274b02d files/ROX-Defaults.xml 696
+SHA256 e2da029d1d64e2803346e4f9270e8851cbd2d89fc27e893670fe3bd1e933bfb8 files/ROX-Defaults.xml 696
+AUX rox-session-0.30-wmselect.patch 2165 RMD160 9fe82d2e7da8d6dd23d159d31d413ad4c4d48039 SHA1 bce7e57fec7d7088770c3af7a44119caa21f64d3 SHA256 16306a410574fe5f82476ab46b02173417289cc6a9a34978563c1924e8da70f9
+MD5 a022ca6d6962d4b5da64212444572de2 files/rox-session-0.30-wmselect.patch 2165
+RMD160 9fe82d2e7da8d6dd23d159d31d413ad4c4d48039 files/rox-session-0.30-wmselect.patch 2165
+SHA256 16306a410574fe5f82476ab46b02173417289cc6a9a34978563c1924e8da70f9 files/rox-session-0.30-wmselect.patch 2165
 AUX rox-start 1115 RMD160 adb4c4ca3a5892da82e99f952165ed556322a2e5 SHA1 7992d2f67dd7e0dbd96e8c220450de83a84a3711 SHA256 0c8fc2a8562f42f2ffc05631ddfbc4237e2186f7ab013dcba92d3c3c0f21b1f3
 MD5 23039f746199e34cbf4d0724a2978e8f files/rox-start 1115
 RMD160 adb4c4ca3a5892da82e99f952165ed556322a2e5 files/rox-start 1115
@@ -8,18 +16,18 @@ EBUILD rox-session-0.29.ebuild 1241 RMD160 95137e9cfce191ef2e732433a6065fa516e14
 MD5 4c55ff22b0a7b40288941f7ff25c79bc rox-session-0.29.ebuild 1241
 RMD160 95137e9cfce191ef2e732433a6065fa516e14eac rox-session-0.29.ebuild 1241
 SHA256 ccd0b015cbc592b34f8a6b51390fda0b7f0eea40a3d891c15b1f1eb456aa0e2c rox-session-0.29.ebuild 1241
-EBUILD rox-session-0.30-r2.ebuild 1260 RMD160 43fb88b36a542c082a22631f7dfb5b52eb49a44f SHA1 2956ece706a1d3a28eaa7720d4265c76ecb4ab69 SHA256 db1f8244ac1e20e8efa6b97d374748e8ce121ede6acd3984a95a172bff92d338
-MD5 f673da7640366a15fcc3fbb5613e09ad rox-session-0.30-r2.ebuild 1260
-RMD160 43fb88b36a542c082a22631f7dfb5b52eb49a44f rox-session-0.30-r2.ebuild 1260
-SHA256 db1f8244ac1e20e8efa6b97d374748e8ce121ede6acd3984a95a172bff92d338 rox-session-0.30-r2.ebuild 1260
+EBUILD rox-session-0.30-r3.ebuild 1850 RMD160 82198404ba9cf43c697a694c0dac2e8e8fa2972c SHA1 20a25f8737ca3ed5858ed102379cd46ac16ea71c SHA256 5ad95595764b4b999214ad5a488d033413e37bcb96e641e3c0561148213d71b8
+MD5 c4eda4933f1a14afc00e44e1871b7cb2 rox-session-0.30-r3.ebuild 1850
+RMD160 82198404ba9cf43c697a694c0dac2e8e8fa2972c rox-session-0.30-r3.ebuild 1850
+SHA256 5ad95595764b4b999214ad5a488d033413e37bcb96e641e3c0561148213d71b8 rox-session-0.30-r3.ebuild 1850
 EBUILD rox-session-0.30.ebuild 1257 RMD160 a07595837c722be1d01ee35a50fb95e821bb0acf SHA1 75d893b73f872b052dd81f72cc85ccc77776a1ed SHA256 e5d55d05176d304305d3ce4193acb5283f44150eca75e86995ce7ac9b9151ef9
 MD5 ea0e044086a1b938966c5c5c31418fa9 rox-session-0.30.ebuild 1257
 RMD160 a07595837c722be1d01ee35a50fb95e821bb0acf rox-session-0.30.ebuild 1257
 SHA256 e5d55d05176d304305d3ce4193acb5283f44150eca75e86995ce7ac9b9151ef9 rox-session-0.30.ebuild 1257
-MISC ChangeLog 5445 RMD160 29c5717e881a0e1dcdd5eadfe0c846c5e71e5787 SHA1 5bb06e456fadaeb9f551ae3c9773ef80ce55d299 SHA256 6b09782f021b4fdc669300b1a005db53990afebbf019e7d3b4003637a1ddc881
-MD5 053b4707a17d65d6e09dc6d31f9f9f49 ChangeLog 5445
-RMD160 29c5717e881a0e1dcdd5eadfe0c846c5e71e5787 ChangeLog 5445
-SHA256 6b09782f021b4fdc669300b1a005db53990afebbf019e7d3b4003637a1ddc881 ChangeLog 5445
+MISC ChangeLog 5847 RMD160 fc3f00c39369a5d63d25bad0ef56d5df93d2f4ee SHA1 9751d11d6d3f7c8dffc6cf8e8b2ed72562c66c12 SHA256 4959715483ff8440f20fde7f7ae77edb6c7767de0944e225354e7352d9e18b22
+MD5 d69372bef93e255d548496bff9ebe1ec ChangeLog 5847
+RMD160 fc3f00c39369a5d63d25bad0ef56d5df93d2f4ee ChangeLog 5847
+SHA256 4959715483ff8440f20fde7f7ae77edb6c7767de0944e225354e7352d9e18b22 ChangeLog 5847
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
@@ -30,6 +38,6 @@ SHA256 28cb7605e63b93b97dacfef90cf3e92e94603c63abc746f54a35356b869898ed files/di
 MD5 9fd7883126a104216fe17dd7f6ffec09 files/digest-rox-session-0.30 253
 RMD160 cf4bda797af2410646065f391dc85d8b59b566de files/digest-rox-session-0.30 253
 SHA256 4d9d57f170d22f4f616166e232ce9547afe8c1e1d8b2138a0a049457e16c953a files/digest-rox-session-0.30 253
-MD5 9fd7883126a104216fe17dd7f6ffec09 files/digest-rox-session-0.30-r2 253
-RMD160 cf4bda797af2410646065f391dc85d8b59b566de files/digest-rox-session-0.30-r2 253
-SHA256 4d9d57f170d22f4f616166e232ce9547afe8c1e1d8b2138a0a049457e16c953a files/digest-rox-session-0.30-r2 253
+MD5 9fd7883126a104216fe17dd7f6ffec09 files/digest-rox-session-0.30-r3 253
+RMD160 cf4bda797af2410646065f391dc85d8b59b566de files/digest-rox-session-0.30-r3 253
+SHA256 4d9d57f170d22f4f616166e232ce9547afe8c1e1d8b2138a0a049457e16c953a files/digest-rox-session-0.30-r3 253
diff --git a/rox-base/rox-session/files/ROX-Defaults.xml b/rox-base/rox-session/files/ROX-Defaults.xml
new file mode 100644
index 000000000000..97043760fc46
--- /dev/null
+++ b/rox-base/rox-session/files/ROX-Defaults.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<interface xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+  <name>ROX-Defaults</name>
+  <summary>a default configuration for ROX</summary>
+  <description>
+This package is used by ROX-Session to provide sensible defaults. For example,
+clicking on a text file will open it in Edit, while clicking on an archive will
+use Archive. The required programs are fetched on demand using Zero Install.</description>
+  <homepage>http://rox.sourceforge.net/desktop/ROX-Session</homepage>
+  <feed-for interface="http://rox.sourceforge.net/2005/interfaces/ROX-Defaults"/>
+  <implementation id="/usr/bin" main="true" stability="packaged" version="0.2"/>
+</interface>
diff --git a/rox-base/rox-session/files/digest-rox-session-0.30-r2 b/rox-base/rox-session/files/digest-rox-session-0.30-r3
index 2c6780d8dd0c..2c6780d8dd0c 100644
--- a/rox-base/rox-session/files/digest-rox-session-0.30-r2
+++ b/rox-base/rox-session/files/digest-rox-session-0.30-r3
diff --git a/rox-base/rox-session/files/rox-session-0.30-wmselect.patch b/rox-base/rox-session/files/rox-session-0.30-wmselect.patch
new file mode 100644
index 000000000000..e414100cf577
--- /dev/null
+++ b/rox-base/rox-session/files/rox-session-0.30-wmselect.patch
@@ -0,0 +1,71 @@
+--- ROX-Session/wm.py.orig	2008-01-04 10:42:40.000000000 -0500
++++ ROX-Session/wm.py	2008-01-04 15:26:26.000000000 -0500
+@@ -44,7 +44,8 @@
+ 		import session
+ 		session.may_run_login_script()
+ 	else:
+-		choose_wm('None of the default window managers are installed')
++		choose_wm(_("No window manager has been configured. "
++			"Please enter one below:"))
+ 
+ def available_in_path(command):
+ 	for x in path_dirs:
+@@ -56,13 +57,9 @@
+ def get_window_manager():
+ 	user_wm = settings.settings.get('ROX/WindowManager', None)
+ 	if user_wm:
+-		wms = [user_wm] + window_managers
+-	else:
+-		wms = window_managers
+-	for wm in wms:
+-		wm_split = shell_split(wm)
++		wm_split = shell_split(user_wm)
+ 		if available_in_path(wm_split[0]):
+-			return wm, wm_split
++			return user_wm, wm_split
+ 	return None, None
+ 
+ def wm_died(status):
+@@ -76,24 +73,37 @@
+ 			    "Please restart it, or choose another window manager."))
+ 
+ def choose_wm(message):
++	current_wm = get_window_manager()[0]
+ 	box = rox.Dialog('Choose a window manager', None,
+ 		g.DIALOG_MODAL | g.DIALOG_NO_SEPARATOR)
+-	box.add_button(g.STOCK_CLOSE, g.RESPONSE_CANCEL)
++	if current_wm is not None:
++		box.add_button(g.STOCK_CLOSE, g.RESPONSE_CANCEL)
+ 	box.add_button(g.STOCK_EXECUTE, g.RESPONSE_OK)
+ 	box.set_position(g.WIN_POS_CENTER)
+ 
+ 	box.vbox.pack_start(g.Label(message), True, True, 0)
+ 	box.set_default_response(g.RESPONSE_OK)
+ 
+-	entry = g.Entry()
+-	entry.set_activates_default(True)
++	entry = g.combo_box_entry_new_text()
+ 	box.vbox.pack_start(entry, False, True, 0)
+-	entry.set_text(get_window_manager()[0] or '')
++
++	current_wm_in_list = False
++	index = 0
++	for wm in window_managers:
++		if available_in_path(shell_split(wm)[0]):
++			entry.append_text(wm)
++			if wm == current_wm:
++				current_wm_in_list = True
++				entry.set_active(index)
++			index += 1
++	if not current_wm_in_list and current_wm is not None:
++		entry.prepend_text(current_wm)
++		entry.set_active(0)
+ 
+ 	box.vbox.show_all()
+ 
+ 	if box.run() == int(g.RESPONSE_OK):
+-		settings.settings.set('ROX/WindowManager',  entry.get_text())
++		settings.settings.set('ROX/WindowManager',  entry.get_active_text())
+ 		box.destroy()
+ 		start()
+ 	else:
diff --git a/rox-base/rox-session/rox-session-0.30-r2.ebuild b/rox-base/rox-session/rox-session-0.30-r3.ebuild
index 0feaf30310da..4617e4a7e136 100644
--- a/rox-base/rox-session/rox-session-0.30-r2.ebuild
+++ b/rox-base/rox-session/rox-session-0.30-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.30-r2.ebuild,v 1.1 2008/01/03 18:49:26 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.30-r3.ebuild,v 1.1 2008/01/04 20:55:23 lack Exp $
 
 ROX_LIB_VER="2.0.4-r1"
 ROX_VER="2.7-r1"
-inherit eutils rox-0install multilib
+inherit eutils rox-0install
 
 DESCRIPTION="Rox-Session is a really simple session manager"
 HOMEPAGE="http://rox.sourceforge.net/rox_session.html"
@@ -20,6 +20,16 @@ RDEPEND=">=dev-python/dbus-python-0.71"
 MY_PN="ROX-Session"
 APPNAME=${MY_PN}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# By default on first startup rox-session tries to load oroborox (and
+	# download it if it's not already installed).  This patch gives users a
+	# choice of existing WM instead of forcing oroborox down their throats:
+	epatch "${FILESDIR}/${P}-wmselect.patch"
+}
+
 src_install() {
 	rox-0install_src_install
 
@@ -31,6 +41,13 @@ src_install() {
 	dodir /etc/X11/Sessions
 	echo "/usr/bin/rox-start" > "${D}/etc/X11/Sessions/ROX_Desktop"
 	fperms a+x /etc/X11/Sessions/ROX_Desktop
+
+	# This is fun- Requires 'ROX-Defaults' which is basically useless.
+	# So setup a dummy feed for it:
+	local feedname
+	feedname=$(0distutils -e "${FILESDIR}/ROX-Defaults.xml") || die "0distutils URI escape failed"
+	insinto "${NATIVE_FEED_DIR}"
+	newins "${FILESDIR}/ROX-Defaults.xml" "${feedname}"
 }
 
 pkg_postinst() {