[gnome-continuous] manifest: update webkitgtk4 patch and remove unused options



commit eeaf10a4956e4ad7fe08193a601e2e0db78242f4
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Fri Nov 28 13:59:31 2014 +0100

    manifest: update webkitgtk4 patch and remove unused options

 manifest.json                          |    5 +----
 patches/webkitgtk-cmake-buildapi.patch |   16 ++++++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index d17f000..911e38c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -764,10 +764,7 @@
                {"src": "tarball:http://www.webkitgtk.org/releases/webkitgtk-2.7.2.tar.xz";,
                 "name": "webkitgtk4",
                 "checksum": "042964d2bc5e02d48feb80d1021bb24c634e4fdfcb3d1356df0a599c6950c46d",
-                "patches": ["webkitgtk-cmake-buildapi.patch"],
-                 "config-opts": ["--enable-introspection",
-                               "--enable-debug-symbols=min",
-                               "--disable-maintainer-mode"]},
+                "patches": ["webkitgtk-cmake-buildapi.patch"]},
 
                {"src": "gnome:libgee",
                 "patches": ["gee-builddir.patch"]},
diff --git a/patches/webkitgtk-cmake-buildapi.patch b/patches/webkitgtk-cmake-buildapi.patch
index 59dea76..bf12348 100644
--- a/patches/webkitgtk-cmake-buildapi.patch
+++ b/patches/webkitgtk-cmake-buildapi.patch
@@ -1,4 +1,4 @@
-From 1e729789d0e90641201d1e0f9fa14bff5564cc79 Mon Sep 17 00:00:00 2001
+From 5597e7e9f77740ce1f90ce918789251e9187353d 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
@@ -7,8 +7,8 @@ Subject: [PATCH] build: Add a "configure" script implementing the GNOME Build
 See https://github.com/cgwalters/build-api
 ---
  Source/cmake/FindGStreamer.cmake |  2 ++
- configure                        | 52 ++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 54 insertions(+)
+ configure                        | 56 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+)
  create mode 100755 configure
 
 diff --git a/Source/cmake/FindGStreamer.cmake b/Source/cmake/FindGStreamer.cmake
@@ -26,10 +26,10 @@ index 7805588..140a087 100644
                                              VERSION_VAR   GSTREAMER_VERSION)
 diff --git a/configure b/configure
 new file mode 100755
-index 0000000..46faad2
+index 0000000..6ee9698
 --- /dev/null
 +++ b/configure
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,56 @@
 +#!/bin/bash
 +# configure script adapter for cmake
 +# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
@@ -74,13 +74,17 @@ index 0000000..46faad2
 +
 +srcdir=$(dirname $0)
 +
++unset CFLAGS
++unset CXXFLAGS
++
 +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" \
++     -DCMAKE_C_FLAGS="-m64 -mtune=generic -Wl,--no-keep-memory" \
++     -DCMAKE_CXX_FLAGS="-m64 -mtune=generic -Wl,--no-keep-memory" \
 +     ${srcdir}
 -- 
 2.1.0


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