[gnome-ostree] manifest: Update to current webkitgtk stable
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] manifest: Update to current webkitgtk stable
- Date: Sat, 27 Apr 2013 16:45:03 +0000 (UTC)
commit 5ae1b28b6b0b1fd25f259cec194c0fe7ea5ab1cd
Author: Colin Walters <walters verbum org>
Date: Sat Apr 27 07:40:12 2013 -0400
manifest: Update to current webkitgtk stable
I was getting build errors with the previous one on one machine,
but that ended up needing a patch anyways.
manifest.json | 6 ++--
patches/webkitgtk-disable-parallel.patch | 39 ---------------------------
patches/webkitgtk-linking-2.patch | 39 ---------------------------
patches/webkitgtk-socketpair-includes.patch | 26 ++++++++++++++++++
4 files changed, 29 insertions(+), 81 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 2aacfaf..f71f448 100644
--- a/manifest.json
+++ b/manifest.json
@@ -647,10 +647,10 @@
{"src": "git:http://git.chromium.org/webm/libwebp.git"},
- {"src": "tarball:http://www.webkitgtk.org/releases/webkitgtk-1.11.91.tar.xz",
+ {"src": "tarball:http://www.webkitgtk.org/releases/webkitgtk-2.0.1.tar.xz",
"name": "webkitgtk",
- "checksum": "bf5419724e555bddcd2b82ebac9af47cb08e1ce0b7eb37baf30084fda74b5bee",
- "patches": ["webkitgtk-linking-2.patch"],
+ "patches": ["webkitgtk-socketpair-includes.patch"],
+ "checksum": "6303552a39d7912725d75bc55f530cdb99171fb873e299798d0bb932d6ea76cb",
"config-opts": ["--enable-introspection",
"--enable-debug-symbols=min",
"--with-gstreamer=1.0"]},
diff --git a/patches/webkitgtk-socketpair-includes.patch b/patches/webkitgtk-socketpair-includes.patch
new file mode 100644
index 0000000..30b9041
--- /dev/null
+++ b/patches/webkitgtk-socketpair-includes.patch
@@ -0,0 +1,26 @@
+From 5297699c5b6b65553a45b56c18c10927f1e3dcf6 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sat, 27 Apr 2013 11:27:12 -0400
+Subject: [PATCH] ProcessLauncherGtk: Add missing #includes needed for socketpair()
+
+Not sure why this wasn't failing for others.
+---
+ .../UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
b/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
+index 7c7f03a..6c0fae1 100644
+--- a/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
++++ b/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
+@@ -36,6 +36,8 @@
+ #include <WebCore/RunLoop.h>
+ #include <errno.h>
+ #include <locale.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <wtf/text/CString.h>
+ #include <wtf/text/WTFString.h>
+ #include <wtf/gobject/GOwnPtr.h>
+--
+1.7.1
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]