aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2020-04-09 23:19:01 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2020-04-09 23:31:39 +0200
commitf61634a939fb6f3cfc2c813ac75763eea4016aad (patch)
treef81350c54bc91f00c63ee1a0bd91ba6b69c5d0f0
parent386af84e101e82ea54e6a3e2874ef279234e720a (diff)
downloadaports-f61634a939fb6f3cfc2c813ac75763eea4016aad.tar.gz
aports-f61634a939fb6f3cfc2c813ac75763eea4016aad.tar.bz2
aports-f61634a939fb6f3cfc2c813ac75763eea4016aad.tar.xz
community/calcurse: upgrade to 4.6.0
Backport an upstream patch for events with empty descriptions and remove a test which is "sloppily written" and fails though the tested functionality should be working according to upstream [0]. [0]: https://github.com/lfos/calcurse/issues/274#issuecomment-611716028
-rw-r--r--community/calcurse/0001-Accept-empty-DESCRIPTION-in-ical-import.patch59
-rw-r--r--community/calcurse/APKBUILD19
2 files changed, 75 insertions, 3 deletions
diff --git a/community/calcurse/0001-Accept-empty-DESCRIPTION-in-ical-import.patch b/community/calcurse/0001-Accept-empty-DESCRIPTION-in-ical-import.patch
new file mode 100644
index 0000000000..0aa96c0df3
--- /dev/null
+++ b/community/calcurse/0001-Accept-empty-DESCRIPTION-in-ical-import.patch
@@ -0,0 +1,59 @@
+From c3165b8da21303747008d74dd3a686d11029989b Mon Sep 17 00:00:00 2001
+From: Lars Henriksen <LarsHenriksen@get2net.dk>
+Date: Fri, 3 Apr 2020 20:34:20 +0200
+Subject: [PATCH] Accept empty DESCRIPTION in ical import
+
+Adresses GitHub issue #274.
+
+Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
+Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
+---
+ src/ical.c | 5 -----
+ test/ical-009.sh | 5 +++--
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/src/ical.c b/src/ical.c
+index f6b9bd9..9aff5b4 100644
+--- a/src/ical.c
++++ b/src/ical.c
+@@ -899,11 +899,6 @@ static char *ical_read_note(char *line, unsigned *noskipped,
+ ical_log(log, item_type, itemline, _("malformed description."));
+ (*noskipped)++;
+ return NULL;
+- } else if (strlen(notestr) == 0) {
+- mem_free(notestr);
+- ical_log(log, item_type, itemline, _("empty description."));
+- (*noskipped)++;
+- return NULL;
+ } else {
+ note = generate_note(notestr);
+ mem_free(notestr);
+diff --git a/test/ical-009.sh b/test/ical-009.sh
+index 9558f15..31dc283 100755
+--- a/test/ical-009.sh
++++ b/test/ical-009.sh
+@@ -10,11 +10,12 @@ if [ "$1" = 'actual' ]; then
+ echo "$out" | sed -n '4,5p'
+ log=$(echo "$out" | awk '$1 == "See" {print $2}')
+ cat "$log" | sed '1,17d'
++ cat $PWD/.calcurse/notes/* | wc
+ rm -rf .calcurse || exit 1
+ elif [ "$1" = 'expected' ]; then
+ cat <<EOD
+ Import process report: 0068 lines read
+-1 app / 0 events / 1 todo / 11 skipped
++2 apps / 0 events / 1 todo / 10 skipped
+
+ VEVENT [12]: could not retrieve event start time.
+ VEVENT [17]: recurrence frequency not recognized.
+@@ -24,9 +25,9 @@ VEVENT [32]: malformed exceptions line.
+ VEVENT [39]: line break in summary.
+ VEVENT [44]: malformed description line.
+ VEVENT [50]: malformed description.
+-VEVENT [56]: empty description.
+ VTODO [62]: malformed summary.
+ VTODO [66]: The ical file seems to be malformed. The end of item was not found.
++ 1 0 1
+ EOD
+ else
+ ./run-test "$0"
diff --git a/community/calcurse/APKBUILD b/community/calcurse/APKBUILD
index 97850b8b6d..27e432caf0 100644
--- a/community/calcurse/APKBUILD
+++ b/community/calcurse/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
pkgname=calcurse
-pkgver=4.5.1
+pkgver=4.6.0
pkgrel=0
pkgdesc="A text-based personal organizer"
url="https://calcurse.org/"
@@ -11,7 +11,19 @@ arch="all"
makedepends="ncurses-dev"
checkdepends="tzdata"
subpackages="$pkgname-doc"
-source="https://calcurse.org/files/calcurse-$pkgver.tar.gz"
+source="https://calcurse.org/files/calcurse-$pkgver.tar.gz
+ 0001-Accept-empty-DESCRIPTION-in-ical-import.patch"
+
+prepare() {
+ default_prepare
+
+ # The test is "sloppily written" and currently fails:
+ #
+ # Please note that the calcurse [...] works even though the test fails.
+ #
+ # See: https://github.com/lfos/calcurse/issues/274#issuecomment-611716028
+ sed -i test/Makefile.in -e '/ical-009.sh \\/d'
+}
build() {
./configure \
@@ -35,4 +47,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="dfac702b2e6352bfaf8eb916c7873918c29f884fdaf583bb6de984d5ee9d86f29df31e2b0a93c34af43c55260cc32d285578bc069b396793a72dafed11deaff3 calcurse-4.5.1.tar.gz"
+sha512sums="1d52b9412726c844814be5caeb58520b493123c0af34aa7ceeec459d03cb8dd53be1ff4f702ce468fa7aad84b91b361d61fdbea41062e68da8926cf5dcb9d748 calcurse-4.6.0.tar.gz
+8ca462dbe91ca4df4aa244c4a9260b1059ff1c8a2f4706df5ce5489747283667807ae5b5995c5e7ef72795abae862374b0d1e6541bfb4cf2dd0dabf6df2bb6f4 0001-Accept-empty-DESCRIPTION-in-ical-import.patch"