[spice] Actually add patch for writing cegui.log to the proper location

Hans de Goede jwrdegoede at fedoraproject.org
Sat Nov 6 06:28:49 UTC 2010


commit c86bc1f1222a9aaeabd66e81ea4307514ea5d04b
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sat Nov 6 07:28:19 2010 +0100

    Actually add patch for writing cegui.log to the proper location

 ...-Make-cegui-log-to-app_data_dir-cegui.log.patch |   42 ++++++++++++++++++++
 spice.spec                                         |    2 +
 2 files changed, 44 insertions(+), 0 deletions(-)
---
diff --git a/0006-spicec-Make-cegui-log-to-app_data_dir-cegui.log.patch b/0006-spicec-Make-cegui-log-to-app_data_dir-cegui.log.patch
new file mode 100644
index 0000000..688f6d2
--- /dev/null
+++ b/0006-spicec-Make-cegui-log-to-app_data_dir-cegui.log.patch
@@ -0,0 +1,42 @@
+From bfaa4579103d924bec737b52b947b512d89460d6 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Fri, 5 Nov 2010 20:46:28 +0100
+Subject: [PATCH spice] spicec: Make cegui log to <app_data_dir>/cegui.log
+
+This stops the client from dropping CEGUI.log files into the cwd all
+the time, and stops it from crashing when the cwd is not writable
+(rhbz#650253).
+---
+ client/gui/gui.cpp |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/client/gui/gui.cpp b/client/gui/gui.cpp
+index f1ca13d..d8513c6 100644
+--- a/client/gui/gui.cpp
++++ b/client/gui/gui.cpp
+@@ -891,7 +891,6 @@ GUI::GUI(Application& app, Application::State state)
+     , _pixmap (new RedPixmapSw(MAIN_GUI_WIDTH, MAIN_GUI_HEIGHT, RedDrawable::RGB32, true, 0))
+     , _renderer (new CEGUI::SoftRenderer(_pixmap->get_data(), MAIN_GUI_WIDTH, MAIN_GUI_HEIGHT,
+                                          _pixmap->get_stride()))
+-    , _gui_system (new CEGUI::System(_renderer, new CEGUIResourceProvider()))
+     , _dialog (NULL)
+     , _prev_time (Platform::get_monolithic_time())
+ 
+@@ -919,6 +918,14 @@ GUI::~GUI()
+ 
+ void GUI::init_cegui()
+ {
++    std::string log_file_name;
++
++    Platform::get_app_data_dir(log_file_name, "spicec");
++    Platform::path_append(log_file_name, "cegui.log");
++
++    _gui_system = new CEGUI::System(_renderer, new CEGUIResourceProvider(),
++                                    NULL, NULL, "", log_file_name);
++
+     CEGUI::SchemeManager::getSingleton().loadScheme("TaharezLook.scheme");
+     _gui_system->setDefaultMouseCursor("TaharezLook", "MouseArrow");
+     _gui_system->setDefaultTooltip("TaharezLook/Tooltip");
+-- 
+1.7.3.2
+
diff --git a/spice.spec b/spice.spec
index db8f790..a7449fc 100644
--- a/spice.spec
+++ b/spice.spec
@@ -12,6 +12,7 @@ Patch2:         0002-client-Interpret-the-title-control-message-as-utf8-i.patch
 Patch3:         0003-Remove-no-longer-used-wstring_printf-functions.patch
 Patch4:         0004-spicec-x11-Do-not-set-_NET_WM_USER_TIME-to-0-on-star.patch
 Patch5:         0005-spicec-x11-Listen-for-selection-owner-window-destroy.patch
+Patch6:         0006-spicec-Make-cegui-log-to-app_data_dir-cegui.log.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=613529
 ExclusiveArch:  i686 x86_64
@@ -74,6 +75,7 @@ using spice-server, you will need to install spice-server-devel.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %configure --enable-gui


More information about the scm-commits mailing list