From 9d4c5eb827cb2ab8c35c7127ba232f00c40a76f4 Mon Sep 17 00:00:00 2001
From: Vincent Brillault <vincent.brillault@cern.ch>
Date: Tue, 15 Dec 2020 11:32:25 +0100
Subject: [PATCH] Remove patch already applied in CERN's repo
---
.s2i/bin/assemble | 4 ----
patches/01_fix_caldav_events.patch | 32 ------------------------------
2 files changed, 36 deletions(-)
delete mode 100644 patches/01_fix_caldav_events.patch
diff --git a/.s2i/bin/assemble b/.s2i/bin/assemble
index d572d70..019125a 100644
--- a/.s2i/bin/assemble
+++ b/.s2i/bin/assemble
@@ -11,10 +11,6 @@ sed -ri \
-e '/The configured LOGERRORFILE can not be modified./ s/^.*$/true;/' \
./lib/core/zpush.php
-# Workaround to make calendars actually writable
-echo "Applying patches"
-patch -p2 < 01_fix_caldav_events.patch
-
echo "Assembling"
/usr/libexec/s2i/assemble
diff --git a/patches/01_fix_caldav_events.patch b/patches/01_fix_caldav_events.patch
deleted file mode 100644
index 35d3339..0000000
--- a/patches/01_fix_caldav_events.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 19f32af87b32e5c171d2bfa767717767e26e4a07 Mon Sep 17 00:00:00 2001
-From: Giacomo Tenaglia <Giacomo.Tenaglia@cern.ch>
-Date: Wed, 9 Dec 2020 15:51:04 +0100
-Subject: [PATCH] CalDAV: add missing DESCRIPTION for VALARM of ACTION:DISPLAY
-
----
- src/backend/caldav/caldav.php | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/backend/caldav/caldav.php b/src/backend/caldav/caldav.php
-index feeb3543..f782badb 100644
---- a/src/backend/caldav/caldav.php
-+++ b/src/backend/caldav/caldav.php
-@@ -1227,6 +1227,7 @@ class BackendCalDAV extends BackendDiff {
- if (isset($data->reminder)) {
- $valarm = $vcal->createComponent('VALARM');
- $valarm->add('ACTION', "DISPLAY");
-+ $valarm->add('DESCRIPTION', 'Default Z-Push description');
- $valarm->add('TRIGGER', "-PT".$data->reminder."M", ['RELATED' => "START"]);
- $vevent->add($valarm);
- }
-@@ -1632,6 +1633,7 @@ class BackendCalDAV extends BackendDiff {
- if ($data->reminderset && $data->remindertime) {
- $valarm = $vcal->createComponent('VALARM');
- $valarm->add('ACTION', "DISPLAY");
-+ $valarm->add('DESCRIPTION', 'Default Z-Push description');
- $valarm->add('TRIGGER', gmdate("Ymd\THis\Z", $data->remindertime), ['VALUE' => "DATE-TIME"]);
- $vtodo->add($valarm);
- }
---
-2.29.2
-
--
GitLab