OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-integration?expand=0&rev=45
This commit is contained in:
parent
cbc2868b48
commit
5f22e22087
@ -1,38 +0,0 @@
|
||||
From b9298a5f0cd0763d5c7fc58655fa791e0fa60915 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
||||
Date: Sat, 11 Feb 2017 22:07:54 +0100
|
||||
Subject: [PATCH] Do not treat filename in selection as URL
|
||||
|
||||
Summary:
|
||||
KFileWidget::setSelection(QString &) accepts either absolute URLs
|
||||
or relative paths. If the filename contains a :, it gets treated
|
||||
as a URL and gets rejected. This forces setSelection to parse
|
||||
it as URL.
|
||||
|
||||
CCBUG: 376365
|
||||
|
||||
Subscribers: plasma-devel
|
||||
|
||||
Tags: #plasma
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D4579
|
||||
---
|
||||
src/platformtheme/kdeplatformfiledialoghelper.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/platformtheme/kdeplatformfiledialoghelper.cpp b/src/platformtheme/kdeplatformfiledialoghelper.cpp
|
||||
index d94060f..a2b775f 100644
|
||||
--- a/src/platformtheme/kdeplatformfiledialoghelper.cpp
|
||||
+++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp
|
||||
@@ -126,7 +126,7 @@ void KDEPlatformFileDialog::selectFile(const QUrl &filename)
|
||||
{
|
||||
QUrl dirUrl = filename.adjusted(QUrl::RemoveFilename);
|
||||
m_fileWidget->setUrl(dirUrl);
|
||||
- m_fileWidget->setSelection(filename.fileName());
|
||||
+ m_fileWidget->setSelection(filename.toString());
|
||||
}
|
||||
|
||||
void KDEPlatformFileDialog::setViewMode(QFileDialogOptions::ViewMode view)
|
||||
--
|
||||
2.11.0
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:af132265c547ffa187c910b4c381cf93d7cd17d9a60e1307617edca8bbc40c8c
|
||||
size 49688
|
3
plasma-integration-5.9.2.tar.xz
Normal file
3
plasma-integration-5.9.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:239f68671b1d1c7eb7e937dc9acf9b01ab1e5e13f69d032fa645aa7d880b3afe
|
||||
size 49824
|
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 14 17:58:13 CET 2017 - fabian@ritter-vogt.de
|
||||
|
||||
- Update to 5.9.2
|
||||
* New feature release
|
||||
* For more details please see:
|
||||
* https://www.kde.org/announcements/plasma-5.9.2.php
|
||||
- Changes since 5.9.1:
|
||||
* Do not treat filename in selection as URL
|
||||
* [KHintsSettings] Emit QGuiApplication::paletteChanged when run as QApplication
|
||||
- Remove patches, now upstream:
|
||||
* 0001-Do-not-treat-filename-in-selection-as-URL.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 12 11:01:07 UTC 2017 - fabian@ritter-vogt.de
|
||||
|
||||
|
@ -18,19 +18,17 @@
|
||||
|
||||
%bcond_without lang
|
||||
Name: plasma5-integration
|
||||
Version: 5.9.1
|
||||
Version: 5.9.2
|
||||
Release: 0
|
||||
# Full Plasma 5 version (e.g. 5.9.1)
|
||||
# Full Plasma 5 version (e.g. 5.9.2)
|
||||
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
|
||||
# Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
|
||||
# Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.2 in KUF)
|
||||
%{!?_plasma5_version: %global _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
|
||||
Summary: Plugins responsible for better integration of Qt applications in KDE Workspace
|
||||
License: GPL-2.0+
|
||||
Group: System/GUI/KDE
|
||||
Url: http://www.kde.org
|
||||
Source: http://download.kde.org/stable/plasma/%{version}/plasma-integration-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM 0001-Do-not-treat-filename-in-selection-as-URL.patch fabian@ritter-vogt.de kde#376365 https://phabricator.kde.org/D4579 -- Do not treat filename in selection as URL
|
||||
Patch1: 0001-Do-not-treat-filename-in-selection-as-URL.patch
|
||||
BuildRequires: extra-cmake-modules >= 5.17.0
|
||||
BuildRequires: kf5-filesystem
|
||||
BuildRequires: libQt5Gui-private-headers-devel >= 5.5.0
|
||||
@ -79,7 +77,6 @@ Applications do not need to link to this directly.
|
||||
%lang_package -n plasma5-integration-plugin
|
||||
%prep
|
||||
%setup -q -n plasma-integration-%{version}
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%cmake_kf5 -d build
|
||||
|
Loading…
x
Reference in New Issue
Block a user