commit spectacle for openSUSE:Factory
Hello community, here is the log from the commit of package spectacle for openSUSE:Factory checked in at 2018-03-29 11:48:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spectacle (Old) and /work/SRC/openSUSE:Factory/.spectacle.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "spectacle" Thu Mar 29 11:48:39 2018 rev:28 rq:590867 version:17.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/spectacle/spectacle.changes 2018-03-20 21:42:27.320360422 +0100 +++ /work/SRC/openSUSE:Factory/.spectacle.new/spectacle.changes 2018-03-29 11:48:41.385345258 +0200 @@ -1,0 +2,7 @@ +Sat Mar 24 18:23:53 UTC 2018 - fabian@ritter-vogt.de + +- Add patch to fix taking screenshots on wayland without the wayland + platform plugin: + * 0001-Decide-to-use-the-wayland-backend-by-looking-at-XDG_.patch + +------------------------------------------------------------------- New: ---- 0001-Decide-to-use-the-wayland-backend-by-looking-at-XDG_.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spectacle.spec ++++++ --- /var/tmp/diff_new_pack.Zed9y4/_old 2018-03-29 11:48:41.961324507 +0200 +++ /var/tmp/diff_new_pack.Zed9y4/_new 2018-03-29 11:48:41.965324363 +0200 @@ -29,6 +29,8 @@ Group: Productivity/Graphics/Other Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM https://phabricator.kde.org/D11655 +Patch1: 0001-Decide-to-use-the-wayland-backend-by-looking-at-XDG_.patch BuildRequires: extra-cmake-modules BuildRequires: kconfig-devel BuildRequires: kcoreaddons-devel @@ -87,6 +89,7 @@ %prep %setup -q +%autopatch -p1 %build %cmake_kf5 -d build ++++++ 0001-Decide-to-use-the-wayland-backend-by-looking-at-XDG_.patch ++++++
From 3dad76703cbc5810202f41642c84d32ca7b50933 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fabian@ritter-vogt.de> Date: Sat, 24 Mar 2018 19:21:43 +0100 Subject: [PATCH] Decide to use the wayland backend by looking at XDG_SESSION_TYPE
Summary: With plasma-workspace master, QT_QPA_PLATFORM is no longer set, so spectacle runs with the xcb platform plugin. Test Plan: Installed, can take screenshots on wayland again. Reviewers: #spectacle, graesslin Differential Revision: https://phabricator.kde.org/D11655 --- src/SpectacleCore.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SpectacleCore.cpp b/src/SpectacleCore.cpp index cf3f06e..99fdbd9 100644 --- a/src/SpectacleCore.cpp +++ b/src/SpectacleCore.cpp @@ -59,14 +59,14 @@ SpectacleCore::SpectacleCore(StartMode startMode, ImageGrabber::GrabMode grabMod setFilename(saveFileName); } + if (qstrcmp(qgetenv("XDG_SESSION_TYPE"), "wayland") == 0) { + mImageGrabber = new KWinWaylandImageGrabber; + } #ifdef XCB_FOUND - if (KWindowSystem::isPlatformX11()) { + if (!mImageGrabber && KWindowSystem::isPlatformX11()) { mImageGrabber = new X11ImageGrabber; } #endif - if (!mImageGrabber && KWindowSystem::isPlatformWayland()) { - mImageGrabber = new KWinWaylandImageGrabber; - } if (!mImageGrabber) { mImageGrabber = new DummyImageGrabber; -- 2.16.2
participants (1)
-
root@hilbert.suse.de