From 0518646e612a0fd8f0479d50a689fb8b09471987 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Tue, 30 Oct 2018 01:48:06 -0500 Subject: california-0.4.0-3: rebuild --- ...-Build-with-evolution-data-server-3.13.90.patch | 39 -------------------- pcr/california/PKGBUILD | 12 +++--- pcr/california/california-0.4.0-libical-3.0.patch | 43 ---------------------- 3 files changed, 6 insertions(+), 88 deletions(-) delete mode 100644 pcr/california/0002-Build-with-evolution-data-server-3.13.90.patch delete mode 100644 pcr/california/california-0.4.0-libical-3.0.patch (limited to 'pcr/california') 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 deleted file mode 100644 index 93894395c..000000000 --- a/pcr/california/0002-Build-with-evolution-data-server-3.13.90.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 69ea9a4d8..174ddc58a 100644 --- a/pcr/california/PKGBUILD +++ b/pcr/california/PKGBUILD @@ -4,18 +4,18 @@ pkgname=california pkgver=0.4.0 -pkgrel=2.11 +pkgrel=3 pkgdesc='A new calendar application for GNOME 3. It is currently under heavy development.' arch=('i686' 'x86_64' 'armv7h') url="https://wiki.gnome.org/Apps/California" license=('LGPL2.1') depends=('evolution-data-server' 'libgee' 'xdg-utils' "libical>=3" "libical<4") -depends+=("icu>=62" "icu<63") +depends+=("icu>=63" "icu<64") 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' - '0002-Build-with-evolution-data-server-3.13.90.patch' - 'california-0.4.0-libical-3.0.patch') + 'https://src.fedoraproject.org/cgit/rpms/california.git/plain/0002-Build-with-evolution-data-server-3.13.90.patch' + 'https://src.fedoraproject.org/cgit/rpms/california.git/plain/california-0.4.0-libical-3.0.patch') sha256sums=('b25f356363a9f8f8f93c7ab78af02de39f9c3b71964663129ac9904de9147eb6' 'f512f50470954ec4018c99c49c37fa7e23074653a2e090ff13e32631ec10293d' 'c6924c868d2b44639463ce7e426c5917377ec7d0d6aa0fd38f7a018a9563be33') @@ -23,8 +23,8 @@ sha256sums=('b25f356363a9f8f8f93c7ab78af02de39f9c3b71964663129ac9904de9147eb6' prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "$srcdir/0002-Build-with-evolution-data-server-3.13.90.patch" - patch -Np1 -i "$srcdir/california-0.4.0-libical-3.0.patch" + patch -p1 < ../0002-Build-with-evolution-data-server-3.13.90.patch + patch -p1 < ../california-0.4.0-libical-3.0.patch ./configure \ --prefix=/usr \ diff --git a/pcr/california/california-0.4.0-libical-3.0.patch b/pcr/california/california-0.4.0-libical-3.0.patch deleted file mode 100644 index a6eae3474..000000000 --- a/pcr/california/california-0.4.0-libical-3.0.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up california-0.4.0/src/application/california-application.vala.libical-3.0 california-0.4.0/src/application/california-application.vala ---- california-0.4.0/src/application/california-application.vala.libical-3.0 2015-03-24 00:36:24.000000000 +0100 -+++ california-0.4.0/src/application/california-application.vala 2017-11-08 18:50:45.118098403 +0100 -@@ -55,7 +55,7 @@ public class Application : Gtk.Applicati - } - } - -- private static const ActionEntry[] action_entries = { -+ private const ActionEntry[] action_entries = { - // public actions - { ACTION_CALENDAR_MANAGER, on_calendar_manager }, - { ACTION_HELP, on_help }, -diff -up california-0.4.0/src/component/component.vala.libical-3.0 california-0.4.0/src/component/component.vala ---- california-0.4.0/src/component/component.vala.libical-3.0 2015-03-24 00:36:24.000000000 +0100 -+++ california-0.4.0/src/component/component.vala 2017-11-08 18:50:45.118098403 +0100 -@@ -224,7 +224,6 @@ private void date_to_ical(Calendar.Date - ical_dt->hour = 0; - ical_dt->minute = 0; - ical_dt->second = 0; -- ical_dt->is_utc = 0; - ical_dt->is_date = 1; - ical_dt->is_daylight = 0; - ical_dt->zone = null; -@@ -240,7 +239,6 @@ private void exact_time_to_ical(Calendar - ical_dt->hour = exact_time.hour; - ical_dt->minute = exact_time.minute; - ical_dt->second = exact_time.second; -- ical_dt->is_utc = exact_time.tz.is_utc ? 1 : 0; - ical_dt->is_date = 0; - ical_dt->is_daylight = exact_time.is_dst ? 1 : 0; - ical_dt->zone = iCal.icaltimezone.get_builtin_timezone(exact_time.tz.zone.value); -diff -up california-0.4.0/src/host/host-main-window.vala.libical-3.0 california-0.4.0/src/host/host-main-window.vala ---- california-0.4.0/src/host/host-main-window.vala.libical-3.0 2017-11-08 18:51:38.508097665 +0100 -+++ california-0.4.0/src/host/host-main-window.vala 2017-11-08 18:53:36.865096028 +0100 -@@ -71,7 +71,7 @@ public class MainWindow : Gtk.Applicatio - private const string ACTION_RESET_FONT = "reset-font"; - private const string ACCEL_RESET_FONT = "KP_Multiply"; - -- private static const ActionEntry[] action_entries = { -+ private const ActionEntry[] action_entries = { - { ACTION_QUICK_CREATE_EVENT, on_quick_create_event }, - { ACTION_JUMP_TO_TODAY, on_jump_to_today }, - { ACTION_NEXT, on_next }, -- cgit v1.2.3