[gnome-continuous] manifest: build evolution master



commit ed335b8fd2d343f330057b05888f95800b6657eb
Author: Javier Jardón <jjardon gnome org>
Date:   Sat Feb 18 21:12:00 2017 +0000

    manifest: build evolution master

 manifest.json                    |   10 +---
 patches/evolution-buildapi.patch |  123 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 124 insertions(+), 9 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index cce83fc..ac0a087 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1248,16 +1248,8 @@
                {"src": "gnome:gtkhtml"},
 
                {"src": "gnome:evolution",
-                "tag": "dad728dfd69aaba8edfe84a8f922a012dbad32ac",
-                "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",
-                                "--disable-bogofilter",
-                                "--disable-spamassassin",
-                                "--disable-text-highlight",
-                                "--disable-pst-import",
-                                "--disable-libcryptui",
-                                "--disable-autoar"]},
+               "patches": ["patches/evolution-buildapi.patch"]},
 
                {"src": "gnome:evolution-ews",
                 "irc_room": "evolution",
diff --git a/patches/evolution-buildapi.patch b/patches/evolution-buildapi.patch
new file mode 100644
index 0000000..fa51f2c
--- /dev/null
+++ b/patches/evolution-buildapi.patch
@@ -0,0 +1,123 @@
+From 6f2b7a5d7753deaeb9189323721d1247001ca0ab Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi 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
+
+v2:
+  - Use the Ninja generator for CMake
+  - Perform various sanity checks
+---
+ configure | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 101 insertions(+)
+ create mode 100755 configure
+
+diff --git a/configure b/configure
+new file mode 100755
+index 0000000..fd3dfbb
+--- /dev/null
++++ b/configure
+@@ -0,0 +1,101 @@
++#!/bin/bash
++# configure script adapter for cmake
++# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
++# Copyright 2017 Emmanuele Bassi <ebassi gnome org>
++# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
++
++# 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
++}
++
++sanitycheck() {
++    # $1 = arg name
++    # $1 = arg command
++    # $2 = arg alternates
++    local cmd=$( which $2 2>/dev/null )
++    if [ -x "$cmd" ]; then
++        read "$1" <<< "$cmd"
++        return 0
++    fi
++    test -z $3 || {
++        for alt in $3; do
++            cmd=$( which $alt 2>/dev/null )
++            if [ -x "$cmd" ]; then
++                read "$1" <<< "$cmd"
++                return 0
++            fi
++        done
++    }
++    echo -e "\e[1;31mERROR\e[0m: Command '$2' not found"
++    exit 1
++}
++
++sanitycheck CMAKE 'cmake'
++sanitycheck NINJA 'ninja' 'ninja-build'
++
++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;;
++        --includedir) read_arg includedir "$@" || shift;;
++      *) echo "Ignoring unknown option '$1'";;
++    esac
++    shift
++done
++
++srcdir=$(dirname $0)
++
++# Defaults
++test -z ${prefix} && prefix="/usr/local"
++test -z ${bindir} && bindir=${prefix}/bin
++test -z ${sbindir} && sbindir=${prefix}/sbin
++test -z ${libexecdir} && libexecdir=${prefix}/bin
++test -z ${datarootdir} && datarootdir=${prefix}/share
++test -z ${datadir} && datadir=${datarootdir}
++test -z ${sysconfdir} && sysconfdir=${prefix}/etc
++test -z ${libdir} && libdir=${prefix}/lib
++test -z ${mandir} && mandir=${prefix}/share/man
++test -z ${includedir} && includedir=${prefix}/include
++
++cat > Makefile <<END
++# Generated by configure; do not edit
++
++all:
++      ${NINJA}
++
++install:
++      DESTDIR="\$(DESTDIR)" ${NINJA} install
++END
++
++
++exec ${CMAKE} \
++     -DENABLE_LIBCRYPTUI=OFF \
++     -DENABLE_PST_IMPORT=OFF \
++     -DENABLE_YTNEF=OFF \
++     -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
++     -GNinja \
++     ${srcdir}
+-- 
+2.9.3
+


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