Hello community,
here is the log from the commit of package xdg-desktop-portal-kde for
openSUSE:Factory checked in at 2020-10-30 11:47:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdg-desktop-portal-kde (Old)
and /work/SRC/openSUSE:Factory/.xdg-desktop-portal-kde.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-desktop-portal-kde"
Fri Oct 30 11:47:36 2020 rev:69 rq:844609 version:5.20.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/xdg-desktop-portal-kde/xdg-desktop-portal-kde.changes
2020-10-22 14:26:22.938971118 +0200
+++
/work/SRC/openSUSE:Factory/.xdg-desktop-portal-kde.new.3463/xdg-desktop-portal-kde.changes
2020-10-30 11:47:56.313721718 +0100
@@ -1,0 +2,10 @@
+Tue Oct 27 20:43:54 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Update to 5.20.2
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/plasma-5.20.2
+- Changes since 5.20.1:
+ * FileChooser: escape slash character in user visible filter name
(kde#427306)
+
+-------------------------------------------------------------------
Old:
----
xdg-desktop-portal-kde-5.20.1.tar.xz
xdg-desktop-portal-kde-5.20.1.tar.xz.sig
New:
----
xdg-desktop-portal-kde-5.20.2.tar.xz
xdg-desktop-portal-kde-5.20.2.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdg-desktop-portal-kde.spec ++++++
--- /var/tmp/diff_new_pack.561uPP/_old 2020-10-30 11:47:56.857722199 +0100
+++ /var/tmp/diff_new_pack.561uPP/_new 2020-10-30 11:47:56.861722203 +0100
@@ -25,15 +25,15 @@
%define kf5_version 5.50.0
Name: xdg-desktop-portal-kde
-Version: 5.20.1
+Version: 5.20.2
Release: 0
Summary: QT/KF5 backend for xdg-desktop-portal
License: LGPL-2.1-or-later
Group: System/Libraries
URL: http://www.kde.org
-Source: xdg-desktop-portal-kde-%{version}.tar.xz
+Source:
https://download.kde.org/stable/plasma/%{version}/xdg-desktop-portal-kde-%{version}.tar.xz
%if %{with lang}
-Source1: xdg-desktop-portal-kde-%{version}.tar.xz.sig
+Source1:
https://download.kde.org/stable/plasma/%{version}/xdg-desktop-portal-kde-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
BuildRequires: extra-cmake-modules >= %{kf5_version}
++++++ xdg-desktop-portal-kde-5.20.1.tar.xz ->
xdg-desktop-portal-kde-5.20.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.20.1/CMakeLists.txt
new/xdg-desktop-portal-kde-5.20.2/CMakeLists.txt
--- old/xdg-desktop-portal-kde-5.20.1/CMakeLists.txt 2020-10-20
14:15:26.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.20.2/CMakeLists.txt 2020-10-27
13:34:58.000000000 +0100
@@ -2,7 +2,7 @@
project(xdg-desktop-portal-kde)
-set(PROJECT_VERSION "5.20.1")
+set(PROJECT_VERSION "5.20.2")
set(PROJECT_VERSION_MAJOR 5)
set(QT_MIN_VERSION "5.15.0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.20.1/src/filechooser.cpp
new/xdg-desktop-portal-kde-5.20.2/src/filechooser.cpp
--- old/xdg-desktop-portal-kde-5.20.1/src/filechooser.cpp 2020-10-20
14:15:08.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.20.2/src/filechooser.cpp 2020-10-27
13:34:34.000000000 +0100
@@ -588,8 +588,12 @@
}
if (!filterStrings.isEmpty()) {
+ QString userVisibleName = filterList.userVisibleName;
+ if (!isMobile()) {
+ userVisibleName.replace(QLatin1Char('/'),
QStringLiteral("\\/"));
+ }
const QString filterString = filterStrings.join(QLatin1Char('
'));
- const QString nameFilter =
QStringLiteral("%1|%2").arg(filterString, filterList.userVisibleName);
+ const QString nameFilter =
QStringLiteral("%1|%2").arg(filterString, userVisibleName);
nameFilters << nameFilter;
allFilters[filterList.userVisibleName] = filterList;
}
@@ -603,7 +607,11 @@
if (filterStruct.type == 0) {
// make the relevant entry the first one in the list of
filters,
// since that is the one that gets preselected by
KFileWidget::setFilter
- QString nameFilter =
QStringLiteral("%1|%2").arg(filterStruct.filterString,
filterList.userVisibleName);
+ QString userVisibleName = filterList.userVisibleName;
+ if (!isMobile()) {
+ userVisibleName.replace(QLatin1Char('/'),
QStringLiteral("\\/"));
+ }
+ QString nameFilter =
QStringLiteral("%1|%2").arg(filterStruct.filterString, userVisibleName);
nameFilters.removeAll(nameFilter);
nameFilters.push_front(nameFilter);
} else {
@@ -615,7 +623,7 @@
}
}
-bool FileChooserPortal::isMobile() const
+bool FileChooserPortal::isMobile()
{
QByteArray mobile = qgetenv("QT_QUICK_CONTROLS_MOBILE");
return mobile == "true" || mobile == "1";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.20.1/src/filechooser.h
new/xdg-desktop-portal-kde-5.20.2/src/filechooser.h
--- old/xdg-desktop-portal-kde-5.20.1/src/filechooser.h 2020-10-20
14:15:08.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.20.2/src/filechooser.h 2020-10-27
13:34:34.000000000 +0100
@@ -110,7 +110,7 @@
QStringList &mimeTypeFilters, QMap<QString,
FilterList> &allFilters,
QString &selectedMimeTypeFilter);
- bool isMobile() const;
+ static bool isMobile();
MobileFileDialog *m_mobileFileDialog;
};
