pcr/california, nonprism/california: cleaned up pkgbuilds, rebuilt for updated libical

2 files changed, 51 insertions, 26 deletions

diff --git a/nonprism/california/PKGBUILD b/nonprism/california/PKGBUILD
index a371479ec..42f2cc0c1 100644
--- a/nonprism/california/PKGBUILD
+++ b/nonprism/california/PKGBUILD
@@ -2,55 +2,62 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 
-# TODO: add explicit versioned dependency canary on icu -- à la
-#       iceweasel -- so as to avoid breakage when Arch bumps the
-#       soname
-
 pkgname=california
 pkgver=0.4.0
-pkgrel=2.7.nonprism1
+pkgrel=2.9.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')
+depends=('evolution-data-server' 'libgee' 'xdg-utils' "libical>=3" "libical<4")
+depends_x86_64=("icu>=60" "icu<61")
+depends_i686=("icu>=60" "icu<61")
+depends_armv7h=("icu>=60" "icu<61")
 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'
         'nonprism.patch')
 sha256sums=('b25f356363a9f8f8f93c7ab78af02de39f9c3b71964663129ac9904de9147eb6'
             'f512f50470954ec4018c99c49c37fa7e23074653a2e090ff13e32631ec10293d'
+            '6a49d69d260e240bc0f8d4cf03098dbcba774ea5000fd038a879489683bf881d'
             '2c75a8170f97658776d66f2bc8c39afdc27f5ef1e69f59df32f3b7c8dbe30cc5')
 
 prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+  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"
+
+  # remove Google Calendar support
+  patch -Np1 -i "$srcdir/nonprism.patch"
+
+  rm -rv src/activator/google
+
+  cd po
+  for file in *.po; do
+    intltool-update ${file%.*}
+    msgattrib --no-obsolete -o $file $file
+  done
 
-	# remove Google Calendar support
-	patch -Np1 -i "${srcdir}/nonprism.patch"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-	rm -rv src/activator/google
+  ./configure \
+    --prefix=/usr
 
-	cd po
-	for file in *.po; do
-	  intltool-update ${file%.*}
-	  msgattrib --no-obsolete -o $file $file
-	done
+  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
 }
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 < ../0002-Build-with-evolution-data-server-3.13.90.patch
-	./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
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make install DESTDIR="$pkgdir"
-	install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make install DESTDIR="$pkgdir"
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/nonprism/california/california-remove-is_utc.patch b/nonprism/california/california-remove-is_utc.patch
new file mode 100644
index 000000000..6666f9aee
--- /dev/null
+++ b/nonprism/california/california-remove-is_utc.patch
@@ -0,0 +1,18 @@
+--- 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);