summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Dave Woodfall2019-08-01 21:28:50 +0200
committer Willy Sudiarto Raharjo2019-08-03 02:54:52 +0200
commit68eae774a8b3a4b31c1f0de04f080403bab017c2 (patch)
treec45307598730b4c33b04401975d93bdd9f8ea675
parentbba6cf177cc8a66adeb41046ac276b85751c4ed5 (diff)
downloadslackbuilds-68eae774a8b3a4b31c1f0de04f080403bab017c2.tar.gz
office/calcurse: Add DST patch.
-rw-r--r--office/calcurse/calcurse.SlackBuild6
-rw-r--r--office/calcurse/dst_change.patch15
2 files changed, 20 insertions, 1 deletions
diff --git a/office/calcurse/calcurse.SlackBuild b/office/calcurse/calcurse.SlackBuild
index f7b034d114..02c4c2c2ff 100644
--- a/office/calcurse/calcurse.SlackBuild
+++ b/office/calcurse/calcurse.SlackBuild
@@ -28,7 +28,7 @@
PRGNAM=calcurse
VERSION=${VERSION:-4.5.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -73,6 +73,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Fix a problem with DST
+# https://lists.calcurse.org/bugs/msg00281.html
+patch -p1 <$CWD/dst_change.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/office/calcurse/dst_change.patch b/office/calcurse/dst_change.patch
new file mode 100644
index 0000000000..db0800db79
--- /dev/null
+++ b/office/calcurse/dst_change.patch
@@ -0,0 +1,15 @@
+diff -Naur a/src/utils.c b/src/utils.c
+--- a/src/utils.c 2019-06-16 20:04:39.000000000 +0100
++++ b/src/utils.c 2019-08-01 16:12:00.864953675 +0100
+@@ -526,9 +526,11 @@
+ t.tm_mon += delta_month;
+ t.tm_mday += delta_day;
+
++ t.tm_isdst = -1;
+ if (mktime(&t) == -1) {
+ return 1;
+ } else {
++ t.tm_isdst = -1;
+ *date = t;
+ return 0;
+ }