The following commit has been merged in the master branch:
commit 21c4e7cf04d86adfb236a5474d7367d70877b755
Author: Robin Cornelius <[EMAIL PROTECTED]>
Date: Mon Nov 17 16:08:58 2008 +0000
Fix a build fault due to incorrect usage of Gtk message dialogs
diff --git a/debian/patches/series b/debian/patches/series
index a07d027..e57177b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-#linux_joystick.patch
VWR-9557-EnableBuildWithNvidiaOrMesaHeaders.patch
Allow-CXXFLAGS-to-specify-the-debug-flag.patch
remove_as_needed.patch
@@ -36,3 +35,4 @@ VWR-8751-Build-with-a-shared-llmozlib2.patch
lltemplatemessagereader_memcpy.patch
no_old_school_typedefs.patch
gcc_warning_on_llwindowsdl_var_not_set.patch
+use_gtk_correctly.patch
diff --git a/debian/patches/use_gtk_correctly.patch
b/debian/patches/use_gtk_correctly.patch
new file mode 100644
index 0000000..dedc330
--- /dev/null
+++ b/debian/patches/use_gtk_correctly.patch
@@ -0,0 +1,13 @@
+diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
+index e5d15c4..f624111 100644
+--- a/indra/llwindow/llwindowsdl.cpp
++++ b/indra/llwindow/llwindowsdl.cpp
+@@ -2530,7 +2530,7 @@ S32 OSMessageBoxSDL(const std::string& text, const
std::string& caption, U32 typ
+ buttons = GTK_BUTTONS_YES_NO;
+ break;
+ }
+- win = gtk_message_dialog_new(NULL,flags, messagetype, buttons,
text.c_str());
++ win = gtk_message_dialog_new(NULL,flags, messagetype, buttons,
"%s",text.c_str());
+
+ # if LL_X11
+ // Make GTK tell the window manager to associate this
--
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and
OpenSim grids
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
