From 43db231e77dca9d513ff930706d4113f3b93a35c Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Tue, 4 Sep 2012 11:43:10 +0200
Subject: [PATCH] Adapt Qt4 to change of stdcxx, issue #339

The new C++ standard library provided by libports is a shared library.
We need to include it in each run script that uses Qt4.
---
 qt4/lib/import/import-qt4.inc | 3 ++-
 qt4/run/calculatorform.run    | 1 +
 qt4/run/previewer.run         | 1 +
 qt4/run/qpluginwidget.run     | 1 +
 qt4/run/qt4.run               | 1 +
 qt4/run/qt_avplay.run         | 1 +
 qt4/run/tetrix.run            | 1 +
 qt4/run/textedit.run          | 1 +
 8 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/qt4/lib/import/import-qt4.inc b/qt4/lib/import/import-qt4.inc
index 6542711e06..cbe9a6fd34 100644
--- a/qt4/lib/import/import-qt4.inc
+++ b/qt4/lib/import/import-qt4.inc
@@ -114,8 +114,9 @@ INC_DIR += $(QT4_REP_DIR)/include/genode
 #
 # We cannot just extend the 'LIBS' variable here because 'import-*.mk' are
 # included (in 'base/mk/lib.mk') by iterating through the elements of the
-# 'LIBS' variable. Hence, we need to manually import the stdlib snippet.
+# 'LIBS' variable. Hence, we also need to manually import the stdlib snippet.
 #
+LIBS += stdcxx
 include $(call select_from_repositories,lib/import/import-stdcxx.mk)
 
 # custom main() thread stack size support via main() wrapper
diff --git a/qt4/run/calculatorform.run b/qt4/run/calculatorform.run
index f911b7d243..c33e0aeba0 100644
--- a/qt4/run/calculatorform.run
+++ b/qt4/run/calculatorform.run
@@ -109,6 +109,7 @@ set boot_modules {
 	qt_core.lib.so
 	qt_gui.lib.so
 	zlib.lib.so
+	stdcxx.lib.so
 }
 
 # platform-specific modules
diff --git a/qt4/run/previewer.run b/qt4/run/previewer.run
index 1bc26f5c68..064da77dec 100644
--- a/qt4/run/previewer.run
+++ b/qt4/run/previewer.run
@@ -112,6 +112,7 @@ set boot_modules {
 	qt_network.lib.so
 	qt_webcore.lib.so
 	zlib.lib.so
+	stdcxx.lib.so
 }
 
 # platform-specific modules
diff --git a/qt4/run/qpluginwidget.run b/qt4/run/qpluginwidget.run
index 10da43289d..85f9e6bebf 100644
--- a/qt4/run/qpluginwidget.run
+++ b/qt4/run/qpluginwidget.run
@@ -126,6 +126,7 @@ set boot_modules {
 	qnitpickerviewwidget.lib.so
 	qpluginwidget.lib.so
 	test-plugin.tar
+	stdcxx.lib.so
 }
 
 # platform-specific modules
diff --git a/qt4/run/qt4.run b/qt4/run/qt4.run
index d650499d7b..95b8897667 100644
--- a/qt4/run/qt4.run
+++ b/qt4/run/qt4.run
@@ -116,6 +116,7 @@ set boot_modules {
 	qt_ui_tools.lib.so
 	qt_xml.lib.so
 	zlib.lib.so
+	stdcxx.lib.so
 }
 
 # platform-specific modules
diff --git a/qt4/run/qt_avplay.run b/qt4/run/qt_avplay.run
index 1764a9697a..53f4922c5a 100644
--- a/qt4/run/qt_avplay.run
+++ b/qt4/run/qt_avplay.run
@@ -143,6 +143,7 @@ set boot_modules {
 	libc_rom.lib.so
 	avplay
 	mediafile
+	stdcxx.lib.so
 }
 
 # platform-specific modules
diff --git a/qt4/run/tetrix.run b/qt4/run/tetrix.run
index f63b00e509..0864594680 100644
--- a/qt4/run/tetrix.run
+++ b/qt4/run/tetrix.run
@@ -112,6 +112,7 @@ set boot_modules {
 	qt_ui_tools.lib.so
 	qt_xml.lib.so
 	zlib.lib.so
+	stdcxx.lib.so
 }
 
 # platform-specific modules
diff --git a/qt4/run/textedit.run b/qt4/run/textedit.run
index 5dc660bdb8..83f942460d 100644
--- a/qt4/run/textedit.run
+++ b/qt4/run/textedit.run
@@ -155,6 +155,7 @@ set boot_modules {
 	qt_gui.lib.so
 	zlib.lib.so
 	usb_drv
+	stdcxx.lib.so
 }
 
 # platform-specific modules