openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
January 2017
- 1 participants
- 679 discussions
Hello community,
here is the log from the commit of package megaglest-data for openSUSE:Factory checked in at 2017-01-25 23:18:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/megaglest-data (Old)
and /work/SRC/openSUSE:Factory/.megaglest-data.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "megaglest-data"
Changes:
--------
New Changes file:
--- /dev/null 2016-12-08 12:47:06.134691974 +0100
+++ /work/SRC/openSUSE:Factory/.megaglest-data.new/megaglest-data.changes 2017-01-25 23:18:05.770187140 +0100
@@ -0,0 +1,283 @@
+-------------------------------------------------------------------
+Wed Feb 3 21:21:37 UTC 2016 - joop.boonen(a)opensuse.org
+
+- Update to version 3.12.0
+
+-------------------------------------------------------------------
+Sun Jun 7 06:54:05 UTC 2015 - dap.darkness(a)gmail.com
+
+- Update to version 3.11.1:
+ * new translations.
+- tarball → _service.
+
+-------------------------------------------------------------------
+Tue Jan 27 14:54:38 UTC 2015 - joop.boonen(a)opensuse.org
+
+- Update to version 3.11.0
+ * healthbars with a lot of options
+ * multi shot / multi-projectiles with different timings,sounds and particle systems
+ * several camera shake effects
+ * new tileset "pine rock"
+ * some new maps
+ * improve switching settings when connected to a headless server
+ * support for team unit sharing
+ * team resource sharing
+ * tags feature
+ * Attack boosts fixed in many ways
+ * Attack boosts and upgrades now support upgrading attack speed
+ * timed particles and mesh bound particles really work now.
+ * unit height independend particle positioning ( flat-particle-positions )
+ * CPU players multiplier are displayed in debug view
+ * You can have non commandable units
+ * Units spawned by an attack skill can get an attack command
+ * Unit and Splash particles can be speeded up ( accelerated )
+ * Looting https://github.com/MegaGlest/megaglest-source/pull/17
+ * HP and EP starting values
+ * <target-height> <burn-height> can be given https://docs.megaglest.org/XML/Unit#target-height
+ * +several bugfixes
+
+-------------------------------------------------------------------
+Fri Feb 28 14:57:11 UTC 2014 - joop.boonen(a)opensuse.org
+
+- Update to version 3.9.1
+
+-------------------------------------------------------------------
+Sat Nov 23 15:48:18 UTC 2013 - mailaender(a)opensuse.org
+
+- Update to version 3.9.0
+
+-------------------------------------------------------------------
+Mon Sep 2 17:44:42 UTC 2013 - joop.boonen(a)opensuse.org
+
+- Update to version 3.8.0-beta1
+
+-------------------------------------------------------------------
+Mon Mar 18 15:21:54 UTC 2013 - joop.boonen(a)opensuse.org
+
+- Corrected the license
+
+-------------------------------------------------------------------
+Tue Nov 27 23:35:26 UTC 2012 - joop.boonen(a)opensuse.org
+
+- Added a Corrected dutch.lng file as the other one
+ crashed MegaGlest
+
+-------------------------------------------------------------------
+Tue Nov 27 21:03:04 UTC 2012 - joop.boonen(a)opensuse.org
+
+- Build megaglest version 3.7.1
+
+-------------------------------------------------------------------
+Sun Nov 18 09:22:15 UTC 2012 - joop.boonen(a)opensuse.org
+
+- Build megaglest version 3.7.0 beta2
+
+-------------------------------------------------------------------
+Sat Jan 28 23:23:29 UTC 2012 - joop.boonen(a)opensuse.org
+
+- Build megaglest version 3.6.0.3
+- Got rid of Obsoletes glest-data and glest-megapack
+
+-------------------------------------------------------------------
+Thu Jan 5 23:15:49 UTC 2012 - joop.boonen(a)opensuse.org
+
+- Created megaglest-fontpath.diff so
+ megaglest-source-embedded-3.6.0.2.tar.xz doesn't need to be used
+
+-------------------------------------------------------------------
+Thu Jan 5 20:25:58 UTC 2012 - joop.boonen(a)opensuse.org
+
+- megaglest-source-embedded is a part of megaglest-data
+ data/core/fonts/ is needed
+
+-------------------------------------------------------------------
+Fri Dec 23 21:35:10 UTC 2011 - jengelh(a)medozas.de
+
+- Remove redundant/unwanted tags/section (cf. specfile guidelines)
+
+-------------------------------------------------------------------
+Fri Dec 23 13:09:23 UTC 2011 - joop.boonen(a)opensuse.org
+
+- Build version 3.6.0.2
+
+-------------------------------------------------------------------
+Fri Sep 23 07:39:49 UTC 2011 - joop.boonen(a)opensuse.org
+
+- Build version 3.5.2.4
+
+-------------------------------------------------------------------
+Fri May 27 18:03:52 UTC 2011 - joop.boonen(a)opensuse.org
+
+- build version 3.5.2
+
+-------------------------------------------------------------------
+Sat May 14 10:45:11 UTC 2011 - joop.boonen(a)opensuse.org
+
+- build version 3.5.1
+- corrected the spec file for the new data format
+
+-------------------------------------------------------------------
+Mon Apr 25 08:11:04 UTC 2011 - joop.boonen(a)opensuse.org
+
+- build version 3.5.0
+- added fdupes for smaller footprint
+
+-------------------------------------------------------------------
+Sun Mar 6 16:03:12 UTC 2011 - joop.boonen(a)opensuse.org
+
+- corrected provide and requires
+- added missing authors
+
+-------------------------------------------------------------------
+Tue Mar 1 15:35:08 UTC 2011 - prusnak(a)opensuse.org
+
+- spec cleanup
+- provide and obsolete glest-data
+
+-------------------------------------------------------------------
+Fri Feb 04 16:01:12 UTC 2011 - nick.schrader(a)iserv-gis.de
+
+- build megaglest 3.4.0
+- changed package name to megaglest
+
+-------------------------------------------------------------------
+Mon Oct 18 09:22:12 UTC 2010 - joop.boonen(a)opensuse.org
+
+- build megaglest 3.3.7.2
+
+-------------------------------------------------------------------
+Sat Oct 16 15:24:22 UTC 2010 - joop.boonen(a)opensuse.org
+
+- build megaglest 3.3.7
+ * Significant game play performance improvements.
+ * Added support for FreeBSD (thanks m0ellemeister) and Mac OS X (thanks GeoVah)!
+ * Players can now tell multiple units to build a new unit all at the same time (multi-build)
+ * Particle and Transparency improvements
+ * Map Preview in game lobby
+ * Added ability to pick a random faction in the game lobby
+ * Added ability to be a non-player and Observe a network game (becoming an Observer)
+ * Added ability to change playername in game lobby
+ * Added new map filter (to display maps with x players)
+ * AI Player improvements
+ * Added new LUA functions and events (see wiki for details).
+ * Added numerous new commandline options (use --help to see a detailed list)
+ * Improved network performance
+ * Masterserver PHP scripts will now run on a Microsoft Windows Server
+ * Added ability to move / size UI components in a custom manner
+ * Many bugfixes.
+
+-------------------------------------------------------------------
+Sun Aug 29 19:11:02 UTC 2010 - joop.boonen(a)opensuse.org
+
+- build megaglest data packages 3.3.6
+ - This package Obsoletes glest-megapack
+ - megaglest is an extended glest version with the
+ megapack included
+ - needed to add the missing icons via icons.tar
+
+-------------------------------------------------------------------
+Wed Nov 18 21:47:49 CET 2009 - joop.boonen(a)opensuse.org
+
+- building version 3.2.1 for glest 3.2.2
+
+-------------------------------------------------------------------
+Thu Mar 6 08:38:05 CET 2008 - sndirsch(a)suse.de
+
+- updated to glest 3.1.2
+
+-------------------------------------------------------------------
+Thu Feb 21 17:21:54 CET 2008 - prusnak(a)suse.cz
+
+- updated to glest 3.1.0
+
+-------------------------------------------------------------------
+Thu Jan 31 05:34:56 CET 2008 - sndirsch(a)suse.de
+
+- updated data files to final release 3.0.0
+
++++ 86 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.megaglest-data.new/megaglest-data.changes
New:
----
megaglest-data-3.12.0.b1.tar.xz
megaglest-data.changes
megaglest-data.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ megaglest-data.spec ++++++
#
# spec file for package megaglest-data
#
# Copyright (c) 2016 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: megaglest-data
Version: 3.12.0
Release: 0
Summary: Data files for MegaGlest
License: CC-BY-SA-3.0
Group: Amusements/Games/Strategy/Real Time
Url: http://www.megaglest.org/
Source: https://github.com/MegaGlest/megaglest-data/releases/download/%{version}/%{…
BuildRequires: xz
Requires: megaglest >= %{version}
%if 0%{?suse_version}
BuildRequires: fdupes
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
Data files required for playing MegaGlest.
%prep
%setup -q -n megaglest-%{version}
%build
%install
# get rid of unwanted files
find . -name "*~" -exec rm {} \;
find . -name "*\.bak" -exec rm {} \;
for i in $(find . -name "*.G3D"); do
rename G3D g3d $i
done
mkdir -p %{buildroot}/%{_datadir}/megaglest
cp -rp * %{buildroot}/%{_datadir}/megaglest/.
find %{buildroot} -name README.txt -exec rm {} \;
find %{buildroot} -name CHANGELOG.txt -exec rm {} \;
find %{buildroot} -name glest.ini -exec rm {} \;
find %{buildroot} -name servers.ini -exec rm {} \;
%if 0%{?suse_version}
%fdupes -s %{buildroot}
%endif
%files
%defattr(-, root, root)
%doc docs/LICENSE.data.txt docs/AUTHORS.data.txt
%{_datadir}/megaglest/
%changelog
1
0
Hello community,
here is the log from the commit of package akonadi-server for openSUSE:Factory checked in at 2017-01-25 23:15:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/akonadi-server (Old)
and /work/SRC/openSUSE:Factory/.akonadi-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-server"
Changes:
--------
--- /work/SRC/openSUSE:Factory/akonadi-server/akonadi-server.changes 2016-12-29 22:43:03.455351682 +0100
+++ /work/SRC/openSUSE:Factory/.akonadi-server.new/akonadi-server.changes 2017-01-25 23:15:40.576075342 +0100
@@ -1,0 +2,14 @@
+Sun Jan 22 17:10:01 UTC 2017 - hrvoje.senjan(a)gmail.com
+
+- Add handle-mysql-process-crashes-gracefully.patch from upstream
+
+-------------------------------------------------------------------
+Sat Jan 14 08:48:19 UTC 2017 - lbeltrame(a)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
+
+- Drop upstream patch fix-connect-api.patch
+
+-------------------------------------------------------------------
Old:
----
akonadi-16.12.0.tar.xz
fix-connect-api.patch
New:
----
akonadi-16.12.1.tar.xz
handle-mysql-process-crashes-gracefully.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ akonadi-server.spec ++++++
--- /var/tmp/diff_new_pack.qZneu0/_old 2017-01-25 23:15:41.323962578 +0100
+++ /var/tmp/diff_new_pack.qZneu0/_new 2017-01-25 23:15:41.327961975 +0100
@@ -1,7 +1,7 @@
#
# spec file for package akonadi-server
#
-# 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
@@ -18,10 +18,10 @@
%define rname akonadi
%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}')}
Name: akonadi-server
-Version: 16.12.0
+Version: 16.12.1
Release: 0
Summary: PIM Storage Service
License: LGPL-2.1+
@@ -29,8 +29,8 @@
Url: http://akonadi-project.org
Source: %{rname}-%{version}.tar.xz
Source99: akonadi-server-rpmlintrc
-#PATCH-FIX-UPSTREAM fix-connect-api.patch montel(a)kde.org
-Patch1: fix-connect-api.patch
+# PATCH-FIX-UPSTREAM handle-mysql-process-crashes-gracefully.patch
+Patch0: handle-mysql-process-crashes-gracefully.patch
BuildRequires: boost-devel
BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules >= %{kf5_version}
@@ -161,7 +161,7 @@
%prep
%setup -q -n %{rname}-%{version}
-%patch1 -p1
+%patch0 -p1
%build
%cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir}
++++++ akonadi-16.12.0.tar.xz -> akonadi-16.12.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.0/CMakeLists.txt new/akonadi-16.12.1/CMakeLists.txt
--- old/akonadi-16.12.0/CMakeLists.txt 2016-12-07 11:27:47.000000000 +0100
+++ new/akonadi-16.12.1/CMakeLists.txt 2017-01-08 16:41:33.000000000 +0100
@@ -22,7 +22,7 @@
include(AkonadiMacros)
-set(PIM_VERSION "5.4.0")
+set(PIM_VERSION "5.4.1")
set(QT_REQUIRED_VERSION "5.6.0")
set(AKONADI_VERSION ${PIM_VERSION})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.0/src/core/changerecorder_p.cpp new/akonadi-16.12.1/src/core/changerecorder_p.cpp
--- old/akonadi-16.12.0/src/core/changerecorder_p.cpp 2016-12-07 11:27:47.000000000 +0100
+++ new/akonadi-16.12.1/src/core/changerecorder_p.cpp 2017-01-08 16:41:33.000000000 +0100
@@ -127,11 +127,11 @@
notificationsLoaded();
}
-static const quint64 s_currentVersion = Q_UINT64_C(0x000500000000);
+static const quint64 s_currentVersion = Q_UINT64_C(0x000600000000);
static const quint64 s_versionMask = Q_UINT64_C(0xFFFF00000000);
static const quint64 s_sizeMask = Q_UINT64_C(0x0000FFFFFFFF);
-QQueue<Protocol::ChangeNotification> ChangeRecorderPrivate::loadFrom(QIODevice *device, bool &needsFullSave) const
+QQueue<Protocol::ChangeNotification> ChangeRecorderPrivate::loadFrom(QFile *device, bool &needsFullSave) const
{
QDataStream stream(device);
stream.setVersion(QDataStream::Qt_4_6);
@@ -161,6 +161,11 @@
stream >> sessionId;
stream >> type;
+ if (stream.status() != QDataStream::Ok) {
+ qCWarning(AKONADICORE_LOG) << "Error reading saved notifications! Aborting. Corrupt file:" << device->fileName();
+ break;
+ }
+
switch (static_cast<LegacyType>(type)) {
case Item:
msg = loadItemNotification(stream, version);
@@ -463,6 +468,10 @@
stream >> remoteId;
stream >> remoteRevision;
stream >> mimeType;
+ if (stream.status() != QDataStream::Ok) {
+ qCWarning(AKONADICORE_LOG) << "Error reading saved notifications! Aborting";
+ return msg;
+ }
msg.addItem(uid, remoteId, remoteRevision, mimeType);
}
stream >> resource;
@@ -558,6 +567,10 @@
stream >> remoteId;
stream >> remoteRevision;
stream >> dummyString;
+ if (stream.status() != QDataStream::Ok) {
+ qCWarning(AKONADICORE_LOG) << "Error reading saved notifications! Aborting";
+ return msg;
+ }
msg.setId(uid);
msg.setRemoteId(remoteId);
msg.setRemoteRevision(remoteRevision);
@@ -637,6 +650,10 @@
stream >> remoteId;
stream >> dummyString;
stream >> dummyString;
+ if (stream.status() != QDataStream::Ok) {
+ qCWarning(AKONADICORE_LOG) << "Error reading saved notifications! Aborting";
+ return msg;
+ }
msg.setId(uid);
msg.setRemoteId(remoteId);
}
@@ -702,9 +719,20 @@
stream >> dummyString;
stream >> dummyString;
stream >> dummyString;
+ if (stream.status() != QDataStream::Ok) {
+ qCWarning(AKONADICORE_LOG) << "Error reading saved notifications! Aborting";
+ return msg;
+ }
}
stream >> dummyBa;
- stream >> dummyBa;
+ if (version == 5) {
+ // there was a bug in version 5 serializer that serialized this
+ // field as qint64 (8 bytes) instead of empty QByteArray (which is
+ // 4 bytes)
+ stream >> dummyI;
+ } else {
+ stream >> dummyBa;
+ }
stream >> dummyI;
stream >> dummyI;
stream >> itemParts;
@@ -754,7 +782,7 @@
stream << QString();
stream << QString();
stream << QByteArray();
- stream << qint64(0);
+ stream << QByteArray();
stream << qint64(0);
stream << qint64(0);
stream << rv;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.0/src/core/changerecorder_p.h new/akonadi-16.12.1/src/core/changerecorder_p.h
--- old/akonadi-16.12.0/src/core/changerecorder_p.h 2016-12-07 11:27:47.000000000 +0100
+++ new/akonadi-16.12.1/src/core/changerecorder_p.h 2017-01-08 16:41:33.000000000 +0100
@@ -51,7 +51,7 @@
QString notificationsFileName() const;
void loadNotifications();
- QQueue<Protocol::ChangeNotification> loadFrom(QIODevice *device, bool &needsFullSave) const;
+ QQueue<Protocol::ChangeNotification> loadFrom(QFile *device, bool &needsFullSave) const;
QString dumpNotificationListToString() const;
void addToStream(QDataStream &stream, const Protocol::ChangeNotification &msg);
void saveNotifications();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.0/src/core/monitor_p.cpp new/akonadi-16.12.1/src/core/monitor_p.cpp
--- old/akonadi-16.12.0/src/core/monitor_p.cpp 2016-12-07 11:27:47.000000000 +0100
+++ new/akonadi-16.12.1/src/core/monitor_p.cpp 2017-01-08 16:41:33.000000000 +0100
@@ -953,6 +953,13 @@
it.setRemoteId(msgItem.remoteId);
it.setRemoteRevision(msgItem.remoteRevision);
it.setMimeType(msgItem.mimeType);
+ } else if (msg.operation() == Protocol::ItemChangeNotification::Move) {
+ // For moves we remove the RID from the PimItemTable to prevent
+ // RID conflict during merge (see T3904 in Phab), so restore the
+ // RID from notification.
+ // TODO: Should we do this for all items with empty RID? Right now
+ // I only know about this usecase.
+ it.setRemoteId(msgItem.remoteId);
}
if (!it.parentCollection().isValid()) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.0/src/server/collectionscheduler.cpp new/akonadi-16.12.1/src/server/collectionscheduler.cpp
--- old/akonadi-16.12.0/src/server/collectionscheduler.cpp 2016-12-07 11:27:47.000000000 +0100
+++ new/akonadi-16.12.1/src/server/collectionscheduler.cpp 2017-01-08 16:41:33.000000000 +0100
@@ -66,12 +66,7 @@
Q_INVOKABLE void pause()
{
- if (!isActive()) {
- qCCritical(AKONADISERVER_LOG) << "Cannot pause an inactive timer";
- return;
- }
- if (isPaused()) {
- qCCritical(AKONADISERVER_LOG) << "Cannot pause an already paused timer";
+ if (!isActive() || isPaused()) {
return;
}
@@ -82,7 +77,6 @@
Q_INVOKABLE void resume()
{
if (!isPaused()) {
- qCCritical(AKONADISERVER_LOG) << "Cannot resume a timer that is not paused.";
return;
}
@@ -128,14 +122,12 @@
void CollectionScheduler::inhibit(bool inhibit)
{
- if (inhibit && mScheduler->isActive() && !mScheduler->isPaused()) {
+ if (inhibit) {
const bool success = QMetaObject::invokeMethod(mScheduler, "pause", Qt::QueuedConnection);
- Q_ASSERT(success);
- Q_UNUSED(success);
- } else if (!inhibit && mScheduler->isPaused()) {
+ Q_ASSERT(success); Q_UNUSED(success);
+ } else {
const bool success = QMetaObject::invokeMethod(mScheduler, "resume", Qt::QueuedConnection);
- Q_ASSERT(success);
- Q_UNUSED(success);
+ Q_ASSERT(success); Q_UNUSED(success);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.0/src/server/connection.cpp new/akonadi-16.12.1/src/server/connection.cpp
--- old/akonadi-16.12.0/src/server/connection.cpp 2016-12-07 11:27:47.000000000 +0100
+++ new/akonadi-16.12.1/src/server/connection.cpp 2017-01-08 16:41:33.000000000 +0100
@@ -96,7 +96,7 @@
connect(socket, &QIODevice::readyRead,
this, &Connection::slotNewData);
connect(socket, &QLocalSocket::disconnected,
- this, &Connection::disconnected);
+ this, &Connection::slotSocketDisconnected);
m_idleTimer = new QTimer(this);
connect(m_idleTimer, &QTimer::timeout,
@@ -169,8 +169,23 @@
}
}
+void Connection::slotSocketDisconnected()
+{
+ // If we have active handler, wait for it to finish, then we emit the signal
+ // from slotNewDate()
+ if (m_currentHandler) {
+ return;
+ }
+
+ Q_EMIT disconnected();
+}
+
void Connection::slotNewData()
{
+ if (m_socket->state() != QLocalSocket::ConnectedState) {
+ return;
+ }
+
m_idleTimer->stop();
// will only open() a previously idle backend.
@@ -251,6 +266,11 @@
}
delete m_currentHandler;
m_currentHandler = 0;
+
+ if (m_socket->state() != QLocalSocket::ConnectedState) {
+ Q_EMIT disconnected();
+ return;
+ }
}
// reset, arm the timer
@@ -394,7 +414,7 @@
{
while (m_socket->bytesAvailable() < (int) sizeof(qint64)) {
if (m_socket->state() == QLocalSocket::UnconnectedState) {
- return Protocol::Command();
+ throw ProtocolException("Socket disconnected");
}
m_socket->waitForReadyRead(500);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.0/src/server/connection.h new/akonadi-16.12.1/src/server/connection.h
--- old/akonadi-16.12.0/src/server/connection.h 2016-12-07 11:27:47.000000000 +0100
+++ new/akonadi-16.12.1/src/server/connection.h 2017-01-08 16:41:33.000000000 +0100
@@ -85,7 +85,7 @@
void slotNewData();
void slotConnectionStateChange(ConnectionState state);
void slotConnectionIdle();
-
+ void slotSocketDisconnected();
void slotSendHello();
protected:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.0/src/server/handler/akappend.cpp new/akonadi-16.12.1/src/server/handler/akappend.cpp
--- old/akonadi-16.12.0/src/server/handler/akappend.cpp 2016-12-07 11:27:47.000000000 +0100
+++ new/akonadi-16.12.1/src/server/handler/akappend.cpp 2017-01-08 16:41:33.000000000 +0100
@@ -82,14 +82,14 @@
bool AkAppend::insertItem(const Protocol::CreateItemCommand &cmd, PimItem &item,
const Collection &parentCol)
{
- if (!item.insert()) {
- return failureResponse("Failed to append item");
- }
-
if (!item.datetime().isValid()) {
item.setDatetime(QDateTime::currentDateTimeUtc());
}
+ if (!item.insert()) {
+ return failureResponse("Failed to append item");
+ }
+
// set message flags
const QSet<QByteArray> flags = cmd.mergeModes() == Protocol::CreateItemCommand::None ? cmd.flags() : cmd.addedFlags();
if (!flags.isEmpty()) {
@@ -179,6 +179,7 @@
currentItem.setDatetime(newItem.datetime());
needsUpdate = true;
}
+
if (newItem.size() > 0 && newItem.size() != currentItem.size()) {
currentItem.setSize(newItem.size());
needsUpdate = true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.0/src/server/handler/modify.cpp new/akonadi-16.12.1/src/server/handler/modify.cpp
--- old/akonadi-16.12.0/src/server/handler/modify.cpp 2016-12-07 11:27:47.000000000 +0100
+++ new/akonadi-16.12.1/src/server/handler/modify.cpp 2017-01-08 16:41:33.000000000 +0100
@@ -189,7 +189,7 @@
cols.reserve(cmd.persistentSearchCollections().size());
QVector<qint64> inCols = cmd.persistentSearchCollections();
qSort(inCols);
- Q_FOREACH (qint64 col, cmd.persistentSearchCollections()) {
+ Q_FOREACH (qint64 col, inCols) {
cols.append(QString::number(col));
}
const QString colStr = cols.join(QLatin1Char(' '));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.0/src/server/handler/move.cpp new/akonadi-16.12.1/src/server/handler/move.cpp
--- old/akonadi-16.12.0/src/server/handler/move.cpp 2016-12-07 11:27:47.000000000 +0100
+++ new/akonadi-16.12.1/src/server/handler/move.cpp 2017-01-08 16:41:33.000000000 +0100
@@ -56,6 +56,7 @@
// Split the list by source collection
QMap<Entity::Id /* collection */, PimItem> toMove;
QMap<Entity::Id /* collection */, Collection> sources;
+ ImapSet toMoveIds;
Q_FOREACH (/*sic!*/ PimItem item, items) { //krazy:exclude=foreach
if (!item.isValid()) {
failureResponse("Invalid item in result set!?");
@@ -87,6 +88,7 @@
}
toMove.insertMulti(source.id(), item);
+ toMoveIds.add(QVector<qint64>{ item.id() });
}
if (!transaction.commit()) {
@@ -94,8 +96,18 @@
return;
}
+ // Batch-reset RID
+ // The item should have an empty RID in the destination collection to avoid
+ // RID conflicts with existing items (see T3904 in Phab).
+ QueryBuilder qb2(PimItem::tableName(), QueryBuilder::Update);
+ qb2.setColumnValue(PimItem::remoteIdColumn(), QString());
+ ItemQueryHelper::itemSetToQuery(toMoveIds, connection()->context(), qb2);
+ if (!qb2.exec()) {
+ failureResponse("Unable to update RID");
+ return;
+ }
+
// Emit notification for each source collection separately
- QVector<PimItem::Id> itemsToResetRID;
Collection source;
PimItem::List itemsToMove;
for (auto it = toMove.cbegin(), end = toMove.cend(); it != end; ++it) {
@@ -108,29 +120,11 @@
}
itemsToMove.push_back(*it);
-
- // reset RID on inter-resource moves, but only after generating the change notification
- // so that this still contains the old one for the source resource
- const bool isInterResourceMove = it->collection().resource().id() != source.resource().id();
- if (isInterResourceMove) {
- itemsToResetRID.push_back(it->id());
- }
}
if (!itemsToMove.isEmpty()) {
store->notificationCollector()->itemsMoved(itemsToMove, source, mDestination);
}
-
- // Batch-reset RID for all inter-resource moves
- if (!itemsToResetRID.isEmpty()) {
- QueryBuilder qb(PimItem::tableName(), QueryBuilder::Update);
- qb.setColumnValue(PimItem::remoteIdColumn(), QString());
- ItemQueryHelper::itemSetToQuery(itemsToResetRID, connection()->context(), qb);
- if (!qb.exec()) {
- failureResponse("Unable to update RID");
- return;
- }
- }
}
bool Move::parseStream()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.0/src/server/search/searchmanager.cpp new/akonadi-16.12.1/src/server/search/searchmanager.cpp
--- old/akonadi-16.12.0/src/server/search/searchmanager.cpp 2016-12-07 11:27:47.000000000 +0100
+++ new/akonadi-16.12.1/src/server/search/searchmanager.cpp 2017-01-08 16:41:33.000000000 +0100
@@ -427,35 +427,54 @@
qCDebug(AKONADISERVER_LOG) << "Got" << newMatches.count() << "results, out of which" << existingMatches.count() << "are already in the collection";
newMatches = newMatches - existingMatches;
+ if (newMatches.isEmpty()) {
+ qCDebug(AKONADISERVER_LOG) << "Added results: 0 (fast path)";
+ return;
+ }
const bool existingTransaction = DataStore::self()->inTransaction();
if (!existingTransaction) {
DataStore::self()->beginTransaction();
}
+ // First query all the IDs we got from search plugin/agent against the DB.
+ // This will remove IDs that no longer exist in the DB.
QVariantList newMatchesVariant;
newMatchesVariant.reserve(newMatches.count());
Q_FOREACH (qint64 id, newMatches) {
newMatchesVariant << id;
- Collection::addPimItem(collection.id(), id);
}
- qCDebug(AKONADISERVER_LOG) << "Added" << newMatches.count();
+ SelectQueryBuilder<PimItem> qb;
+ qb.addValueCondition(PimItem::idFullColumnName(), Query::In, newMatchesVariant);
+ if (!qb.exec()) {
+ return;
+ }
+
+ const auto items = qb.result();
+ if (items.count() != newMatches.count()) {
+ qCDebug(AKONADISERVER_LOG) << "Search backend returned" << (newMatches.count() - items.count()) << "results that no longer exist in Akonadi.";
+ qCDebug(AKONADISERVER_LOG) << "Please reindex collection" << collection.id();
+ // TODO: Request the reindexing directly from here
+ }
+
+ if (items.isEmpty()) {
+ qCDebug(AKONADISERVER_LOG) << "Added results: 0";
+ return;
+ }
+
+ for (const auto item : items) {
+ Collection::addPimItem(collection.id(), item.id());
+ }
if (!existingTransaction && !DataStore::self()->commitTransaction()) {
qCDebug(AKONADISERVER_LOG) << "Failed to commit transaction";
return;
}
- if (!newMatchesVariant.isEmpty()) {
- SelectQueryBuilder<PimItem> qb;
- qb.addValueCondition(PimItem::idFullColumnName(), Query::In, newMatchesVariant);
- if (!qb.exec()) {
- return ;
- }
- const QVector<PimItem> newItems = qb.result();
- DataStore::self()->notificationCollector()->itemsLinked(newItems, collection);
- // Force collector to dispatch the notification now
- DataStore::self()->notificationCollector()->dispatchNotifications();
- }
+ DataStore::self()->notificationCollector()->itemsLinked(items, collection);
+ // Force collector to dispatch the notification now
+ DataStore::self()->notificationCollector()->dispatchNotifications();
+
+ qCDebug(AKONADISERVER_LOG) << "Added results:" << items.count();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.0/src/server/storage/partstreamer.cpp new/akonadi-16.12.1/src/server/storage/partstreamer.cpp
--- old/akonadi-16.12.0/src/server/storage/partstreamer.cpp 2016-12-07 11:27:47.000000000 +0100
+++ new/akonadi-16.12.1/src/server/storage/partstreamer.cpp 2017-01-08 16:41:33.000000000 +0100
@@ -64,13 +64,13 @@
{
Q_EMIT responseAvailable(Protocol::StreamPayloadCommand(partName, Protocol::StreamPayloadCommand::MetaData));
- Protocol::StreamPayloadResponse response = mConnection->readCommand();
- if (response.isError() || !response.isValid()) {
+ const auto cmd = mConnection->readCommand();
+ if (!cmd.isValid() || Protocol::Response(cmd).isError()) {
mError = QStringLiteral("Client failed to provide part metadata");
return Protocol::PartMetaData();
}
- return response.metaData();
+ return Protocol::StreamPayloadResponse(cmd).metaData();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-16.12.0/src/widgets/subscriptiondialog.cpp new/akonadi-16.12.1/src/widgets/subscriptiondialog.cpp
--- old/akonadi-16.12.0/src/widgets/subscriptiondialog.cpp 2016-12-07 11:27:47.000000000 +0100
+++ new/akonadi-16.12.1/src/widgets/subscriptiondialog.cpp 2017-01-08 16:41:33.000000000 +0100
@@ -223,7 +223,7 @@
mainLayout->addWidget(buttonBox);
connect(d->model, SIGNAL(loaded()), SLOT(modelLoaded()));
- connect(d->mOkButton, &QAbstractButton::clicked, this, &QDialog::done);
+ connect(d->mOkButton, SIGNAL(clicked(bool)), this, SLOT(done()));
connect(buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &SubscriptionDialog::deleteLater);
ControlGui::widgetNeedsAkonadi(mainWidget);
d->readConfig();
++++++ handle-mysql-process-crashes-gracefully.patch ++++++
>From 4c5ca9bf32e5a9d569e83f66a439c65d8939a540 Mon Sep 17 00:00:00 2001
From: Martin Koller <kollix(a)aon.at>
Date: Sat, 21 Jan 2017 12:11:14 +0100
Subject: handle mysql process crashes gracefully
This patch checks if the mysqld stops unexpectedly when it was started
from akonadiserver and tells the latter to quit when a
stopped mysqld was discovered.
Also in this case the local socket file is removed so that
a restart can work without problem.
REVIEW: 129264
---
src/server/storage/dbconfigmysql.cpp | 69 +++++++++++++++++++++++++++++++++---
src/server/storage/dbconfigmysql.h | 11 ++++--
2 files changed, 72 insertions(+), 8 deletions(-)
diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
index 0962ccb..7631890 100644
--- a/src/server/storage/dbconfigmysql.cpp
+++ b/src/server/storage/dbconfigmysql.cpp
@@ -32,6 +32,7 @@
#include <QSqlDriver>
#include <QSqlError>
#include <QSqlQuery>
+#include <QCoreApplication>
using namespace Akonadi;
using namespace Akonadi::Server;
@@ -190,6 +191,8 @@ bool DbConfigMysql::startInternalServer()
const QString dataDir = StandardDirs::saveDir("data", QStringLiteral("db_data"));
#ifndef Q_OS_WIN
const QString socketDirectory = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
+ const QString socketFile = QStringLiteral("%1/mysql.socket").arg(socketDirectory);
+ const QString pidFileName = QStringLiteral("%1/mysql.pid").arg(socketDirectory);
#endif
// generate config file
@@ -289,6 +292,39 @@ bool DbConfigMysql::startInternalServer()
qCCritical(AKONADISERVER_LOG) << "MySQL cannot deal with a socket path this long. Path was: " << socketDirectory;
return false;
}
+
+ // If mysql.socket file exists, check if also the server process is still running,
+ // else we can safely remove the socket file (cleanup after a system crash, etc.)
+ QFile pidFile(pidFileName);
+ if (QFile::exists(socketFile) && pidFile.open(QIODevice::ReadOnly)) {
+ qCDebug(AKONADISERVER_LOG) << "Found a mysqld pid file, checking whether the server is still running...";
+ QByteArray pid = pidFile.readLine().trimmed();
+ QFile proc(QString::fromLatin1("/proc/" + pid + "/stat"));
+ // Check whether the process with the PID from pidfile still exists and whether
+ // it's actually still mysqld or, whether the PID has been recycled in the meanwhile.
+ bool serverIsRunning = false;
+ if (proc.open(QIODevice::ReadOnly)) {
+ const QByteArray stat = proc.readAll();
+ const QList<QByteArray> stats = stat.split(' ');
+ if (stats.count() > 1) {
+ // Make sure the PID actually belongs to mysql process
+ if (stats[1] == "(mysqld)") {
+ // Yup, our mysqld is actually running, so pretend we started the server
+ // and try to connect to it
+ qCWarning(AKONADISERVER_LOG) << "mysqld for Akonadi is already running, trying to connect to it.";
+ serverIsRunning = true;
+ }
+ }
+ proc.close();
+ }
+
+ if (!serverIsRunning) {
+ qCDebug(AKONADISERVER_LOG) << "No mysqld process with specified PID is running. Removing the pidfile and starting a new instance...";
+ pidFile.close();
+ pidFile.remove();
+ QFile::remove(socketFile);
+ }
+ }
#endif
// synthesize the mysqld command
@@ -296,14 +332,15 @@ bool DbConfigMysql::startInternalServer()
arguments << QStringLiteral("--defaults-file=%1/mysql.conf").arg(akDir);
arguments << QStringLiteral("--datadir=%1/").arg(dataDir);
#ifndef Q_OS_WIN
- arguments << QStringLiteral("--socket=%1/mysql.socket").arg(socketDirectory);
+ arguments << QStringLiteral("--socket=%1").arg(socketFile);
+ arguments << QStringLiteral("--pid-file=%1").arg(pidFileName);
#else
arguments << QString::fromLatin1("--shared-memory");
#endif
// If mysql.socket file does not exists, then we must start the server,
// otherwise we reconnect to it
- if (!QFile::exists(QStringLiteral("%1/mysql.socket").arg(socketDirectory))) {
+ if (!QFile::exists(socketFile)) {
// move mysql error log file out of the way
const QFileInfo errorLog(dataDir + QDir::separator() + QLatin1String("mysql.err"));
if (errorLog.exists()) {
@@ -348,9 +385,11 @@ bool DbConfigMysql::startInternalServer()
return false;
}
- #ifndef Q_OS_WIN
+ connect(mDatabaseProcess, static_cast<void(QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished),
+ this, &DbConfigMysql::processFinished);
+
+#ifndef Q_OS_WIN
// wait until mysqld has created the socket file (workaround for QTBUG-47475 in Qt5.5.0)
- QString socketFile = QStringLiteral("%1/mysql.socket").arg(socketDirectory);
int counter = 50; // avoid an endless loop in case mysqld terminated
while ((counter-- > 0) && !QFileInfo::exists(socketFile)) {
QThread::msleep(100);
@@ -358,7 +397,6 @@ bool DbConfigMysql::startInternalServer()
#endif
} else {
qCDebug(AKONADISERVER_LOG) << "Found mysql.socket file, reconnecting to the database";
- mDatabaseProcess = new QProcess();
}
const QLatin1String initCon("initConnection");
@@ -378,7 +416,7 @@ bool DbConfigMysql::startInternalServer()
if (opened) {
break;
}
- if (mDatabaseProcess->waitForFinished(500)) {
+ if (mDatabaseProcess && mDatabaseProcess->waitForFinished(500)) {
qCCritical(AKONADISERVER_LOG) << "Database process exited unexpectedly during initial connection!";
qCCritical(AKONADISERVER_LOG) << "executable:" << mMysqldPath;
qCCritical(AKONADISERVER_LOG) << "arguments:" << arguments;
@@ -459,12 +497,33 @@ bool DbConfigMysql::startInternalServer()
return success;
}
+void DbConfigMysql::processFinished(int exitCode, QProcess::ExitStatus exitStatus)
+{
+ Q_UNUSED(exitCode);
+ Q_UNUSED(exitStatus);
+
+ qCCritical(AKONADISERVER_LOG) << "database server stopped unexpectedly";
+
+#ifndef Q_OS_WIN
+ // when the server stopped unexpectedly, make sure to remove the stale socket file since otherwise
+ // it can not be started again
+ const QString socketDirectory = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
+ const QString socketFile = QStringLiteral("%1/mysql.socket").arg(socketDirectory);
+ QFile::remove(socketFile);
+#endif
+
+ QCoreApplication::quit();
+}
+
void DbConfigMysql::stopInternalServer()
{
if (!mDatabaseProcess) {
return;
}
+ disconnect(mDatabaseProcess, static_cast<void(QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished),
+ this, &DbConfigMysql::processFinished);
+
// first, try the nicest approach
if (!mCleanServerShutdownCommand.isEmpty()) {
QProcess::execute(mCleanServerShutdownCommand);
diff --git a/src/server/storage/dbconfigmysql.h b/src/server/storage/dbconfigmysql.h
index 27841e8..a25f28b 100644
--- a/src/server/storage/dbconfigmysql.h
+++ b/src/server/storage/dbconfigmysql.h
@@ -21,14 +21,16 @@
#define DBCONFIGMYSQL_H
#include "dbconfig.h"
-
-class QProcess;
+#include <QObject>
+#include <QProcess>
namespace Akonadi {
namespace Server {
-class DbConfigMysql : public DbConfig
+class DbConfigMysql : public QObject, public DbConfig
{
+ Q_OBJECT
+
public:
DbConfigMysql();
@@ -75,6 +77,9 @@ public:
/// reimpl
void initSession(const QSqlDatabase &database) Q_DECL_OVERRIDE;
+private Q_SLOTS:
+ void processFinished(int exitCode, QProcess::ExitStatus exitStatus);
+
private:
int parseCommandLineToolsVersion() const;
--
cgit v0.11.2
1
0
Hello community,
here is the log from the commit of package spectacle for openSUSE:Factory checked in at 2017-01-25 23:15:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/spectacle (Old)
and /work/SRC/openSUSE:Factory/.spectacle.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spectacle"
Changes:
--------
--- /work/SRC/openSUSE:Factory/spectacle/spectacle.changes 2016-12-17 10:58:13.395073870 +0100
+++ /work/SRC/openSUSE:Factory/.spectacle.new/spectacle.changes 2017-01-25 23:15:24.950431361 +0100
@@ -1,0 +2,13 @@
+Sat Jan 21 11:24:27 UTC 2017 - fabian(a)ritter-vogt.de
+
+- Add patch to support Plasma 5.9 feature of images in notifications:
+ * set-screenshot-URL-for-notification.patch
+
+-------------------------------------------------------------------
+Sat Jan 14 09:08:57 UTC 2017 - lbeltrame(a)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:
----
spectacle-16.12.0.tar.xz
New:
----
set-screenshot-URL-for-notification.patch
spectacle-16.12.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spectacle.spec ++++++
--- /var/tmp/diff_new_pack.wwVMbm/_old 2017-01-25 23:15:25.434358394 +0100
+++ /var/tmp/diff_new_pack.wwVMbm/_new 2017-01-25 23:15:25.446356585 +0100
@@ -1,7 +1,7 @@
#
# spec file for package spectacle
#
-# 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,16 +17,18 @@
Name: spectacle
-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)
+%define kf5_version 5.29.0
+# 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: Screen Capture Program
License: LGPL-2.0+ and GPL-2.0+
Group: Productivity/Graphics/Other
Url: http://www.kde.org
Source0: %{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM set-screenshot-URL-for-notification.patch kde(a)privat.broulik.de -- Set screenshot URL for notification
+Patch1: set-screenshot-URL-for-notification.patch
BuildRequires: extra-cmake-modules
BuildRequires: kconfig-devel
BuildRequires: kcoreaddons-devel
@@ -36,7 +38,7 @@
BuildRequires: kf5-filesystem
BuildRequires: ki18n-devel
BuildRequires: kio-devel
-BuildRequires: knotifications-devel
+BuildRequires: knotifications-devel >= %{kf5_version}
BuildRequires: kwidgetsaddons-devel
BuildRequires: kwindowsystem-devel
BuildRequires: kxmlgui-devel
@@ -79,6 +81,7 @@
%prep
%setup -q
+%patch1 -p1
%build
%cmake_kf5 -d build
++++++ set-screenshot-URL-for-notification.patch ++++++
>From 945548e8c63f02c39aef492d31d8942ee6063bd6 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde(a)privat.broulik.de>
Date: Tue, 13 Dec 2016 10:42:54 +0100
Subject: [PATCH] Set screenshot URL for notification
This will have Plasma show a beautiful interactive (can be dragged to
e.g. a browser window) preview for the thumbnail.
REVIEW: 129593
---
CMakeLists.txt | 2 +-
src/SpectacleCore.cpp | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b75638..dfbbe37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(SPECTACLE_VERSION ${KDE_APPLICATIONS_VERSION})
cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.4.0")
-set(KF5_MIN_VERSION "5.25.0")
+set(KF5_MIN_VERSION "5.29.0")
set(PLASMA_MIN_VERSION "5.4.0")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
diff --git a/src/SpectacleCore.cpp b/src/SpectacleCore.cpp
index 82c84a2..96044c6 100644
--- a/src/SpectacleCore.cpp
+++ b/src/SpectacleCore.cpp
@@ -252,6 +252,7 @@ void SpectacleCore::doNotify(const QUrl &savedAt)
}
notify->setActions({i18nc("Open the screenshot we just saved", "Open")});
+ notify->setUrls({savedAt});
connect(notify, &KNotification::action1Activated, this, [this, savedAt] {
new KRun(savedAt, nullptr);
++++++ spectacle-16.12.0.tar.xz -> spectacle-16.12.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.12.0/CMakeLists.txt new/spectacle-16.12.1/CMakeLists.txt
--- old/spectacle-16.12.0/CMakeLists.txt 2016-12-06 20:57:05.000000000 +0100
+++ new/spectacle-16.12.1/CMakeLists.txt 2017-01-09 06:50:34.000000000 +0100
@@ -5,7 +5,7 @@
# KDE Application Version, managed by release script
set(KDE_APPLICATIONS_VERSION_MAJOR "16")
set(KDE_APPLICATIONS_VERSION_MINOR "12")
-set(KDE_APPLICATIONS_VERSION_MICRO "0")
+set(KDE_APPLICATIONS_VERSION_MICRO "1")
set(KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
set(SPECTACLE_VERSION ${KDE_APPLICATIONS_VERSION})
@@ -14,7 +14,7 @@
cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.4.0")
-set(KF5_MIN_VERSION "5.18.0")
+set(KF5_MIN_VERSION "5.25.0")
set(PLASMA_MIN_VERSION "5.4.0")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
@@ -38,6 +38,7 @@
find_package(
Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
Core
+ Concurrent
Widgets
DBus
PrintSupport
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.12.0/desktop/org.kde.spectacle.appdata.xml new/spectacle-16.12.1/desktop/org.kde.spectacle.appdata.xml
--- old/spectacle-16.12.0/desktop/org.kde.spectacle.appdata.xml 2016-12-06 20:57:05.000000000 +0100
+++ new/spectacle-16.12.1/desktop/org.kde.spectacle.appdata.xml 2017-01-09 06:50:34.000000000 +0100
@@ -14,6 +14,7 @@
<name xml:lang="fi">Spectacle</name>
<name xml:lang="id">Spectacle</name>
<name xml:lang="it">Spectacle</name>
+ <name xml:lang="ko">Spectacle</name>
<name xml:lang="nl">Spectacle</name>
<name xml:lang="nn">Spectacle</name>
<name xml:lang="pl">Spectacle</name>
@@ -38,6 +39,7 @@
<p xml:lang="fi">Spectacle on yksinkertainen sovellus ruutukaappauskuvien ottamiseksi. Se voi kaapata kuvan koko työpöydältä, yksittäiseltä näytöltä, aktiivisesta ikkunasta, hiiren alla olevasta ikkunasta tai suorakulmaisesta näytön alueesta. Kuvat voi myöhemmin tulostaa, lähettää muihin sovelluksiin käsiteltäväksi tai tallentaa sellaisinaan.</p>
<p xml:lang="id">Spectacle adalah aplikasi sederhana untuk menangkap cuplikan layar desktop. Hal ini bisa menangkap citra-citra dari seluruh desktop, monitor tunggal, jendela yang sedang aktif, jendela saat ini yang sedang di bawah mouse, atau wilayah berbentuk persegi pada layar. Citra-citra kemudian bisa dicetak, dikirim ke aplikasi lain untuk manipulasi, atau secara cepat disimpan sebagai apa.</p>
<p xml:lang="it">Spectacle è una semplice applicazione per catturare schermate. Può acquisire immagini dell'intero desktop, di un singolo monitor, della finestra attiva, della finestra sotto il puntatore del mouse, o di una regione rettangolare dello schermo. Le immagini possono essere stampate, inviate ad altre applicazioni per essere modificate, o salvate rapidamente così come sono.</p>
+ <p xml:lang="ko">Spectacle은 데스크톱 스크린샷을 찍는 프로그램입니다. 전체 데스크톱, 단일 모니터, 활성 창, 마우스 아래 창, 화면의 사각형 영역을 찍을 수 있습니다. 사진을 인쇄하거나, 그대로 저장하거나, 다른 프로그램에서 곧바로 편집할 수 있습니다.</p>
<p xml:lang="nl">Spectacle is een eenvoudige toepassing voor het opnemen van schermafbeeldingen van het bureaublad. Het kan afbeeldingen van het gehele bureaublad, een enkele monitor, het nu actieve venster, het venster nu onder de muis of een rechthoekig gebied van het scherm. De afbeelding kan dan afgedrukt worden, naar een andere toepassing voor bewerking worden verzonden of snel worden opgeslagen zoals deze nu is.</p>
<p xml:lang="nn">Spectacle er eit enkel program for å ta skjermbilete. Det kan ta bilete av heile skrivebordet, ein einskild skjerm, det gjeldande vindauget, vindauget under musepeikaren eller eit utsnitt av skjermflata. Bileta kan skrivast ut, sendast til andre program for vidare arbeid eller lagrast direkte.</p>
<p xml:lang="pl">Spectacle to prosta aplikacja do wykonywania zrzutów ekranu. Za jej pomocą można przechwycić cały pulpit, pojedynczy monitor, obecnie aktywne okno, okno obecnie pod wskaźnikiem myszy lub prostokątny obszar ekrany. Zrzuty można wydrukować, wysłać do innej aplikacji do obróbki lub szybko zapisać tak jak go wykonano.</p>
@@ -47,6 +49,7 @@
<p xml:lang="sv">Spectacle är ett enkelt program för att ta skärmbilder av skrivbordet. Det kan ta bilder av hela skrivbordet, en enda bildskärm, fönstret som för närvarande är aktivt, fönstret som för närvarande är under musen, eller ett rektangulärt skärmområde. Bilderna kan därefter skrivas ut, skickas till andra program för behandling, eller snabbt sparas som de är.</p>
<p xml:lang="uk">Spectacle — проста програма для створення знімків екрана. Передбачено можливість захоплення знімків усієї стільниці, окремого монітора, поточного активного вікна, вікна під вказівником миші або прямокутної ділянки на екрані. Створені зображення можна надрукувати, надіслати до іншої програми для обробки або зберегти без змін.</p>
<p xml:lang="x-test">xxSpectacle is a simple application for capturing desktop screenshots. It can capture images of the entire desktop, a single monitor, the currently active window, the window currently under the mouse, or a rectangular region of the screen. The images can then be printed, sent to other applications for manipulation, or quickly be saved as-is.xx</p>
+ <p xml:lang="zh-CN">Spectacle 是一个用于抓取桌面截图的简单应用程序。它可以抓取整个桌面、单个显示器、当前活动窗口、鼠标所在的窗口或是屏幕上的一块方形区域的图像。这些图像稍后便可以用于打印、向其它应用程序发送以进行进一步操作或是直接保存下来。</p>
<p xml:lang="zh-TW">Spectale 是一個用來擷取桌面快照的簡易應用程式。它可以擷取整個桌面、單一個顯示器、目前作用中的視窗、目前滑鼠底下的的視窗或是螢幕上的矩形區域等。其所擷取的圖片可以被列印、傳送到其他應用程式以供進一步操作或是快速儲存而不進行修改。</p>
<p>Features:</p>
<p xml:lang="ca">Característiques:</p>
@@ -60,6 +63,7 @@
<p xml:lang="he">תכונות</p>
<p xml:lang="id">Fitur:</p>
<p xml:lang="it">Funzionalità:</p>
+ <p xml:lang="ko">기능:</p>
<p xml:lang="nl">Mogelijkheden:</p>
<p xml:lang="nn">Funksjonar:</p>
<p xml:lang="pl">Możliwości:</p>
@@ -85,6 +89,7 @@
<li xml:lang="he">צילום כל שולחן עבודה</li>
<li xml:lang="id">Tangkap Entri Desktop</li>
<li xml:lang="it">Cattura l'intero desktop</li>
+ <li xml:lang="ko">전체 데스크톱 찍기</li>
<li xml:lang="nl">Opname van het gehele bureaublad</li>
<li xml:lang="nn">Ta bilete av heile skrivebordet</li>
<li xml:lang="pl">Przechwytywanie całego pulpitu</li>
@@ -108,6 +113,7 @@
<li xml:lang="he">צילום המסך הנוכחי</li>
<li xml:lang="id">Tangkap Monitor Saat Ini</li>
<li xml:lang="it">Cattura il monitor attuale</li>
+ <li xml:lang="ko">현재 모니터 찍기</li>
<li xml:lang="nl">Opname van de huidige monitor</li>
<li xml:lang="nn">Ta bilete av gjeldande skjerm</li>
<li xml:lang="pl">Przechwytywanie bieżącego monitora</li>
@@ -131,6 +137,7 @@
<li xml:lang="he">צילום החלון הפעיל</li>
<li xml:lang="id">Tangkap Jendela Aktif</li>
<li xml:lang="it">Cattura la finestra attiva</li>
+ <li xml:lang="ko">활성 창 찍기</li>
<li xml:lang="nl">Opname van het actieve venster</li>
<li xml:lang="nn">Ta bilete av aktivt vindauge</li>
<li xml:lang="pl">Przechwytywanie aktywnego okna</li>
@@ -154,6 +161,7 @@
<li xml:lang="he">צילון מלבן</li>
<li xml:lang="id">Tangkap Wilayah Berbentuk Persegi</li>
<li xml:lang="it">Cattura una regione rettangolare</li>
+ <li xml:lang="ko">화면의 사각형 영역 찍기</li>
<li xml:lang="nl">Opname van een rechthoekig gebied</li>
<li xml:lang="nn">Ta bilete av skjermutsnitt</li>
<li xml:lang="pl">Przechwytywanie obszaru prostokątnego</li>
@@ -176,6 +184,7 @@
<li xml:lang="he">קיצור דרך לצילום מסך</li>
<li xml:lang="id">Pintasan keyboard untuk mengambil cuplikan-layar</li>
<li xml:lang="it">Scorciatoie di tastiera per acquisire schermate</li>
+ <li xml:lang="ko">화면 스크린샷 찍기 단축키</li>
<li xml:lang="nl">Sneltoetsen voor het maken van schermafdrukken</li>
<li xml:lang="nn">Snøggtastar for å ta bilete av skjermen</li>
<li xml:lang="pl">Skróty klawiszowe do wykonywania zrzutów ekranu</li>
@@ -185,6 +194,7 @@
<li xml:lang="sv">Snabbtangenter för att ta skärmbilder</li>
<li xml:lang="uk">Створення знімків за допомогою натискання комбінацій клавіш</li>
<li xml:lang="x-test">xxKeyboard shortcuts for taking screenshotsxx</li>
+ <li xml:lang="zh-CN">用于截图的键盘快捷键</li>
<li xml:lang="zh-TW">螢幕快照的鍵盤快捷鍵</li>
</ul>
</description>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.12.0/desktop/org.kde.spectacle.desktop new/spectacle-16.12.1/desktop/org.kde.spectacle.desktop
--- old/spectacle-16.12.0/desktop/org.kde.spectacle.desktop 2016-12-06 20:57:05.000000000 +0100
+++ new/spectacle-16.12.1/desktop/org.kde.spectacle.desktop 2017-01-09 06:50:34.000000000 +0100
@@ -19,7 +19,7 @@
GenericName[it]=Accessorio per catturare schermate
GenericName[ko]=화면 캡처 유틸리티
GenericName[lt]=KDE ekranvaizdžių paveikslavimas
-GenericName[nl]=Hulpmiddel voor het vangen van een schermafdruk
+GenericName[nl]=Hulpmiddel voor het maken van een schermafdruk
GenericName[nn]=Verktøy for å lagra skjermbilete
GenericName[pl]=Narzędzie do przechwytywania ekranu
GenericName[pt]=Utilitário de Captura de Imagens
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.12.0/desktop/spectacle.khotkeys new/spectacle-16.12.1/desktop/spectacle.khotkeys
--- old/spectacle-16.12.0/desktop/spectacle.khotkeys 2016-12-06 20:57:05.000000000 +0100
+++ new/spectacle-16.12.1/desktop/spectacle.khotkeys 2017-01-09 06:50:34.000000000 +0100
@@ -21,6 +21,7 @@
Comment[he]=קיצור דרך לצילום מסך
Comment[id]=Pintasan keyboard untuk mengambil cuplikan-layar
Comment[it]=Scorciatoia per acquisire schermate
+Comment[ko]=화면 스크린샷 찍기 단축키
Comment[nl]=Sneltoetsen voor het maken van schermafdrukken
Comment[nn]=Snarvegar for å ta bilete av skjermen
Comment[pl]=Skróty do zrzucania ekranu
@@ -51,6 +52,7 @@
Name[he]=צילומי מסך
Name[id]=Screenshots
Name[it]=Schermate
+Name[ko]=스크린샷
Name[nl]=Schermafdrukken
Name[nn]=Skjermbilete
Name[pl]=Zrzuty ekranu
@@ -86,6 +88,7 @@
Comment[he]=הפעל את כלי צילום המסך והראה את הממשק הגרפי
Comment[id]=Mulai alat cuplikan-layar dan tunjukkan GUI
Comment[it]=Avvia lo strumento per le schermate e ne mostra l'interfaccia
+Comment[ko]=스크린샷 도구를 시작하고 GUI 보이기
Comment[nl]=Start het hulpmiddel voor schermafdrukken en toon de GUI
Comment[nn]=Start skjermbiletverktøyet og vis grafisk grensesnitt
Comment[pl]=Wywołaj narzędzie zrzutów ekranu i pokaż graficzny interfejs
@@ -115,6 +118,7 @@
Name[he]=הפעל את כלי צילום המסך
Name[id]=Start Screenshot Tool
Name[it]=Avvia lo strumento per le schermate
+Name[ko]=스크린샷 도구 시작하기
Name[nl]=Het hulpmiddel voor schermafdrukken starten
Name[nn]=Skjermbiletverktøyet
Name[pl]=Wywołaj narzędzie zrzutów ekranu
@@ -159,6 +163,7 @@
Comment[gl]=Acción_sinxela
Comment[id]=Tindakan_sederhana
Comment[it]=Azione_semplice
+Comment[ko]=Simple_action
Comment[nl]=Eenvoudige_handeling
Comment[nn]=Enkel_handling
Comment[pl]=Proste_działanie
@@ -192,6 +197,7 @@
Comment[gl]=Capturar todas as pantallas e gardar a captura.
Comment[id]=Ambil sebuah cuplikan-layar layar penuh (semua monitor) dan menyimpannya
Comment[it]=Cattura una schermata a tutto schermo (tutti i monitor) e la salva
+Comment[ko]=모든 모니터의 스크린샷을 찍고 저장하기
Comment[nl]=Een volledige schermafdruk maken (alle monitoren) en deze opslaan
Comment[nn]=Ta eit fullskjermbilete (alle skjermar) og lagra det
Comment[pl]=Wykonaj zrzut całego ekranu (wszystkie monitory) i zapisz go
@@ -219,6 +225,7 @@
Name[gl]=Capturar todas as pantallas
Name[id]=Take Full Screen Screenshot
Name[it]=Cattura l'intero schermo
+Name[ko]=전체 화면 스크린샷 찍기
Name[nl]=Schermafdruk van Volledig scherm maken
Name[nn]=Ta fullskjermsbilete
Name[pl]=Wykonaj zrzut całego ekranu
@@ -263,6 +270,7 @@
Comment[gl]=Acción_sinxela
Comment[id]=Tindakan_sederhana
Comment[it]=Azione_semplice
+Comment[ko]=Simple_action
Comment[nl]=Eenvoudige_handeling
Comment[nn]=Enkel_handling
Comment[pl]=Proste_działanie
@@ -296,6 +304,7 @@
Comment[gl]=Capturar a xanela activa e gardar a captura.
Comment[id]=Ambil sebuah cuplikan-layar pada jendela yang aktif saat ini dan menyimpannya
Comment[it]=Cattura una schermata della finestra attiva e la salva
+Comment[ko]=현재 활성 창 스크린샷을 찍고 저장하기
Comment[nl]=Een schermafdruk van het huidige actieve venster maken en het opslaan
Comment[nn]=Ta skjermbilete frå det aktive vindauget og lagra det
Comment[pl]=Wykonaj zrzut obecnie aktywnego okna i zapisz go
@@ -323,6 +332,7 @@
Name[gl]=Capturar a xanela activa
Name[id]=Take Active Window Screenshot
Name[it]=Cattura la finestra attiva
+Name[ko]=활성 창 스크린샷 찍기
Name[nl]=Schermafdruk van actieve venster maken
Name[nn]=Ta skjermbilete av aktivt vindauge
Name[pl]=Wykonaj zrzut obecnie aktywnego okna
@@ -367,6 +377,7 @@
Comment[gl]=Acción_sinxela
Comment[id]=Tindakan_sederhana
Comment[it]=Azione_semplice
+Comment[ko]=Simple_action
Comment[nl]=Eenvoudige_handeling
Comment[nn]=Enkel_handling
Comment[pl]=Proste_działanie
@@ -400,6 +411,7 @@
Comment[gl]=Capturar unha rexión rectangular indicada e gardar a captura.
Comment[id]=Ambil sebuah cuplikan-layar pada wilayah berbentuk persegi yang kamu tetapkan dan menyimpannya
Comment[it]=Cattura una schermata di una regione rettangolare a piacere e la salva
+Comment[ko]=지정한 사각형 영역의 스크린샷을 찍고 저장하기
Comment[nl]=Een schermafdruk van een rechthoekig gebied dat u specificeert maken en het opslaan
Comment[nn]=Ta rektangulært skjermutsnitt og lagra det
Comment[pl]=Wykonaj zrzut podanego przez ciebie prostokątnego obszaru i zapisz go
@@ -427,6 +439,7 @@
Name[gl]=Capturar unha rexión rectangular
Name[id]=Take Rectangular Region Screenshot
Name[it]=Cattura una regione rettangolare
+Name[ko]=사각형 영역 스크린샷 찍기
Name[nl]=Schermafdruk van rechthoekig gebied maken
Name[nn]=Ta rektangulært skjermutsnitt
Name[pl]=Wykonaj zrzut prostokątnego obszaru
@@ -471,6 +484,7 @@
Comment[gl]=Acción_sinxela
Comment[id]=Tindakan_sederhana
Comment[it]=Azione_semplice
+Comment[ko]=Simple_action
Comment[nl]=Eenvoudige_handeling
Comment[nn]=Enkel_handling
Comment[pl]=Proste_działanie
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.12.0/src/CMakeLists.txt new/spectacle-16.12.1/src/CMakeLists.txt
--- old/spectacle-16.12.0/src/CMakeLists.txt 2016-12-06 20:57:05.000000000 +0100
+++ new/spectacle-16.12.1/src/CMakeLists.txt 2017-01-09 06:50:34.000000000 +0100
@@ -14,6 +14,7 @@
SpectacleDBusAdapter.cpp
PlatformBackends/ImageGrabber.cpp
PlatformBackends/DummyImageGrabber.cpp
+ PlatformBackends/KWinWaylandImageGrabber.cpp
Gui/KSMainWindow.cpp
Gui/KSWidget.cpp
Gui/KSImageWidget.cpp
@@ -60,6 +61,7 @@
target_link_libraries(
spectacle
+ Qt5::Concurrent
Qt5::DBus
Qt5::PrintSupport
Qt5::Quick
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.12.0/src/Config.h.in new/spectacle-16.12.1/src/Config.h.in
--- old/spectacle-16.12.0/src/Config.h.in 2016-12-06 20:57:05.000000000 +0100
+++ new/spectacle-16.12.1/src/Config.h.in 2017-01-09 06:50:34.000000000 +0100
@@ -14,6 +14,6 @@
#cmakedefine SPECTACLE_VERSION "@SPECTACLE_VERSION@"
/* set the release codename */
-#define SPECTACLE_CODENAME "Everything Is Going To Be Alright"
+#define SPECTACLE_CODENAME "Orderly Transfer of Power"
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.12.0/src/Gui/KSMainWindow.cpp new/spectacle-16.12.1/src/Gui/KSMainWindow.cpp
--- old/spectacle-16.12.0/src/Gui/KSMainWindow.cpp 2016-12-06 20:57:05.000000000 +0100
+++ new/spectacle-16.12.1/src/Gui/KSMainWindow.cpp 2017-01-09 06:50:34.000000000 +0100
@@ -39,6 +39,7 @@
#include <KStandardGuiItem>
#include <KHelpMenu>
#include <KAboutData>
+#include <KWindowSystem>
#include "SettingsDialog/SettingsDialog.h"
#include "ExportMenu.h"
@@ -67,7 +68,7 @@
// credits for this goes to Thomas Lübking <thomas.luebking(a)gmail.com>
#ifdef XCB_FOUND
- if (qApp->platformName() == QStringLiteral("xcb")) {
+ if (KWindowSystem::isPlatformX11()) {
// create a window if we haven't already. note that the QWidget constructor
// should already have done this
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.12.0/src/PlatformBackends/KWinWaylandImageGrabber.cpp new/spectacle-16.12.1/src/PlatformBackends/KWinWaylandImageGrabber.cpp
--- old/spectacle-16.12.0/src/PlatformBackends/KWinWaylandImageGrabber.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/spectacle-16.12.1/src/PlatformBackends/KWinWaylandImageGrabber.cpp 2017-01-09 06:50:34.000000000 +0100
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2016 Martin Graesslin <mgraesslin(a)kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#include "KWinWaylandImageGrabber.h"
+
+#include <QDBusInterface>
+#include <QDBusPendingCall>
+#include <QDBusPendingReply>
+#include <QDBusUnixFileDescriptor>
+
+#include <QtConcurrentRun>
+#include <QFutureWatcher>
+#include <qplatformdefs.h>
+
+#include <errno.h>
+
+static int readData(int fd, QByteArray &data)
+{
+ // implementation based on QtWayland file qwaylanddataoffer.cpp
+ char buf[4096];
+ int retryCount = 0;
+ int n;
+ while (true) {
+ n = QT_READ(fd, buf, sizeof buf);
+ // give user 30 sec to click a window, afterwards considered as error
+ if (n == -1 && (errno == EAGAIN) && ++retryCount < 30000) {
+ usleep(1000);
+ } else {
+ break;
+ }
+ }
+ if (n > 0) {
+ data.append(buf, n);
+ n = readData(fd, data);
+ }
+ return n;
+}
+
+static QImage readImage(int pipeFd)
+{
+ QByteArray content;
+ if (readData(pipeFd, content) != 0) {
+ close(pipeFd);
+ return QImage();
+ }
+ close(pipeFd);
+ QDataStream ds(content);
+ QImage image;
+ ds >> image;
+ return image;
+};
+
+KWinWaylandImageGrabber::KWinWaylandImageGrabber(QObject *parent) :
+ ImageGrabber(parent)
+{
+}
+
+KWinWaylandImageGrabber::~KWinWaylandImageGrabber() = default;
+
+bool KWinWaylandImageGrabber::onClickGrabSupported() const
+{
+ return true;
+}
+
+void KWinWaylandImageGrabber::grabFullScreen()
+{
+ grab(Mode::FullScreen, mCapturePointer);
+}
+
+void KWinWaylandImageGrabber::grabCurrentScreen()
+{
+ grab(Mode::CurrentScreen, mCapturePointer);
+}
+
+void KWinWaylandImageGrabber::grabActiveWindow()
+{
+ // unsupported
+ emit pixmapChanged(QPixmap());
+}
+
+void KWinWaylandImageGrabber::grabRectangularRegion()
+{
+ // unsupported
+ emit pixmapChanged(QPixmap());
+}
+
+void KWinWaylandImageGrabber::grabWindowUnderCursor()
+{
+ int mask = 0;
+ if (mCaptureDecorations) {
+ mask = 1;
+ }
+ if (mCapturePointer) {
+ mask |= 1 << 1;
+ }
+ grab(Mode::Window, mask);
+}
+
+void KWinWaylandImageGrabber::grabTransientWithParent()
+{
+ // unsupported, perform grab window under cursor
+ grabWindowUnderCursor();
+}
+
+QPixmap KWinWaylandImageGrabber::blendCursorImage(const QPixmap &pixmap, int x, int y, int width, int height)
+{
+ Q_UNUSED(x)
+ Q_UNUSED(y)
+ Q_UNUSED(width)
+ Q_UNUSED(height)
+ return pixmap;
+}
+
+void KWinWaylandImageGrabber::startReadImage(int readPipe)
+{
+ QFutureWatcher<QImage> *watcher = new QFutureWatcher<QImage>(this);
+ QObject::connect(watcher, &QFutureWatcher<QImage>::finished, this,
+ [watcher, this] {
+ watcher->deleteLater();
+ const QImage img = watcher->result();
+ emit pixmapChanged(QPixmap::fromImage(img));
+ }
+ );
+ watcher->setFuture(QtConcurrent::run(readImage, readPipe));
+}
+
+template <typename T>
+void KWinWaylandImageGrabber::callDBus(Mode mode, int writeFd, T argument)
+{
+ QDBusInterface interface(QStringLiteral("org.kde.KWin"), QStringLiteral("/Screenshot"), QStringLiteral("org.kde.kwin.Screenshot"));
+ static const QMap<Mode, QString> s_hash = {
+ {Mode::Window, QStringLiteral("interactive")},
+ {Mode::CurrentScreen, QStringLiteral("screenshotScreen")},
+ {Mode::FullScreen, QStringLiteral("screenshotFullscreen")}
+ };
+ auto it = s_hash.find(mode);
+ Q_ASSERT(it != s_hash.end());
+ interface.asyncCall(it.value(), QVariant::fromValue(QDBusUnixFileDescriptor(writeFd)), argument);
+}
+
+template <typename T>
+void KWinWaylandImageGrabber::grab(Mode mode, T argument)
+{
+ int pipeFds[2];
+ if (pipe2(pipeFds, O_CLOEXEC|O_NONBLOCK) != 0) {
+ emit imageGrabFailed();
+ return;
+ }
+
+ callDBus(mode, pipeFds[1], argument);
+ startReadImage(pipeFds[0]);
+
+ close(pipeFds[1]);
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.12.0/src/PlatformBackends/KWinWaylandImageGrabber.h new/spectacle-16.12.1/src/PlatformBackends/KWinWaylandImageGrabber.h
--- old/spectacle-16.12.0/src/PlatformBackends/KWinWaylandImageGrabber.h 1970-01-01 01:00:00.000000000 +0100
+++ new/spectacle-16.12.1/src/PlatformBackends/KWinWaylandImageGrabber.h 2017-01-09 06:50:34.000000000 +0100
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2016 Martin Graesslin <mgraesslin(a)kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef KWINWAYLANDIMAGEGRABBER_H
+#define KWINWAYLANDIMAGEGRABBER_H
+
+#include "ImageGrabber.h"
+
+class KWinWaylandImageGrabber : public ImageGrabber
+{
+ Q_OBJECT
+
+ public:
+
+ explicit KWinWaylandImageGrabber(QObject * parent = 0);
+ virtual ~KWinWaylandImageGrabber();
+
+ bool onClickGrabSupported() const Q_DECL_OVERRIDE;
+
+ protected:
+
+ void grabFullScreen() Q_DECL_OVERRIDE;
+ void grabCurrentScreen() Q_DECL_OVERRIDE;
+ void grabActiveWindow() Q_DECL_OVERRIDE;
+ void grabRectangularRegion() Q_DECL_OVERRIDE;
+ void grabWindowUnderCursor() Q_DECL_OVERRIDE;
+ void grabTransientWithParent() Q_DECL_OVERRIDE;
+ QPixmap blendCursorImage(const QPixmap &pixmap, int x, int y, int width, int height) Q_DECL_OVERRIDE;
+
+ private:
+
+ void startReadImage(int readPipe);
+ enum class Mode {
+ Window,
+ CurrentScreen,
+ FullScreen
+ };
+ template <typename T>
+ void callDBus(Mode mode, int writeFd, T argument);
+ template <typename T>
+ void grab(Mode mode, T argument);
+};
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spectacle-16.12.0/src/SpectacleCore.cpp new/spectacle-16.12.1/src/SpectacleCore.cpp
--- old/spectacle-16.12.0/src/SpectacleCore.cpp 2016-12-06 20:57:05.000000000 +0100
+++ new/spectacle-16.12.1/src/SpectacleCore.cpp 2017-01-09 06:50:34.000000000 +0100
@@ -40,6 +40,7 @@
#ifdef XCB_FOUND
#include "PlatformBackends/X11ImageGrabber.h"
#endif
+#include "PlatformBackends/KWinWaylandImageGrabber.h"
SpectacleCore::SpectacleCore(StartMode startMode, ImageGrabber::GrabMode grabMode, QString &saveFileName,
qint64 delayMsec, bool notifyOnGrab, QObject *parent) :
@@ -62,10 +63,13 @@
}
#ifdef XCB_FOUND
- if (qApp->platformName() == QStringLiteral("xcb")) {
+ if (KWindowSystem::isPlatformX11()) {
mImageGrabber = new X11ImageGrabber;
}
#endif
+ if (!mImageGrabber && KWindowSystem::isPlatformWayland()) {
+ mImageGrabber = new KWinWaylandImageGrabber;
+ }
if (!mImageGrabber) {
mImageGrabber = new DummyImageGrabber;
1
0
Hello community,
here is the log from the commit of package kate for openSUSE:Factory checked in at 2017-01-25 23:15:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kate (Old)
and /work/SRC/openSUSE:Factory/.kate.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kate"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kate/kate.changes 2016-12-17 10:34:29.385225191 +0100
+++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes 2017-01-25 23:15:11.164510061 +0100
@@ -1,0 +2,13 @@
+Thu Jan 19 19:19:16 UTC 2017 - fabian(a)ritter-vogt.de
+
+- Add upstream patch to fix build with plasma-framework >= 5.30
+ * remove-popupapplet-servicetype.patch
+
+-------------------------------------------------------------------
+Sat Jan 14 08:52:14 UTC 2017 - lbeltrame(a)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:
----
kate-16.12.0.tar.xz
New:
----
kate-16.12.1.tar.xz
remove-popupapplet-servicetype.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kate.spec ++++++
--- /var/tmp/diff_new_pack.PjmmH5/_old 2017-01-25 23:15:11.752421411 +0100
+++ /var/tmp/diff_new_pack.PjmmH5/_new 2017-01-25 23:15:11.756420809 +0100
@@ -18,10 +18,10 @@
%define _appstreamkpackage 0%(cat %{_kf5_libdir}/cmake/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1)
Name: kate
-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: Advanced Text Editor
License: GPL-2.0+
@@ -29,6 +29,8 @@
Group: Productivity/Editors/Other
Url: http://www.kde.org/
Source0: %{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM remove-popupapplet-servicetype.patch -- Remove the depreciated Plasma PopupApplet servicetype
+Patch1: remove-popupapplet-servicetype.patch
BuildRequires: kactivities5-devel
BuildRequires: kconfig-devel
BuildRequires: kcrash-devel
@@ -87,6 +89,7 @@
%prep
%setup -q
+%patch1 -p1
%build
%cmake_kf5 -d build
++++++ kate-16.12.0.tar.xz -> kate-16.12.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-16.12.0/CMakeLists.txt new/kate-16.12.1/CMakeLists.txt
--- old/kate-16.12.0/CMakeLists.txt 2016-12-06 20:51:08.000000000 +0100
+++ new/kate-16.12.1/CMakeLists.txt 2017-01-08 16:44:29.000000000 +0100
@@ -9,7 +9,7 @@
# KDE Application Version, managed by release script
set (KDE_APPLICATIONS_VERSION_MAJOR "16")
set (KDE_APPLICATIONS_VERSION_MINOR "12")
-set (KDE_APPLICATIONS_VERSION_MICRO "0")
+set (KDE_APPLICATIONS_VERSION_MICRO "1")
set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
# we need some parts of the ECM CMake helpers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-16.12.0/kate/kateviewspace.cpp new/kate-16.12.1/kate/kateviewspace.cpp
--- old/kate-16.12.0/kate/kateviewspace.cpp 2016-12-06 20:51:08.000000000 +0100
+++ new/kate-16.12.1/kate/kateviewspace.cpp 2017-01-08 16:44:29.000000000 +0100
@@ -355,6 +355,7 @@
const int id = m_tabBar->insertTab(index, doc->documentName());
m_tabBar->setTabToolTip(id, doc->url().toDisplayString());
m_docToTabId[doc] = id;
+ updateDocumentState(doc);
connect(doc, SIGNAL(documentNameChanged(KTextEditor::Document*)),
this, SLOT(updateDocumentName(KTextEditor::Document*)));
++++++ remove-popupapplet-servicetype.patch ++++++
>From a1f8e09413465969d10b198a6c3bb01e90ca440d Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke(a)gmail.com>
Date: Wed, 21 Dec 2016 11:22:36 +0100
Subject: [PATCH] Remove the depreciated Plasma PopupApplet servicetype
---
addons/sessionapplet/applet/metadata.desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: kate-16.12.1/addons/sessionapplet/applet/metadata.desktop
===================================================================
--- kate-16.12.1.orig/addons/sessionapplet/applet/metadata.desktop
+++ kate-16.12.1/addons/sessionapplet/applet/metadata.desktop
@@ -98,7 +98,7 @@ Comment[zh_TW]=Kate 工作階段啟動�
Type=Service
Icon=kate
-X-KDE-ServiceTypes=Plasma/Applet,Plasma/PopupApplet
+X-KDE-ServiceTypes=Plasma/Applet
X-Plasma-API=declarativeappletscript
X-Plasma-MainScript=ui/katesessions.qml
1
0
Hello community,
here is the log from the commit of package okular for openSUSE:Factory checked in at 2017-01-25 23:14:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/okular (Old)
and /work/SRC/openSUSE:Factory/.okular.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "okular"
Changes:
--------
--- /work/SRC/openSUSE:Factory/okular/okular.changes 2016-12-17 10:56:55.030200968 +0100
+++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2017-01-25 23:14:59.578257138 +0100
@@ -1,0 +2,13 @@
+Thu Jan 19 15:36:33 UTC 2017 - wbauer(a)tmo.at
+
+- Cleanup/update build requirements
+- Add necessary dependencies to the devel package (boo#1020735)
+
+-------------------------------------------------------------------
+Sat Jan 14 09:07:59 UTC 2017 - lbeltrame(a)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:
----
okular-16.12.0.tar.xz
New:
----
okular-16.12.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ okular.spec ++++++
--- /var/tmp/diff_new_pack.5DDMMB/_old 2017-01-25 23:15:00.186165471 +0100
+++ /var/tmp/diff_new_pack.5DDMMB/_new 2017-01-25 23:15:00.190164868 +0100
@@ -17,66 +17,58 @@
Name: okular
-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: Document Viewer
License: GPL-2.0+
Group: Productivity/Office/Other
Url: http://www.kde.org
Source: %{name}-%{version}.tar.xz
-BuildRequires: OpenEXR-devel
BuildRequires: chmlib-devel
BuildRequires: extra-cmake-modules
-BuildRequires: fdupes
-BuildRequires: fribidi-devel
+BuildRequires: freetype2-devel
BuildRequires: kactivities5-devel
BuildRequires: karchive-devel
BuildRequires: kbookmarks-devel
+BuildRequires: kcompletion-devel
BuildRequires: kconfig-devel
BuildRequires: kconfigwidgets-devel
-BuildRequires: kdelibs4support-devel
+BuildRequires: kcoreaddons-devel
+BuildRequires: kdbusaddons-devel
BuildRequires: kdoctools-devel
-BuildRequires: kemoticons-devel
BuildRequires: kf5-filesystem
BuildRequires: khtml-devel
-BuildRequires: ki18n-devel
-BuildRequires: kidletime-devel
+BuildRequires: kiconthemes-devel
BuildRequires: kio-devel
BuildRequires: kjs-devel
-BuildRequires: knotifyconfig-devel
-BuildRequires: kpackage-devel
BuildRequires: kparts-devel
BuildRequires: kpty-devel
BuildRequires: kwallet-devel
-BuildRequires: kwidgetsaddons-devel
+BuildRequires: kwindowsystem-devel
BuildRequires: libdjvulibre-devel
BuildRequires: libepub-devel
-BuildRequires: libgphoto2-devel
BuildRequires: libjpeg-devel
BuildRequires: libkexiv2-devel
-BuildRequires: libkscreen2-devel
BuildRequires: libpoppler-qt5-devel
BuildRequires: libqca-qt5-devel
BuildRequires: libspectre-devel
BuildRequires: libtiff-devel
BuildRequires: mobipocket-devel
-BuildRequires: net-snmp-devel
BuildRequires: phonon4qt5-devel
BuildRequires: pkgconfig
-BuildRequires: sane-backends-devel
-BuildRequires: solid-devel
-BuildRequires: sonnet-devel
BuildRequires: threadweaver-devel
-BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2.0
-BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
-BuildRequires: pkgconfig(Qt5Qml) >= 5.2.0
-BuildRequires: pkgconfig(Qt5Script) >= 5.2.0
-BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0
-BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
-BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
+BuildRequires: pkgconfig(Qt5Core) >= 5.6.0
+BuildRequires: pkgconfig(Qt5DBus) >= 5.6.0
+BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.6.0
+BuildRequires: pkgconfig(Qt5Qml) >= 5.6.0
+BuildRequires: pkgconfig(Qt5Quick) >= 5.6.0
+BuildRequires: pkgconfig(Qt5Svg) >= 5.6.0
+BuildRequires: pkgconfig(Qt5Test) >= 5.6.0
+BuildRequires: pkgconfig(Qt5Widgets) >= 5.6.0
+Buildrequires: zlib-devel
Obsoletes: okular5 < %{version}
Provides: okular5 = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -89,6 +81,12 @@
Summary: Document Viewer - Development Files
Group: Development/Libraries/KDE
Requires: %{name} = %{version}
+Requires: cmake(Qt5Core) >= 5.6.0
+Requires: cmake(Qt5PrintSupport) >= 5.6.0
+Requires: cmake(Qt5Widgets) >= 5.6.0
+Requires: cmake(KF5CoreAddons)
+Requires: cmake(KF5Config)
+Requires: cmake(KF5XmlGui)
Obsoletes: okular5-devel < %{version}
Provides: okular5-devel = %{version}
++++++ okular-16.12.0.tar.xz -> okular-16.12.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/CMakeLists.txt new/okular-16.12.1/CMakeLists.txt
--- old/okular-16.12.0/CMakeLists.txt 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/CMakeLists.txt 2017-01-08 19:38:42.000000000 +0100
@@ -11,7 +11,7 @@
# KDE Application Version, managed by release script
set (KDE_APPLICATIONS_VERSION_MAJOR "16")
set (KDE_APPLICATIONS_VERSION_MINOR "12")
-set (KDE_APPLICATIONS_VERSION_MICRO "0")
+set (KDE_APPLICATIONS_VERSION_MICRO "1")
set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
include(ECMInstallIcons)
@@ -264,6 +264,7 @@
ui/ktreeviewsearchline.cpp
ui/latexrenderer.cpp
ui/minibar.cpp
+ ui/okmenutitle.cpp
ui/pageitemdelegate.cpp
ui/pagepainter.cpp
ui/pagesizelabel.cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/core/document.cpp new/okular-16.12.1/core/document.cpp
--- old/okular-16.12.0/core/document.cpp 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/core/document.cpp 2017-01-08 19:38:42.000000000 +0100
@@ -2196,11 +2196,11 @@
foreach (const QString& supported, md.mimeTypes())
{
QMimeType mimeType = mimeDatabase.mimeTypeForName(supported);
- if (mimeType == type) {
+ if (mimeType == type && !exactMatches.contains(md)) {
exactMatches << md;
}
- if (type.inherits(supported))
+ if (type.inherits(supported) && !offers.contains(md))
{
offers << md;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/chm/libokularGenerator_chmlib.json new/okular-16.12.1/generators/chm/libokularGenerator_chmlib.json
--- old/okular-16.12.0/generators/chm/libokularGenerator_chmlib.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/chm/libokularGenerator_chmlib.json 2017-01-08 19:38:42.000000000 +0100
@@ -40,6 +40,7 @@
"Description[fi]": "Microsoft Windows -ohjetiedostohahmonnin",
"Description[fr]": "Un système de rendu pour les fichiers d'aide Windows",
"Description[it]": "Un visualizzatore per file di aiuto di Microsoft Windows",
+ "Description[ko]": "마이크로소프트 Windows 도움말 파일 표시기",
"Description[nl]": "Een viewer voor Microsoft Windows-helpbestanden",
"Description[nn]": "Ein framvisar for Microsoft Windows-hjelpefiler",
"Description[pl]": "System zajmujący się wyświetlaniem plików pomocy Microsoft Windows",
@@ -69,6 +70,7 @@
"Name[fi]": "CHM-taustaosa",
"Name[fr]": "Moteur CHM",
"Name[it]": "Backend CHM",
+ "Name[ko]": "CHM 백엔드",
"Name[nl]": "CHM-backend",
"Name[nn]": "CHM-motor",
"Name[pl]": "Silnik CHM",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/chm/org.kde.okular-chm.metainfo.xml new/okular-16.12.1/generators/chm/org.kde.okular-chm.metainfo.xml
--- old/okular-16.12.0/generators/chm/org.kde.okular-chm.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/chm/org.kde.okular-chm.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">CHM-dokumendid</name>
<name xml:lang="fi">CHM-tiedostot</name>
<name xml:lang="it">Documenti CHM</name>
+ <name xml:lang="ko">CHM 문서</name>
<name xml:lang="nl">CHM-documenten</name>
<name xml:lang="nn">CHM-dokument</name>
+ <name xml:lang="pl">Dokumenty CHM</name>
<name xml:lang="pt">Documentos CHM</name>
<name xml:lang="sk">CHM dokumenty</name>
<name xml:lang="sl">Dokumenti CHM</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">CHM-dokumentide lugemise toetus</summary>
<summary xml:lang="fi">Lisää CHM-tiedostojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di documenti CHM</summary>
+ <summary xml:lang="ko">CHM 문서 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van CHM-documenten toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa CHM-dokument</summary>
+ <summary xml:lang="pl">Dodaje obsługę dokumentów CHM</summary>
<summary xml:lang="pt">Adiciona o suporte para a leitura de documentos CHM</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie CHM dokumentov</summary>
<summary xml:lang="sl">Doda podporo za branje dokumentov CHM</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/comicbook/libokularGenerator_comicbook.json new/okular-16.12.1/generators/comicbook/libokularGenerator_comicbook.json
--- old/okular-16.12.0/generators/comicbook/libokularGenerator_comicbook.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/comicbook/libokularGenerator_comicbook.json 2017-01-08 19:38:42.000000000 +0100
@@ -32,6 +32,7 @@
"Description[fi]": "Eri sarjakuvakirjamuotojen hahmonnin",
"Description[fr]": "Un système de rendu pour divers formats de livres de BD",
"Description[it]": "Un visualizzatore per vari formati di strisce a fumetti",
+ "Description[ko]": "다양한 만화책 형식 렌더러",
"Description[nl]": "Een viewer voor diverse ComicBook-formaten",
"Description[nn]": "Ein gjengjevar for ulike teikneserieformat",
"Description[pl]": "Wyświetlanie różnych formatów comic book.",
@@ -64,6 +65,7 @@
"Name[fi]": "ComicBook-taustaosa",
"Name[fr]": "Moteur pour les livres de BD",
"Name[it]": "Backend ComicBook",
+ "Name[ko]": "만화책 백엔드",
"Name[nl]": "ComicBook-backend",
"Name[nn]": "ComicBook-motor",
"Name[pl]": "Moduł ComicBook",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/comicbook/org.kde.okular-comicbook.metainfo.xml new/okular-16.12.1/generators/comicbook/org.kde.okular-comicbook.metainfo.xml
--- old/okular-16.12.0/generators/comicbook/org.kde.okular-comicbook.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/comicbook/org.kde.okular-comicbook.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">Koomiksid</name>
<name xml:lang="fi">Sarjakuvakirjat</name>
<name xml:lang="it">Fumetti</name>
+ <name xml:lang="ko">만화책</name>
<name xml:lang="nl">Stripboeken</name>
<name xml:lang="nn">Teikneseriar</name>
+ <name xml:lang="pl">Komiksy</name>
<name xml:lang="pt">Banda Desenhada</name>
<name xml:lang="sk">Knihy komiksov</name>
<name xml:lang="sl">Stripi</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">Koomiksite lugemise toetus</summary>
<summary xml:lang="fi">Lisää sarjakuvakirjojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di fumetti</summary>
+ <summary xml:lang="ko">만화책 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van stripboeken toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa teikneseriefiler</summary>
+ <summary xml:lang="pl">Dodaje obsługę komiksów</summary>
<summary xml:lang="pt">Adiciona o suporte para ler livros de banda desenhada</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie komiksov</summary>
<summary xml:lang="sl">Doda podporo za branje stripov</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/djvu/libokularGenerator_djvu.json new/okular-16.12.1/generators/djvu/libokularGenerator_djvu.json
--- old/okular-16.12.0/generators/djvu/libokularGenerator_djvu.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/djvu/libokularGenerator_djvu.json 2017-01-08 19:38:42.000000000 +0100
@@ -31,6 +31,7 @@
"Description[fi]": "DjVuLibreen perustuva DjVu-taustaosa",
"Description[fr]": "Moteur DjVu utilisant DjVuLibre",
"Description[it]": "Backend DjVu basato su DjVuLibre",
+ "Description[ko]": "DjVuLibre 기반 DjVu 백엔드",
"Description[nl]": "DjVu-backend gebaseerd op DjVuLibre",
"Description[nn]": "DjVu-motor basert på DjVuLibre",
"Description[pl]": "Silnik DjVu oparty na DjVuLibre",
@@ -60,6 +61,7 @@
"Name[fi]": "DjVu-taustaosa",
"Name[fr]": "Moteur DjVu",
"Name[it]": "Backend DjVu",
+ "Name[ko]": "DjVu 백엔드",
"Name[nl]": "DjVu-backend",
"Name[nn]": "DjVu-motor",
"Name[pl]": "Silnik DjVu",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/djvu/org.kde.okular-djvu.metainfo.xml new/okular-16.12.1/generators/djvu/org.kde.okular-djvu.metainfo.xml
--- old/okular-16.12.0/generators/djvu/org.kde.okular-djvu.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/djvu/org.kde.okular-djvu.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">DjVu dokumendid</name>
<name xml:lang="fi">DjVu-tiedostot</name>
<name xml:lang="it">Documenti DjVu</name>
+ <name xml:lang="ko">DjVu 문서</name>
<name xml:lang="nl">DjVu-documenten</name>
<name xml:lang="nn">DjVu-dokument</name>
+ <name xml:lang="pl">Dokumenty DjVu</name>
<name xml:lang="pt">Documentos DjVu</name>
<name xml:lang="sk">DjVu dokumenty</name>
<name xml:lang="sl">Dokumenti DjVu</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">DjVu dokumentide lugemise toetus</summary>
<summary xml:lang="fi">Lisää DjVu-tiedostojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di documenti DjVu</summary>
+ <summary xml:lang="ko">DjVu 문서 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van DjVu-documenten toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa DjVu-dokument</summary>
+ <summary xml:lang="pl">Dodaje obsługę czytania dokumentów DjVu</summary>
<summary xml:lang="pt">Adiciona o suporte para a leitura de documentos DjVu</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie DjVu dokumentov</summary>
<summary xml:lang="sl">Doda podporo za branje dokumentov DjVu</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/dvi/libokularGenerator_dvi.json new/okular-16.12.1/generators/dvi/libokularGenerator_dvi.json
--- old/okular-16.12.0/generators/dvi/libokularGenerator_dvi.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/dvi/libokularGenerator_dvi.json 2017-01-08 19:38:42.000000000 +0100
@@ -29,6 +29,7 @@
"Description[fi]": "DVI-tiedostohahmonnin",
"Description[fr]": "Système de rendu pour fichiers « DVI »",
"Description[it]": "Un visualizzatore di file DVI",
+ "Description[ko]": "DVI 파일 렌더러",
"Description[nl]": "Een DVI-bestandsweergever",
"Description[nn]": "Ein gjengjevar for DVI-filer",
"Description[pl]": "Wyświetlanie pliku DVI",
@@ -58,6 +59,7 @@
"Name[fi]": "DVI-taustaosa",
"Name[fr]": "Moteur DVI",
"Name[it]": "Backend DVI",
+ "Name[ko]": "DVI 백엔드",
"Name[nl]": "DVI-backend",
"Name[nn]": "DVI-motor",
"Name[pl]": "Obsługa DVI",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/dvi/org.kde.okular-dvi.metainfo.xml new/okular-16.12.1/generators/dvi/org.kde.okular-dvi.metainfo.xml
--- old/okular-16.12.0/generators/dvi/org.kde.okular-dvi.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/dvi/org.kde.okular-dvi.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">DVI dokumendid</name>
<name xml:lang="fi">DVI-tiedostot</name>
<name xml:lang="it">Documenti DVI</name>
+ <name xml:lang="ko">DVI 문서</name>
<name xml:lang="nl">DVI-documenten</name>
<name xml:lang="nn">DVI-dokument</name>
+ <name xml:lang="pl">Dokumenty DVI</name>
<name xml:lang="pt">Documentos DVI</name>
<name xml:lang="sk">DVI dokumenty</name>
<name xml:lang="sl">Dokumenti DVI</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">DVI dokumentide lugemise toetus</summary>
<summary xml:lang="fi">Lisää DVI-tiedostojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di documenti DVI</summary>
+ <summary xml:lang="ko">DVI 문서 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van DVI-documenten toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa DVI-dokument</summary>
+ <summary xml:lang="pl">Dodaje obsługę dokumentów DVI</summary>
<summary xml:lang="pt">Adiciona o suporte para a leitura de documentos DVI</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie DVI dokumentov</summary>
<summary xml:lang="sl">Doda podporo za branje dokumentov DVI</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/epub/libokularGenerator_epub.json new/okular-16.12.1/generators/epub/libokularGenerator_epub.json
--- old/okular-16.12.0/generators/epub/libokularGenerator_epub.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/epub/libokularGenerator_epub.json 2017-01-08 19:38:42.000000000 +0100
@@ -29,6 +29,7 @@
"Description[fi]": "EPub-taustaosa",
"Description[fr]": "Un moteur EPub",
"Description[it]": "Backend EPub",
+ "Description[ko]": "EPub 백엔드",
"Description[nl]": "Een EPub-backend",
"Description[nn]": "Ein EPUB-motor",
"Description[pl]": "Moduł EPub",
@@ -58,6 +59,7 @@
"Name[fi]": "EPub-taustaosa",
"Name[fr]": "Moteur EPub",
"Name[it]": "Backend EPub",
+ "Name[ko]": "EPub 백엔드",
"Name[nl]": "EPub-backend",
"Name[nn]": "EPUB-motor",
"Name[pl]": "Moduł EPub",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/epub/org.kde.okular-epub.metainfo.xml new/okular-16.12.1/generators/epub/org.kde.okular-epub.metainfo.xml
--- old/okular-16.12.0/generators/epub/org.kde.okular-epub.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/epub/org.kde.okular-epub.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">EPub</name>
<name xml:lang="fi">EPub</name>
<name xml:lang="it">EPub</name>
+ <name xml:lang="ko">EPub</name>
<name xml:lang="nl">EPub</name>
<name xml:lang="nn">EPUB</name>
+ <name xml:lang="pl">EPub</name>
<name xml:lang="pt">EPub</name>
<name xml:lang="sk">EPub</name>
<name xml:lang="sl">EPub</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">E-raamatute lugemise toetus</summary>
<summary xml:lang="fi">Lisää e-kirjojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di libri digitali in formato EPub</summary>
+ <summary xml:lang="ko">전자책 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van e-boeken toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa e-bøker i EPUB-formatet</summary>
+ <summary xml:lang="pl">Dodaje obsługę czytania ebooków</summary>
<summary xml:lang="pt">Adiciona o suporte para a leitura de E-Books</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie e-kníh</summary>
<summary xml:lang="sl">Doda podporo za branje e-knjig</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/fax/libokularGenerator_fax.json new/okular-16.12.1/generators/fax/libokularGenerator_fax.json
--- old/okular-16.12.0/generators/fax/libokularGenerator_fax.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/fax/libokularGenerator_fax.json 2017-01-08 19:38:42.000000000 +0100
@@ -31,6 +31,7 @@
"Description[fi]": "G3/G4-faksitiedostotaustaosa",
"Description[fr]": "Un moteur de document fax G3/G4",
"Description[it]": "Un backend per documenti fax G3/G4",
+ "Description[ko]": "G3/G4 팩스 문서 백엔드",
"Description[nl]": "Een backend voor een G3/G4 faxdocument",
"Description[nn]": "Ein motor for G3/G4-faksdokument",
"Description[pl]": "Obsługa dokumentów faksowych G3/G4",
@@ -61,6 +62,7 @@
"Name[fi]": "Faksitaustaosa",
"Name[fr]": "Moteur Fax",
"Name[it]": "Backend fax",
+ "Name[ko]": "팩스 백엔드",
"Name[nl]": "Faxbackend",
"Name[nn]": "Faksmotor",
"Name[pl]": "Obsługa faksu",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/fax/org.kde.okular-fax.metainfo.xml new/okular-16.12.1/generators/fax/org.kde.okular-fax.metainfo.xml
--- old/okular-16.12.0/generators/fax/org.kde.okular-fax.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/fax/org.kde.okular-fax.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">Faks</name>
<name xml:lang="fi">Faksi</name>
<name xml:lang="it">Fax</name>
+ <name xml:lang="ko">팩스</name>
<name xml:lang="nl">Fax</name>
<name xml:lang="nn">Faks</name>
+ <name xml:lang="pl">Fax</name>
<name xml:lang="pt">Fax</name>
<name xml:lang="sk">Fax</name>
<name xml:lang="sl">Faks</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">Faksidokumentide lugemise toetus</summary>
<summary xml:lang="fi">Lisää faksitiedostojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di documenti Fax</summary>
+ <summary xml:lang="ko">팩스 문서 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van faxdocumenten toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa faksdokument</summary>
+ <summary xml:lang="pl">Dodaje obsługę czytania faksów</summary>
<summary xml:lang="pt">Adiciona o suporte para a leitura de documentos de Fax</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie faxových dokumentov</summary>
<summary xml:lang="sl">Doda podporo za branje faksiranih dokumentov</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/fictionbook/libokularGenerator_fb.json new/okular-16.12.1/generators/fictionbook/libokularGenerator_fb.json
--- old/okular-16.12.0/generators/fictionbook/libokularGenerator_fb.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/fictionbook/libokularGenerator_fb.json 2017-01-08 19:38:42.000000000 +0100
@@ -32,6 +32,7 @@
"Description[fi]": "FictionBook-e-kirjojen hahmonnin",
"Description[fr]": "Système de rendu pour les livres électroniques FictionBook",
"Description[it]": "Un visualizzatore per ebook FictionBook",
+ "Description[ko]": "FictionBook 전자책 렌더러",
"Description[nl]": "Een viewer voor FictionBooks eBooks",
"Description[nn]": "Ein lesar for e-bøker av typen FictionBook",
"Description[pl]": "Wyświetlanie eksiążek FictionBook",
@@ -61,6 +62,7 @@
"Name[fi]": "FictionBook-taustaosa",
"Name[fr]": "Moteur pour FictionBook",
"Name[it]": "Backend Fiction Book",
+ "Name[ko]": "Fiction Book 백엔드",
"Name[nl]": "FictionBook-backend",
"Name[nn]": "FictionBook-motor",
"Name[pl]": "Obsługa Fiction Book",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/fictionbook/org.kde.okular-fb.metainfo.xml new/okular-16.12.1/generators/fictionbook/org.kde.okular-fb.metainfo.xml
--- old/okular-16.12.0/generators/fictionbook/org.kde.okular-fb.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/fictionbook/org.kde.okular-fb.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">FictionBook</name>
<name xml:lang="fi">FictionBook</name>
<name xml:lang="it">FictionBook</name>
+ <name xml:lang="ko">FictionBook</name>
<name xml:lang="nl">Fictie boek</name>
<name xml:lang="nn">FictionBook</name>
+ <name xml:lang="pl">Fikcja</name>
<name xml:lang="pt">FictionBook</name>
<name xml:lang="sk">FictionBook</name>
<name xml:lang="sl">FictionBook</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">FictionBooki lugemise toetus</summary>
<summary xml:lang="fi">Lisää FictionBook-lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di documenti in formato FictionBooks</summary>
+ <summary xml:lang="ko">FictionBook 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van fictie boeken toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa e-bøker i FictionBook-formatet</summary>
+ <summary xml:lang="pl">Dodaje obsługę czytania fikcji</summary>
<summary xml:lang="pt">Adiciona o suporte para a leitura de livros no formato FictionBooks</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie FictionBook</summary>
<summary xml:lang="sl">Doda podporo za branje dokumentov FictionBook</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/kimgio/libokularGenerator_kimgio.json new/okular-16.12.1/generators/kimgio/libokularGenerator_kimgio.json
--- old/okular-16.12.0/generators/kimgio/libokularGenerator_kimgio.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/kimgio/libokularGenerator_kimgio.json 2017-01-08 19:38:42.000000000 +0100
@@ -51,6 +51,7 @@
"Description[fi]": "Yksinkertainen kuvataustaosa",
"Description[fr]": "Un moteur simple pour image",
"Description[it]": "Un semplice backend per le immagini",
+ "Description[ko]": "간단한 그림 백엔드",
"Description[nl]": "Een eenvoudige afbeeldingsbackend",
"Description[nn]": "Ein enkel biletmotor",
"Description[pl]": "Silnik prostych obrazków",
@@ -101,6 +102,7 @@
"Name[fi]": "Kuvataustaosa",
"Name[fr]": "Moteur image",
"Name[it]": "Backend immagini",
+ "Name[ko]": "그림 백엔드",
"Name[nl]": "Afbeeldings-backend",
"Name[nn]": "Biletmotor",
"Name[pl]": "Silnik obrazów",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/kimgio/org.kde.okular-kimgio.metainfo.xml new/okular-16.12.1/generators/kimgio/org.kde.okular-kimgio.metainfo.xml
--- old/okular-16.12.0/generators/kimgio/org.kde.okular-kimgio.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/kimgio/org.kde.okular-kimgio.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">Pildid</name>
<name xml:lang="fi">Kuvat</name>
<name xml:lang="it">Immagini</name>
+ <name xml:lang="ko">그림</name>
<name xml:lang="nl">Afbeeldingen</name>
<name xml:lang="nn">Bilete</name>
+ <name xml:lang="pl">Obrazy</name>
<name xml:lang="pt">Imagens</name>
<name xml:lang="sk">Obrázky</name>
<name xml:lang="sl">Slike</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">Paljude pildivormingute lugemise toetus</summary>
<summary xml:lang="fi">Lisää monien kuvatiedostomuotojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di vari formati di immagini</summary>
+ <summary xml:lang="ko">다양한 그림 형식 읽기 지원 추가</summary>
<summary xml:lang="nl">Ondersteuning toevoegen om vele afbeeldingsformaten te lezen</summary>
<summary xml:lang="nn">Legg til støtte for å lesa mange ulike biletformat</summary>
+ <summary xml:lang="pl">Dodaje obsługę czytania wielu formatów obrazów</summary>
<summary xml:lang="pt">Adiciona o suporte para ler muitos formatos de imagem</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie mnohých obrazových formátov</summary>
<summary xml:lang="sl">Doda podporo za branje številnih slikovnih vrst</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/mobipocket/libokularGenerator_mobi.json new/okular-16.12.1/generators/mobipocket/libokularGenerator_mobi.json
--- old/okular-16.12.0/generators/mobipocket/libokularGenerator_mobi.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/mobipocket/libokularGenerator_mobi.json 2017-01-08 19:38:42.000000000 +0100
@@ -31,6 +31,7 @@
"Description[fi]": "MobiPocket-taustaosa",
"Description[fr]": "Un moteur Mobipocket",
"Description[it]": "Un backend per mobipocket",
+ "Description[ko]": "Mobipocket 백엔드",
"Description[nl]": "Een mobipocket-backend",
"Description[nn]": "Ein Mobipocket-motor",
"Description[pl]": "Obsługa mobipocket",
@@ -60,6 +61,7 @@
"Name[fi]": "Mobipocket-taustaosa",
"Name[fr]": "Moteur Mobipocket",
"Name[it]": "Backend Mobipocket",
+ "Name[ko]": "Mobipocket 백엔드",
"Name[nl]": "Mobipocket-backend",
"Name[nn]": "Mobipocket-motor",
"Name[pl]": "Obsługa Mobipocket",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml new/okular-16.12.1/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml
--- old/okular-16.12.0/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">Mobipocket</name>
<name xml:lang="fi">Mobipocket</name>
<name xml:lang="it">Mobipocket</name>
+ <name xml:lang="ko">Mobipocket</name>
<name xml:lang="nl">Mobipocket</name>
<name xml:lang="nn">Mobipocket</name>
+ <name xml:lang="pl">Mobipocket</name>
<name xml:lang="pt">Mobipocket</name>
<name xml:lang="sk">Mobipocket</name>
<name xml:lang="sl">Mobipocket</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">Mobipocketi e-raamatute lugemise toetus</summary>
<summary xml:lang="fi">Lisää MobiPocket-e-kirjojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di libri digitali in formato Mobipocket</summary>
+ <summary xml:lang="ko">Mobipocket 전자책 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van Mobipocket e-boeken toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa e-bøker i Mobipocket-formatet</summary>
+ <summary xml:lang="pl">Dodaje obsługę czytania ebooków Mobipocket</summary>
<summary xml:lang="pt">Adiciona o suporte para ler E-books da Mobipocket</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie e-kníh Mobipocket</summary>
<summary xml:lang="sl">Doda podporo za branje e-knjig Mobipocket</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/ooo/libokularGenerator_ooo.json new/okular-16.12.1/generators/ooo/libokularGenerator_ooo.json
--- old/okular-16.12.0/generators/ooo/libokularGenerator_ooo.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/ooo/libokularGenerator_ooo.json 2017-01-08 19:38:42.000000000 +0100
@@ -32,6 +32,7 @@
"Description[fi]": "OpenDocument-tekstitiedostojen hahmonnin",
"Description[fr]": "Un système de rendu pour documents textes OpenDocument",
"Description[it]": "Un visualizzatore per documenti OpenDocument Text",
+ "Description[ko]": "OpenDocument 텍스트 문서 렌더러",
"Description[nl]": "Een viewer voor OpenDocument-tekstdocumenten",
"Description[nn]": "Ein lesar for OpenDocument-tekstdokument",
"Description[pl]": "Program wyświetlający dokumentów tekstowych OpenDocument",
@@ -61,6 +62,7 @@
"Name[fi]": "OpenDocument-tekstitaustaosa",
"Name[fr]": "Moteur pour texte OpenDocument",
"Name[it]": "Backend OpenDocument Text",
+ "Name[ko]": "OpenDocument 텍스트 백엔드",
"Name[nl]": "OpenDocument-tekst-backend",
"Name[nn]": "OpenDocument-tekstmotor",
"Name[pl]": "Silnik dokumentów OpenDocument",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/ooo/org.kde.okular-ooo.metainfo.xml new/okular-16.12.1/generators/ooo/org.kde.okular-ooo.metainfo.xml
--- old/okular-16.12.0/generators/ooo/org.kde.okular-ooo.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/ooo/org.kde.okular-ooo.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">OpenDocument</name>
<name xml:lang="fi">OpenDocument</name>
<name xml:lang="it">OpenDocument</name>
+ <name xml:lang="ko">OpenDocument</name>
<name xml:lang="nl">OpenDocument</name>
<name xml:lang="nn">OpenDocument</name>
+ <name xml:lang="pl">OpenDocument</name>
<name xml:lang="pt">OpenDocument</name>
<name xml:lang="sk">OpenDocument</name>
<name xml:lang="sl">OpenDocument</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">OpenDocument tekstifailide lugemise toetus</summary>
<summary xml:lang="fi">Lisää OpenDocument-tekstitiedostojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di documenti di testo OpenDocument</summary>
+ <summary xml:lang="ko">OpenDocument 텍스트 파일 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van OpenDocument tekstbestanden toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa tekstfiler i OpenDocument-formatet</summary>
+ <summary xml:lang="pl">Dodaje obsługę czytania plików tekstowych OpenDocument</summary>
<summary xml:lang="pt">Adiciona o suporte para ler documentos de texto em OpenDocument</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie textových súborov OpenDocument</summary>
<summary xml:lang="sl">Doda podporo za branje besedilnih datotek OpenDocument</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/plucker/libokularGenerator_plucker.json new/okular-16.12.1/generators/plucker/libokularGenerator_plucker.json
--- old/okular-16.12.0/generators/plucker/libokularGenerator_plucker.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/plucker/libokularGenerator_plucker.json 2017-01-08 19:38:42.000000000 +0100
@@ -32,6 +32,7 @@
"Description[fi]": "Plucker-e-kirjojen hahmonnin",
"Description[fr]": "Système de rendu pour les livres électroniques Plucker",
"Description[it]": "Un visualizzatore per eBook Plucker",
+ "Description[ko]": "Plucker 전자책 렌더러",
"Description[nl]": "Een viewer voor Plucker eBooks",
"Description[nn]": "Ein gjengjevar for Plucker-e-bøker",
"Description[pl]": "Wyświetlanie eksiążek w formacie Plucker",
@@ -61,6 +62,7 @@
"Name[fi]": "Plucker-tiedostotaustaosa",
"Name[fr]": "Moteur de document Plucker",
"Name[it]": "Backend per documenti Plucker",
+ "Name[ko]": "Plucker 문서 백엔드",
"Name[nl]": "Plucker Document-backend",
"Name[nn]": "Plucker-dokumentmotor",
"Name[pl]": "Obsługa dokumentów Plucker",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/plucker/org.kde.okular-plucker.metainfo.xml new/okular-16.12.1/generators/plucker/org.kde.okular-plucker.metainfo.xml
--- old/okular-16.12.0/generators/plucker/org.kde.okular-plucker.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/plucker/org.kde.okular-plucker.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">Plucker</name>
<name xml:lang="fi">Plucker</name>
<name xml:lang="it">Plucker</name>
+ <name xml:lang="ko">plucker</name>
<name xml:lang="nl">Plucker</name>
<name xml:lang="nn">Plucker</name>
+ <name xml:lang="pl">Plucker</name>
<name xml:lang="pt">Plucker</name>
<name xml:lang="sk">Plucker</name>
<name xml:lang="sl">Plucker</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">Pluckeri dokumentide lugemise toetus</summary>
<summary xml:lang="fi">Lisää Plucker-tiedostojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di documenti Plucker</summary>
+ <summary xml:lang="ko">Plucker 문서 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van Plucker-documenten toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa Plucker-dokument</summary>
+ <summary xml:lang="pl">Dodaje obsługę czytania dokumentów Plucker</summary>
<summary xml:lang="pt">Adiciona o suporte para ler documentos do Plucker</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie dokumentov Plucker</summary>
<summary xml:lang="sl">Doda podporo za branje dokumentov Plucker</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/poppler/generator_pdf.cpp new/okular-16.12.1/generators/poppler/generator_pdf.cpp
--- old/okular-16.12.0/generators/poppler/generator_pdf.cpp 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/poppler/generator_pdf.cpp 2017-01-08 19:38:42.000000000 +0100
@@ -1643,9 +1643,7 @@
{
case SaveChanges:
{
- // Saving files with /Encrypt is not supported before Poppler 0.22
- QMutexLocker locker( userMutex() );
- return pdfdoc->isEncrypted() ? false : true;
+ return true;
}
default: ;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/poppler/libokularGenerator_poppler.json new/okular-16.12.1/generators/poppler/libokularGenerator_poppler.json
--- old/okular-16.12.0/generators/poppler/libokularGenerator_poppler.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/poppler/libokularGenerator_poppler.json 2017-01-08 19:38:42.000000000 +0100
@@ -31,6 +31,7 @@
"Description[fi]": "PDF-tiedostohahmonnin",
"Description[fr]": "Système de rendu pour les fichiers « PDF »",
"Description[it]": "Un visualizzatore di file PDF",
+ "Description[ko]": "PDF 파일 렌더러",
"Description[nl]": "Een PDF-bestandsviewer",
"Description[nn]": "Ein gjengjevar for PDF-filer",
"Description[pl]": "Wyświetlanie pliku PDF",
@@ -62,6 +63,7 @@
"Name[fi]": "PDF-taustaosa",
"Name[fr]": "Moteur PDF",
"Name[it]": "Backend PDF",
+ "Name[ko]": "PDF 백엔드",
"Name[nl]": "PDF-backend",
"Name[nn]": "PDF-motor",
"Name[pl]": "Silnik PDF",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/poppler/org.kde.okular-poppler.metainfo.xml new/okular-16.12.1/generators/poppler/org.kde.okular-poppler.metainfo.xml
--- old/okular-16.12.0/generators/poppler/org.kde.okular-poppler.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/poppler/org.kde.okular-poppler.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">PDF</name>
<name xml:lang="fi">PDF</name>
<name xml:lang="it">PDF</name>
+ <name xml:lang="ko">PDF</name>
<name xml:lang="nl">PDF</name>
<name xml:lang="nn">PDF</name>
+ <name xml:lang="pl">PDF</name>
<name xml:lang="pt">PDF</name>
<name xml:lang="sk">PDF</name>
<name xml:lang="sl">PDF</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">PDF-dokumentide lugemise toetus</summary>
<summary xml:lang="fi">Lisää PDF-tiedostojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di documenti PDF</summary>
+ <summary xml:lang="ko">PDF 문서 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van PDF-documenten toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa PDF-dokument</summary>
+ <summary xml:lang="pl">Dodaje obsługę czytania PDFów</summary>
<summary xml:lang="pt">Adiciona o suporte para ler documentos em PDF</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie PDF dokumentov</summary>
<summary xml:lang="sl">Doda podporo za branje dokumentov PDF</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/spectre/libokularGenerator_ghostview.json new/okular-16.12.1/generators/spectre/libokularGenerator_ghostview.json
--- old/okular-16.12.0/generators/spectre/libokularGenerator_ghostview.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/spectre/libokularGenerator_ghostview.json 2017-01-08 19:38:42.000000000 +0100
@@ -30,6 +30,7 @@
"Description[fi]": "Spectre-kirjastoon pohjautuva PostScript-tiedostohahmonnin",
"Description[fr]": "Système de rendu pour les fichiers « PostScript » utilisant la librairie Spectre",
"Description[it]": "Un visualizzatore di file PostScript basato sulla libreria Spectre",
+ "Description[ko]": "Spectre 라이브러리를 사용하는 포스트스크립트 파일 렌더러",
"Description[nl]": "Een renderer van PostScript bestanden gebaseerd op de bibliotheek Spectre",
"Description[nn]": "Ein gjengjevar for PostScript-filer, basert på Spectre-biblioteket",
"Description[pl]": "Wyświetlanie plików PostScript oparte o bibliotekę Spectre",
@@ -60,6 +61,7 @@
"Name[fi]": "PS-taustaosa",
"Name[fr]": "Moteur PS",
"Name[it]": "Backend PS",
+ "Name[ko]": "PS 백엔드",
"Name[nl]": "PS-backend",
"Name[nn]": "PS-motor",
"Name[pl]": "Silnik PS",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/spectre/org.kde.okular-spectre.metainfo.xml new/okular-16.12.1/generators/spectre/org.kde.okular-spectre.metainfo.xml
--- old/okular-16.12.0/generators/spectre/org.kde.okular-spectre.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/spectre/org.kde.okular-spectre.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">PostScript</name>
<name xml:lang="fi">PostScript</name>
<name xml:lang="it">PostScript</name>
+ <name xml:lang="ko">포스트스크립트</name>
<name xml:lang="nl">PostScript</name>
<name xml:lang="nn">PostScript</name>
+ <name xml:lang="pl">PostScript</name>
<name xml:lang="pt">PostScript</name>
<name xml:lang="sk">PostScript</name>
<name xml:lang="sl">PostScript</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">PostScript-dokumentide lugemise toetus</summary>
<summary xml:lang="fi">Lisää PostScript-tiedostojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di documenti PostScript</summary>
+ <summary xml:lang="ko">포스트스크립트 문서 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van PostScript-documenten toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa PostScript-dokument</summary>
+ <summary xml:lang="pl">Dodaje obsługę czytania dokumentów PostScript</summary>
<summary xml:lang="pt">Adiciona o suporte para ler documentos em PostScript</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie dokumentov PostScript</summary>
<summary xml:lang="sl">Doda podporo za branje dokumentov PostScript</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/tiff/libokularGenerator_tiff.json new/okular-16.12.1/generators/tiff/libokularGenerator_tiff.json
--- old/okular-16.12.0/generators/tiff/libokularGenerator_tiff.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/tiff/libokularGenerator_tiff.json 2017-01-08 19:38:42.000000000 +0100
@@ -31,6 +31,7 @@
"Description[fi]": "TIFF-taustaosa",
"Description[fr]": "Un moteur TIFF",
"Description[it]": "Un backend per TIFF",
+ "Description[ko]": "TIFF 백엔드",
"Description[nl]": "Een TIFF-backend",
"Description[nn]": "Ein TIFF-motor",
"Description[pl]": "Jeden z silników TIFF",
@@ -60,6 +61,7 @@
"Name[fi]": "TIFF-taustaosa",
"Name[fr]": "Moteur TIFF",
"Name[it]": "Backend TIFF",
+ "Name[ko]": "TIFF 백엔드",
"Name[nl]": "TIFF-backend",
"Name[nn]": "TIFF-motor",
"Name[pl]": "Silnik TIFF",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/tiff/org.kde.okular-tiff.metainfo.xml new/okular-16.12.1/generators/tiff/org.kde.okular-tiff.metainfo.xml
--- old/okular-16.12.0/generators/tiff/org.kde.okular-tiff.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/tiff/org.kde.okular-tiff.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">TIFF</name>
<name xml:lang="fi">TIFF</name>
<name xml:lang="it">Tiff</name>
+ <name xml:lang="ko">TIFF</name>
<name xml:lang="nl">Tiff</name>
<name xml:lang="nn">TIFF</name>
+ <name xml:lang="pl">Tiff</name>
<name xml:lang="pt">TIFF</name>
<name xml:lang="sk">Tiff</name>
<name xml:lang="sl">Tiff</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">TIFF-dokumentide lugemise toetus</summary>
<summary xml:lang="fi">Lisää TIFF-kuvatiedostojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di documenti Tiff</summary>
+ <summary xml:lang="ko">TIFF 문서 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van Tiff-documenten toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa TIFF-dokument</summary>
+ <summary xml:lang="pl">Dodaje obsługę czytania dokumentów Tiff</summary>
<summary xml:lang="pt">Adiciona o suporte para ler documentos em TIFF</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie Tiff dokumentov</summary>
<summary xml:lang="sl">Doda podporo za branje dokumentov Tiff</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/txt/libokularGenerator_txt.json new/okular-16.12.1/generators/txt/libokularGenerator_txt.json
--- old/okular-16.12.0/generators/txt/libokularGenerator_txt.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/txt/libokularGenerator_txt.json 2017-01-08 19:38:42.000000000 +0100
@@ -29,6 +29,7 @@
"Description[fi]": "Txt-taustaosa",
"Description[fr]": "Moteur Txt",
"Description[it]": "Backend di testo semplice",
+ "Description[ko]": "TXT 백엔드",
"Description[nl]": "Txt-backend",
"Description[nn]": "Txt-motor",
"Description[pl]": "Silnik tekstowy",
@@ -57,6 +58,7 @@
"Name[fi]": "Txt-taustaosa",
"Name[fr]": "Moteur Txt",
"Name[it]": "Backend di testo semplice",
+ "Name[ko]": "TXT 백엔드",
"Name[nl]": "Txt-backend",
"Name[nn]": "Txt-motor",
"Name[pl]": "Silnik tekstowy",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/txt/org.kde.okular-txt.metainfo.xml new/okular-16.12.1/generators/txt/org.kde.okular-txt.metainfo.xml
--- old/okular-16.12.0/generators/txt/org.kde.okular-txt.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/txt/org.kde.okular-txt.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">Tekst</name>
<name xml:lang="fi">Teksti</name>
<name xml:lang="it">Testo</name>
+ <name xml:lang="ko">텍스트</name>
<name xml:lang="nl">Tekst</name>
<name xml:lang="nn">Tekst</name>
+ <name xml:lang="pl">Tekst</name>
<name xml:lang="pt">Texto</name>
<name xml:lang="sk">Text</name>
<name xml:lang="sl">Besedilo</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">Lihttekstidokumentide lugemise toetus</summary>
<summary xml:lang="fi">Lisää paljaiden tekstitiedostojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di documenti in testo semplice</summary>
+ <summary xml:lang="ko">일반 텍스트 문서 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van gewone tekstdocumenten toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa reintekstdokument</summary>
+ <summary xml:lang="pl">Dodaje obsługę czytania zwykłych plików tekstowych</summary>
<summary xml:lang="pt">Adiciona o suporte para ler documentos em texto simples</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie čistých textových dokumentov</summary>
<summary xml:lang="sl">Doda podporo za branje besedilnih dokumentov</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/xps/libokularGenerator_xps.json new/okular-16.12.1/generators/xps/libokularGenerator_xps.json
--- old/okular-16.12.0/generators/xps/libokularGenerator_xps.json 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/xps/libokularGenerator_xps.json 2017-01-08 19:38:42.000000000 +0100
@@ -50,6 +50,7 @@
"Description[fi]": "XPS-taustaosa",
"Description[fr]": "Un moteur XPS",
"Description[it]": "Un backend per XPS",
+ "Description[ko]": "XPS 백엔드",
"Description[nl]": "Een XPS-backend",
"Description[nn]": "Ein XPS-motor",
"Description[pl]": "Jeden z silników XPS",
@@ -80,6 +81,7 @@
"Name[fi]": "XPS-taustaosa",
"Name[fr]": "Moteur XPS",
"Name[it]": "Backend XPS",
+ "Name[ko]": "XPS 백엔드",
"Name[nl]": "XPS-backend",
"Name[nn]": "XPS-motor",
"Name[pl]": "Silnik XPS",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/generators/xps/org.kde.okular-xps.metainfo.xml new/okular-16.12.1/generators/xps/org.kde.okular-xps.metainfo.xml
--- old/okular-16.12.0/generators/xps/org.kde.okular-xps.metainfo.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/generators/xps/org.kde.okular-xps.metainfo.xml 2017-01-08 19:38:42.000000000 +0100
@@ -13,8 +13,10 @@
<name xml:lang="et">XPS</name>
<name xml:lang="fi">XPS</name>
<name xml:lang="it">XPS</name>
+ <name xml:lang="ko">XPS</name>
<name xml:lang="nl">XPS</name>
<name xml:lang="nn">XPS</name>
+ <name xml:lang="pl">XPS</name>
<name xml:lang="pt">XPS</name>
<name xml:lang="sk">XPS</name>
<name xml:lang="sl">XPS</name>
@@ -35,8 +37,10 @@
<summary xml:lang="et">XPS-dokumentide lugemise toetus</summary>
<summary xml:lang="fi">Lisää XPS-tiedostojen lukutuen</summary>
<summary xml:lang="it">Aggiunge il supporto per la lettura di documenti XPS</summary>
+ <summary xml:lang="ko">XPS 문서 읽기 지원 추가</summary>
<summary xml:lang="nl">Voegt ondersteuning voor lezen van XPS-documenten toe</summary>
<summary xml:lang="nn">Legg til støtte for å lesa XPS-dokument</summary>
+ <summary xml:lang="pl">Dodaje obsługę dokumentów XPS</summary>
<summary xml:lang="pt">Adiciona o suporte para ler documentos em XPS</summary>
<summary xml:lang="sk">Pridá podporu pre čítanie XPS dokumentov</summary>
<summary xml:lang="sl">Doda podporo za branje dokumentov XPS</summary>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/part.cpp new/okular-16.12.1/part.cpp
--- old/okular-16.12.0/part.cpp 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/part.cpp 2017-01-08 19:38:42.000000000 +0100
@@ -94,6 +94,7 @@
#include "ui/fileprinterpreview.h"
#include "ui/guiutils.h"
#include "ui/layers.h"
+#include "ui/okmenutitle.h"
#include "conf/preferencesdialog.h"
#include "settings.h"
#include "core/action.h"
@@ -2518,7 +2519,7 @@
QAction *fitPageWidth = 0;
if (page)
{
- popup->setTitle( i18n( "Page %1", page->number() + 1 ) );
+ popup->addAction( new OKMenuTitle( popup, i18n( "Page %1", page->number() + 1 ) ) );
if ( ( !currentPage && m_document->bookmarkManager()->isBookmarked( page->number() ) ) ||
( currentPage && m_document->bookmarkManager()->isBookmarked( m_document->viewport() ) ) )
removeBookmark = popup->addAction( QIcon::fromTheme(QStringLiteral("edit-delete-bookmark")), i18n("Remove Bookmark") );
@@ -2533,7 +2534,7 @@
if ((m_showMenuBarAction && !m_showMenuBarAction->isChecked()) || (m_showFullScreenAction && m_showFullScreenAction->isChecked()))
{
- popup->setTitle( i18n( "Tools" ) );
+ popup->addAction( new OKMenuTitle( popup, i18n( "Tools" ) ) );
if (m_showMenuBarAction && !m_showMenuBarAction->isChecked()) popup->addAction(m_showMenuBarAction);
if (m_showFullScreenAction && m_showFullScreenAction->isChecked()) popup->addAction(m_showFullScreenAction);
reallyShow = true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/shell/org.kde.okular.appdata.xml new/okular-16.12.1/shell/org.kde.okular.appdata.xml
--- old/okular-16.12.0/shell/org.kde.okular.appdata.xml 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/shell/org.kde.okular.appdata.xml 2017-01-08 19:38:42.000000000 +0100
@@ -12,9 +12,12 @@
<name xml:lang="et">Okular</name>
<name xml:lang="fi">Okular</name>
<name xml:lang="it">Okular</name>
+ <name xml:lang="ko">Okular</name>
<name xml:lang="nl">Okular</name>
<name xml:lang="nn">Okular</name>
+ <name xml:lang="pl">Okular</name>
<name xml:lang="pt">Okular</name>
+ <name xml:lang="pt-BR">Okular</name>
<name xml:lang="sk">Okular</name>
<name xml:lang="sl">Okular</name>
<name xml:lang="sr">Окулар</name>
@@ -34,9 +37,12 @@
<summary xml:lang="et">Dokumendinäitaja</summary>
<summary xml:lang="fi">Asiakirjakatselin</summary>
<summary xml:lang="it">Visore di documenti</summary>
+ <summary xml:lang="ko">문서 뷰어</summary>
<summary xml:lang="nl">Documentenviewer</summary>
<summary xml:lang="nn">Dokumentvisar</summary>
+ <summary xml:lang="pl">Przeglądarka dokumentów</summary>
<summary xml:lang="pt">Visualizador do Documento</summary>
+ <summary xml:lang="pt-BR">Visualizador de documentos</summary>
<summary xml:lang="sk">Prehliadač dokumentov</summary>
<summary xml:lang="sl">Pregledovalnik dokumentov</summary>
<summary xml:lang="sr">Приказивач докумената</summary>
@@ -58,8 +64,10 @@
<p xml:lang="et">Okular on KDE välja töötatud universaalne dokumentide näitaja. Okular võib töötada eri platvormidel, kaasa arvatud Linux, Windows, Mac OS X, *BSD jne.</p>
<p xml:lang="fi">Okular on KDE:n kehittämä yleiskäyttöinen asiakirjakatselin. Okular toimii useissa ympäristöissä kuten Linuxissa, Windowsissa, Mac OS X:ssä, *BSD:ssä jne.</p>
<p xml:lang="it">Okular è un lettore universale di documenti sviluppato da KDE. Okular funziona su varie piattaforme, incluse (ma non solo) Linux, Windows, Mac OS X, *BSD, ecc.</p>
+ <p xml:lang="ko">Okular는 만능 문서 뷰어입니다. Okular는 리눅스, macOS, Windows, *BSD 등 여러 플랫폼에서 동작합니다.</p>
<p xml:lang="nl">Okular is een universele documentviewer ontwikkeld door KDE. Okular werkt op meerdere platforms, inclusief, maar niet beperkt tot Linux, Windows, Mac OS X, *BSD, etc.</p>
<p xml:lang="nn">Okular er ein dokumentvisar for mange ulike filformat, og er utvikla av KDE. Okular køyrer på fleire plattformer, blant anna Linux, Windows, Mac OS X og *BSD.</p>
+ <p xml:lang="pl">Okular jest wszechstronną przeglądarką dokumentów opracowaną przez KDE. Okular działa na wielu platformach takich jak Linux, Windows, Mac OS X, *BSD, itp.</p>
<p xml:lang="pt">O Okular é um visualizador universal de documentos desenvolvido pelo KDE. O Okular funciona em diversas plataformas, incluindo mas não se limitando ao Linux, Windows, Mac OS X, *BSD, etc.</p>
<p xml:lang="sk">Okular je univerzálny prehliadač dokumentov vyvinutý v KDE. Okular beží na mnohých platformách, vrátane Linux, Windows, Mac OS X, *BSD, atď.</p>
<p xml:lang="sl">Okular je univerzalni pregledovalnik dokumentov, ki so ga razvili pri KDE. Dela v več okoljih vključno s sistemi Linux, Windows, Mac OS X in *BSD.</p>
@@ -80,9 +88,12 @@
<p xml:lang="et">Omadused:</p>
<p xml:lang="fi">Ominaisuuksia:</p>
<p xml:lang="it">Funzionalità:</p>
+ <p xml:lang="ko">기능:</p>
<p xml:lang="nl">Kenmerken:</p>
<p xml:lang="nn">Funksjonar:</p>
+ <p xml:lang="pl">Możliwości:</p>
<p xml:lang="pt">Funcionalidades:</p>
+ <p xml:lang="pt-BR">Recursos:</p>
<p xml:lang="sk">Funkcie:</p>
<p xml:lang="sl">Zmožnosti:</p>
<p xml:lang="sr">Могућности:</p>
@@ -102,8 +113,10 @@
<li xml:lang="et">Toetatud vormingud: PDF, PS, Tiff, CHM, DjVu, pildid, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, faks</li>
<li xml:lang="fi">Tuetut tiedostomuodot: PDF, PS, TIFF, CHM, DjVu, kuvatiedostot, DVI, XPS, ODT, FictionBook, sarjakuvakirjat, Plucker, EPub, faksit</li>
<li xml:lang="it">Formati supportati: PDF, PS, Tiff, CHM, DjVu, immagini, DVI, XPS, ODT, Fiction Book, fumetti, Plucker, EPub, Fax</li>
+ <li xml:lang="ko">지원하는 형식: PDF, PS, Tiff, CHM, DjVu, 사진, DVI, XPS, ODT, Fiction Book, 만화책, Plucker, EPub, 팩스</li>
<li xml:lang="nl">Ondersteunde formaten: PDF, PS, Tiff, CHM, DjVu, Afbeeldingen, DVI, XPS, ODT, Fictie boek, Stripboek, Plucker, EPub, Fax</li>
<li xml:lang="nn">Støtta format: PDF, PS, Tiff, CHM, DjVu, bilete, DVI, XPS, ODT, e-bøker, teikneseriar, Plucker, EPub, Fax</li>
+ <li xml:lang="pl">Obsługa formatów: PDF, PS, Tiff, CHM, DjVu, Obrazy, DVI, XPS, ODT, Fikcja, Komiksy, Plucker, EPub, Fax</li>
<li xml:lang="pt">Formatos Suportados: PDF, PS, Tiff, CHM, DjVu, Imagens, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax</li>
<li xml:lang="sk">Podporované formáty: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, ODT, Fiction Book, Comic Book, Plucker, EPub, Fax</li>
<li xml:lang="sl">Podprte vrste: PDF, PS, Tiff, CHM, DjVu, slike, DVI, XPS, ODT, Fiction Book, stripi, Plucker, EPub, faks</li>
@@ -123,8 +136,10 @@
<li xml:lang="et">Külgriba sisukorra, pisipiltide, annotatsioonide ja järjehoidjatega</li>
<li xml:lang="fi">Sivupaneeli, jossa sisältö, pienoiskuvat, tarkastelut ja kirjanmerkit</li>
<li xml:lang="it">Barra laterale con contenuti, miniature, revisioni e segnalibri</li>
+ <li xml:lang="ko">목차, 책갈피, 미리 보기, 주석이 있는 사이드바</li>
<li xml:lang="nl">Zijbalk met inhoud, miniaturen, reviews en bladwijzers</li>
<li xml:lang="nn">Sidestolpe med innhaldsliste, miniatyrbilete, omtalar og bokmerke</li>
+ <li xml:lang="pl">Pasek boczny z treścią, miniaturami, recenzją i zakładkami</li>
<li xml:lang="pt">Barra lateral com o conteúdo, miniaturas, revisões e marcação de favoritos</li>
<li xml:lang="sk">Posuvník s obsahom, miniatúrami, revíziami a záložkami</li>
<li xml:lang="sl">Stranska vrstica z vsebino, sličicami, ocenami in zaznamki</li>
@@ -144,8 +159,10 @@
<li xml:lang="et">Annotatsioonide toetus</li>
<li xml:lang="fi">Merkintöjen tuki</li>
<li xml:lang="it">Supporto per le annotazioni</li>
+ <li xml:lang="ko">주석 지원</li>
<li xml:lang="nl">Ondersteuning van annotaties</li>
<li xml:lang="nn">Støtte for merknadar</li>
+ <li xml:lang="pl">Obsługa przypisów</li>
<li xml:lang="pt">Suporte para anotações</li>
<li xml:lang="sk">Podpora anotácií</li>
<li xml:lang="sl">Podpora zabeležkam</li>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/ui/annotationpopup.cpp new/okular-16.12.1/ui/annotationpopup.cpp
--- old/okular-16.12.0/ui/annotationpopup.cpp 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/ui/annotationpopup.cpp 2017-01-08 19:38:42.000000000 +0100
@@ -18,6 +18,7 @@
#include "core/annotations.h"
#include "core/document.h"
#include "guiutils.h"
+#include "okmenutitle.h"
Q_DECLARE_METATYPE( AnnotationPopup::AnnotPagePair )
@@ -84,7 +85,7 @@
const AnnotPagePair &pair = mAnnotations.at(0);
- menu.setTitle( i18np( "Annotation", "%1 Annotations", mAnnotations.count() ) );
+ menu.addAction( new OKMenuTitle( &menu, i18np( "Annotation", "%1 Annotations", mAnnotations.count() ) ) );
action = menu.addAction( QIcon::fromTheme( QStringLiteral("comment") ), i18n( "&Open Pop-up Note" ) );
action->setData( QVariant::fromValue( pair ) );
@@ -124,7 +125,7 @@
{
foreach ( const AnnotPagePair& pair, mAnnotations )
{
- menu.setTitle( GuiUtils::captionForAnnotation( pair.annotation ) );
+ menu.addAction( new OKMenuTitle( &menu, GuiUtils::captionForAnnotation( pair.annotation ) ) );
action = menu.addAction( QIcon::fromTheme( QStringLiteral("comment") ), i18n( "&Open Pop-up Note" ) );
action->setData( QVariant::fromValue( pair ) );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/ui/okmenutitle.cpp new/okular-16.12.1/ui/okmenutitle.cpp
--- old/okular-16.12.0/ui/okmenutitle.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/okular-16.12.1/ui/okmenutitle.cpp 2017-01-08 19:38:42.000000000 +0100
@@ -0,0 +1,65 @@
+/* This file was part of the KDE libraries (copied partially from kmenu.cpp)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License version 2 as published by the Free Software Foundation.
+
+ This library 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 Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include "okmenutitle.h"
+
+#include <QApplication>
+#include <QEvent>
+#include <QKeyEvent>
+#include <QMenu>
+#include <QToolButton>
+
+OKMenuTitle::OKMenuTitle(QMenu *menu, const QString &text, const QIcon &icon)
+ : QWidgetAction(menu)
+{
+ QAction *buttonAction = new QAction(menu);
+ QFont font = buttonAction->font();
+ font.setBold(true);
+ buttonAction->setFont(font);
+ buttonAction->setText(text);
+ buttonAction->setIcon(icon);
+
+ QToolButton *titleButton = new QToolButton(menu);
+ titleButton->installEventFilter(this); // prevent clicks on the title of the menu
+ titleButton->setDefaultAction(buttonAction);
+ titleButton->setDown(true); // prevent hover style changes in some styles
+ titleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ setDefaultWidget(titleButton);
+}
+
+bool OKMenuTitle::eventFilter(QObject *object, QEvent *event)
+{
+ Q_UNUSED(object);
+
+ if (event->type() == QEvent::Paint) {
+ return false;
+ } else if (event->type() == QEvent::KeyRelease) {
+ // If we're receiving the key release event is because we just gained
+ // focus though a key event, use the same key to move it to the next action
+ if (static_cast<QMenu*>(parentWidget())->activeAction() == this) {
+ QKeyEvent *ke = static_cast<QKeyEvent*>(event);
+ QKeyEvent newKe(QEvent::KeyPress, ke->key(), ke->modifiers(), ke->text(), ke->isAutoRepeat(), ke->count());
+ QApplication::sendEvent(parentWidget(), &newKe);
+ }
+
+ // TODO What happens when there's multiple OKMenuTitle or only OKMenuTitle in a menu
+ }
+
+ event->accept();
+ return true;
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/ui/okmenutitle.h new/okular-16.12.1/ui/okmenutitle.h
--- old/okular-16.12.0/ui/okmenutitle.h 1970-01-01 01:00:00.000000000 +0100
+++ new/okular-16.12.1/ui/okmenutitle.h 2017-01-08 19:38:42.000000000 +0100
@@ -0,0 +1,31 @@
+/* This file was part of the KDE libraries (copied partially from kmenu.cpp)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License version 2 as published by the Free Software Foundation.
+
+ This library 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 Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef OKMENUTITLE_H
+#define OKMENUTITLE_H
+
+#include <QWidgetAction>
+
+class OKMenuTitle : public QWidgetAction
+{
+public:
+ OKMenuTitle(QMenu *menu, const QString &text, const QIcon &icon = QIcon());
+
+ bool eventFilter(QObject *object, QEvent *event) override;
+};
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-16.12.0/ui/pageview.cpp new/okular-16.12.1/ui/pageview.cpp
--- old/okular-16.12.0/ui/pageview.cpp 2016-12-09 23:00:22.000000000 +0100
+++ new/okular-16.12.1/ui/pageview.cpp 2017-01-08 19:38:42.000000000 +0100
@@ -70,6 +70,7 @@
#include "pageviewannotator.h"
#include "priorities.h"
#include "toolaction.h"
+#include "okmenutitle.h"
#ifdef HAVE_SPEECH
#include "tts.h"
#endif
@@ -2774,7 +2775,7 @@
QAction *imageToFile = 0;
if ( d->document->supportsSearching() && !selectedText.isEmpty() )
{
- menu.setTitle( i18np( "Text (1 character)", "Text (%1 characters)", selectedText.length() ) );
+ menu.addAction( new OKMenuTitle( &menu, i18np( "Text (1 character)", "Text (%1 characters)", selectedText.length() ) ) );
textToClipboard = menu.addAction( QIcon::fromTheme(QStringLiteral("edit-copy")), i18n( "Copy to Clipboard" ) );
bool copyAllowed = d->document->isAllowed( Okular::AllowCopy );
if ( !copyAllowed )
@@ -2791,7 +2792,7 @@
addWebShortcutsMenu( &menu, selectedText );
}
}
- menu.setTitle( i18n( "Image (%1 by %2 pixels)", selectionRect.width(), selectionRect.height() ) );
+ menu.addAction( new OKMenuTitle( &menu, i18n( "Image (%1 by %2 pixels)", selectionRect.width(), selectionRect.height() ) ) );
imageToClipboard = menu.addAction( QIcon::fromTheme(QStringLiteral("image-x-generic")), i18n( "Copy to Clipboard" ) );
imageToFile = menu.addAction( QIcon::fromTheme(QStringLiteral("document-save")), i18n( "Save to File..." ) );
QAction *choice = menu.exec( e->globalPos() );
1
0
Hello community,
here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2017-01-25 23:14:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old)
and /work/SRC/openSUSE:Factory/.kdelibs4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes 2016-12-17 11:02:24.475423523 +0100
+++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes 2017-01-25 23:14:44.860476483 +0100
@@ -1,0 +2,7 @@
+Sat Jan 14 10:04:42 UTC 2017 - lbeltrame(a)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
+
+-------------------------------------------------------------------
kdelibs4.changes: same change
Old:
----
kdelibs-4.14.27.tar.xz
New:
----
kdelibs-4.14.28.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4-apidocs.spec ++++++
--- /var/tmp/diff_new_pack.ZiovkM/_old 2017-01-25 23:14:46.264264798 +0100
+++ /var/tmp/diff_new_pack.ZiovkM/_new 2017-01-25 23:14:46.268264195 +0100
@@ -17,7 +17,7 @@
Name: kdelibs4-apidocs
-Version: 4.14.27
+Version: 4.14.28
Release: 0
Summary: KDE 4 API documentation
License: LGPL-2.1+
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.ZiovkM/_old 2017-01-25 23:14:46.296259973 +0100
+++ /var/tmp/diff_new_pack.ZiovkM/_new 2017-01-25 23:14:46.300259370 +0100
@@ -20,7 +20,7 @@
%bcond_with gendoxygen
Name: kdelibs4
-Version: 4.14.27
+Version: 4.14.28
Release: 0
BuildRequires: OpenEXR-devel
BuildRequires: automoc4
++++++ kdelibs-4.14.27.tar.xz -> kdelibs-4.14.28.tar.xz ++++++
/work/SRC/openSUSE:Factory/kdelibs4/kdelibs-4.14.27.tar.xz /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs-4.14.28.tar.xz differ: char 27, line 1
1
0
Hello community,
here is the log from the commit of package sweeper for openSUSE:Factory checked in at 2017-01-25 23:14:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sweeper (Old)
and /work/SRC/openSUSE:Factory/.sweeper.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sweeper"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sweeper/sweeper.changes 2016-12-17 11:02:01.642665325 +0100
+++ /work/SRC/openSUSE:Factory/.sweeper.new/sweeper.changes 2017-01-25 23:14:26.335270076 +0100
@@ -1,0 +2,7 @@
+Sat Jan 14 09:11:04 UTC 2017 - lbeltrame(a)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:
----
sweeper-16.12.0.tar.xz
New:
----
sweeper-16.12.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sweeper.spec ++++++
--- /var/tmp/diff_new_pack.SgkCIH/_old 2017-01-25 23:14:26.959175989 +0100
+++ /var/tmp/diff_new_pack.SgkCIH/_new 2017-01-25 23:14:26.963175385 +0100
@@ -17,7 +17,7 @@
Name: sweeper
-Version: 16.12.0
+Version: 16.12.1
Release: 0
Summary: KDE Privacy Utility
License: LGPL-2.1+
++++++ sweeper-16.12.0.tar.xz -> sweeper-16.12.1.tar.xz ++++++
1
0
Hello community,
here is the log from the commit of package kmousetool for openSUSE:Factory checked in at 2017-01-25 23:14:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmousetool (Old)
and /work/SRC/openSUSE:Factory/.kmousetool.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmousetool"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kmousetool/kmousetool.changes 2016-12-17 10:59:41.906505878 +0100
+++ /work/SRC/openSUSE:Factory/.kmousetool.new/kmousetool.changes 2017-01-25 23:14:14.876998040 +0100
@@ -1,0 +2,7 @@
+Sat Jan 14 09:09:48 UTC 2017 - lbeltrame(a)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:
----
kmousetool-16.12.0.tar.xz
New:
----
kmousetool-16.12.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kmousetool.spec ++++++
--- /var/tmp/diff_new_pack.fP1pD9/_old 2017-01-25 23:14:15.480906966 +0100
+++ /var/tmp/diff_new_pack.fP1pD9/_new 2017-01-25 23:14:15.488905760 +0100
@@ -26,7 +26,7 @@
License: GPL-2.0+
Group: System/GUI/KDE
Url: http://www.kde.org
-Version: 16.12.0
+Version: 16.12.1
Release: 0
Source0: %{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ kmousetool-16.12.0.tar.xz -> kmousetool-16.12.1.tar.xz ++++++
1
0
Hello community,
here is the log from the commit of package kmag for openSUSE:Factory checked in at 2017-01-25 23:14:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmag (Old)
and /work/SRC/openSUSE:Factory/.kmag.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmag"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kmag/kmag.changes 2016-12-17 10:59:29.720236220 +0100
+++ /work/SRC/openSUSE:Factory/.kmag.new/kmag.changes 2017-01-25 23:14:02.390881064 +0100
@@ -1,0 +2,7 @@
+Sat Jan 14 09:09:43 UTC 2017 - lbeltrame(a)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:
----
kmag-16.12.0.tar.xz
New:
----
kmag-16.12.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kmag.spec ++++++
--- /var/tmp/diff_new_pack.hxkOj3/_old 2017-01-25 23:14:02.838813510 +0100
+++ /var/tmp/diff_new_pack.hxkOj3/_new 2017-01-25 23:14:02.838813510 +0100
@@ -26,7 +26,7 @@
License: GPL-2.0
Group: System/GUI/KDE
Url: http://www.kde.org
-Version: 16.12.0
+Version: 16.12.1
Release: 0
Source0: %{name}-%version.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ kmag-16.12.0.tar.xz -> kmag-16.12.1.tar.xz ++++++
1
0
Hello community,
here is the log from the commit of package kget for openSUSE:Factory checked in at 2017-01-25 23:13:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kget (Old)
and /work/SRC/openSUSE:Factory/.kget.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kget"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kget/kget.changes 2016-12-17 10:59:02.092159199 +0100
+++ /work/SRC/openSUSE:Factory/.kget.new/kget.changes 2017-01-25 23:13:49.192871510 +0100
@@ -1,0 +2,7 @@
+Sat Jan 14 09:09:25 UTC 2017 - lbeltrame(a)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:
----
kget-16.12.0.tar.xz
New:
----
kget-16.12.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kget.spec ++++++
--- /var/tmp/diff_new_pack.il8imx/_old 2017-01-25 23:13:49.660800938 +0100
+++ /var/tmp/diff_new_pack.il8imx/_new 2017-01-25 23:13:49.668799732 +0100
@@ -17,7 +17,7 @@
Name: kget
-Version: 16.12.0
+Version: 16.12.1
Release: 0
Summary: Download Manager
License: GPL-2.0+
++++++ kget-16.12.0.tar.xz -> kget-16.12.1.tar.xz ++++++
1
0