Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (0aa041a46f2651c26a6767f56047e304982f8c80)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (0aa041a46f2651c26a6767f56047e304982f8c80)
  • Date: Sat, 22 Mar 2008 22:07:15 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

x11/xscreensaver/HISTORY | 5 +++++
x11/xscreensaver/PRE_BUILD | 3 +++
x11/xscreensaver/demo-Gtk.patch | 16 ++++++++++++++++
3 files changed, 24 insertions(+)

New commits:
commit 0aa041a46f2651c26a6767f56047e304982f8c80
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xscreensaver: Patch from Javier to fix compilation with latest gtk+2.
Fixes Bug #14387

diff --git a/x11/xscreensaver/HISTORY b/x11/xscreensaver/HISTORY
index 1be2e9e..59d6b0c 100644
--- a/x11/xscreensaver/HISTORY
+++ b/x11/xscreensaver/HISTORY
@@ -1,3 +1,8 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply demo-Gtk.patch
+ * demo-Gtk.patch: Patch written by Javier to fix compilation with
+ latest gtk+2. Fixes Bug #14387
+
2007-07-23 David Brown <dmlb2000 AT gmail.com>
* DETAILS: 5.03

diff --git a/x11/xscreensaver/PRE_BUILD b/x11/xscreensaver/PRE_BUILD
new file mode 100755
index 0000000..2652151
--- /dev/null
+++ b/x11/xscreensaver/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+patch $SOURCE_DIRECTORY/driver/demo-Gtk.c \
+ $SCRIPT_DIRECTORY/demo-Gtk.patch
diff --git a/x11/xscreensaver/demo-Gtk.patch b/x11/xscreensaver/demo-Gtk.patch
new file mode 100644
index 0000000..62bea2e
--- /dev/null
+++ b/x11/xscreensaver/demo-Gtk.patch
@@ -0,0 +1,16 @@
+#
+# From http://bugs.sourcemage.org/show_bug.cgi?id=14387
+#
+diff -Naur xscreensaver-5.03.old/driver/demo-Gtk.c
xscreensaver-5.03/driver/demo-Gtk.c
+--- xscreensaver-5.03.old/driver/demo-Gtk.c 2008-03-22 10:27:57.000000000
-0600
++++ xscreensaver-5.03/driver/demo-Gtk.c 2008-03-22 10:28:57.000000000
-0600
+@@ -1127,7 +1127,7 @@
+ if (!was) gtk_widget_set_sensitive (parent, True);
+ #ifdef HAVE_GTK2
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (list));
+- STFU g_assert (model);
++ g_assert (model);
+ if (gtk_tree_model_iter_nth_child (model, &iter, NULL, list_elt))
+ {
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list));
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (0aa041a46f2651c26a6767f56047e304982f8c80), Eric Sandall, 03/22/2008

Archive powered by MHonArc 2.6.24.

Top of Page