Commit cee0298c authored by Vadim Rutkovsky's avatar Vadim Rutkovsky

manifest: re-add webkitgtk-2.7.2 to the build

This reverts commit c927918b.
parent f4715c90
......@@ -750,13 +750,25 @@
{"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.7.2.tar.xz",
"name": "webkitgtk4",
"checksum": "042964d2bc5e02d48feb80d1021bb24c634e4fdfcb3d1356df0a599c6950c46d",
"patches": ["webkitgtk-cmake-buildapi.patch"],
"config-opts": ["--enable-introspection",
"--enable-debug-symbols=min",
"--disable-maintainer-mode"]},
{"src": "gnome:libgee",
"patches": ["gee-builddir.patch"]},
......@@ -1107,9 +1119,7 @@
"--disable-offline-appstream-data",
"--enable-installed-tests"]},
{"src": "gnome:epiphany",
"tag": "9e8e34a398788754ce76119b502eb8e458f1aec8",
"tag-reason": "requires webkitgtk 2.5.1"},
{"src": "gnome:epiphany"},
{"src": "gnome:gnome-calculator",
"config-opts": ["--enable-installed-tests"]},
......@@ -1163,14 +1173,8 @@
"config-opts": ["--enable-introspection"]},
{"src": "gnome:gnome-documents",
"tag": "44c0b8e53905b5d754a6dba68267f500e041f76e",
"tag-reason": "requires webkit 2.5.1",
"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,
......
From 1e729789d0e90641201d1e0f9fa14bff5564cc79 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
---
Source/cmake/FindGStreamer.cmake | 2 ++
configure | 52 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+)
create mode 100755 configure
diff --git a/Source/cmake/FindGStreamer.cmake b/Source/cmake/FindGStreamer.cmake
index 7805588..140a087 100644
--- a/Source/cmake/FindGStreamer.cmake
+++ b/Source/cmake/FindGStreamer.cmake
@@ -123,6 +123,8 @@ foreach (_component ${GStreamer_FIND_COMPONENTS})
list(APPEND _GSTREAMER_REQUIRED_VARS ${_UPPER_NAME}_INCLUDE_DIRS ${_UPPER_NAME}_LIBRARIES)
endforeach ()
+list(APPEND GSTREAMER_INCLUDE_DIRS ${prefix}/lib/gstreamer-1.0/include/)
+
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer REQUIRED_VARS _GSTREAMER_REQUIRED_VARS
VERSION_VAR GSTREAMER_VERSION)
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment