Hello community,
here is the log from the commit of package xdg-desktop-portal-kde for
openSUSE:Factory checked in at 2018-02-07 18:41:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdg-desktop-portal-kde (Old)
and /work/SRC/openSUSE:Factory/.xdg-desktop-portal-kde.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-desktop-portal-kde"
Wed Feb 7 18:41:18 2018 rev:15 rq:573514 version:5.12.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/xdg-desktop-portal-kde/xdg-desktop-portal-kde.changes
2018-01-25 12:39:36.949253970 +0100
+++
/work/SRC/openSUSE:Factory/.xdg-desktop-portal-kde.new/xdg-desktop-portal-kde.changes
2018-02-07 18:41:19.460432903 +0100
@@ -1,0 +2,18 @@
+Tue Feb 6 15:45:03 UTC 2018 - [email protected]
+
+- Add patch to fix build with latest Qt dev version where
+ QCUPSSupport::cupsOptionsList was removed from the private API
+ (kde#389825):
+ * 0001-Fix-build-with-Qt-dev-branch-where-QCUPSSupport-cups.patch
+
+-------------------------------------------------------------------
+Fri Feb 2 21:03:45 CET 2018 - [email protected]
+
+- Update to 5.12.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/plasma-5.12.0.php
+- Changes since 5.11.95:
+ * None
+
+-------------------------------------------------------------------
Old:
----
xdg-desktop-portal-kde-5.11.95.tar.xz
New:
----
0001-Fix-build-with-Qt-dev-branch-where-QCUPSSupport-cups.patch
xdg-desktop-portal-kde-5.12.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdg-desktop-portal-kde.spec ++++++
--- /var/tmp/diff_new_pack.DUMVez/_old 2018-02-07 18:41:20.088403499 +0100
+++ /var/tmp/diff_new_pack.DUMVez/_new 2018-02-07 18:41:20.092403312 +0100
@@ -20,13 +20,15 @@
%define kf5_version 5.26.0
Name: xdg-desktop-portal-kde
-Version: 5.11.95
+Version: 5.12.0
Release: 0
Summary: QT/KF5 backend for xdg-desktop-portal
License: LGPL-2.1+
Group: System/Libraries
Url: http://www.kde.org
-Source:
http://download.kde.org/unstable/plasma/%{version}/xdg-desktop-portal-kde-%{version}.tar.xz
+Source: xdg-desktop-portal-kde-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM
0001-Fix-build-with-Qt-dev-branch-where-QCUPSSupport-cups.patch - kde#389825
+Patch0: 0001-Fix-build-with-Qt-dev-branch-where-QCUPSSupport-cups.patch
BuildRequires: extra-cmake-modules >= %{kf5_version}
BuildRequires: libQt5PrintSupport-private-headers-devel
BuildRequires: cmake(KF5CoreAddons) >= %{kf5_version}
@@ -50,6 +52,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%cmake_kf5 -d build
++++++ 0001-Fix-build-with-Qt-dev-branch-where-QCUPSSupport-cups.patch ++++++
>From f0cc071c09d721734d0ca5bdf3baaa75d46bd64b Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <[email protected]>
Date: Tue, 6 Feb 2018 16:54:31 +0100
Subject: [PATCH] Fix build with Qt dev branch, where
QCUPSSupport::cupsOptionsList was removed
Summary:
Fix build with Qt dev branch, where QCUPSSupport::cupsOptionsList was removed
BUG 389825
Reviewers: aacid, jriddell
Differential Revision: https://phabricator.kde.org/D10345
---
src/print.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/print.cpp b/src/print.cpp
index 439b6ce..d797007 100644
--- a/src/print.cpp
+++ b/src/print.cpp
@@ -636,7 +636,7 @@ uint PrintPortal::PreparePrint(const QDBusObjectPath
&handle,
resultingSettings.insert(QLatin1String("page-ranges"),
QString("%1-%2").arg(printer->fromPage()).arg(printer->toPage()));
}
// Set cups specific properties
- const QStringList cupsOptions = QCUPSSupport::cupsOptionsList(printer);
+ const QStringList cupsOptions =
printer->printEngine()->property(PPK_CupsOptions).toStringList();
qCDebug(XdgDesktopPortalKdePrint) << cupsOptions;
if (cupsOptions.contains(QLatin1String("page-set"))) {
resultingSettings.insert(QLatin1String("page-set"),
cupsOptions.at(cupsOptions.indexOf(QLatin1String("page-set")) + 1));
--
2.16.1
++++++ xdg-desktop-portal-kde-5.11.95.tar.xz ->
xdg-desktop-portal-kde-5.12.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.11.95/CMakeLists.txt
new/xdg-desktop-portal-kde-5.12.0/CMakeLists.txt
--- old/xdg-desktop-portal-kde-5.11.95/CMakeLists.txt 2018-01-15
14:46:33.000000000 +0100
+++ new/xdg-desktop-portal-kde-5.12.0/CMakeLists.txt 2018-02-01
15:46:26.000000000 +0100
@@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.4.0")
-set(PROJECT_VERSION "5.11.95")
+set(PROJECT_VERSION "5.12.0")
set(PROJECT_VERSION_MAJOR 5)
################# set KDE specific information #################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.11.95/po/nn/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.12.0/po/nn/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.11.95/po/nn/xdg-desktop-portal-kde.po
1970-01-01 01:00:00.000000000 +0100
+++ new/xdg-desktop-portal-kde-5.12.0/po/nn/xdg-desktop-portal-kde.po
2018-02-01 15:46:00.000000000 +0100
@@ -0,0 +1,64 @@
+# Translation of xdg-desktop-portal-kde to Norwegian Nynorsk
+#
+# Karl Ove Hufthammer <[email protected]>, 2018.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
+"POT-Creation-Date: 2017-05-23 03:08+0200\n"
+"PO-Revision-Date: 2018-01-27 12:09+0100\n"
+"Last-Translator: Karl Ove Hufthammer <[email protected]>\n"
+"Language-Team: Norwegian Nynorsk <[email protected]>\n"
+"Language: nn\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 2.0\n"
+
+#: src/accessdialog.cpp:42
+#, kde-format
+msgid "Request device access"
+msgstr "Be om tilgang til eining"
+
+#. i18n: ectx: property (windowTitle), widget (QDialog, AppChooserDialog)
+#. i18n: ectx: property (windowTitle), widget (QDialog, AccessDialog)
+#: src/accessdialog.ui:20 src/appchooserdialog.ui:14
+#, kde-format
+msgid "Dialog"
+msgstr "Dialogvindauge"
+
+#. i18n: ectx: property (text), widget (QLabel, iconLabel)
+#: src/accessdialog.ui:26
+#, kde-format
+msgid "Icon"
+msgstr "Ikon"
+
+#. i18n: ectx: property (text), widget (QLabel, titleLabel)
+#. i18n: ectx: property (text), widget (QLabel, subtitleLabel)
+#. i18n: ectx: property (text), widget (QLabel, bodyLabel)
+#: src/accessdialog.ui:38 src/accessdialog.ui:51 src/accessdialog.ui:69
+#, kde-format
+msgid "TextLabel"
+msgstr "Tekstmerkelapp"
+
+#: src/appchooserdialog.cpp:66
+#, kde-format
+msgid "Select"
+msgstr "Vel"
+
+#: src/appchooserdialog.cpp:67
+#, kde-format
+msgid "Select application"
+msgstr "Vel program"
+
+#. i18n: ectx: property (text), widget (QLabel, searchLabel)
+#: src/appchooserdialog.ui:22
+#, kde-format
+msgid "Search"
+msgstr "Søk"
+
+#: src/filechooser.cpp:159
+#, kde-format
+msgid "Open"
+msgstr "Opna"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.11.95/po/ru/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.12.0/po/ru/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.11.95/po/ru/xdg-desktop-portal-kde.po
2018-01-15 14:46:30.000000000 +0100
+++ new/xdg-desktop-portal-kde-5.12.0/po/ru/xdg-desktop-portal-kde.po
2018-02-01 15:46:08.000000000 +0100
@@ -1,13 +1,13 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Alexander Potashev <[email protected]>, 2017.
+# Alexander Potashev <[email protected]>, 2017, 2018.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2017-05-23 03:08+0200\n"
-"PO-Revision-Date: 2017-10-05 04:28+0300\n"
+"PO-Revision-Date: 2018-01-19 01:53+0300\n"
"Last-Translator: Alexander Potashev <[email protected]>\n"
"Language-Team: Russian <[email protected]>\n"
"Language: ru\n"
@@ -21,20 +21,20 @@
#: src/accessdialog.cpp:42
#, kde-format
msgid "Request device access"
-msgstr ""
+msgstr "Запрос доступа к устройству"
#. i18n: ectx: property (windowTitle), widget (QDialog, AppChooserDialog)
#. i18n: ectx: property (windowTitle), widget (QDialog, AccessDialog)
#: src/accessdialog.ui:20 src/appchooserdialog.ui:14
#, kde-format
msgid "Dialog"
-msgstr ""
+msgstr "Диалог"
#. i18n: ectx: property (text), widget (QLabel, iconLabel)
#: src/accessdialog.ui:26
#, kde-format
msgid "Icon"
-msgstr ""
+msgstr "Значок"
#. i18n: ectx: property (text), widget (QLabel, titleLabel)
#. i18n: ectx: property (text), widget (QLabel, subtitleLabel)
@@ -42,17 +42,17 @@
#: src/accessdialog.ui:38 src/accessdialog.ui:51 src/accessdialog.ui:69
#, kde-format
msgid "TextLabel"
-msgstr ""
+msgstr "Текстовая метка"
#: src/appchooserdialog.cpp:66
#, kde-format
msgid "Select"
-msgstr ""
+msgstr "Выбрать"
#: src/appchooserdialog.cpp:67
#, kde-format
msgid "Select application"
-msgstr ""
+msgstr "Выбор приложения"
#. i18n: ectx: property (text), widget (QLabel, searchLabel)
#: src/appchooserdialog.ui:22
@@ -63,4 +63,4 @@
#: src/filechooser.cpp:159
#, kde-format
msgid "Open"
-msgstr ""
\ No newline at end of file
+msgstr "Открыть"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.11.95/po/zh_CN/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.12.0/po/zh_CN/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.11.95/po/zh_CN/xdg-desktop-portal-kde.po
2018-01-15 14:46:33.000000000 +0100
+++ new/xdg-desktop-portal-kde-5.12.0/po/zh_CN/xdg-desktop-portal-kde.po
2018-02-01 15:46:26.000000000 +0100
@@ -3,7 +3,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2017-05-23 03:08+0200\n"
-"PO-Revision-Date: 2018-01-08 17:59-0500\n"
+"PO-Revision-Date: 2018-02-01 07:16-0500\n"
"Last-Translator: guoyunhebrave <[email protected]>\n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
@@ -14,7 +14,7 @@
"X-Generator: crowdin.com\n"
"X-Crowdin-Project: kdeorg\n"
"X-Crowdin-Language: zh-CN\n"
-"X-Crowdin-File: /kf5-trunk/messages/kde-workspace/xdg-desktop-portal-kde."
+"X-Crowdin-File: /kf5-stable/messages/kde-workspace/xdg-desktop-portal-kde."
"pot\n"
#: src/accessdialog.cpp:42
@@ -51,7 +51,7 @@
#: src/appchooserdialog.cpp:67
#, kde-format
msgid "Select application"
-msgstr "选择程序"
+msgstr "选择应用"
#. i18n: ectx: property (text), widget (QLabel, searchLabel)
#: src/appchooserdialog.ui:22
