nonprism/california: rebuild

4 files changed, 80 insertions, 38 deletions

diff --git a/nonprism/california/PKGBUILD b/nonprism/california/PKGBUILD
index 42f2cc0c1..ea788571b 100644
--- a/nonprism/california/PKGBUILD
+++ b/nonprism/california/PKGBUILD
@@ -1,34 +1,34 @@
 # 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.nonprism1
+pkgrel=2.10.nonprism1
 pkgdesc='A new calendar application for GNOME 3. It is currently under heavy development, without Google Calendar support'
 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'
         'nonprism.patch')
 sha256sums=('b25f356363a9f8f8f93c7ab78af02de39f9c3b71964663129ac9904de9147eb6'
             'f512f50470954ec4018c99c49c37fa7e23074653a2e090ff13e32631ec10293d'
-            '6a49d69d260e240bc0f8d4cf03098dbcba774ea5000fd038a879489683bf881d'
-            '2c75a8170f97658776d66f2bc8c39afdc27f5ef1e69f59df32f3b7c8dbe30cc5')
+            'c6924c868d2b44639463ce7e426c5917377ec7d0d6aa0fd38f7a018a9563be33'
+            '31bb9d156017c308d5ab18e515b1310db8f890a1defee8d0ee6a5ac3cb65a76e')
 
 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"
 
   # remove Google Calendar support
   patch -Np1 -i "$srcdir/nonprism.patch"
@@ -44,7 +44,8 @@ prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./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/nonprism/california/california-0.4.0-libical-3.0.patch b/nonprism/california/california-0.4.0-libical-3.0.patch
new file mode 100644
index 000000000..a6eae3474
--- /dev/null
+++ b/nonprism/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/nonprism/california/california-remove-is_utc.patch b/nonprism/california/california-remove-is_utc.patch
deleted file mode 100644
index 6666f9aee..000000000
--- a/nonprism/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);
diff --git a/nonprism/california/nonprism.patch b/nonprism/california/nonprism.patch
index 46d5e5147..39f96512b 100644
--- a/nonprism/california/nonprism.patch
+++ b/nonprism/california/nonprism.patch
@@ -147,6 +147,14 @@ diff -Nur california-0.4.0.orig/src/Makefile.am california-0.4.0/src/Makefile.am
  	rc/activator-instance-list.ui \
  	rc/app-menu.interface \
  	rc/event-editor-attendees-card.ui \
+@@ -253,7 +245,6 @@
+ 	--pkg libecal-1.2 \
+ 	--pkg libical \
+ 	--pkg libsoup-2.4 \
+-	--pkg libgdata \
+ 	--pkg Goa-1.0 \
+ 	--pkg langinfo \
+ 	$(NULL)
 diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in
 --- california-0.4.0.orig/src/Makefile.in	2015-03-23 21:07:56.000000000 -0300
 +++ california-0.4.0/src/Makefile.in	2015-09-25 19:02:30.100517944 -0300
@@ -193,7 +201,15 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in
  	rc/activator-instance-list.ui \
  	rc/app-menu.interface \
  	rc/event-editor-attendees-card.ui \
-@@ -932,24 +917,6 @@
+@@ -788,7 +773,6 @@
+ 	--pkg libecal-1.2 \
+ 	--pkg libical \
+ 	--pkg libsoup-2.4 \
+-	--pkg libgdata \
+ 	--pkg Goa-1.0 \
+ 	--pkg langinfo \
+ 	$(NULL)
+@@ -932,24 +916,6 @@
  activator/generic/california-generic-subscribe.$(OBJEXT):  \
  	activator/generic/$(am__dirstamp) \
  	activator/generic/$(DEPDIR)/$(am__dirstamp)
@@ -218,7 +234,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in
  activator/webcal/$(am__dirstamp):
  	@$(MKDIR_P) activator/webcal
  	@: > activator/webcal/$(am__dirstamp)
