Hello community,
here is the log from the commit of package kalarm for openSUSE:Factory checked in at 2017-01-18 21:46:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kalarm (Old)
and /work/SRC/openSUSE:Factory/.kalarm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kalarm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kalarm/kalarm.changes 2016-12-17 10:32:49.627370651 +0100
+++ /work/SRC/openSUSE:Factory/.kalarm.new/kalarm.changes 2017-01-18 21:46:37.667667959 +0100
@@ -1,0 +2,7 @@
+Sat Jan 14 08:51:25 UTC 2017 - lbeltrame@kde.org
+
+- - Update to KDE Applications 16.12.1
+ * KDE Applications 16.12.1
+ * https://www.kde.org/announcements/announce-applications-16.12.1.php
+
+-------------------------------------------------------------------
Old:
----
kalarm-16.12.0.tar.xz
New:
----
kalarm-16.12.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kalarm.spec ++++++
--- /var/tmp/diff_new_pack.rXUJVg/_old 2017-01-18 21:46:38.099606862 +0100
+++ /var/tmp/diff_new_pack.rXUJVg/_new 2017-01-18 21:46:38.103606296 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kalarm
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -17,10 +17,10 @@
Name: kalarm
-Version: 16.12.0
+Version: 16.12.1
Release: 0
%define kf5_version 5.26.0
-# Latest stable Applications (e.g. 16.08 in KA, but 16.12.0 in KUA)
+# Latest stable Applications (e.g. 16.08 in KA, but 16.12.1 in KUA)
%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
Summary: Personal Alarm Scheduler
License: GPL-2.0
@@ -76,6 +76,8 @@
Provides: kalarm5 = %{version}
Obsoletes: kalarm5 < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# It can only build on the same platforms as Qt Webengine
+ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64
%description
Personal alarm message, command and email scheduler for KDE
++++++ kalarm-16.12.0.tar.xz -> kalarm-16.12.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.0/CMakeLists.txt new/kalarm-16.12.1/CMakeLists.txt
--- old/kalarm-16.12.0/CMakeLists.txt 2016-12-08 07:06:33.000000000 +0100
+++ new/kalarm-16.12.1/CMakeLists.txt 2017-01-02 02:08:37.000000000 +0100
@@ -32,7 +32,7 @@
endif()
-set(KDEPIM_VERSION_NUMBER "5.4.0")
+set(KDEPIM_VERSION_NUMBER "5.4.1")
set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
set(AKONADI_MIMELIB_VERSION "5.4.0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.0/Changelog new/kalarm-16.12.1/Changelog
--- old/kalarm-16.12.0/Changelog 2016-12-08 07:06:33.000000000 +0100
+++ new/kalarm-16.12.1/Changelog 2017-01-02 02:08:37.000000000 +0100
@@ -1,5 +1,10 @@
KAlarm Change Log
+=== Version 2.11.12 (KDE Applications 16.12.1) --- 1 January 2017 ===
++ Fix Export Alarms file save error [KDE Bug 374337]
++ Fix arrow/page up/down keys not working in date edit control
+ (needs KDE Frameworks 5.30) [KDE Bug 373886]
+
=== Version 2.11.11 (KDE Applications 16.12.0) --- 16 November 2016 ===
+ Fix crash on exit [KDE Bug 372223]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.0/src/alarmcalendar.cpp new/kalarm-16.12.1/src/alarmcalendar.cpp
--- old/kalarm-16.12.0/src/alarmcalendar.cpp 2016-12-08 07:06:33.000000000 +0100
+++ new/kalarm-16.12.1/src/alarmcalendar.cpp 2017-01-02 02:08:37.000000000 +0100
@@ -1,7 +1,7 @@
/*
* alarmcalendar.cpp - KAlarm calendar file access
* Program: kalarm
- * Copyright © 2001-2014 by David Jarvie
+ * Copyright © 2001-2017 by David Jarvie
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -730,11 +730,10 @@
&append);
if (file.isEmpty())
return false;
- QUrl url;
- url.setPath(file);
+ QUrl url = QUrl::fromLocalFile(file);
if (!url.isValid())
{
- qCDebug(KALARM_LOG) << "Invalid URL";
+ qCDebug(KALARM_LOG) << "Invalid URL" << url;
return false;
}
qCDebug(KALARM_LOG) << url.toDisplayString();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.0/src/functions.cpp new/kalarm-16.12.1/src/functions.cpp
--- old/kalarm-16.12.0/src/functions.cpp 2016-12-08 07:06:33.000000000 +0100
+++ new/kalarm-16.12.1/src/functions.cpp 2017-01-02 02:08:37.000000000 +0100
@@ -1622,6 +1622,7 @@
* Check that a file exists and is a plain readable file.
* Updates 'filename' and 'url' even if an error occurs, since 'filename' may
* be needed subsequently by showFileErrMessage().
+* 'filename' is in user input format and may be a local file path or URL.
*/
FileErr checkFileExists(QString& filename, QUrl& url)
{
@@ -1629,7 +1630,7 @@
// (using home directory as the default).
// This also supports absolute paths and absolute urls.
FileErr err = FileErr_None;
- url = QUrl::fromUserInput(filename, QDir::homePath());
+ url = QUrl::fromUserInput(filename, QDir::homePath(), QUrl::AssumeLocalFile);
if (filename.isEmpty())
{
url = QUrl();
@@ -1637,7 +1638,16 @@
}
else if (!url.isValid())
err = FileErr_Nonexistent;
- else if (!url.isLocalFile())
+ else if (url.isLocalFile())
+ {
+ // It's a local file
+ filename = url.toLocalFile();
+ QFileInfo info(filename);
+ if (info.isDir()) err = FileErr_Directory;
+ else if (!info.exists()) err = FileErr_Nonexistent;
+ else if (!info.isReadable()) err = FileErr_Unreadable;
+ }
+ else
{
filename = url.toDisplayString();
auto statJob = KIO::stat(url, KIO::StatJob::SourceSide, 2);
@@ -1651,15 +1661,6 @@
else if (!fi.isReadable()) err = FileErr_Unreadable;
}
}
- else
- {
- // It's a local file
- filename = url.toLocalFile();
- QFileInfo info(filename);
- if (info.isDir()) err = FileErr_Directory;
- else if (!info.exists()) err = FileErr_Nonexistent;
- else if (!info.isReadable()) err = FileErr_Unreadable;
- }
return err;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.0/src/kalarm.h new/kalarm-16.12.1/src/kalarm.h
--- old/kalarm-16.12.0/src/kalarm.h 2016-12-08 07:06:33.000000000 +0100
+++ new/kalarm-16.12.1/src/kalarm.h 2017-01-02 02:08:37.000000000 +0100
@@ -1,7 +1,7 @@
/*
* kalarm.h - global header file
* Program: kalarm
- * Copyright © 2001-2016 by David Jarvie
+ * Copyright © 2001-2017 by David Jarvie
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
#undef QT3_SUPPORT
#define VERSION_SUFFIX "-5"
-#define KALARM_VERSION "2.11.11" VERSION_SUFFIX
+#define KALARM_VERSION "2.11.12" VERSION_SUFFIX
#define KALARM_NAME "KAlarm"
#define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-16.12.0/src/main.cpp new/kalarm-16.12.1/src/main.cpp
--- old/kalarm-16.12.0/src/main.cpp 2016-12-08 07:06:33.000000000 +0100
+++ new/kalarm-16.12.1/src/main.cpp 2017-01-02 02:08:37.000000000 +0100
@@ -1,7 +1,7 @@
/*
* main.cpp
* Program: kalarm
- * Copyright © 2001-2016 by David Jarvie
+ * Copyright © 2001-2017 by David Jarvie
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
QStringLiteral(KALARM_VERSION),
i18n("Personal alarm message, command and email scheduler for KDE"),
KAboutLicense::GPL,
- ki18n("Copyright 2001-%1, David Jarvie").subs(2016).toString(), QString(),
+ ki18n("Copyright 2001-%1, David Jarvie").subs(2017).toString(), QString(),
QStringLiteral("http://www.astrojar.org.uk/kalarm"));
aboutData.addAuthor(i18n("David Jarvie"), i18n("Author"), QStringLiteral("djarvie@kde.org"));
aboutData.setOrganizationDomain("kde.org");
