[gnome-continuous] Update the webkit cmake build patch



commit 023a8f20170a851ad0dec34bbe4d5a4c0800fc38
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu Feb 16 16:46:47 2017 +0000

    Update the webkit cmake build patch
    
    We need to wrap the invocation to Ninja with a Makefile, to ensure the
    build-api is respected.

 patches/webkitgtk-cmake-buildapi.patch |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/patches/webkitgtk-cmake-buildapi.patch b/patches/webkitgtk-cmake-buildapi.patch
index 1b8b446..06a51fe 100644
--- a/patches/webkitgtk-cmake-buildapi.patch
+++ b/patches/webkitgtk-cmake-buildapi.patch
@@ -1,4 +1,4 @@
-From fde3782821f1f1378be8606877bc8ccbc1f63652 Mon Sep 17 00:00:00 2001
+From ee4248dcfbd1bda8e920cc7708b1350a13890ba4 Mon Sep 17 00:00:00 2001
 From: Emmanuele Bassi <ebassi gnome org>
 Date: Fri, 21 Nov 2014 11:12:07 +0100
 Subject: [PATCH] build: Add a "configure" script implementing the GNOME Build
@@ -10,18 +10,21 @@ v2:
   - Fix whitespace issues
   - Add -GNinja switch
 
+v3:
+  - Generate a Makefile wrapper for Ninja
+
 See https://github.com/cgwalters/build-api
 ---
- configure | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 59 insertions(+)
+ configure | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 69 insertions(+)
  create mode 100755 configure
 
 diff --git a/configure b/configure
 new file mode 100755
-index 0000000..ca5ed44
+index 0000000..c831269
 --- /dev/null
 +++ b/configure
-@@ -0,0 +1,59 @@
+@@ -0,0 +1,69 @@
 +#!/bin/bash
 +# configure script adapter for cmake
 +# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
@@ -70,6 +73,16 @@ index 0000000..ca5ed44
 +unset CFLAGS
 +unset CXXFLAGS
 +
++cat > Makefile <<END
++# Generated by configure; do not edit
++
++all:
++        ${NINJA}
++
++install:
++        DESTDIR="\$(DESTDIR)" ${NINJA} install
++END
++
 +exec cmake \
 +     -DPORT=GTK \
 +     -DCMAKE_BUILD_TYPE=Release \


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