Hello community, here is the log from the commit of package kitinerary for openSUSE:Factory checked in at 2019-11-12 11:37:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitinerary (Old) and /work/SRC/openSUSE:Factory/.kitinerary.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitinerary" Tue Nov 12 11:37:15 2019 rev:17 rq:746888 version:19.08.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kitinerary/kitinerary.changes 2019-10-27 13:39:58.169191399 +0100 +++ /work/SRC/openSUSE:Factory/.kitinerary.new.2990/kitinerary.changes 2019-11-12 11:37:16.490211747 +0100 @@ -1,0 +2,11 @@ +Thu Nov 7 23:13:03 UTC 2019 - Luca Beltrame <[email protected]> + +- Update to 19.08.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.08.3.php +- Changes since 19.08.2: + * Better end time default for restaurant reservations without an end time + * Fix compatibility with Poppler 0.82 + +------------------------------------------------------------------- Old: ---- kitinerary-19.08.2.tar.xz kitinerary-19.08.2.tar.xz.sig New: ---- kitinerary-19.08.3.tar.xz kitinerary-19.08.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitinerary.spec ++++++ --- /var/tmp/diff_new_pack.yphibX/_old 2019-11-12 11:37:17.066212353 +0100 +++ /var/tmp/diff_new_pack.yphibX/_new 2019-11-12 11:37:17.070212358 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: kitinerary -Version: 19.08.2 +Version: 19.08.3 Release: 0 Summary: Data model and extraction system for travel reservations License: LGPL-2.1-or-later ++++++ kitinerary-19.08.2.tar.xz -> kitinerary-19.08.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-19.08.2/CMakeLists.txt new/kitinerary-19.08.3/CMakeLists.txt --- old/kitinerary-19.08.2/CMakeLists.txt 2019-10-08 02:30:45.000000000 +0200 +++ new/kitinerary-19.08.3/CMakeLists.txt 2019-11-05 05:19:20.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.12.2") +set(PIM_VERSION "5.12.3") project(KItinerary VERSION ${PIM_VERSION}) set(CMAKE_CXX_STANDARD 14) @@ -29,9 +29,9 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Test Gui Qml) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n) -set(KMIME_VERSION "5.12.1") -set(KCALENDARCORE_LIB_VERSION "5.12.1") -set(KCONTACTS_LIB_VERSION "5.12.1") +set(KMIME_VERSION "5.12.3") +set(KCALENDARCORE_LIB_VERSION "5.12.3") +set(KCONTACTS_LIB_VERSION "5.12.3") find_package(KF5Mime ${KMIME_VERSION} CONFIG REQUIRED) @@ -62,17 +62,12 @@ if (${Poppler_VERSION} VERSION_GREATER 0.68) set(HAVE_POPPLER_0_69 ON) endif() - set(CMAKE_REQUIRED_LIBRARIES Poppler::Core Qt5::Core) - check_cxx_source_compiles(" - #include <goo/GooString.h> - #include <QString> - int main() - { - GooString s; - QString val = QString::fromUtf8(s.c_str()); - return 0; - } - " HAVE_POPPLER_0_72) + if (${Poppler_VERSION} VERSION_GREATER 0.71) + set(HAVE_POPPLER_0_72 ON) + endif() + if (${Poppler_VERSION} VERSION_GREATER 0.81) + set(HAVE_POPPLER_0_82 ON) + endif() endif() if (TARGET ZXing::Core) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-19.08.2/po/zh_CN/kitinerary.po new/kitinerary-19.08.3/po/zh_CN/kitinerary.po --- old/kitinerary-19.08.2/po/zh_CN/kitinerary.po 2019-10-08 02:30:45.000000000 +0200 +++ new/kitinerary-19.08.3/po/zh_CN/kitinerary.po 2019-11-05 05:19:20.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-08-30 07:48+0200\n" -"PO-Revision-Date: 2019-09-05 09:51\n" +"PO-Revision-Date: 2019-10-09 10:05\n" "Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-19.08.2/src/calendarhandler.cpp new/kitinerary-19.08.3/src/calendarhandler.cpp --- old/kitinerary-19.08.2/src/calendarhandler.cpp 2019-09-30 07:37:37.000000000 +0200 +++ new/kitinerary-19.08.3/src/calendarhandler.cpp 2019-10-30 07:40:11.000000000 +0100 @@ -379,7 +379,7 @@ event->setDtStart(reservation.startTime()); auto endTime = reservation.endTime(); if (!endTime.isValid()) { - endTime = QDateTime(reservation.startTime().date(), QTime(23, 59, 59)); + endTime = reservation.startTime().addSecs(7200); // if we have no end time, let's assume 2h } event->setDtEnd(endTime); event->setAllDay(false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-19.08.2/src/config-kitinerary.h.cmake new/kitinerary-19.08.3/src/config-kitinerary.h.cmake --- old/kitinerary-19.08.2/src/config-kitinerary.h.cmake 2019-09-30 07:37:37.000000000 +0200 +++ new/kitinerary-19.08.3/src/config-kitinerary.h.cmake 2019-10-30 07:40:11.000000000 +0100 @@ -24,6 +24,7 @@ #cmakedefine HAVE_POPPLER_0_58 #cmakedefine HAVE_POPPLER_0_69 #cmakedefine HAVE_POPPLER_0_72 +#cmakedefine HAVE_POPPLER_0_82 #cmakedefine HAVE_ZXING diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-19.08.2/src/pdf/pdfextractoroutputdevice.cpp new/kitinerary-19.08.3/src/pdf/pdfextractoroutputdevice.cpp --- old/kitinerary-19.08.2/src/pdf/pdfextractoroutputdevice.cpp 2019-09-30 07:37:37.000000000 +0200 +++ new/kitinerary-19.08.3/src/pdf/pdfextractoroutputdevice.cpp 2019-10-30 07:40:11.000000000 +0100 @@ -30,7 +30,7 @@ { } -void PdfExtractorOutputDevice::drawImage(GfxState* state, Object* ref, Stream* str, int width, int height, GfxImageColorMap* colorMap, bool interpolate, int* maskColors, bool inlineImg) +void PdfExtractorOutputDevice::drawImage(GfxState* state, Object* ref, Stream* str, int width, int height, GfxImageColorMap* colorMap, bool interpolate, PopplerMaskColors* maskColors, bool inlineImg) { Q_UNUSED(str); Q_UNUSED(interpolate); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-19.08.2/src/pdf/pdfextractoroutputdevice_p.h new/kitinerary-19.08.3/src/pdf/pdfextractoroutputdevice_p.h --- old/kitinerary-19.08.2/src/pdf/pdfextractoroutputdevice_p.h 2019-09-30 07:37:37.000000000 +0200 +++ new/kitinerary-19.08.3/src/pdf/pdfextractoroutputdevice_p.h 2019-10-30 07:40:11.000000000 +0100 @@ -21,6 +21,7 @@ #include <config-kitinerary.h> #include "pdfvectorpicture_p.h" +#include "popplertypes_p.h" #ifdef HAVE_POPPLER #include <TextOutputDev.h> @@ -43,7 +44,7 @@ void finalize(); bool needNonText() override { return true; } - void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, int *maskColors, bool inlineImg) override; + void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, PopplerMaskColors *maskColors, bool inlineImg) override; // operations used to detect vector barcodes void saveState(GfxState *state) override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitinerary-19.08.2/src/pdf/popplertypes_p.h new/kitinerary-19.08.3/src/pdf/popplertypes_p.h --- old/kitinerary-19.08.2/src/pdf/popplertypes_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kitinerary-19.08.3/src/pdf/popplertypes_p.h 2019-10-30 07:40:11.000000000 +0100 @@ -0,0 +1,30 @@ +/* + Copyright (C) 2019 Volker Krause <[email protected]> + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. +*/ + +#ifndef KITINERARY_POPPLERTYPES_P_H +#define KITINERARY_POPPLERTYPES_P_H + +#include <config-kitinerary.h> + +#ifdef HAVE_POPPLER_0_82 +using PopplerMaskColors = const int; +#else +using PopplerMaskColors = int; +#endif + +#endif // KITINERARY_POPPLERTYPES_P_H +
