[california/f22] Update to 0.3.1; Add patch to build with current evolution-data-server
Milan Crha
mcrha at fedoraproject.org
Mon Feb 23 10:52:10 UTC 2015
commit 6a9ba3d06ab2ccd69998bc9db2be84f74ccec822
Author: Milan Crha <mcrha at redhat.com>
Date: Mon Feb 23 11:50:31 2015 +0100
Update to 0.3.1; Add patch to build with current evolution-data-server
.gitignore | 1 +
...-Build-with-evolution-data-server-3.13.90.patch | 39 ++++++++++++++++++++++
california.spec | 11 ++++--
sources | 2 +-
4 files changed, 50 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e0ca5df..ef3340f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/california-0.1.3.tar.xz
/california-0.1.4.tar.xz
/california-0.2.0.tar.xz
+/california-0.3.1.tar.xz
diff --git a/0002-Build-with-evolution-data-server-3.13.90.patch b/0002-Build-with-evolution-data-server-3.13.90.patch
new file mode 100644
index 0000000..9389439
--- /dev/null
+++ b/0002-Build-with-evolution-data-server-3.13.90.patch
@@ -0,0 +1,39 @@
+diff --git a/configure.ac b/configure.ac
+index 8a94642..1ca6426 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 ee6a572..5009b5d 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;
diff --git a/california.spec b/california.spec
index b465873..d585581 100644
--- a/california.spec
+++ b/california.spec
@@ -1,15 +1,16 @@
%global gtk3_version 3.12.2
Name: california
-Version: 0.2.0
+Version: 0.3.1
Release: 1%{?dist}
Summary: Calendar application
License: LGPLv2+
URL: https://wiki.gnome.org/Apps/California
-Source0: https://download.gnome.org/sources/california/0.2/california-%{version}.tar.xz
+Source0: https://download.gnome.org/sources/california/0.3/california-%{version}.tar.xz
Patch0: 0001-Fix-desktop-file-keywords-Swedish-translation.patch
+Patch1: 0002-Build-with-evolution-data-server-3.13.90.patch
BuildRequires: desktop-file-utils
BuildRequires: intltool
@@ -24,6 +25,7 @@ BuildRequires: pkgconfig(libecal-1.2)
BuildRequires: pkgconfig(libgdata)
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: vala
+BuildRequires: xdg-utils
Requires: gtk3%{?_isa} >= %{gtk3_version}
@@ -34,6 +36,7 @@ manage your online calendars with a simple and modern interface.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%configure
@@ -71,6 +74,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/glib-2.0/schemas/org.yorba.california.gschema.xml
%changelog
+* Mon Feb 23 2015 Milan Crha <mcrha at redhat.com> - 0.3.1-1
+- Update to 0.3.1
+- Add patch to build with current evolution-data-server
+
* Wed Oct 01 2014 Kalev Lember <kalevlember at gmail.com> - 0.2.0-1
- Update to 0.2.0
- Set minimum required gtk3 version
diff --git a/sources b/sources
index a3cafc7..5fc643f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-055d92f2ec324709fb019c352040763c california-0.2.0.tar.xz
+5349dc619c33938a3f5362fe0b3978f1 california-0.3.1.tar.xz
More information about the scm-commits
mailing list