Date: Wednesday, November 22, 2017 @ 10:27:55
Author: foutrelis
Revision: 310552
upgpkg: orage 4.12.1-4
libical 3 rebuild.
Added:
orage/trunk/libical3.patch
Modified:
orage/trunk/PKGBUILD
----------------+
PKGBUILD | 15 +++++++++++--
libical3.patch | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-11-22 10:19:49 UTC (rev 310551)
+++ PKGBUILD 2017-11-22 10:27:55 UTC (rev 310552)
@@ -5,7 +5,7 @@
pkgname=orage
pkgver=4.12.1
-pkgrel=3
+pkgrel=4
pkgdesc="A simple calendar application with reminders for Xfce"
arch=('x86_64')
license=('GPL2')
@@ -15,9 +15,18 @@
makedepends=('intltool')
conflicts=('xfcalendar')
replaces=('xfcalendar')
-source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('3cf9aa441ae83c8688865f82217025cdf3ebaa152cce4571777b8c2aa8dd9062')
+source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+ libical3.patch)
+sha256sums=('3cf9aa441ae83c8688865f82217025cdf3ebaa152cce4571777b8c2aa8dd9062'
+ 'c9da6ce0e03f9072b16a554ea3e30ed453d5bcb3fb0fdab8b4574582cd375602')
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1512302
+ patch -Np1 -i ../libical3.patch
+}
+
build() {
cd "$srcdir/$pkgname-$pkgver"
Added: libical3.patch
===================================================================
--- libical3.patch (rev 0)
+++ libical3.patch 2017-11-22 10:27:55 UTC (rev 310552)
@@ -0,0 +1,59 @@
+diff -up orage-4.12.1/src/ical-code.c.libical-3.0 orage-4.12.1/src/ical-code.c
+--- orage-4.12.1/src/ical-code.c.libical-3.0 2017-11-14 08:41:30.917375493
+0100
++++ orage-4.12.1/src/ical-code.c 2017-11-14 08:41:56.823375135 +0100
+@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_curr
+ && (strcmp(g_par.local_timezone, "floating") != 0))
+ ctime = icaltime_current_time_with_zone(local_icaltimezone);
+ else { / * use floating time * /
+- ctime.is_utc = 0;
+ ctime.is_date = 0;
+ ctime.is_daylight = 0;
+ ctime.zone = NULL;
+@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_a
+ * when counting alarm time. */
+ if (rel == ICAL_RELATED_START) {
+ per.stime.is_date = 0;
+- per.stime.is_utc = 1;
+ per.stime.is_daylight = 0;
+ per.stime.zone = utc_icaltimezone;
+ per.stime.hour = 0;
+@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_a
+ }
+ else {
+ per.etime.is_date = 0;
+- per.etime.is_utc = 1;
+ per.etime.is_daylight = 0;
+ per.etime.zone = utc_icaltimezone;
+ per.etime.hour = 0;
+@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_al
+ /* HACK: convert to UTC time so that we can use time arithmetic
+ * when counting alarm time. */
+ start_time.is_date = 0;
+- start_time.is_utc = 1;
+ start_time.is_daylight = 0;
+ start_time.zone = utc_icaltimezone;
+ start_time.hour = 0;
+@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigg
+ */
+ if (icaltime_is_date(per.stime)) {
+ if (local_icaltimezone != utc_icaltimezone) {
+- next_alarm_time.is_utc = 0;
+ next_alarm_time.is_daylight = 0;
+ next_alarm_time.zone = local_icaltimezone;
+ }
+@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop n
+ */
+ if (icaltime_is_date(per.stime)) {
+ if (local_icaltimezone != utc_icaltimezone) {
+- next_alarm_time.is_utc = 0;
+ next_alarm_time.is_daylight = 0;
+ next_alarm_time.zone = local_icaltimezone;
+ }
+@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop
+ */
+ if (icaltime_is_date(per.stime)) {
+ if (local_icaltimezone != utc_icaltimezone) {
+- next_alarm_time.is_utc = 0;
+ next_alarm_time.is_daylight = 0;
+ next_alarm_time.zone = local_icaltimezone;
+ }
