[gnome-ostree] 3.6: Use webkitgtk-tarball-releases

[Colin Walters <walters src gnome org>]

commit 9b3c2eef471633a9477236714ee706126909241e
Author: Colin Walters <walters verbum org>
Date:   Sun Sep 23 14:22:55 2012 -0400

    3.6: Use webkitgtk-tarball-releases

 gnomeos-3.6.json                                  |   12 ++++---
 patches/geoclue-autogen-Honor-NOCONFIGURE-1.patch |   25 +++++++++++++
 patches/webkitgtk-disable-parallel.patch          |   39 +++++++++++++++++++++
 3 files changed, 71 insertions(+), 5 deletions(-)
---
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index fda7600..9a2b60c 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -705,11 +705,13 @@
 				 "--disable-examples",
 				 "--disable-fatal-warnings"]},
 
-		{"src": "git:git://git.webkit.org/WebKit.git",
-		 "tag": "4e276ff268f3f3e97abb97f8e5a8cf6d8d97d2db",
-		 "patches": ["WebKit-autogen.patch",
-			     "WebKit-build-Don-t-break-on-deprecations.patch",
-			     "WebKit-gtk2xtbin-Don-t-use-deprecated-GDK_THREADS_ENTER-mac.patch"]},
+		{"src": "fd:geoclue",
+		 "patches": ["geoclue-autogen-Honor-NOCONFIGURE-1.patch"]},
+
+		{"src": "gnome:webkitgtk-tarball-releases",
+		 "config-opts": ["--enable-introspection",
+				 "--with-gstreamer=1.0"],
+		 "patches": ["webkitgtk-disable-parallel.patch"]},
 
 		{"src": "gnome:librest"},
 
diff --git a/patches/geoclue-autogen-Honor-NOCONFIGURE-1.patch b/patches/geoclue-autogen-Honor-NOCONFIGURE-1.patch
new file mode 100644
index 0000000..e66fe51
--- /dev/null
+++ b/patches/geoclue-autogen-Honor-NOCONFIGURE-1.patch
@@ -0,0 +1,25 @@
+From 2919755b1a1e1d22fa78d0610a45092b45e42af1 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sun, 23 Sep 2012 14:19:15 -0400
+Subject: [PATCH] autogen: Honor NOCONFIGURE=1
+
+See http://people.gnome.org/~walters/docs/build-api.txt
+---
+ autogen.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 326c76a..5f0957b 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -42,4 +42,6 @@ gtkdocize || exit 1
+ && "${AUTOMAKE}" --add-missing \
+ && "${AUTOCONF}"
+ 
+-$(dirname "${0}")/configure "$@"
++if test -z "$NOCONFIGURE"; then
++    exec $(dirname "${0}")/configure "$@"
++fi
+-- 
+1.7.11.4
+
diff --git a/patches/webkitgtk-disable-parallel.patch b/patches/webkitgtk-disable-parallel.patch
new file mode 100644
index 0000000..580c6fc
--- /dev/null
+++ b/patches/webkitgtk-disable-parallel.patch
@@ -0,0 +1,39 @@
+From b6516bfd5db25e4d133133b79b3dec3ab07b19f7 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sun, 23 Sep 2012 15:25:38 -0400
+Subject: [PATCH] Disable parallel builds for now
+
+---
+ GNUmakefile.am | 5 +++++
+ GNUmakefile.in | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/GNUmakefile.am b/GNUmakefile.am
+index 8eeb9ff..26efe9f 100644
+--- a/GNUmakefile.am
++++ b/GNUmakefile.am
+@@ -349,3 +349,8 @@ if ENABLE_WEBKIT2
+ 	@-cp ./Documentation/webkit2gtk/tmpl/*.sgml $(distdir)/Documentation/webkit2gtk/tmpl
+ 	@cp ./Documentation/webkit2gtk/html/* $(distdir)/Documentation/webkit2gtk/html
+ endif
++
++# Parallel builds are broken at the moment:
++# https://bugs.webkit.org/show_bug.cgi?id=79498
++# http://savannah.gnu.org/bugs/?30653
++.NOTPARALLEL:
+diff --git a/GNUmakefile.in b/GNUmakefile.in
+index 64d602d..06214f2 100644
+--- a/GNUmakefile.in
++++ b/GNUmakefile.in
+@@ -80638,3 +80638,8 @@ doc-dist-hook: docs-build.stamp
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
++
++# Parallel builds are broken at the moment:
++# https://bugs.webkit.org/show_bug.cgi?id=79498
++# http://savannah.gnu.org/bugs/?30653
++.NOTPARALLEL:
+-- 
+1.7.11.4
+