Hello community,

here is the log from the commit of package conky for openSUSE:Factory checked 
in at 2018-03-08 10:58:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/conky (Old)
 and      /work/SRC/openSUSE:Factory/.conky.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "conky"

Thu Mar  8 10:58:02 2018 rev:23 rq:583730 version:1.10.8

Changes:
--------
--- /work/SRC/openSUSE:Factory/conky/conky.changes      2018-01-02 
16:35:12.388098187 +0100
+++ /work/SRC/openSUSE:Factory/.conky.new/conky.changes 2018-03-08 
10:58:03.744114871 +0100
@@ -1,0 +2,21 @@
+Mon Mar  5 08:46:59 UTC 2018 - adam.ma...@suse.de
+
+- New upstream version 1.10.8
+  + fixed segfault when HOME is unset
+  + Fix segfault when kernel reports non-sequential SMP CPU indices
+  + Provide support to query active port on PulseAudio's default sink
+  + enable persistent view of irc messages
+  + Fix SEGV in a CPU hotplug environment
+  + GPLv3 is the default license
+  + Support multiple include paths for libbircclient
+- conky-1.10.4-ncurses.patch: comment out - doesn't seem to be needed
+- conky-1.10.0-libircclient.patch: removed, upstreamed.
+- conky.luamm.patch: removed, upstreamed.
+- libical3.patch: adds support for libical 3.x
+
+-------------------------------------------------------------------
+Sat Mar  3 11:55:29 UTC 2018 - jeng...@inai.de
+
+- Explicitly request old libical
+
+-------------------------------------------------------------------

Old:
----
  conky-1.10.0-libircclient.patch
  conky-1.10.6.tar.gz
  conky.luamm.patch

New:
----
  conky-1.10.8.tar.gz
  libical3.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ conky.spec ++++++
--- /var/tmp/diff_new_pack.42jQpc/_old  2018-03-08 10:58:04.528086533 +0100
+++ /var/tmp/diff_new_pack.42jQpc/_new  2018-03-08 10:58:04.536086244 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package conky
 #
-# Copyright (c) 2017 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
@@ -26,28 +26,26 @@
 %endif
 
 Name:           conky
-Version:        1.10.6
+Version:        1.10.8
 Release:        0
 Summary:        Lightweight System Monitor
-License:        GPL-3.0+ and LGPL-3.0+ and MIT
+License:        GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT
 Group:          System/Monitoring
 Url:            https://github.com/brndnmtthws/conky
-Source:         
https://github.com/brndnmtthws/conky/archive/v%{version}/conky-%{version}.tar.gz
+Source:         
https://github.com/brndnmtthws/conky/archive/v%{version}.tar.gz#/conky-%{version}.tar.gz
 Source1:        conkyconf.SUSE
 Source2:        conky.conf.SUSE
 Source3:        README.SUSE
-Patch0:         conky-1.10.0-libircclient.patch
 Patch1:         conky-1.10.1-avoid-git.patch
 # our ncurses doesn't supply a .pc file
 Patch2:         conky-1.10.4-ncurses.patch
 Patch3:         conky.timestamp.patch
-Patch4:         conky.luamm.patch
+Patch4:         libical3.patch
 BuildRequires:  cmake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook2x
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
-BuildRequires:  libical-devel
 BuildRequires:  libiw-devel
 BuildRequires:  libmicrohttpd-devel
 BuildRequires:  libmysqld-devel
@@ -59,6 +57,7 @@
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libical)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(xdamage)
@@ -154,11 +153,8 @@
 
 %prep
 %setup -q
-%if 0%{?is_opensuse}
-%patch0 -p1
-%endif
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 

++++++ conky-1.10.6.tar.gz -> conky-1.10.8.tar.gz ++++++
++++ 4616 lines of diff (skipped)

++++++ libical3.patch ++++++
Author: Adam Majer <ama...@suse.de>
Date: Mon Mar  5 10:59:09 CET 2018
PR: https://github.com/brndnmtthws/conky/pull/465

This patch adds support for libical 3.x

Index: conky-1.10.8/src/ical.cc
===================================================================
--- conky-1.10.8.orig/src/ical.cc
+++ conky-1.10.8/src/ical.cc
@@ -49,13 +49,13 @@ struct ical_event *add_event(struct ical
        icaltimetype start;
 
        start = icalcomponent_get_dtstart(new_ev);
-       if(icaltime_compare(start, icaltime_from_timet(time(NULL), 0)) <= 0) {
+       if(icaltime_compare(start, icaltime_from_timet_with_zone(time(NULL), 0, 
NULL)) <= 0) {
                icalproperty *rrule = icalcomponent_get_first_property(new_ev, 
ICAL_RRULE_PROPERTY);
                if(rrule) {
                        icalrecur_iterator* ritr = 
icalrecur_iterator_new(icalproperty_get_rrule(rrule), start);
                        icaltimetype nexttime = icalrecur_iterator_next(ritr);
                        while (!icaltime_is_null_time(nexttime)) {
-                               if(icaltime_compare(nexttime, 
icaltime_from_timet(time(NULL), 0)) > 0) {
+                               if(icaltime_compare(nexttime, 
icaltime_from_timet_with_zone(time(NULL), 0, NULL)) > 0) {
                                        start = nexttime;
                                        break;
                                }

Reply via email to