[gnome-ostree] manifest: Add libwebp, switch to using tarball for WebKitGtk

[Colin Walters <walters src gnome org>]

commit d185a9e530f5438e7a0f41f8083e17591a5431e7
Author: Colin Walters <walters verbum org>
Date:   Sun Mar 10 10:34:40 2013 -0400

    manifest: Add libwebp, switch to using tarball for WebKitGtk
    
    The tarball import git repository is unfortunate for a variety of
    reasons, but the primary one is basically that the WebKitGtk
    maintainers don't update it.
    
    Let's just build from their tarball.
    
    Also rebuild harfbuzz since it needs to pick up the new-enough ICU.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=691312

 manifest.json                     |   15 +++++++----
 patches/webkitgtk-linking-2.patch |   39 ++++++++++++++++++++++++++++++
 patches/webkitgtk-linking.patch   |   47 -------------------------------------
 3 files changed, 48 insertions(+), 53 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index b25ac48..3a88ba9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -613,12 +613,16 @@
 
                {"src": "fd:geoclue",
                 "patches": ["geoclue-autogen-Honor-NOCONFIGURE-1.patch"]},
+      
+                {"src": "git:http://git.chromium.org/webm/libwebp.git"},
 
-               {"src": "gnome:webkitgtk-tarball-releases",
+               {"src": "tarball:http://www.webkitgtk.org/releases/webkitgtk-1.11.91.tar.xz";,
+                "name": "webkitgtk",
+                "checksum": "bf5419724e555bddcd2b82ebac9af47cb08e1ce0b7eb37baf30084fda74b5bee",
+                "patches": ["webkitgtk-linking-2.patch"],
                 "config-opts": ["--enable-introspection",
-                                "--with-gstreamer=1.0"],
-                "patches": ["webkitgtk-disable-parallel.patch",
-                            "webkitgtk-linking.patch"]},
+                                "--enable-debug-symbols=min",
+                                "--with-gstreamer=1.0"]},
 
                {"src": "gnome:vala-bootstrap",
                 "bootstrap": true,
@@ -798,6 +802,5 @@
        ],
     
     "build-epoch": {"version": 5,
-                   "component-names": ["harfbuzz", "webkitgtk-tarball-releases"]}
-
+                   "component-names": ["harfbuzz"]}
 }
diff --git a/patches/webkitgtk-linking-2.patch b/patches/webkitgtk-linking-2.patch
new file mode 100644
index 0000000..f1d1048
--- /dev/null
+++ b/patches/webkitgtk-linking-2.patch
@@ -0,0 +1,39 @@
+From b78d4f928a1e34bfb47676b0d519dee3b301a8b4 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sun, 10 Mar 2013 15:47:33 -0400
+Subject: [PATCH] build: Optimize linker for memory use/space
+
+We'd really like to be able to build webkitgtk on at least a machine
+with 4G, since, well, that's what my laptop has.
+---
+ Source/autotools/SetupCompilerFlags.m4 |    3 ++-
+ configure                              |    2 ++
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/Source/autotools/SetupCompilerFlags.m4 b/Source/autotools/SetupCompilerFlags.m4
+index d87054d..46d7049 100644
+--- a/Source/autotools/SetupCompilerFlags.m4
++++ b/Source/autotools/SetupCompilerFlags.m4
+@@ -21,4 +21,5 @@ else
+     CFLAGS="$CFLAGS -O0"
+ fi
+ 
+-
++dnl Optimize for ld memory use: http://lists.macosforge.org/pipermail/webkit-dev/2012-March/020111.html
++LDFLAGS="$LDFLAGS -Wl,--no-keep-memory"
+diff --git a/configure b/configure
+index b807730..a8b7cce 100755
+--- a/configure
++++ b/configure
+@@ -21103,6 +21103,8 @@ else
+     CFLAGS="$CFLAGS -O0"
+ fi
+ 
++LDFLAGS="$LDFLAGS -Wl,--no-keep-memory"
++
+ 
+ 
+ # Configuration flags that are used throughout WebKitGTK+.
+-- 
+1.7.1
+