[gnome-continuous] manifest: sync libical with upstream
- From: Vadim Rutkovsky <vrutkovsky src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] manifest: sync libical with upstream
- Date: Mon, 26 Jan 2015 15:41:05 +0000 (UTC)
commit 479804288ebb18359c369be88d87872df5446d77
Author: Igor Gnatenko <ignatenko src gnome org>
Date: Mon Jan 26 15:16:16 2015 +0300
manifest: sync libical with upstream
Signed-off-by: Igor Gnatenko <ignatenko src gnome org>
https://bugzilla.gnome.org/show_bug.cgi?id=743498
manifest.json | 7 ++-
patches/libical-cmake-buildapi.patch | 73 ++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 2 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 8b05e25..7520f4c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -44,7 +44,8 @@
"alexlarsson": "git:git://github.com/alexlarsson/",
"anholt": "git:git://github.com/anholt/",
"fujita": "git:git://github.com/fujita/",
- "mikechristie" : "git:git://github.com/mikechristie/"},
+ "mikechristie" : "git:git://github.com/mikechristie/",
+ "libical": "git:git://github.com/libical/"},
"patches": {"src": "gnome:gnome-continuous",
"subdir": "patches"},
@@ -961,7 +962,9 @@
{"src": "gnome:gnome-online-miners"},
- {"src": "cgwalters:libical-tarballs-as-git"},
+ {"src": "libical:libical",
+ "tag": "v1.0.1",
+ "patches": ["libical-cmake-buildapi.patch"]},
{"src": "gnome:evolution-data-server",
"irc_room": "evolution",
diff --git a/patches/libical-cmake-buildapi.patch b/patches/libical-cmake-buildapi.patch
new file mode 100644
index 0000000..4670b95
--- /dev/null
+++ b/patches/libical-cmake-buildapi.patch
@@ -0,0 +1,73 @@
+From c8c32842781dd144d86c3ee8973cc15fffeabe26 Mon Sep 17 00:00:00 2001
+From: Vadim Rutkovsky <vrutkovs redhat com>
+Date: Tue, 12 Nov 2013 10:50:07 -0500
+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 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 49 insertions(+)
+ create mode 100755 configure
+
+diff --git a/configure b/configure
+new file mode 100755
+index 0000000..ad28740
+--- /dev/null
++++ b/configure
+@@ -0,0 +1,49 @@
++#!/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 \
++ -DSHARED_ONLY=true \
++ -DGOBJECT_INTROSPECTION=true \
++ -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
++ -DLIB_INSTALL_DIR:PATH=${libdir} \
++ ${srcdir}
+--
+1.8.3.1
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]