diff options
| -rw-r--r-- | pcr/california/PKGBUILD | 17 | ||||
| -rw-r--r-- | pcr/california/california-0.4.0-libical-3.0.patch | 43 | ||||
| -rw-r--r-- | pcr/california/california-remove-is_utc.patch | 18 |
3 files changed, 52 insertions, 26 deletions
diff --git a/pcr/california/PKGBUILD b/pcr/california/PKGBUILD index d479f7464..2cba2ac9e 100644 --- a/pcr/california/PKGBUILD +++ b/pcr/california/PKGBUILD @@ -1,35 +1,36 @@ # Maintainer (Arch): Martin Poehlmann <mpdeimos@outlook.com> +# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> -# Contributor: André Silva <emulatorman@hyperbola.info> pkgname=california pkgver=0.4.0 -pkgrel=2.9 +pkgrel=2.10 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_x86_64=("icu>=60" "icu<61") +depends_x86_64=("icu>=61" "icu<62") depends_i686=("icu>=60" "icu<61") -depends_armv7h=("icu>=60" "icu<61") +depends_armv7h=("icu>=61" "icu<62") 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-remove-is_utc.patch') + 'california-0.4.0-libical-3.0.patch') sha256sums=('b25f356363a9f8f8f93c7ab78af02de39f9c3b71964663129ac9904de9147eb6' 'f512f50470954ec4018c99c49c37fa7e23074653a2e090ff13e32631ec10293d' - '6a49d69d260e240bc0f8d4cf03098dbcba774ea5000fd038a879489683bf881d') + 'c6924c868d2b44639463ce7e426c5917377ec7d0d6aa0fd38f7a018a9563be33') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "$srcdir/0002-Build-with-evolution-data-server-3.13.90.patch" - patch -Np1 -i "$srcdir/california-remove-is_utc.patch" + patch -Np1 -i "$srcdir/california-0.4.0-libical-3.0.patch" ./configure \ - --prefix=/usr + --prefix=/usr \ + --disable-fatal sed -i 's#californiadocdir = ${prefix}#californiadocdir = ${datadir}#g' Makefile sed -i 's/static const/const/' src/host/host-main-window.vala diff --git a/pcr/california/california-0.4.0-libical-3.0.patch b/pcr/california/california-0.4.0-libical-3.0.patch new file mode 100644 index 000000000..a6eae3474 --- /dev/null +++ b/pcr/california/california-0.4.0-libical-3.0.patch @@ -0,0 +1,43 @@ +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 }, diff --git a/pcr/california/california-remove-is_utc.patch b/pcr/california/california-remove-is_utc.patch deleted file mode 100644 index 6666f9aee..000000000 --- a/pcr/california/california-remove-is_utc.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- california-0.4.0.orig/src/component/component.vala 2015-03-23 18:36:24.000000000 -0500 -+++ california-0.4.0/src/component/component.vala 2017-12-04 15:40:43.105276768 -0500 -@@ -224,7 +224,6 @@ - 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 @@ - 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); |