From 10bb3fbe38248c488612c4a7df7988d2c5870800 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Thu, 2 Feb 2017 18:26:57 +0100
Subject: [PATCH] qt5: add missing routes to run scripts

Issue #2250
---
 repos/libports/run/qt5_common.inc   | 19 +++++++++++++++----
 repos/libports/run/qt5_drivers.inc  |  6 +++++-
 repos/libports/run/qt5_textedit.run | 26 ++++++++++++--------------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc
index 34f4a8dfb6..145dddd720 100644
--- a/repos/libports/run/qt5_common.inc
+++ b/repos/libports/run/qt5_common.inc
@@ -53,7 +53,7 @@ proc qt5_start_nodes { feature_arg } {
 
 	append start_nodes {
 		<start name="nitpicker">
-			<resource name="RAM" quantum="1M"/>
+			<resource name="RAM" quantum="2M"/>
 			<provides><service name="Nitpicker"/></provides>
 			<route> }
 	append_if [use_fb_sdl feature] start_nodes { 
@@ -115,8 +115,11 @@ proc qt5_start_nodes { feature_arg } {
 				<policy label_prefix="layouter"  role="layouter"/>
 			</config>
 			<route>
+				<service name="ROM" label="focus">          <child name="report_rom"/> </service>
+				<service name="ROM" label="resize_request"> <child name="report_rom"/> </service>
+				<service name="Report">                     <child name="report_rom"/> </service>
 				<any-service>
-					<child name="nitpicker"/> <child name="report_rom"/> <parent/> <any-child/>
+					<child name="nitpicker"/> <parent/> <any-child/>
 				</any-service>
 			</route>
 		</start>
@@ -125,8 +128,13 @@ proc qt5_start_nodes { feature_arg } {
 			<binary name="floating_window_layouter"/>
 			<resource name="RAM" quantum="4M"/>
 			<route>
+				<service name="ROM" label="window_list">       <child name="report_rom"/> </service>
+				<service name="ROM" label="focus_request">     <child name="report_rom"/> </service>
+				<service name="ROM" label="hover">             <child name="report_rom"/> </service>
+				<service name="ROM" label="decorator_margins"> <child name="report_rom"/> </service>
+				<service name="Report">                        <child name="report_rom"/> </service>
 				<any-service>
-					<child name="wm"/> <child name="report_rom"/> <parent/> <any-child/>
+					<child name="wm"/> <parent/> <any-child/>
 				</any-service>
 			</route>
 		</start>
@@ -135,8 +143,11 @@ proc qt5_start_nodes { feature_arg } {
 			<binary name="decorator"/>
 			<resource name="RAM" quantum="12M"/>
 			<route>
+				<service name="ROM" label="window_layout"> <child name="report_rom"/> </service>
+				<service name="ROM" label="pointer">       <child name="report_rom"/> </service>
+				<service name="Report">                    <child name="report_rom"/> </service>
 				<any-service>
-					<child name="wm"/> <child name="report_rom"/> <parent/> <any-child/>
+					<child name="wm"/> <parent/> <any-child/>
 				</any-service>
 			</route>
 		</start>
diff --git a/repos/libports/run/qt5_drivers.inc b/repos/libports/run/qt5_drivers.inc
index 7f3366fff1..a9a69e37c6 100644
--- a/repos/libports/run/qt5_drivers.inc
+++ b/repos/libports/run/qt5_drivers.inc
@@ -187,7 +187,11 @@ proc drivers_start_nodes { feature_arg } {
 		append start_nodes {
 				</config>
 				<route>
-					<service name="LOG"> <parent/> </service>}
+					<service name="LOG"> <parent/> </service>
+					<service name="RAM"> <parent/> </service>
+					<service name="CPU"> <parent/> </service>
+					<service name="ROM"> <parent/> </service>
+					<service name="PD">  <parent/> </service>}
 		append_if [use_ps2_drv feature] start_nodes {
 					<service name="Input" label="ps2"> <child name="ps2_drv" /> </service>}
 		append_if [use_usb_drv feature] start_nodes {
diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run
index 74ee9599b6..bcaa847ee2 100644
--- a/repos/libports/run/qt5_textedit.run
+++ b/repos/libports/run/qt5_textedit.run
@@ -89,26 +89,24 @@ append config {
 	<start name="textedit">
 		<resource name="RAM" quantum="70M"/>
 		<config xpos="3" ypos="0" width="500" height="710">
-			<libc stdout="/dev/log" stderr="/dev/log">
-				<vfs>
-					<dir name="dev"> <log/> </dir>
-					<tar name="qt5_fs_textedit.tar"/>
-					<dir name="fs">	<fs/> </dir>
-				</vfs>
-			</libc>
+			<libc stdout="/dev/log" stderr="/dev/log"/>
+			<vfs>
+				<dir name="dev"> <log/> </dir>
+				<tar name="qt5_fs_textedit.tar"/>
+				<dir name="fs">	<fs/> </dir>
+			</vfs>
 		</config>
 	</start>
 	<start name="textedit2">
 		<binary name="textedit" />
 		<resource name="RAM" quantum="70M"/>
 		<config xpos="512" ypos="0" width="500" height="710">
-			<libc stdout="/dev/log" stderr="/dev/log">
-				<vfs>
-					<dir name="dev"> <log/> </dir>
-					<tar name="qt5_fs_textedit.tar"/>
-					<dir name="fs">	<fs/> </dir>
-				</vfs>
-			</libc>
+			<libc stdout="/dev/log" stderr="/dev/log"/>
+			<vfs>
+				<dir name="dev"> <log/> </dir>
+				<tar name="qt5_fs_textedit.tar"/>
+				<dir name="fs">	<fs/> </dir>
+			</vfs>
 		</config>
 	</start>
 </config>