Hello community, here is the log from the commit of package spectacle for openSUSE:Factory checked in at 2020-09-21 17:00:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spectacle (Old) and /work/SRC/openSUSE:Factory/.spectacle.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spectacle" Mon Sep 21 17:00:26 2020 rev:59 rq:835111 version:20.08.1 Changes: -------- --- /work/SRC/openSUSE:Factory/spectacle/spectacle.changes 2020-09-09 18:05:59.639419325 +0200 +++ /work/SRC/openSUSE:Factory/.spectacle.new.4249/spectacle.changes 2020-09-21 17:01:18.338807848 +0200 @@ -1,0 +2,7 @@ +Thu Sep 17 05:30:03 UTC 2020 - Luca Beltrame <[email protected]> + +- Add upstream patch to fix --output command line option + (kde#424380): + * 0001-Fix-wrong-file-name-when-output-option-is-used.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-wrong-file-name-when-output-option-is-used.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spectacle.spec ++++++ --- /var/tmp/diff_new_pack.ozSaM1/_old 2020-09-21 17:01:21.406810606 +0200 +++ /var/tmp/diff_new_pack.ozSaM1/_new 2020-09-21 17:01:21.406810606 +0200 @@ -28,6 +28,8 @@ Group: Productivity/Graphics/Other URL: https://www.kde.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +#PATCH-FIX-UPSTREAM +Patch: 0001-Fix-wrong-file-name-when-output-option-is-used.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: libqt5-qtdeclarative-private-headers-devel ++++++ 0001-Fix-wrong-file-name-when-output-option-is-used.patch ++++++ >From 7f88fcb4bb4085f39b7330212efacb19c2b5bcad Mon Sep 17 00:00:00 2001 From: Nazar Kalinowski <[email protected]> Date: Sun, 19 Jul 2020 12:12:17 +0300 Subject: [PATCH] Fix wrong file name when --output option is used BUG: 424380 --- src/SpectacleCore.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/SpectacleCore.cpp b/src/SpectacleCore.cpp index 6cc202d..941e8a0 100644 --- a/src/SpectacleCore.cpp +++ b/src/SpectacleCore.cpp @@ -118,7 +118,6 @@ void SpectacleCore::onActivateRequested(QStringList arguments, const QString& /* mNotify = true; mCopyToClipboard = Settings::copyImageToClipboard(); qint64 lDelayMsec = 0; - QString lFileName = QString(); // are we ask to run in background or dbus mode? if (parser->isSet(QStringLiteral("background"))) { @@ -135,13 +134,6 @@ void SpectacleCore::onActivateRequested(QStringList arguments, const QString& /* lDelayMsec = 0; } - if (!(lFileName.isEmpty() || lFileName.isNull())) { - if (QDir::isRelativePath(lFileName)) { - lFileName = QDir::current().absoluteFilePath(lFileName); - } - setFilename(lFileName); - } - // reset last region if it should not be remembered across restarts if(!Settings::alwaysRememberRegion()) { Settings::setCropRegion({0, 0, 0, 0}); @@ -159,7 +151,13 @@ void SpectacleCore::onActivateRequested(QStringList arguments, const QString& /* } if (parser->isSet(QStringLiteral("output"))) { - lFileName = parser->value(QStringLiteral("output")); + QString lFileName = parser->value(QStringLiteral("output")); + if (!(lFileName.isEmpty() || lFileName.isNull())) { + if (QDir::isRelativePath(lFileName)) { + lFileName = QDir::current().absoluteFilePath(lFileName); + } + setFilename(lFileName); + } } if (parser->isSet(QStringLiteral("delay"))) { -- 2.27.0
