summaryrefslogtreecommitdiff
path: root/user/orage
diff options
context:
space:
mode:
Diffstat (limited to 'user/orage')
-rw-r--r--user/orage/APKBUILD22
-rw-r--r--user/orage/libical-3.patch76
2 files changed, 10 insertions, 88 deletions
diff --git a/user/orage/APKBUILD b/user/orage/APKBUILD
index c64f3c18b..663792e24 100644
--- a/user/orage/APKBUILD
+++ b/user/orage/APKBUILD
@@ -1,18 +1,17 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house>
+# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
pkgname=orage
-pkgver=4.12.1
-pkgrel=2
+pkgver=4.18.0
+pkgrel=0
pkgdesc="Calendaring software for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+ AND BSD-3-Clause AND (LGPL-2.1-only OR MPL-1.0) AND (GPL-2.0+ OR Artistic-2.0) AND MPL-1.0 AND BSD-2-Clause AND LGPL-2.0+"
-makedepends="intltool gtk+2.0-dev dbus-glib-dev libnotify-dev popt-dev
- xfce4-panel-dev"
-subpackages="$pkgname-doc $pkgname-lang"
-source="https://archive.xfce.org/src/apps/orage/4.12/orage-$pkgver.tar.bz2
- libical-3.patch
- "
+depends=""
+makedepends="intltool dbus-glib-dev libical-dev libnotify-dev libxfce4ui-dev
+ popt-dev xfce4-panel-dev"
+subpackages="$pkgname-lang"
+source="https://archive.xfce.org/src/apps/orage/${pkgver%.*}/orage-$pkgver.tar.bz2"
build() {
LIBS="-lintl" ./configure \
@@ -33,5 +32,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196 orage-4.12.1.tar.bz2
-4f46c99ee3354861d2dca34b9a87bdacc8cd9ad0ad935a364b45b850c08b461c32550bb4df185b66c3963c12f8171ba700c46c263baf92ded8eabc2476bb8cc0 libical-3.patch"
+sha512sums="7760219f64ac3e2ba6d73541a626a0c9411b93268c007f2af5d8080a3a3c0b2a08e00dd96b7794b688aa83c567150c02033b9ba46bf38cd71d3d890e8d1e45ad orage-4.18.0.tar.bz2"
diff --git a/user/orage/libical-3.patch b/user/orage/libical-3.patch
deleted file mode 100644
index ad57fd3cb..000000000
--- a/user/orage/libical-3.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 58e4bb4d3b982876dec33d55003d591559439598 Mon Sep 17 00:00:00 2001
-From: Stefan Seyfried <seife+dev@b1-systems.com>
-Date: Sat, 3 Mar 2018 20:25:24 +0100
-Subject: [PATCH] fix build with libical version 3
-
----
- src/ical-code.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/ical-code.c b/src/ical-code.c
-index d5831404..c40042c3 100644
---- a/src/ical-code.c
-+++ b/src/ical-code.c
-@@ -2579,7 +2579,9 @@ static struct icaltimetype count_first_alarm_time(xfical_period per
- * when counting alarm time. */
- if (rel == ICAL_RELATED_START) {
- per.stime.is_date = 0;
-+#if ICAL_MAJOR_VERSION < 3
- per.stime.is_utc = 1;
-+#endif
- per.stime.is_daylight = 0;
- per.stime.zone = utc_icaltimezone;
- per.stime.hour = 0;
-@@ -2588,7 +2590,9 @@ static struct icaltimetype count_first_alarm_time(xfical_period per
- }
- else {
- per.etime.is_date = 0;
-+#if ICAL_MAJOR_VERSION < 3
- per.etime.is_utc = 1;
-+#endif
- per.etime.is_daylight = 0;
- per.etime.zone = utc_icaltimezone;
- per.etime.hour = 0;
-@@ -2613,7 +2617,9 @@ static struct icaltimetype count_next_alarm_time(struct icaltimetype start_time
- /* HACK: convert to UTC time so that we can use time arithmetic
- * when counting alarm time. */
- start_time.is_date = 0;
-+#if ICAL_MAJOR_VERSION < 3
- start_time.is_utc = 1;
-+#endif
- start_time.is_daylight = 0;
- start_time.zone = utc_icaltimezone;
- start_time.hour = 0;
-@@ -2768,7 +2774,9 @@ static alarm_struct *process_alarm_trigger(icalcomponent *c
- */
- if (icaltime_is_date(per.stime)) {
- if (local_icaltimezone != utc_icaltimezone) {
-+#if ICAL_MAJOR_VERSION < 3
- next_alarm_time.is_utc = 0;
-+#endif
- next_alarm_time.is_daylight = 0;
- next_alarm_time.zone = local_icaltimezone;
- }
-@@ -2850,7 +2858,9 @@ orage_message(120, P_N "Alarm rec loop next_start:%s next_alarm:%s per.stime:%s"
- */
- if (icaltime_is_date(per.stime)) {
- if (local_icaltimezone != utc_icaltimezone) {
-+#if ICAL_MAJOR_VERSION < 3
- next_alarm_time.is_utc = 0;
-+#endif
- next_alarm_time.is_daylight = 0;
- next_alarm_time.zone = local_icaltimezone;
- }
-@@ -2944,7 +2954,9 @@ orage_message(120, P_N "*****After loop Alarm %s %s", icaltime_as_ical_string(ne
- */
- if (icaltime_is_date(per.stime)) {
- if (local_icaltimezone != utc_icaltimezone) {
-+#if ICAL_MAJOR_VERSION < 3
- next_alarm_time.is_utc = 0;
-+#endif
- next_alarm_time.is_daylight = 0;
- next_alarm_time.zone = local_icaltimezone;
- }
---
-2.16.2
-