rpm/gwenview5
SHA256
1
0
Fork 0
forked from pool/gwenview5
Code Pull Requests Activity

Accepting request 430880 from home:alarrosa:branches:KDE:Applications

Browse Source 
- Add fix-multiple-arguments.diff to fix handling of multiple local
  file arguments in the command line (boo#1001276)

OBS-URL: https://build.opensuse.org/request/show/430880
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/gwenview5?expand=0&rev=38
This commit is contained in:
Luca Beltrame 2016-09-28 11:58:00 +00:00 committed by Git OBS Bridge
parent a91d7ea609
commit b2677affe2
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fix-multiple-arguments.diff Normal file
View File

@ -0,0 +1,26 @@
Index: gwenview-16.08.0/app/main.cpp
===================================================================
--- gwenview-16.08.0.orig/app/main.cpp
+++ gwenview-16.08.0/app/main.cpp
@@ -59,8 +59,19 @@ public:
mMultipleUrlsDir.reset(new QTemporaryDir);
mUrl = QUrl::fromLocalFile(mMultipleUrlsDir->path());
QList<QUrl> list;
- foreach(const QString & url, args) {
- list << QUrl::fromUserInput(url);
+ QStringList tmpArgs = args;
+ tmpArgs.removeDuplicates();
+ foreach(const QString & url, tmpArgs) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
+ list << QUrl::fromUserInput(url, QDir::currentPath());
+#else
+ QUrl tmpUrl = QUrl(url);
+ if (tmpUrl.scheme().isEmpty() && !url.startsWith(QLatin1Char('/'))) {
+ list << QUrl::fromLocalFile(url);
+ } else {
+ list << QUrl::fromUserInput(url);
+ }
+#endif
}
KIO::CopyJob* job = KIO::link(list, mUrl);

6
gwenview5.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 28 10:36:41 UTC 2016 - alarrosa@suse.com
- Add fix-multiple-arguments.diff to fix handling of multiple local
file arguments in the command line (boo#1001276)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 9 08:06:19 UTC 2016 - tittiatcoke@gmail.com Fri Sep 9 08:06:19 UTC 2016 - tittiatcoke@gmail.com

3
gwenview5.spec
View File

@ -25,6 +25,8 @@ License: GPL-2.0+
Group: Productivity/Graphics/Viewers Group: Productivity/Graphics/Viewers
Url: http://www.kde.org Url: http://www.kde.org
Source0: %{rname}-%{version}.tar.xz Source0: %{rname}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM fix-multiple-arguments.diff boo#1001276 alarrosa@suse.com - Fix handling of multiple local file arguments in command line
Patch0: fix-multiple-arguments.diff
BuildRequires: baloo5-devel BuildRequires: baloo5-devel
BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: extra-cmake-modules >= 1.7.0
BuildRequires: kactivities5-devel BuildRequires: kactivities5-devel
@ -60,6 +62,7 @@ hierarchy.
%prep %prep
%setup -q -n %{rname}-%{version} %setup -q -n %{rname}-%{version}
%patch0 -p1
%build %build
%cmake_kf5 -d build -- -DGWENVIEW_SEMANTICINFO_BACKEND="Baloo" %cmake_kf5 -d build -- -DGWENVIEW_SEMANTICINFO_BACKEND="Baloo"