-@@ -1408,7 +1375,6 @@
+@@ -1408,7 +1374,6 @@
  	-rm -f activator/*.$(OBJEXT)
  	-rm -f activator/caldav/*.$(OBJEXT)
  	-rm -f activator/generic/*.$(OBJEXT)
@@ -226,7 +242,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in
  	-rm -f activator/webcal/*.$(OBJEXT)
  	-rm -f application/*.$(OBJEXT)
  	-rm -f backing/*.$(OBJEXT)
-@@ -1440,10 +1406,6 @@
+@@ -1440,10 +1405,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote@activator/caldav/$(DEPDIR)/california-caldav-activator-instance.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@activator/caldav/$(DEPDIR)/california-caldav-subscribe.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@activator/generic/$(DEPDIR)/california-generic-subscribe.Po@am__quote@
@@ -237,7 +253,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in
  @AMDEP_TRUE@@am__include@ @am__quote@activator/webcal/$(DEPDIR)/california-webcal-activator-instance.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@activator/webcal/$(DEPDIR)/california-webcal-subscribe.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@application/$(DEPDIR)/california-california-application.Po@am__quote@
-@@ -1694,62 +1656,6 @@
+@@ -1694,62 +1655,6 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(california_CFLAGS) $(CFLAGS) -c -o activator/generic/california-generic-subscribe.obj `if test -f 'activator/generic/generic-subscribe.c'; then $(CYGPATH_W) 'activator/generic/generic-subscribe.c'; else $(CYGPATH_W) '$(srcdir)/activator/generic/generic-subscribe.c'; fi`
  
@@ -300,7 +316,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in
  activator/webcal/california-webcal-activator-instance.o: activator/webcal/webcal-activator-instance.c
  @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(california_CFLAGS) $(CFLAGS) -MT activator/webcal/california-webcal-activator-instance.o -MD -MP -MF activator/webcal/$(DEPDIR)/california-webcal-activator-instance.Tpo -c -o activator/webcal/california-webcal-activator-instance.o `test -f 'activator/webcal/webcal-activator-instance.c' || echo '$(srcdir)/'`activator/webcal/webcal-activator-instance.c
  @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) activator/webcal/$(DEPDIR)/california-webcal-activator-instance.Tpo activator/webcal/$(DEPDIR)/california-webcal-activator-instance.Po
-@@ -3879,31 +3785,6 @@
+@@ -3879,31 +3784,6 @@
  	@if test -f $@; then :; else \
  	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/california_vala.stamp; \
  	fi
@@ -332,7 +348,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in
  $(srcdir)/activator/webcal/webcal-subscribe.c: $(srcdir)/california_vala.stamp
  	@if test -f $@; then :; else rm -f $(srcdir)/california_vala.stamp; fi
  	@if test -f $@; then :; else \
-@@ -4644,9 +4525,9 @@
+@@ -4644,9 +4524,9 @@
  	@if test -f $@; then :; else \
  	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/california_vala.stamp; \
  	fi
@@ -344,7 +360,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in
  	$(AM_V_at)mv -f $@-t $@
  
  ID: $(am__tagged_files)
-@@ -4771,8 +4652,6 @@
+@@ -4771,8 +4651,6 @@
  	-rm -f activator/caldav/$(am__dirstamp)
  	-rm -f activator/generic/$(DEPDIR)/$(am__dirstamp)
  	-rm -f activator/generic/$(am__dirstamp)
@@ -353,7 +369,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in
  	-rm -f activator/webcal/$(DEPDIR)/$(am__dirstamp)
  	-rm -f activator/webcal/$(am__dirstamp)
  	-rm -f application/$(DEPDIR)/$(am__dirstamp)
-@@ -4824,10 +4703,6 @@
+@@ -4824,10 +4702,6 @@
  	-rm -f $(srcdir)/activator/caldav/caldav-activator-instance.c
  	-rm -f $(srcdir)/activator/caldav/caldav-subscribe.c
  	-rm -f $(srcdir)/activator/generic/generic-subscribe.c
@@ -364,7 +380,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in
  	-rm -f $(srcdir)/activator/webcal/webcal-activator-instance.c
  	-rm -f $(srcdir)/activator/webcal/webcal-subscribe.c
  	-rm -f $(srcdir)/application/california-application.c
-@@ -4984,10 +4859,6 @@
+@@ -4984,10 +4858,6 @@
  	-rm -f activator/caldav/caldav-activator-instance.c
  	-rm -f activator/caldav/caldav-subscribe.c
  	-rm -f activator/generic/generic-subscribe.c
@@ -375,7 +391,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in
  	-rm -f activator/webcal/webcal-activator-instance.c
  	-rm -f activator/webcal/webcal-subscribe.c
  	-rm -f application/california-application.c
-@@ -5142,7 +5013,7 @@
+@@ -5142,7 +5012,7 @@
  clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
  
  distclean: distclean-am
@@ -384,7 +400,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
  	distclean-tags
-@@ -5188,7 +5059,7 @@
+@@ -5188,7 +5058,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am