[gtk-osx] Fix compiler error in gtk+-3.10.7
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Fix compiler error in gtk+-3.10.7
- Date: Mon, 3 Feb 2014 00:19:48 +0000 (UTC)
commit 7d3b2bbdbda85ecba4147ddc72b24f188239f70c
Author: John Ralls <jralls ceridwen us>
Date: Sun Feb 2 16:16:34 2014 -0800
Fix compiler error in gtk+-3.10.7
modulesets-stable/gtk-osx.modules | 1 +
patches/0001-gtk3-gtkselection-return-value.patch | 27 +++++++++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index ad125b5..04f50c1 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -176,6 +176,7 @@
autogenargs="--enable-quartz-backend --enable-quartz-relocation">
<branch module="gtk+/3.10/gtk+-3.10.7.tar.xz" version="3.10.7"
hash="sha256:b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427">
+ <patch
file="http://git.gnome.org/browse/gtk-osx-plain/patches/0001-gtk-gtkselection-return-value.patch skip="1"/>
</branch>
<dependencies>
<dep package="glib"/>
diff --git a/patches/0001-gtk3-gtkselection-return-value.patch
b/patches/0001-gtk3-gtkselection-return-value.patch
new file mode 100644
index 0000000..46238d5
--- /dev/null
+++ b/patches/0001-gtk3-gtkselection-return-value.patch
@@ -0,0 +1,27 @@
+From 1c42bb5e34783ea7170e96905d9d60e07e23933f Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen redhat com>
+Date: Mon, 27 Jan 2014 21:58:44 -0500
+Subject: [PATCH] Avoid a compiler warning
+
+gcc doesn't like returning without a value from a non-void
+function.
+---
+ gtk/gtkselection.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
+index 1c77002..3fa8971 100644
+--- a/gtk/gtkselection.c
++++ b/gtk/gtkselection.c
+@@ -2294,7 +2294,7 @@ _gtk_selection_request (GtkWidget *widget,
+ gulong selection_max_size;
+
+ if (event->requestor == NULL)
+- return;
++ return FALSE;
+
+ if (initialize)
+ gtk_selection_init ();
+--
+1.8.3.rc0
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]