[gnome-continuous] manifest: Add webkitgtk-2.6.4 to the build



commit 9c0b515496f0bc4faac34fd42b99ea51d44a7069
Author: Debarshi Ray <debarshir gnome org>
Date:   Tue Nov 11 13:00:58 2014 +0100

    manifest: Add webkitgtk-2.6.4 to the build
    
    The cmake build API adapter is based on the libssh adapter written by
    Colin Walters.
    
    This also moved enchant above the webkitgtk4
    
    https://bugzilla.gnome.org/show_bug.cgi?id=739929

 manifest.json                          |   15 ++++--
 patches/webkitgtk-cmake-buildapi.patch |   73 ++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 5 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index c5f175e..c7a5371 100644
--- a/manifest.json
+++ b/manifest.json
@@ -752,13 +752,22 @@
       
                 {"src": "git:http://git.chromium.org/webm/libwebp.git"},
 
+                {"src": "tarball:http://www.abisource.com/downloads/enchant/1.6.0/enchant-1.6.0.tar.gz";,
+                "name": "enchant",
+                "checksum": "2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f"}, 
+
                {"src": "tarball:http://www.webkitgtk.org/releases/webkitgtk-2.4.6.tar.xz";,
-                "name": "webkitgtk",
+                "name": "webkitgtk3",
                 "checksum": "6fef4aa8d4a2668e03ea15472a71396ea7b776bbe56ad9459a4124b823c11457",
                 "config-opts": ["--enable-introspection",
                                 "--enable-debug-symbols=min",
                                 "--disable-maintainer-mode"]},
 
+               {"src": "tarball:http://www.webkitgtk.org/releases/webkitgtk-2.6.4.tar.xz";,
+                "name": "webkitgtk4",
+                "checksum": "beef5e24edd9b9cade22d80bf373c74d236f996fe30f49f8697a70f267772e9b",
+                "patches": ["webkitgtk-cmake-buildapi.patch"]},
+
                {"src": "gnome:libgee",
                 "patches": ["gee-builddir.patch"]},
 
@@ -1165,10 +1174,6 @@
                {"src": "gnome:gnome-documents",
                 "config-opts": ["--disable-documentation"]},
 
-                {"src": "tarball:http://www.abisource.com/downloads/enchant/1.6.0/enchant-1.6.0.tar.gz";,
-                "name": "enchant",
-                "checksum": "2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f"}, 
-
                 {"src": 
"tarball:http://downloads.sourceforge.net/project/gtkspell/3.0.4/gtkspell3-3.0.4.tar.gz";,
                 "name": "gtkspell3",
                 "rm-configure": true,
diff --git a/patches/webkitgtk-cmake-buildapi.patch b/patches/webkitgtk-cmake-buildapi.patch
new file mode 100644
index 0000000..b41760d
--- /dev/null
+++ b/patches/webkitgtk-cmake-buildapi.patch
@@ -0,0 +1,73 @@
+From 86b2f33bd400459fe73376692af16a7514ddb354 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir gnome org>
+Date: Fri, 21 Nov 2014 11:12:07 +0100
+Subject: [PATCH] build: Add a "configure" script implementing the GNOME Build
+ API
+
+See https://github.com/cgwalters/build-api
+---
+ configure | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 52 insertions(+)
+ create mode 100755 configure
+
+diff --git a/configure b/configure
+new file mode 100755
+index 0000000..46faad2
+--- /dev/null
++++ b/configure
+@@ -0,0 +1,52 @@
++#!/bin/bash
++# configure script adapter for cmake
++# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
++# Copyright 2014 Debarshi Ray <debarshir gnome org>
++# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
++
++prefix=/usr
++
++# Little helper function for reading args from the commandline.
++# it automatically handles -a b and -a=b variants, and returns 1 if
++# we need to shift $3.
++read_arg() {
++    # $1 = arg name
++    # $2 = arg value
++    # $3 = arg parameter
++    local rematch='^[^=]*=(.*)$'
++    if [[ $2 =~ $rematch ]]; then
++        read "$1" <<< "${BASH_REMATCH[1]}"
++    else
++        read "$1" <<< "$3"
++        # There is no way to shift our callers args, so
++        # return 1 to indicate they should do it instead.
++        return 1
++    fi
++}
++
++while (($# > 0)); do
++    case "${1%%=*}" in
++              --prefix) read_arg prefix "$@" || shift;;
++              --bindir) read_arg bindir "$@" || shift;;
++              --sbindir) read_arg sbindir "$@" || shift;;
++              --libexecdir) read_arg libexecdir "$@" || shift;;
++              --datarootdir) read_arg datarootdir "$@" || shift;;
++              --datadir) read_arg datadir "$@" || shift;;
++              --sysconfdir) read_arg sysconfdir "$@" || shift;;
++              --libdir) read_arg libdir "$@" || shift;;
++              --mandir) read_arg mandir "$@" || shift;;
++      *) echo "Ignoring unknown option '$1'";;
++    esac
++    shift
++done
++
++srcdir=$(dirname $0)
++
++exec cmake \
++     -DPORT=GTK \
++     -DCMAKE_BUILD_TYPE=Release \
++     -DENABLE_GTKDOC=OFF \
++     -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
++     -DLIB_INSTALL_DIR:PATH=${libdir} \
++     -DCMAKE_C_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" \
++     ${srcdir}
+-- 
+2.1.0
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]