From b2677affe2b98a879225ecb8c344b208241e02e2fe1d4e9256e1f0444c5f67e0 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 28 Sep 2016 11:58:00 +0000 Subject: [PATCH 1/3] Accepting request 430880 from home:alarrosa:branches:KDE:Applications - 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 --- fix-multiple-arguments.diff | 26 ++++++++++++++++++++++++++ gwenview5.changes | 6 ++++++ gwenview5.spec | 3 +++ 3 files changed, 35 insertions(+) create mode 100644 fix-multiple-arguments.diff diff --git a/fix-multiple-arguments.diff b/fix-multiple-arguments.diff new file mode 100644 index 0000000..870f61a --- /dev/null +++ b/fix-multiple-arguments.diff @@ -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 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); diff --git a/gwenview5.changes b/gwenview5.changes index 88e3ee8..5430d55 100644 --- a/gwenview5.changes +++ b/gwenview5.changes @@ -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 diff --git a/gwenview5.spec b/gwenview5.spec index 855baf1..5ac7eae 100644 --- a/gwenview5.spec +++ b/gwenview5.spec @@ -25,6 +25,8 @@ License: GPL-2.0+ Group: Productivity/Graphics/Viewers Url: http://www.kde.org 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: extra-cmake-modules >= 1.7.0 BuildRequires: kactivities5-devel @@ -60,6 +62,7 @@ hierarchy. %prep %setup -q -n %{rname}-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DGWENVIEW_SEMANTICINFO_BACKEND="Baloo" From 1bc341beb7a2af65d6dcb801f438c1a0ae1f263722cfd72ac966aad09da42509 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 28 Sep 2016 15:50:07 +0000 Subject: [PATCH 2/3] Accepting request 431125 from home:alarrosa:branches:KDE:Applications - Added QUrl::AssumeLocalFile to fix-multiple-arguments.diff to mimic the patch accepted upstream OBS-URL: https://build.opensuse.org/request/show/431125 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/gwenview5?expand=0&rev=39 --- fix-multiple-arguments.diff | 17 +++++++++++++---- gwenview5.changes | 6 ++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/fix-multiple-arguments.diff b/fix-multiple-arguments.diff index 870f61a..5c76bd6 100644 --- a/fix-multiple-arguments.diff +++ b/fix-multiple-arguments.diff @@ -1,7 +1,7 @@ -Index: gwenview-16.08.0/app/main.cpp +Index: gwenview-16.08.1/app/main.cpp =================================================================== ---- gwenview-16.08.0.orig/app/main.cpp -+++ gwenview-16.08.0/app/main.cpp +--- gwenview-16.08.1.orig/app/main.cpp ++++ gwenview-16.08.1/app/main.cpp @@ -59,8 +59,19 @@ public: mMultipleUrlsDir.reset(new QTemporaryDir); mUrl = QUrl::fromLocalFile(mMultipleUrlsDir->path()); @@ -12,7 +12,7 @@ Index: gwenview-16.08.0/app/main.cpp + tmpArgs.removeDuplicates(); + foreach(const QString & url, tmpArgs) { +#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)) -+ list << QUrl::fromUserInput(url, QDir::currentPath()); ++ list << QUrl::fromUserInput(url, QDir::currentPath(), QUrl::AssumeLocalFile); +#else + QUrl tmpUrl = QUrl(url); + if (tmpUrl.scheme().isEmpty() && !url.startsWith(QLatin1Char('/'))) { @@ -24,3 +24,12 @@ Index: gwenview-16.08.0/app/main.cpp } KIO::CopyJob* job = KIO::link(list, mUrl); +@@ -68,7 +79,7 @@ public: + } else { + QString tmpArg = args.first(); + #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)) +- mUrl = QUrl::fromUserInput(tmpArg, QDir::currentPath()); ++ mUrl = QUrl::fromUserInput(tmpArg, QDir::currentPath(), QUrl::AssumeLocalFile); + #else + QUrl tmpUrl = QUrl(tmpArg); + if (tmpUrl.scheme().isEmpty() && !tmpArg.startsWith(QLatin1Char('/'))) { diff --git a/gwenview5.changes b/gwenview5.changes index 5430d55..72b8ed0 100644 --- a/gwenview5.changes +++ b/gwenview5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 28 15:17:34 UTC 2016 - alarrosa@suse.com + +- Added QUrl::AssumeLocalFile to fix-multiple-arguments.diff to + mimic the patch accepted upstream + ------------------------------------------------------------------- Wed Sep 28 10:36:41 UTC 2016 - alarrosa@suse.com From bdd2039f57fb12adcef9dd4b5508ee3588b019c357be5106010aff52c5962834 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 29 Sep 2016 07:48:30 +0000 Subject: [PATCH 3/3] Accepting request 431198 from home:alarrosa:branches:KDE:Applications - Added a require for kdelibs4support since that package provides qimageioplugins services for jpeg, png, gif and other image formats and gwenview5 can't be used without it (boo#1001276). OBS-URL: https://build.opensuse.org/request/show/431198 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/gwenview5?expand=0&rev=40 --- gwenview5.changes | 7 +++++++ gwenview5.spec | 1 + 2 files changed, 8 insertions(+) diff --git a/gwenview5.changes b/gwenview5.changes index 72b8ed0..fb2f2c1 100644 --- a/gwenview5.changes +++ b/gwenview5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 29 07:31:32 UTC 2016 - alarrosa@suse.com + +- Added a require for kdelibs4support since that package provides + qimageioplugins services for jpeg, png, gif and other image formats + and gwenview5 can't be used without it (boo#1001276). + ------------------------------------------------------------------- Wed Sep 28 15:17:34 UTC 2016 - alarrosa@suse.com diff --git a/gwenview5.spec b/gwenview5.spec index 5ac7eae..ed876ee 100644 --- a/gwenview5.spec +++ b/gwenview5.spec @@ -48,6 +48,7 @@ BuildRequires: pkgconfig(Qt5Svg) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0 +Requires: kdelibs4support %if 0%{?suse_version} > 1320 Obsoletes: gwenview < %{version} %else