[gnome-continuous] Add patch to adapt eds to build api



commit 204866ca6aa6088a5c66db67245f534931f07fb4
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Oct 21 04:21:25 2016 +0530

    Add patch to adapt eds to build api

 manifest.json                    |    8 +---
 patches/eds-cmake-buildapi.patch |   76 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 7 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 5342395..6bcea34 100644
--- a/manifest.json
+++ b/manifest.json
@@ -957,13 +957,7 @@
                              "libical-build-introspection.patch"]},
 
                {"src": "gnome:evolution-data-server",
-                "tag": "57ad04c29303723dd8fa4082aeb6380c0873265f",
-                "tag-reason": "this module uses cmake now, tag until patch is made to make it compatible 
with continuous",
-                "irc_room": "evolution",
-                "config-opts": ["--enable-installed-tests",
-                                "--enable-vala-bindings",
-                                "--disable-google-auth",
-                                "--disable-uoa"]},
+                "patches": ["eds-cmake-buildapi.patch"]},
 
                {"src": "fd-xdg:default-icon-theme",
                 "patches": ["default-icon-theme-autogen.patch",
diff --git a/patches/eds-cmake-buildapi.patch b/patches/eds-cmake-buildapi.patch
new file mode 100644
index 0000000..1151c7a
--- /dev/null
+++ b/patches/eds-cmake-buildapi.patch
@@ -0,0 +1,76 @@
+From fd3adf8385f181255f0d1f40f844370a50656ed8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon gnome org>
+Date: Fri, 21 Oct 2016 04:13:24 +0530
+Subject: [PATCH] build: Add a "configure" script implementing the GNOME Build
+ API
+
+See http://people.gnome.org/~walters/docs/build-api.txt
+
+Hopefully this will turn into a generic copy/paste-able adapter for
+cmake.
+---
+ configure | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 52 insertions(+)
+ create mode 100755 configure
+
+diff --git a/configure b/configure
+new file mode 100755
+index 0000000..359f811
+--- /dev/null
++++ b/configure
+@@ -0,0 +1,52 @@
++#!/bin/bash
++# configure script adapter for cmake
++# Copyright 2010, 2011, 2013 Colin Walters <walters verbum 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 \
++     -DENABLE_INTROSPECTION=true \
++     -DENABLE_VALA_BINDINGS=ON \
++     -DENABLE_UOA=OFF \
++     -DENABLE_GOOGLE_AUTH=OFF \
++     -DENABLE_INSTALLED_TESTS=ON \
++     -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
++     -DCMAKE_INSTALL_LIBDIR:PATH=${libdir} \
++     ${srcdir}
+-- 
+2.10.0
+


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