Hello community, here is the log from the commit of package orage for openSUSE:Factory checked in at 2018-03-07 10:33:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orage (Old) and /work/SRC/openSUSE:Factory/.orage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orage" Wed Mar 7 10:33:44 2018 rev:42 rq:582262 version:4.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/orage/orage.changes 2015-04-13 20:31:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.orage.new/orage.changes 2018-03-07 10:33:46.920416893 +0100 @@ -1,0 +2,11 @@ +Sat Mar 3 19:38:13 UTC 2018 - [email protected] + +- add 0001-fix-build-with-libical-version-3.patch (bxo#13997) +- should now work with libical > 2 + +------------------------------------------------------------------- +Sat Mar 3 11:55:29 UTC 2018 - [email protected] + +- Explicitly request old libical + +------------------------------------------------------------------- New: ---- 0001-fix-build-with-libical-version-3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orage.spec ++++++ --- /var/tmp/diff_new_pack.UWLurC/_old 2018-03-07 10:33:48.264368416 +0100 +++ /var/tmp/diff_new_pack.UWLurC/_new 2018-03-07 10:33:48.268368271 +0100 @@ -1,7 +1,7 @@ # # spec file for package orage # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,15 @@ Version: 4.12.1 Release: 0 Summary: Time-managing Application for the Xfce Desktop Environment -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Office/Organizers Url: http://www.xfce.org/projects#applications Source: http://archive.xfce.org/src/apps/orage/4.12/%{name}-%{version}.tar.bz2 Source1: README.SUSE # PATCH-FIX-UPSTREAM orage-use-docdir.patch [email protected] -- Use docdir correctly Patch0: orage-use-docdir.patch +# PATCH-FIX-UPSTREAM 0001-fix-build-with-libical-version-3.patch -- fix build with libical3, bxo#13997 +Patch1: 0001-fix-build-with-libical-version-3.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: perl @@ -69,6 +71,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 cp %{SOURCE1} . sed -i 's:^Icon=clock:Icon=xfcalendar:' globaltime/globaltime.desktop.in ++++++ 0001-fix-build-with-libical-version-3.patch ++++++ >From 58e4bb4d3b982876dec33d55003d591559439598 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried <[email protected]> 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
