[gnome-continuous] manifest: add california

[Vadim Rutkovsky <vrutkovsky src gnome org>]

commit 4ac69e5ac84fa1478fc3b63df62dc92ae308c592
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Wed Mar 25 13:30:53 2015 +0100

    manifest: add california

 manifest.json                                      |    1 +
 patches/california-buildapi.patch                  |   25 +++++++++
 patches/california-don-t-check-for-xdg-email.patch |   29 +++++++++++
 patches/california-new-eds.patch                   |   54 ++++++++++++++++++++
 4 files changed, 109 insertions(+), 0 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index b92e546..18cd125 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1133,6 +1133,7 @@
 
                {"src": "gnome:gnome-calendar" },
 
+               {"src": "gnome:california"},
         {"src": "tarball:https://ftp.gnu.org/gnu/gmp/gmp-6.0.0a.tar.xz";,
          "name": "gmp",
          "checksum": "9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764"},
diff --git a/patches/california-buildapi.patch b/patches/california-buildapi.patch
new file mode 100644
index 0000000..3b7a383
--- /dev/null
+++ b/patches/california-buildapi.patch
@@ -0,0 +1,25 @@
+From e8a9005567ebc6967406b1598000e5b8cbf965a5 Mon Sep 17 00:00:00 2001
+From: Vadim Rutkovsky <vrutkovs redhat com>
+Date: Wed, 25 Mar 2015 13:21:21 +0100
+Subject: [PATCH 2/3] Implement GNOME buildapi
+
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index cf72baa..4537b2d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -112,6 +112,8 @@ AC_CONFIG_FILES([
+       data/california.desktop.in
+ ])
+ 
++echo \#buildapi-variable-no-builddir >/dev/null
++
+ AC_OUTPUT
+ 
+ AC_MSG_RESULT([
+-- 
+1.8.3.1
+
diff --git a/patches/california-don-t-check-for-xdg-email.patch 
b/patches/california-don-t-check-for-xdg-email.patch
new file mode 100644
index 0000000..3d1fa74
--- /dev/null
+++ b/patches/california-don-t-check-for-xdg-email.patch
@@ -0,0 +1,29 @@
+From bacce9e2bfff7eddd11c5f37baf9b5fdf58a4250 Mon Sep 17 00:00:00 2001
+From: Vadim Rutkovsky <vrutkovs redhat com>
+Date: Wed, 25 Mar 2015 13:19:46 +0100
+Subject: [PATCH 1/3] Don't check for xdg-email
+
+xdg-email is required just once in the app and requires xdg-utils,
+which fails to build with builddir!=srcdir
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0e224f3..cf72baa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -65,8 +65,8 @@ AC_MSG_RESULT($california_ok)
+ AM_CONDITIONAL(HAVE__NL_TIME_FIRST_WEEKDAY, test "$california_ok" = "yes")
+ 
+ # xdg-utils (specifically, xdg-email)
+-AC_CHECK_PROG([XDG_EMAIL], [xdg-email], [yes], [no])
+-AS_IF([test "x$XDG_EMAIL" != xyes], [AC_MSG_ERROR([xdg-email required. Please install xdg-utils package.])])
++#AC_CHECK_PROG([XDG_EMAIL], [xdg-email], [yes], [no])
++#AS_IF([test "x$XDG_EMAIL" != xyes], [AC_MSG_ERROR([xdg-email required. Please install xdg-utils 
package.])])
+ 
+ #
+ # configure switches
+-- 
+1.8.3.1
+
diff --git a/patches/california-new-eds.patch b/patches/california-new-eds.patch
new file mode 100644
index 0000000..98a2365
--- /dev/null
+++ b/patches/california-new-eds.patch
@@ -0,0 +1,54 @@
+From 18e82ddace940f8691cb4d71ca30d7f2958f5bbe Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha redhat com>
+Date: Wed, 4 Feb 2015 07:28:00 +0000
+Subject: [PATCH 3/3] Fix build with new EDS buildapi
+
+https://bugzilla.gnome.org/show_bug.cgi?id=743961
+---
+ configure.ac                                     | 2 +-
+ src/backing/eds/backing-eds-calendar-source.vala | 2 +-
+ vapi/libecal-1.2.vapi                            | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4537b2d..25cacce 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS)
+ GLIB_REQUIRED=2.38.0
+ GTK_REQUIRED=3.12.2
+ GEE_REQUIRED=0.10.5
+-ECAL_REQUIRED=3.8.5
++ECAL_REQUIRED=3.13.90
+ LIBSOUP_REQUIRED=2.44
+ GDATA_REQUIRED=0.14.0
+ GOA_REQUIRED=3.8.3
+diff --git a/src/backing/eds/backing-eds-calendar-source.vala 
b/src/backing/eds/backing-eds-calendar-source.vala
+index 7e30e08..da88db4 100644
+--- a/src/backing/eds/backing-eds-calendar-source.vala
++++ b/src/backing/eds/backing-eds-calendar-source.vala
+@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource {
+     
+     // Invoked by EdsStore prior to making it available outside of unit
+     internal async void open_async(Cancellable? cancellable) throws Error {
+-        client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS,
++        client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1,
+             cancellable);
+         
+         client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE);
+diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi
+index 6ead3ec..46fd711 100644
+--- a/vapi/libecal-1.2.vapi
++++ b/vapi/libecal-1.2.vapi
+@@ -23,7 +23,7 @@ namespace E {
+               public bool check_save_schedules ();
+               public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback 
tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error;
+               [CCode (finish_name = "e_cal_client_connect_finish")]
+-              public static async unowned E.Client connect (E.Source source, E.CalClientSourceType 
source_type, GLib.Cancellable cancellable) throws GLib.Error;
++              public static async unowned E.Client connect (E.Source source, E.CalClientSourceType 
source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error;
+               public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType 
source_type, GLib.Cancellable cancellable) throws GLib.Error;
+               [CCode (finish_name = "e_cal_client_create_object_finish")]
+               public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, 
out string out_uid) throws GLib.Error;
+-- 
+1.8.3.1
+