From 9def92333a580118e4b9782126901c53344daae4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 15 Oct 2018 11:40:24 +0200
Subject: add adpated upstream patch for PHP 7.3

---
 c533d42e17e058237f0350ca56c7f01903bb035e.patch | 30 ++++++++++++++++++++++++++
 php-sabre-vobject.spec                         | 10 +++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 c533d42e17e058237f0350ca56c7f01903bb035e.patch

diff --git a/c533d42e17e058237f0350ca56c7f01903bb035e.patch b/c533d42e17e058237f0350ca56c7f01903bb035e.patch
new file mode 100644
index 0000000..88cacc2
--- /dev/null
+++ b/c533d42e17e058237f0350ca56c7f01903bb035e.patch
@@ -0,0 +1,30 @@
+Adapted for version 3 from upstream
+
+
+From c533d42e17e058237f0350ca56c7f01903bb035e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20M=C3=BCller?=
+ <DeepDiver1975@users.noreply.github.com>
+Date: Tue, 25 Sep 2018 20:42:40 +0200
+Subject: [PATCH] Test with php 7.3 on travis (#424)
+
+---
+ .travis.yml                                     | 13 ++++++++++++-
+ lib/Component/VCard.php                         |  2 +-
+ lib/FreeBusyGenerator.php                       |  2 +-
+ tests/VObject/BirthdayCalendarGeneratorTest.php |  4 ++--
+ 4 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/lib/FreeBusyGenerator.php b/lib/FreeBusyGenerator.php
+index e30b136c..ca77cb91 100644
+--- a/lib/FreeBusyGenerator.php
++++ b/lib/FreeBusyGenerator.php
+@@ -430,7 +430,7 @@ protected function calculateBusy(FreeBusyData $fbData, array $objects) {
+                                 // instance. We are skipping this event from the output
+                                 // entirely.
+                                 unset($this->objects[$key]);
+-                                continue;
++                                break;
+                             }
+ 
+                             if ($this->start) {
+
diff --git a/php-sabre-vobject.spec b/php-sabre-vobject.spec
index 1b0203a..7d521da 100644
--- a/php-sabre-vobject.spec
+++ b/php-sabre-vobject.spec
@@ -21,7 +21,7 @@
 Name:           php-sabre-vobject
 Summary:        Library to parse and manipulate iCalendar and vCard objects
 Version:        3.5.3
-Release:        7%{?dist}
+Release:        10%{?dist}
 
 URL:            http://sabre.io/vobject/
 License:        BSD
@@ -31,6 +31,8 @@ Source1:        %{name}-autoload.php
 # replace composer autloader
 Patch0:         %{name}-bin.patch
 Patch1:         https://patch-diff.githubusercontent.com/raw/sabre-io/vobject/pull/395.patch
+# Adapted upstream patch
+Patch2:         c533d42e17e058237f0350ca56c7f01903bb035e.patch
 
 BuildArch:      noarch
 %if %{with_tests}
@@ -82,6 +84,7 @@ Autoloader: %{_datadir}/php/Sabre/VObject/autoload.php
 
 %patch0 -p1 -b .rpm
 %patch1 -p1
+%patch2 -p1
 
 cp %{SOURCE1} lib/autoload.php
 
@@ -112,7 +115,7 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php
 
 : Run upstream test suite against installed library
 ret=0
-for cmd in php php56 php70 php71 php72; do
+for cmd in php php56 php70 php71 php72 php73; do
   if which $cmd; then
    $cmd %{_bindir}/phpunit --verbose || ret=1
   fi
@@ -136,6 +139,9 @@ exit $ret
 
 
 %changelog
+* Mon Oct 15 2018 Remi Collet <remi@remirepo.net> - 4.1.3-10
+- add adpated upstream patch for PHP 7.3
+
 * Mon Oct 30 2017 Remi Collet <remi@remirepo.net> - 4.1.3-2
 - fix FTBFS fro mKoschei, add patch for test from
   https://github.com/sabre-io/vobject/pull/395
-- 
cgit