{pcr,nonprism}/california: rebuild against libedataserver-1.2.so.22

fixes issue #1443

4 files changed, 88 insertions, 6 deletions

diff --git a/nonprism/california/0002-Build-with-evolution-data-server-3.13.90.patch b/nonprism/california/0002-Build-with-evolution-data-server-3.13.90.patch
new file mode 100644
index 000000000..93894395c
--- /dev/null
+++ b/nonprism/california/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/nonprism/california/PKGBUILD b/nonprism/california/PKGBUILD
index 71459d6dd..8e8f779c1 100644
--- a/nonprism/california/PKGBUILD
+++ b/nonprism/california/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer (Arch): Martin Poehlmann <mpdeimos@outlook.com>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: André Silva <emulatorman@parabola.nu>
 
 pkgname=california
 pkgver=0.4.0
-pkgrel=2.5.nonprism1
+pkgrel=2.6.nonprism1
 pkgdesc='A new calendar application for GNOME 3. It is currently under heavy development, without Google Calendar support'
 arch=('i686' 'x86_64')
 url="https://wiki.gnome.org/Apps/California"
@@ -13,7 +13,7 @@ depends=('evolution-data-server' 'libgee' 'xdg-utils')
 makedepends=('vala' 'intltool' 'gnome-common' 'yelp-tools' 'gobject-introspection' 'patch')
 install="${pkgname}.install"
 source=('https://download.gnome.org/sources/california/0.4/california-0.4.0.tar.xz'
-        'http://pkgs.fedoraproject.org/cgit/california.git/plain/0002-Build-with-evolution-data-server-3.13.90.patch'
+        '0002-Build-with-evolution-data-server-3.13.90.patch'
         'nonprism.patch')
 sha256sums=('b25f356363a9f8f8f93c7ab78af02de39f9c3b71964663129ac9904de9147eb6'
             'f512f50470954ec4018c99c49c37fa7e23074653a2e090ff13e32631ec10293d'
@@ -40,6 +40,8 @@ build() {
 	./configure \
 		--prefix=/usr
 	sed -i 's#californiadocdir = ${prefix}#californiadocdir = ${datadir}#g' Makefile
+        sed -i 's/static const/const/' src/host/host-main-window.vala
+        sed -i 's/static const/const/' src/application/california-application.vala
 	make
 }
 
diff --git a/pcr/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pcr/california/0002-Build-with-evolution-data-server-3.13.90.patch
new file mode 100644
index 000000000..93894395c
--- /dev/null
+++ b/pcr/california/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/pcr/california/PKGBUILD b/pcr/california/PKGBUILD
index f4904403c..3357b9857 100644
--- a/pcr/california/PKGBUILD
+++ b/pcr/california/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer (Arch): Martin Poehlmann <mpdeimos@outlook.com>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: André Silva <emulatorman@parabola.nu>
 
 pkgname=california
 pkgver=0.4.0
-pkgrel=2.5
+pkgrel=2.6
 pkgdesc='A new calendar application for GNOME 3. It is currently under heavy development.'
 arch=('i686' 'x86_64')
 url="https://wiki.gnome.org/Apps/California"
@@ -13,7 +13,7 @@ depends=('evolution-data-server' 'libgee' 'xdg-utils')
 makedepends=('vala' 'intltool' 'gnome-common' 'yelp-tools' 'gobject-introspection' 'patch')
 install="${pkgname}.install"
 source=('https://download.gnome.org/sources/california/0.4/california-0.4.0.tar.xz'
-        'http://pkgs.fedoraproject.org/cgit/california.git/plain/0002-Build-with-evolution-data-server-3.13.90.patch')
+        '0002-Build-with-evolution-data-server-3.13.90.patch')
 sha256sums=('b25f356363a9f8f8f93c7ab78af02de39f9c3b71964663129ac9904de9147eb6'
             'f512f50470954ec4018c99c49c37fa7e23074653a2e090ff13e32631ec10293d')
 
@@ -23,6 +23,8 @@ build() {
 	./configure \
 		--prefix=/usr
 	sed -i 's#californiadocdir = ${prefix}#californiadocdir = ${datadir}#g' Makefile
+        sed -i 's/static const/const/' src/host/host-main-window.vala
+        sed -i 's/static const/const/' src/application/california-application.vala
 	make
 }