[uzbl] Add patches to fix warnings and the build

Ben Boeckel mathstuf at fedoraproject.org
Tue Oct 25 17:17:55 UTC 2011


commit 83af9a3184fd0bc1822abf266dcbcf5a5ff41c57
Author: Ben Boeckel <MathStuf at gmail.com>
Date:   Tue Oct 25 13:15:09 2011 -0400

    Add patches to fix warnings and the build

 0001-Get-the-click-context-all-the-time.patch |   31 +++++++++++++++++++++++++
 0001-Include-glib.h.patch                     |   26 +++++++++++++++++++++
 uzbl.spec                                     |    4 +++
 3 files changed, 61 insertions(+), 0 deletions(-)
---
diff --git a/0001-Get-the-click-context-all-the-time.patch b/0001-Get-the-click-context-all-the-time.patch
new file mode 100644
index 0000000..3dc9908
--- /dev/null
+++ b/0001-Get-the-click-context-all-the-time.patch
@@ -0,0 +1,31 @@
+From 4e9672c31ee7790cb4a0453b7d45d3e89613c035 Mon Sep 17 00:00:00 2001
+From: Ben Boeckel <MathStuf at gmail.com>
+Date: Tue, 25 Oct 2011 13:10:48 -0400
+Subject: [PATCH] Get the click context all the time
+
+---
+ src/callbacks.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/callbacks.c b/src/callbacks.c
+index ae5c2e3..f939454 100644
+--- a/src/callbacks.c
++++ b/src/callbacks.c
+@@ -165,12 +165,13 @@ button_press_cb (GtkWidget* window, GdkEventButton* event) {
+     gboolean propagate = FALSE,
+              sendev    = FALSE;
+ 
++    context = get_click_context(NULL);
++
+     if(event->type == GDK_BUTTON_PRESS) {
+         if(uzbl.state.last_button)
+             gdk_event_free((GdkEvent *)uzbl.state.last_button);
+         uzbl.state.last_button = (GdkEventButton *)gdk_event_copy((GdkEvent *)event);
+ 
+-        context = get_click_context(NULL);
+         /* left click */
+         if(event->button == 1) {
+             if((context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE))
+-- 
+1.7.6
+
diff --git a/0001-Include-glib.h.patch b/0001-Include-glib.h.patch
new file mode 100644
index 0000000..be1c165
--- /dev/null
+++ b/0001-Include-glib.h.patch
@@ -0,0 +1,26 @@
+From 689d174ab095508e9579bc5f3de359b3aa09b9ef Mon Sep 17 00:00:00 2001
+From: Ben Boeckel <MathStuf at gmail.com>
+Date: Tue, 25 Oct 2011 13:13:40 -0400
+Subject: [PATCH] Include glib.h
+
+It seems to be needed for webkitgtk3
+---
+ src/uzbl-core.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/uzbl-core.c b/src/uzbl-core.c
+index f90c5dd..a3c36fb 100644
+--- a/src/uzbl-core.c
++++ b/src/uzbl-core.c
+@@ -40,6 +40,8 @@
+ #include "variables.h"
+ #include "type.h"
+ 
++#include <glib.h>
++
+ UzblCore uzbl;
+ 
+ /* commandline arguments (set initial values for the state variables) */
+-- 
+1.7.6
+
diff --git a/uzbl.spec b/uzbl.spec
index 8d243e8..7aeb920 100644
--- a/uzbl.spec
+++ b/uzbl.spec
@@ -22,6 +22,8 @@ Patch0:		%{name}-makefile.patch
 Patch1:		0001-Fedora-specific-error-messages-on-no-configs.patch
 # Submitted at https://github.com/Dieterbe/uzbl/pull/71
 Patch2:		0001-javascriptcoregtk-3.0-is-required-for-webkitgtk3.patch
+Patch3:		0001-Get-the-click-context-all-the-time.patch
+Patch4:		0001-Include-glib.h.patch
 
 %if %{use_webkitgtk3}
 BuildRequires:	webkitgtk3-devel
@@ -106,6 +108,8 @@ Highlighting files for uzbl's configuration.
 %patch0 -p1 -b .makefile
 %patch1 -p1 -b .fedora
 %patch2 -p1 -b .jscore
+%patch3 -p1 -b .context
+%patch4 -p1 -b .include
 
 mkdir -p icons/hicolor/32x32/apps
 mv examples/data/uzbl.png icons/hicolor/32x32/apps


More information about the scm-commits mailing list