October 2016 - openSUSE Commits - openSUSE Mailing Lists

commit plasma-framework for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '16

28 Oct '16

Hello community, here is the log from the commit of package plasma-framework for openSUSE:Factory checked in at 2016-10-28 12:27:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-framework (Old) and /work/SRC/openSUSE:Factory/.plasma-framework.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma-framework" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-framework/plasma-framework.changes 2016-10-04 15:46:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma-framework.new/plasma-framework.changes 2016-10-28 12:27:25.000000000 +0200 @@ -1,0 +2,49 @@ +Thu Oct 27 20:57:36 UTC 2016 - hrvoje.senjan(a)gmail.com + +- Fix SLE build: Fixes-for-building-plasma-framework-with-Qt-55.patch + +------------------------------------------------------------------- +Thu Oct 27 19:25:57 UTC 2016 - fabian(a)ritter-vogt.de + +- Add new-bool-to-use-activated-signal-as-toggle.patch to support + change in plasma5-desktop to enable closing launchers with Meta + (kde#367685) + +------------------------------------------------------------------- +Fri Oct 14 12:26:41 UTC 2016 - wbauer(a)tmo.at + +- Update network.svgz to the latest git version to also add the + "flightmode-on/off" icons to the Air/Oxygen desktop themes + (boo#999967, kde#368660) + +------------------------------------------------------------------- +Thu Oct 13 09:11:03 UTC 2016 - wbauer(a)tmo.at + +- Add network.svgz from latest upstream git Air desktop theme, this + includes a lot of network icons that were missing before + (boo#999967, kde#368660) + +------------------------------------------------------------------- +Sun Oct 2 12:48:18 UTC 2016 - hrvoje.senjan(a)gmail.com + +- Update to 5.27.0 + * Improve timetracker output + * [ToolButtonStyle] Fix menu arrow + * i18n: handle strings in kdevtemplate files + * i18n: review strings in kdevtemplate files + * Add removeMenuItem to PlasmaComponents.ContextMenu + * Update ktorrent icon (kde#369302) + * [WindowThumbnail] Discard pixmap on map events + * Don't include kdeglobals when dealing with a cache config + * Fix Plasma::knownLanguages + * Resize the view just after setting the containment + * Avoid creating a KPluginInfo from a KPluginMetaData instance + * Running tasks must have some indicator + * Task bar lines according to RR 128802 + * [AppletQuickItem] Break from loop when we found a layout + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.27.0.php +- Drop 0001-Commit-translations-from-l10n-kf5.patch, obsorbed by + 5.27.0 tar + +------------------------------------------------------------------- Old: ---- 0001-Commit-translations-from-l10n-kf5.patch plasma-framework-5.27.0~20160928~b115ea1.git.tar.xz New: ---- Fixes-for-building-plasma-framework-with-Qt-55.patch network.svgz new-bool-to-use-activated-signal-as-toggle.patch plasma-framework-5.27.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-framework.spec ++++++ --- /var/tmp/diff_new_pack.s2Jxqi/_old 2016-10-28 12:27:26.000000000 +0200 +++ /var/tmp/diff_new_pack.s2Jxqi/_new 2016-10-28 12:27:26.000000000 +0200 @@ -17,22 +17,25 @@ %bcond_without lang -%define _tar_path 5.26 +%define _tar_path 5.27 Name: plasma-framework -Version: 5.27.0~20160928~b115ea1.git +Version: 5.27.0 Release: 0 %define kf5_version %{version} Summary: Plasma library and runtime components based upon KF5 and Qt5 License: GPL-2.0+ and LGPL-2.0+ Group: System/GUI/KDE Url: https://projects.kde.org/plasma-framework -#Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.t… -Source: %{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.t… Source1: baselibs.conf +# latest network.svgz from git for the Air theme, contains a lot of network icons that were missing before (boo#999967) +Source2: network.svgz # PATCH-FIX-OPENSUSE loosen-up-kactivities-requirement.patch -- require kactivities 5.19.0, as we can't update kactivities5 to 5.26.0 before Plasma 5.6.0 Patch0: loosen-up-kactivities-requirement.patch -# PATCH-FIX-UPSTREAM 0001-Commit-translations-from-l10n-kf5.patch -Patch1: 0001-Commit-translations-from-l10n-kf5.patch +# PATCH-FIX-UPSTREAM new-bool-to-use-activated-signal-as-toggle.patch New bool to use activated signal as toggle of expanded +Patch2: new-bool-to-use-activated-signal-as-toggle.patch +# PATCH-FIX-UPSTREAM Fixes-for-building-plasma-framework-with-Qt-55.patch +Patch3: Fixes-for-building-plasma-framework-with-Qt-55.patch BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes BuildRequires: kactivities5-devel >= 5.19.0 @@ -126,7 +129,10 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +# install updated network.svgz +cp %{S:2} src/desktoptheme/air/icons %build %cmake_kf5 -d build ++++++ Fixes-for-building-plasma-framework-with-Qt-55.patch ++++++ From: Alberto Curro <bertothunder(a)gmail.com> Date: Mon, 17 Oct 2016 15:45:49 +0000 Subject: Fixes for building plasma-framework with Qt 5.5 X-Git-Url: http://quickgit.kde.org/?p=plasma-framework.git&a=commitdiff&h=f82d76eb2b91… --- Fixes for building plasma-framework with Qt 5.5 REVIEW: 129203 REVIEW: 129065 --- --- a/src/declarativeimports/core/windowthumbnail.cpp +++ b/src/declarativeimports/core/windowthumbnail.cpp @@ -219,6 +219,14 @@ //only one (or none) should be set, but never both Q_ASSERT(m_glxPixmap == XCB_PIXMAP_NONE || m_image == EGL_NO_IMAGE_KHR); #endif +#if HAVE_GLX || HAVE_EGL + // NoStage is supported since Qt >= 5.6.x + #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + QQuickWindow::RenderStage m_renderStage = QQuickWindow::NoStage; + #else + QQuickWindow::RenderStage m_renderStage = QQuickWindow::BeforeSynchronizingStage; + #endif +#endif //data is deleted in the render thread (with relevant GLX calls) //note runnable may be called *after* this is deleted @@ -228,7 +236,7 @@ window()->scheduleRenderJob(new DiscardGlxPixmapRunnable(m_texture, m_releaseTexImage, m_glxPixmap), - QQuickWindow::NoStage); + m_renderStage); m_glxPixmap = XCB_PIXMAP_NONE; m_texture = 0; @@ -239,7 +247,7 @@ window()->scheduleRenderJob(new DiscardEglPixmapRunnable(m_texture, m_eglDestroyImageKHR, m_image), - QQuickWindow::NoStage); + m_renderStage); m_image = EGL_NO_IMAGE_KHR; m_texture = 0; ++++++ new-bool-to-use-activated-signal-as-toggle.patch ++++++ From: Roman Gilg <subdiff(a)gmail.com> Date: Wed, 19 Oct 2016 16:51:15 +0000 Subject: New bool to use activated signal as toggle of expanded X-Git-Url: http://quickgit.kde.org/?p=plasma-framework.git&a=commitdiff&h=65706d3878d5… --- New bool to use activated signal as toggle of expanded The launcher applets couldn't be closed with Meta alone and on Wayland in general by any global shortcut, since we used for that the focusOutEvent triggered only on X and only on global shortcuts (on default Alt+F1). This patch introduces the new bool activationTogglesExpanded, which allowes QML applets to decide if they wish to use the activated signal also to end their expanded state. The default value is false, in order to not break any legacy applets. REVIEW: 129204 BUG: 367685 --- --- a/src/plasmaquick/appletquickitem.cpp +++ b/src/plasmaquick/appletquickitem.cpp @@ -48,7 +48,8 @@ switchWidth(-1), switchHeight(-1), applet(a), - expanded(false) + expanded(false), + activationTogglesExpanded(false) { } @@ -727,6 +728,20 @@ emit expandedChanged(expanded); } +bool AppletQuickItem::isActivationTogglesExpanded() const +{ + return d->activationTogglesExpanded; +} + +void AppletQuickItem::setActivationTogglesExpanded(bool activationTogglesExpanded) +{ + if (d->activationTogglesExpanded == activationTogglesExpanded) { + return; + } + d->activationTogglesExpanded = activationTogglesExpanded; + emit activationTogglesExpandedChanged(activationTogglesExpanded); +} + ////////////Internals KDeclarative::QmlObject *AppletQuickItem::qmlObject() --- a/src/plasmaquick/appletquickitem.h +++ b/src/plasmaquick/appletquickitem.h @@ -81,6 +81,12 @@ Q_PROPERTY(bool expanded WRITE setExpanded READ isExpanded NOTIFY expandedChanged) /** + * True when the applet wants the activation signal act in toggle mode, i.e. while being expanded + * the signal shrinks the applet to its not exanded state instead of reexpanding it. + */ + Q_PROPERTY(bool activationTogglesExpanded WRITE setActivationTogglesExpanded READ isActivationTogglesExpanded NOTIFY activationTogglesExpandedChanged) + + /** * the applet root QML item: sometimes is the same as fullRepresentationItem * if a fullrepresentation was not declared explicitly */ @@ -126,6 +132,9 @@ bool isExpanded() const; void setExpanded(bool expanded); + bool isActivationTogglesExpanded() const; + void setActivationTogglesExpanded(bool activationTogglesExpanded); + ////NEEDED BY QML TO CREATE ATTACHED PROPERTIES static AppletQuickItem *qmlAttachedProperties(QObject *object); @@ -135,6 +144,7 @@ void switchHeightChanged(int height); void expandedChanged(bool expanded); + void activationTogglesExpandedChanged(bool activationTogglesExpanded); void compactRepresentationChanged(QQmlComponent *compactRepresentation); void fullRepresentationChanged(QQmlComponent *fullRepresentation); --- a/src/plasmaquick/private/appletquickitem_p.h +++ b/src/plasmaquick/private/appletquickitem_p.h @@ -104,6 +104,7 @@ Plasma::Package containmentPackage; bool expanded : 1; + bool activationTogglesExpanded : 1; static QHash<QObject *, AppletQuickItem *> s_rootObjects; }; --- a/src/scriptengines/qml/plasmoid/appletinterface.cpp +++ b/src/scriptengines/qml/plasmoid/appletinterface.cpp @@ -142,11 +142,16 @@ emit busyChanged(); applet()->updateConstraints(Plasma::Types::UiReadyConstraint); + connect(applet(), &Plasma::Applet::activated, [ = ]() { - setExpanded(true); + // in case the applet doesn't want to get shrinked on reactivation, + // we always expand it again (only in order to conform with legacy behaviour) + bool activate = !( isExpanded() && isActivationTogglesExpanded() ); + + setExpanded(activate); if (QQuickItem *i = qobject_cast<QQuickItem *>(fullRepresentationItem())) { - i->setFocus(true, Qt::ShortcutFocusReason); + i->setFocus(activate, Qt::ShortcutFocusReason); } }); ++++++ plasma-framework-5.27.0~20160928~b115ea1.git.tar.xz -> plasma-framework-5.27.0.tar.xz ++++++ ++++ 54579 lines of diff (skipped)

1 0

commit kpty for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '16

28 Oct '16

Hello community, here is the log from the commit of package kpty for openSUSE:Factory checked in at 2016-10-28 12:27:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpty (Old) and /work/SRC/openSUSE:Factory/.kpty.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kpty" Changes: -------- --- /work/SRC/openSUSE:Factory/kpty/kpty.changes 2016-09-14 23:27:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kpty.new/kpty.changes 2016-10-28 12:27:14.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Oct 26 18:26:37 UTC 2016 - lbeltrame(a)kde.org + +- Add upstream patch find-utempter-better.patch: + * Rework utempter detection to properly build kwrited afterwards + +------------------------------------------------------------------- +Sun Oct 2 12:58:47 UTC 2016 - hrvoje.senjan(a)gmail.com + +- Update to 5.27.0 + * Use ECM path to find utempter binary, more reliable than + simple cmake prefix + * Call the utempter helper executable manually (kde#364779) + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.27.0.php + +------------------------------------------------------------------- Old: ---- kpty-5.26.0.tar.xz New: ---- find-utempter-better.patch kpty-5.27.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpty.spec ++++++ --- /var/tmp/diff_new_pack.tYOA7C/_old 2016-10-28 12:27:15.000000000 +0200 +++ /var/tmp/diff_new_pack.tYOA7C/_new 2016-10-28 12:27:15.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Pty5 -%define _tar_path 5.26 +%define _tar_path 5.27 Name: kpty -Version: 5.26.0 +Version: 5.27.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -38,6 +38,8 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.t… Source1: baselibs.conf +#PATCH-FIX-UPSTREAM: find-utempter-better.patch - find utempter correctly to properly build kwrited afterwards +Patch0: find-utempter-better.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,6 +75,7 @@ %lang_package -n %lname %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build ++++++ find-utempter-better.patch ++++++ diff --git a/cmake/FindUTEMPTER.cmake b/cmake/FindUTEMPTER.cmake index 9773963..4921e58 100644 --- a/cmake/FindUTEMPTER.cmake +++ b/cmake/FindUTEMPTER.cmake @@ -32,9 +32,13 @@ # SUCH DAMAGE. -find_program (UTEMPTER_EXECUTABLE utempter PATHS +# use find_file instead of find_program until this is fixed: +# https://gitlab.kitware.com/cmake/cmake/issues/10468 +find_file (UTEMPTER_EXECUTABLE utempter PATHS ${KDE_INSTALL_FULL_LIBEXECDIR}/utempter ${KDE_INSTALL_FULL_LIBDIR}/utempter + ${CMAKE_PREFIX_PATH}/libexec/utempter + ${CMAKE_PREFIX_PATH}/lib/utempter /usr/libexec/utempter ) ++++++ kpty-5.26.0.tar.xz -> kpty-5.27.0.tar.xz ++++++ ++++ 934630 lines of diff (skipped)

1 0

commit libkolab-qt5 for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '16

28 Oct '16

Hello community, here is the log from the commit of package libkolab-qt5 for openSUSE:Factory checked in at 2016-10-28 12:27:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkolab-qt5 (Old) and /work/SRC/openSUSE:Factory/.libkolab-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkolab-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/libkolab-qt5/libkolab-qt5.changes 2016-08-08 13:49:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkolab-qt5.new/libkolab-qt5.changes 2016-10-28 12:27:05.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Oct 25 11:12:52 UTC 2016 - wbauer(a)tmo.at + +- add %build section that was missing (the build was done in %prep) + +------------------------------------------------------------------- +Tue Oct 25 10:01:09 UTC 2016 - wbauer(a)tmo.at + +- disable parallel build to hopefully fix random build failures + (boo#1006727) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkolab-qt5.spec ++++++ --- /var/tmp/diff_new_pack.AX1qv6/_old 2016-10-28 12:27:05.000000000 +0200 +++ /var/tmp/diff_new_pack.AX1qv6/_new 2016-10-28 12:27:05.000000000 +0200 @@ -110,6 +110,7 @@ %prep %setup -q -n libkolab-%{version} +%build # TESTS: require X and most fail anyway %cmake \ -DLibkolabxml_DIR=%{_libdir}/cmake/Libkolabxml \ @@ -122,7 +123,9 @@ -DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \ -DBUILD_TESTS=FALSE -make %{?_smp_mflags} +# parallel build is too unstable currently (boo#1006727) +#make %{?_smp_mflags} +make -j1 %install # cmake: with earlier releases, we have to change dir manually, as %%cmake_install is not available

1 0

commit kwin5 for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '16

28 Oct '16

Hello community, here is the log from the commit of package kwin5 for openSUSE:Factory checked in at 2016-10-28 12:26:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwin5 (Old) and /work/SRC/openSUSE:Factory/.kwin5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kwin5" Changes: -------- --- /work/SRC/openSUSE:Factory/kwin5/kwin5.changes 2016-10-22 13:08:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kwin5.new/kwin5.changes 2016-10-28 12:26:57.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Oct 24 15:36:48 UTC 2016 - alarrosa(a)suse.com + +- Add 0001-platformx-x11-Add-a-freeze-protection-against-OpenGL.patch, + 0002-platformx-x11-Add-a-freeze-protection-against-OpenGL.patch, + 0003-Remove-most-overhead-caused-by-the-freeze-detection-.patch, + 0004-Do-a-count-down-of-framesToTestForSafety.patch, + 0005-Use-only-one-timer-to-detect-freezes-and-other-optim.patch, + 0006-Test-3-frames-for-freezes-by-default.patch and + 0007-Only-call-PostLastGuardedFrame-when-OpenGLCompositin.patch + to detect freezes caused by broken nouveau opengl drivers and + recover from that situation (boo#1003402, boo#1005323) + +------------------------------------------------------------------- New: ---- 0001-platformx-x11-Add-a-freeze-protection-against-OpenGL.patch 0002-platformx-x11-Add-a-freeze-protection-against-OpenGL.patch 0003-Remove-most-overhead-caused-by-the-freeze-detection-.patch 0004-Do-a-count-down-of-framesToTestForSafety.patch 0005-Use-only-one-timer-to-detect-freezes-and-other-optim.patch 0006-Test-3-frames-for-freezes-by-default.patch 0007-Only-call-PostLastGuardedFrame-when-OpenGLCompositin.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwin5.spec ++++++ --- /var/tmp/diff_new_pack.99vgpT/_old 2016-10-28 12:26:58.000000000 +0200 +++ /var/tmp/diff_new_pack.99vgpT/_new 2016-10-28 12:26:58.000000000 +0200 @@ -27,6 +27,20 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/plasma/%{version}/kwin-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 0001-platformx-x11-Add-a-freeze-protection-against-OpenGL.patch boo#1005323 -- Adds a thread to detect kwin freezing and recover from it +Patch0: 0001-platformx-x11-Add-a-freeze-protection-against-OpenGL.patch +# PATCH-FIX-UPSTREAM 0002-platformx-x11-Add-a-freeze-protection-against-OpenGL.patch boo#1005323 -- Adds a thread to detect kwin freezing and recover from it +Patch1: 0002-platformx-x11-Add-a-freeze-protection-against-OpenGL.patch +# PATCH-FIX-UPSTREAM 0003-Remove-most-overhead-caused-by-the-freeze-detection-.patch boo#1005323 -- Use only one thread for all frames +Patch2: 0003-Remove-most-overhead-caused-by-the-freeze-detection-.patch +# PATCH-FIX-UPSTREAM 0004-Do-a-count-down-of-framesToTestForSafety.patch boo#1005323 -- Do a countdown instead of counting up +Patch3: 0004-Do-a-count-down-of-framesToTestForSafety.patch +# PATCH-FIX-UPSTREAM 0005-Use-only-one-timer-to-detect-freezes-and-other-optim.patch boo#1005323 -- Use only one timer +Patch4: 0005-Use-only-one-timer-to-detect-freezes-and-other-optim.patch +# PATCH-FIX-UPSTREAM 0006-Test-3-frames-for-freezes-by-default.patch boo#1005323 -- Test only 3 frames by default, which is enough to detect freezes +Patch5: 0006-Test-3-frames-for-freezes-by-default.patch +# PATCH-FIX-UPSTREAM 0007-Only-call-PostLastGuardedFrame-when-OpenGLCompositin.patch boo#1005323 -- Only call PostLastGuardedFrame when OpenGLCompositing is set +Patch6: 0007-Only-call-PostLastGuardedFrame-when-OpenGLCompositin.patch BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -137,6 +151,13 @@ %prep %setup -q -n kwin-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ 0001-platformx-x11-Add-a-freeze-protection-against-OpenGL.patch ++++++ >From 572b7b40205f3cf31b43250ad31497ee90133590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin(a)kde.org> Date: Fri, 21 Oct 2016 14:21:29 +0200 Subject: [PATCH 1/4] [platformx/x11] Add a freeze protection against OpenGL Summary: With nouveau driver it can happen that KWin gets frozen when first trying to render with OpenGL. This results in a freeze of the complete desktop as the compositor is non functional. Our OpenGL breakage detection is only able to detect crashes, but not freezes. This change improves it by also added a freeze protection. In the PreInit stage a thread is started with a QTimer of 15 sec. If the timer fires, qFatal is triggered to terminate KWin. This can only happen if the creation of the OpenGL compositor takes longer than said 15 sec. In the PostInit stage the timer gets deleted and the thread stopeed again. Thus if a freeze is detected the OpenGL unsafe protection is written into the config. KWin aborts and gets restarted by DrKonqui. The new KWin instance will no longer try to activate the freezing OpenGL as the protection is set. If KWin doesn't freeze the protection is removed from the config as we are used to. Reviewers: #kwin, davidedmundson, #plasma Reviewed By: davidedmundson, #plasma Subscribers: davidedmundson, plasma-devel, kwin Tags: #plasma Differential Revision: https://phabricator.kde.org/D3127 --- composite.cpp | 11 ++++++++++- composite.h | 1 + platform.h | 4 +++- plugins/platforms/x11/standalone/x11_platform.cpp | 22 ++++++++++++++++++++++ plugins/platforms/x11/standalone/x11_platform.h | 2 ++ 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/composite.cpp b/composite.cpp index 7290440..c3ae50e 100644 --- a/composite.cpp +++ b/composite.cpp @@ -207,7 +207,6 @@ void Compositor::slotCompositingOptionsInitialized() m_scene = SceneOpenGL::createScene(this); - // TODO: Add 30 second delay to protect against screen freezes as well kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostInit); if (m_scene && !m_scene->initFailed()) { @@ -294,6 +293,7 @@ void Compositor::startupWithWorkspace() return; } Q_ASSERT(m_scene); + m_firstFrame = true; connect(workspace(), &Workspace::destroyed, this, [this] { compositeTimer.stop(); }); claimCompositorSelection(); m_xrrRefreshRate = KWin::currentRefreshRate(); @@ -734,7 +734,16 @@ void Compositor::performCompositing() // clear all repaints, so that post-pass can add repaints for the next repaint repaints_region = QRegion(); + if (m_firstFrame && (m_scene->compositingType() & OpenGLCompositing)) { + kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PreFirstFrame); + } m_timeSinceLastVBlank = m_scene->paint(repaints, windows); + if (m_firstFrame) { + if (m_scene->compositingType() & OpenGLCompositing) { + kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostFirstFrame); + } + m_firstFrame = false; + } m_timeSinceStart += m_timeSinceLastVBlank; if (waylandServer()) { diff --git a/composite.h b/composite.h index a1690e2..5412628 100644 --- a/composite.h +++ b/composite.h @@ -239,6 +239,7 @@ private: Scene *m_scene; bool m_bufferSwapPending; bool m_composeAtSwapCompletion; + bool m_firstFrame = true; KWIN_SINGLETON_VARIABLE(Compositor, s_compositor) }; diff --git a/platform.h b/platform.h index 3991f5f..f1b8688 100644 --- a/platform.h +++ b/platform.h @@ -142,7 +142,9 @@ public: virtual bool openGLCompositingIsBroken() const; enum class OpenGLSafePoint { PreInit, - PostInit + PostInit, + PreFirstFrame, + PostFirstFrame }; /** * This method is invoked before and after creating the OpenGL rendering Scene. diff --git a/plugins/platforms/x11/standalone/x11_platform.cpp b/plugins/platforms/x11/standalone/x11_platform.cpp index 8212d1e..1cd73a5 100644 --- a/plugins/platforms/x11/standalone/x11_platform.cpp +++ b/plugins/platforms/x11/standalone/x11_platform.cpp @@ -37,6 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <KConfigGroup> #include <KLocalizedString> +#include <QThread> #include <QOpenGLContext> #include <QX11Info> @@ -199,9 +200,30 @@ void X11StandalonePlatform::createOpenGLSafePoint(OpenGLSafePoint safePoint) auto group = KConfigGroup(kwinApp()->config(), "Compositing"); switch (safePoint) { case OpenGLSafePoint::PreInit: + case OpenGLSafePoint::PreFirstFrame: + Q_ASSERT(m_openGLFreezeProtectionThread == nullptr); + m_openGLFreezeProtectionThread = new QThread(this); + m_openGLFreezeProtectionThread->start(); + m_openGLFreezeProtection = new QTimer; + m_openGLFreezeProtection->setInterval(15000); + m_openGLFreezeProtection->setSingleShot(true); + m_openGLFreezeProtection->start(); + m_openGLFreezeProtection->moveToThread(m_openGLFreezeProtectionThread); + connect(m_openGLFreezeProtection, &QTimer::timeout, m_openGLFreezeProtection, + [] { + qFatal("Freeze in OpenGL initialization detected"); + }, Qt::DirectConnection); + group.writeEntry(unsafeKey, true); break; case OpenGLSafePoint::PostInit: + case OpenGLSafePoint::PostFirstFrame: + m_openGLFreezeProtection->deleteLater(); + m_openGLFreezeProtectionThread->quit(); + m_openGLFreezeProtectionThread->wait(); + delete m_openGLFreezeProtectionThread; + m_openGLFreezeProtectionThread = nullptr; + m_openGLFreezeProtection = nullptr; group.writeEntry(unsafeKey, false); break; } diff --git a/plugins/platforms/x11/standalone/x11_platform.h b/plugins/platforms/x11/standalone/x11_platform.h index e3a670e..b90b759 100644 --- a/plugins/platforms/x11/standalone/x11_platform.h +++ b/plugins/platforms/x11/standalone/x11_platform.h @@ -62,6 +62,8 @@ private: static bool hasGlx(); XInputIntegration *m_xinputIntegration = nullptr; + QThread *m_openGLFreezeProtectionThread = nullptr; + QTimer *m_openGLFreezeProtection = nullptr; }; -- 2.10.1 ++++++ 0002-platformx-x11-Add-a-freeze-protection-against-OpenGL.patch ++++++ >From ee42322059cd772c38f9cbd33be69ae6316ccbce Mon Sep 17 00:00:00 2001 From: Antonio Larrosa <larrosa(a)kde.org> Date: Fri, 21 Oct 2016 21:06:47 +0200 Subject: [PATCH 2/4] [platformx/x11] Add a freeze protection against OpenGL Summary: With nouveau driver it can happen that KWin gets frozen when first trying to render with OpenGL. This results in a freeze of the complete desktop as the compositor is non functional. Our OpenGL breakage detection is only able to detect crashes, but not freezes. This change improves it by also added a freeze protection. In the PreInit stage a thread is started with a QTimer of 15 sec. If the timer fires, qFatal is triggered to terminate KWin. This can only happen if the creation of the OpenGL compositor takes longer than said 15 sec. In the PostInit stage the timer gets deleted and the thread stopeed again. Thus if a freeze is detected the OpenGL unsafe protection is written into the config. KWin aborts and gets restarted by DrKonqui. The new KWin instance will no longer try to activate the freezing OpenGL as the protection is set. If KWin doesn't freeze the protection is removed from the config as we are used to. Check for freezes for the first n frames, not just the first This patch changes the freeze detection code to detect freezes in the first 30 frames (by default, users can change that with the KWIN_MAX_FRAMES_TESTED environment variable). This detects successfully the freezes associated to nouveau drivers in https://bugzilla.suse.com/show_bug.cgi?id=1005323 Reviewers: #kwin, #plasma, davidedmundson Subscribers: kwin, plasma-devel, davidedmundson Tags: #kwin Differential Revision: https://phabricator.kde.org/D3132 --- composite.cpp | 14 ++++++++------ composite.h | 3 ++- platform.h | 4 ++-- plugins/platforms/x11/standalone/x11_platform.cpp | 4 ++-- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/composite.cpp b/composite.cpp index c3ae50e..a425a5f 100644 --- a/composite.cpp +++ b/composite.cpp @@ -135,6 +135,9 @@ Compositor::Compositor(QObject* workspace) } ); + if (qEnvironmentVariableIsSet("KWIN_MAX_FRAMES_TESTED")) + m_maxFramesTestedForSafety = qEnvironmentVariableIntValue("KWIN_MAX_FRAMES_TESTED"); + // register DBus new CompositorDBusInterface(this); } @@ -293,7 +296,6 @@ void Compositor::startupWithWorkspace() return; } Q_ASSERT(m_scene); - m_firstFrame = true; connect(workspace(), &Workspace::destroyed, this, [this] { compositeTimer.stop(); }); claimCompositorSelection(); m_xrrRefreshRate = KWin::currentRefreshRate(); @@ -734,15 +736,15 @@ void Compositor::performCompositing() // clear all repaints, so that post-pass can add repaints for the next repaint repaints_region = QRegion(); - if (m_firstFrame && (m_scene->compositingType() & OpenGLCompositing)) { - kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PreFirstFrame); + if (m_frameCount < m_maxFramesTestedForSafety && (m_scene->compositingType() & OpenGLCompositing)) { + kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PreFrame); } m_timeSinceLastVBlank = m_scene->paint(repaints, windows); - if (m_firstFrame) { + if (m_frameCount < m_maxFramesTestedForSafety) { if (m_scene->compositingType() & OpenGLCompositing) { - kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostFirstFrame); + kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostFrame); } - m_firstFrame = false; + m_frameCount++; } m_timeSinceStart += m_timeSinceLastVBlank; diff --git a/composite.h b/composite.h index 5412628..c6effe0 100644 --- a/composite.h +++ b/composite.h @@ -239,7 +239,8 @@ private: Scene *m_scene; bool m_bufferSwapPending; bool m_composeAtSwapCompletion; - bool m_firstFrame = true; + int m_frameCount = 0; + int m_maxFramesTestedForSafety = 30; KWIN_SINGLETON_VARIABLE(Compositor, s_compositor) }; diff --git a/platform.h b/platform.h index f1b8688..727ef70 100644 --- a/platform.h +++ b/platform.h @@ -143,8 +143,8 @@ public: enum class OpenGLSafePoint { PreInit, PostInit, - PreFirstFrame, - PostFirstFrame + PreFrame, + PostFrame }; /** * This method is invoked before and after creating the OpenGL rendering Scene. diff --git a/plugins/platforms/x11/standalone/x11_platform.cpp b/plugins/platforms/x11/standalone/x11_platform.cpp index 1cd73a5..12c0395 100644 --- a/plugins/platforms/x11/standalone/x11_platform.cpp +++ b/plugins/platforms/x11/standalone/x11_platform.cpp @@ -200,7 +200,7 @@ void X11StandalonePlatform::createOpenGLSafePoint(OpenGLSafePoint safePoint) auto group = KConfigGroup(kwinApp()->config(), "Compositing"); switch (safePoint) { case OpenGLSafePoint::PreInit: - case OpenGLSafePoint::PreFirstFrame: + case OpenGLSafePoint::PreFrame: Q_ASSERT(m_openGLFreezeProtectionThread == nullptr); m_openGLFreezeProtectionThread = new QThread(this); m_openGLFreezeProtectionThread->start(); @@ -217,7 +217,7 @@ void X11StandalonePlatform::createOpenGLSafePoint(OpenGLSafePoint safePoint) group.writeEntry(unsafeKey, true); break; case OpenGLSafePoint::PostInit: - case OpenGLSafePoint::PostFirstFrame: + case OpenGLSafePoint::PostFrame: m_openGLFreezeProtection->deleteLater(); m_openGLFreezeProtectionThread->quit(); m_openGLFreezeProtectionThread->wait(); -- 2.10.1 ++++++ 0003-Remove-most-overhead-caused-by-the-freeze-detection-.patch ++++++ >From 14d993610e36418baa42436dc9606d9217cba590 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa <larrosa(a)kde.org> Date: Sun, 23 Oct 2016 12:19:38 +0200 Subject: [PATCH 3/4] Remove most overhead caused by the freeze-detection thread I separated (Pre/Post)Init and (Pre/Post)Frame code in x11_platform so now *Init "detects" crashes and *Frame detects freezes. Also, now Pre/PostFrame can be called many times in a row since PostFrame doesn't remove the thread but just deletes the timer and PreFrame reuses the thread if it was already created. I added OpenGLSafePoint::PostLastFrame which is called after the last PostFrame safe point, and really removes the thread (also will delete the timer if it wasn't deleted earlier) Also, for freeze detection there's no need to write OpenGLIsUnsafe=true in PreFrame and correct it in PostFrame since kwin doesn't crash and I guess it's not nice to write twice to the config file in every frame, even if it's just the first n frames and the operating system will probably cache those writes. So I moved the code to only set OpenGLIsUnsafe=true when a freeze is detected. --- composite.cpp | 5 ++++ platform.h | 3 ++- plugins/platforms/x11/standalone/x11_platform.cpp | 30 +++++++++++++++++------ 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/composite.cpp b/composite.cpp index a425a5f..37cd54d 100644 --- a/composite.cpp +++ b/composite.cpp @@ -207,9 +207,11 @@ void Compositor::slotCompositingOptionsInitialized() qCWarning(KWIN_CORE) << "KWin has detected that your OpenGL library is unsafe to use"; else { kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PreInit); + kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PreFrame); m_scene = SceneOpenGL::createScene(this); + kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostLastFrame); kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostInit); if (m_scene && !m_scene->initFailed()) { @@ -745,6 +747,9 @@ void Compositor::performCompositing() kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostFrame); } m_frameCount++; + if (m_frameCount >= m_maxFramesTestedForSafety) { + kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostLastFrame); + } } m_timeSinceStart += m_timeSinceLastVBlank; diff --git a/platform.h b/platform.h index 727ef70..83e41bb 100644 --- a/platform.h +++ b/platform.h @@ -144,7 +144,8 @@ public: PreInit, PostInit, PreFrame, - PostFrame + PostFrame, + PostLastFrame }; /** * This method is invoked before and after creating the OpenGL rendering Scene. diff --git a/plugins/platforms/x11/standalone/x11_platform.cpp b/plugins/platforms/x11/standalone/x11_platform.cpp index 12c0395..39652c2 100644 --- a/plugins/platforms/x11/standalone/x11_platform.cpp +++ b/plugins/platforms/x11/standalone/x11_platform.cpp @@ -200,10 +200,18 @@ void X11StandalonePlatform::createOpenGLSafePoint(OpenGLSafePoint safePoint) auto group = KConfigGroup(kwinApp()->config(), "Compositing"); switch (safePoint) { case OpenGLSafePoint::PreInit: + group.writeEntry(unsafeKey, true); + break; + case OpenGLSafePoint::PostInit: + group.writeEntry(unsafeKey, false); + break; case OpenGLSafePoint::PreFrame: - Q_ASSERT(m_openGLFreezeProtectionThread == nullptr); - m_openGLFreezeProtectionThread = new QThread(this); - m_openGLFreezeProtectionThread->start(); + if (m_openGLFreezeProtectionThread == nullptr) { + m_openGLFreezeProtectionThread = new QThread(this); + m_openGLFreezeProtectionThread->setObjectName("FreezeDetector"); + m_openGLFreezeProtectionThread->start(); + } + Q_ASSERT(m_openGLFreezeProtection == nullptr); m_openGLFreezeProtection = new QTimer; m_openGLFreezeProtection->setInterval(15000); m_openGLFreezeProtection->setSingleShot(true); @@ -211,20 +219,26 @@ void X11StandalonePlatform::createOpenGLSafePoint(OpenGLSafePoint safePoint) m_openGLFreezeProtection->moveToThread(m_openGLFreezeProtectionThread); connect(m_openGLFreezeProtection, &QTimer::timeout, m_openGLFreezeProtection, [] { + const QString unsafeKey(QLatin1String("OpenGLIsUnsafe") + (kwinApp()->isX11MultiHead() ? QString::number(kwinApp()->x11ScreenNumber()) : QString())); + auto group = KConfigGroup(kwinApp()->config(), "Compositing"); + group.writeEntry(unsafeKey, true); + group.sync(); qFatal("Freeze in OpenGL initialization detected"); }, Qt::DirectConnection); - - group.writeEntry(unsafeKey, true); break; - case OpenGLSafePoint::PostInit: case OpenGLSafePoint::PostFrame: m_openGLFreezeProtection->deleteLater(); + m_openGLFreezeProtection = nullptr; + break; + case OpenGLSafePoint::PostLastFrame: + if (m_openGLFreezeProtection) { + m_openGLFreezeProtection->deleteLater(); + m_openGLFreezeProtection = nullptr; + }; m_openGLFreezeProtectionThread->quit(); m_openGLFreezeProtectionThread->wait(); delete m_openGLFreezeProtectionThread; m_openGLFreezeProtectionThread = nullptr; - m_openGLFreezeProtection = nullptr; - group.writeEntry(unsafeKey, false); break; } group.sync(); -- 2.10.1 ++++++ 0004-Do-a-count-down-of-framesToTestForSafety.patch ++++++ >From 8e49998eb3677cf0b25bf652ba13ab86bf18b9bc Mon Sep 17 00:00:00 2001 From: Antonio Larrosa <larrosa(a)kde.org> Date: Mon, 24 Oct 2016 09:39:55 +0200 Subject: [PATCH 4/4] Do a count down of framesToTestForSafety Use one variable instead of two and do a count down from m_framesToTestForSafety to 0 --- composite.cpp | 10 +++++----- composite.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/composite.cpp b/composite.cpp index 37cd54d..0abf531 100644 --- a/composite.cpp +++ b/composite.cpp @@ -136,7 +136,7 @@ Compositor::Compositor(QObject* workspace) ); if (qEnvironmentVariableIsSet("KWIN_MAX_FRAMES_TESTED")) - m_maxFramesTestedForSafety = qEnvironmentVariableIntValue("KWIN_MAX_FRAMES_TESTED"); + m_framesToTestForSafety = qEnvironmentVariableIntValue("KWIN_MAX_FRAMES_TESTED"); // register DBus new CompositorDBusInterface(this); @@ -738,16 +738,16 @@ void Compositor::performCompositing() // clear all repaints, so that post-pass can add repaints for the next repaint repaints_region = QRegion(); - if (m_frameCount < m_maxFramesTestedForSafety && (m_scene->compositingType() & OpenGLCompositing)) { + if (m_framesToTestForSafety > 0 && (m_scene->compositingType() & OpenGLCompositing)) { kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PreFrame); } m_timeSinceLastVBlank = m_scene->paint(repaints, windows); - if (m_frameCount < m_maxFramesTestedForSafety) { + if (m_framesToTestForSafety > 0) { if (m_scene->compositingType() & OpenGLCompositing) { kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostFrame); } - m_frameCount++; - if (m_frameCount >= m_maxFramesTestedForSafety) { + m_framesToTestForSafety--; + if (m_framesToTestForSafety == 0) { kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostLastFrame); } } diff --git a/composite.h b/composite.h index c6effe0..c439148 100644 --- a/composite.h +++ b/composite.h @@ -239,8 +239,7 @@ private: Scene *m_scene; bool m_bufferSwapPending; bool m_composeAtSwapCompletion; - int m_frameCount = 0; - int m_maxFramesTestedForSafety = 30; + int m_framesToTestForSafety = 30; KWIN_SINGLETON_VARIABLE(Compositor, s_compositor) }; -- 2.10.1 ++++++ 0005-Use-only-one-timer-to-detect-freezes-and-other-optim.patch ++++++ >From 8f5dbeba06ce05d6474f369a95a1a9d1f814a06f Mon Sep 17 00:00:00 2001 From: Antonio Larrosa <larrosa(a)kde.org> Date: Mon, 24 Oct 2016 16:45:04 +0200 Subject: [PATCH 5/7] Use only one timer to detect freezes and other optimizations stop/restart the same timer instead of creating a new one for each frame tested for freezes. Merged PreInit with PreFrame and PostInit with PostFrame so there's no need to call both before/after init, which didn't make sense contextually. Also moved group.sync() so PreFrame/PostFrame don't call it continuously. Finally, also renamed PostLastFrame to PostLastGuardedFrame --- composite.cpp | 4 +- platform.h | 2 +- plugins/platforms/x11/standalone/x11_platform.cpp | 55 ++++++++++++----------- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/composite.cpp b/composite.cpp index 0abf531..573e7a6 100644 --- a/composite.cpp +++ b/composite.cpp @@ -207,11 +207,9 @@ void Compositor::slotCompositingOptionsInitialized() qCWarning(KWIN_CORE) << "KWin has detected that your OpenGL library is unsafe to use"; else { kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PreInit); - kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PreFrame); m_scene = SceneOpenGL::createScene(this); - kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostLastFrame); kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostInit); if (m_scene && !m_scene->initFailed()) { @@ -748,7 +746,7 @@ void Compositor::performCompositing() } m_framesToTestForSafety--; if (m_framesToTestForSafety == 0) { - kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostLastFrame); + kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostLastGuardedFrame); } } m_timeSinceStart += m_timeSinceLastVBlank; diff --git a/platform.h b/platform.h index 83e41bb..de0b3bf 100644 --- a/platform.h +++ b/platform.h @@ -145,7 +145,7 @@ public: PostInit, PreFrame, PostFrame, - PostLastFrame + PostLastGuardedFrame }; /** * This method is invoked before and after creating the OpenGL rendering Scene. diff --git a/plugins/platforms/x11/standalone/x11_platform.cpp b/plugins/platforms/x11/standalone/x11_platform.cpp index 39652c2..88b37ea 100644 --- a/plugins/platforms/x11/standalone/x11_platform.cpp +++ b/plugins/platforms/x11/standalone/x11_platform.cpp @@ -201,47 +201,50 @@ void X11StandalonePlatform::createOpenGLSafePoint(OpenGLSafePoint safePoint) switch (safePoint) { case OpenGLSafePoint::PreInit: group.writeEntry(unsafeKey, true); - break; - case OpenGLSafePoint::PostInit: - group.writeEntry(unsafeKey, false); - break; + group.sync(); + // Deliberately continue with PreFrame case OpenGLSafePoint::PreFrame: if (m_openGLFreezeProtectionThread == nullptr) { + Q_ASSERT(m_openGLFreezeProtection == nullptr); m_openGLFreezeProtectionThread = new QThread(this); m_openGLFreezeProtectionThread->setObjectName("FreezeDetector"); m_openGLFreezeProtectionThread->start(); - } - Q_ASSERT(m_openGLFreezeProtection == nullptr); - m_openGLFreezeProtection = new QTimer; - m_openGLFreezeProtection->setInterval(15000); - m_openGLFreezeProtection->setSingleShot(true); - m_openGLFreezeProtection->start(); - m_openGLFreezeProtection->moveToThread(m_openGLFreezeProtectionThread); - connect(m_openGLFreezeProtection, &QTimer::timeout, m_openGLFreezeProtection, - [] { - const QString unsafeKey(QLatin1String("OpenGLIsUnsafe") + (kwinApp()->isX11MultiHead() ? QString::number(kwinApp()->x11ScreenNumber()) : QString())); - auto group = KConfigGroup(kwinApp()->config(), "Compositing"); - group.writeEntry(unsafeKey, true); - group.sync(); - qFatal("Freeze in OpenGL initialization detected"); - }, Qt::DirectConnection); + m_openGLFreezeProtection = new QTimer; + m_openGLFreezeProtection->setInterval(15000); + m_openGLFreezeProtection->setSingleShot(true); + m_openGLFreezeProtection->start(); + m_openGLFreezeProtection->moveToThread(m_openGLFreezeProtectionThread); + connect(m_openGLFreezeProtection, &QTimer::timeout, m_openGLFreezeProtection, + [] { + const QString unsafeKey(QLatin1String("OpenGLIsUnsafe") + (kwinApp()->isX11MultiHead() ? QString::number(kwinApp()->x11ScreenNumber()) : QString())); + auto group = KConfigGroup(kwinApp()->config(), "Compositing"); + group.writeEntry(unsafeKey, true); + group.sync(); + qFatal("Freeze in OpenGL initialization detected"); + }, Qt::DirectConnection); + } + else + { + Q_ASSERT(m_openGLFreezeProtection); + QMetaObject::invokeMethod(m_openGLFreezeProtection, "start", Qt::QueuedConnection); + } break; + case OpenGLSafePoint::PostInit: + group.writeEntry(unsafeKey, false); + group.sync(); + // Deliberately continue with PostFrame case OpenGLSafePoint::PostFrame: + QMetaObject::invokeMethod(m_openGLFreezeProtection, "stop", Qt::QueuedConnection); + break; + case OpenGLSafePoint::PostLastGuardedFrame: m_openGLFreezeProtection->deleteLater(); m_openGLFreezeProtection = nullptr; - break; - case OpenGLSafePoint::PostLastFrame: - if (m_openGLFreezeProtection) { - m_openGLFreezeProtection->deleteLater(); - m_openGLFreezeProtection = nullptr; - }; m_openGLFreezeProtectionThread->quit(); m_openGLFreezeProtectionThread->wait(); delete m_openGLFreezeProtectionThread; m_openGLFreezeProtectionThread = nullptr; break; } - group.sync(); } } -- 2.10.1 ++++++ 0006-Test-3-frames-for-freezes-by-default.patch ++++++ >From 550184274e79a832a8179b349b9b139066b5b946 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa <larrosa(a)kde.org> Date: Mon, 24 Oct 2016 16:47:50 +0200 Subject: [PATCH 6/7] Test 3 frames for freezes by default I tested on a system with nouveau and testing for 3 frames seems to be enough to detect the freeze. Note that this can be changed with the environment variable KWIN_MAX_FRAMES_TESTED --- composite.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composite.h b/composite.h index c439148..a7aee56 100644 --- a/composite.h +++ b/composite.h @@ -239,7 +239,7 @@ private: Scene *m_scene; bool m_bufferSwapPending; bool m_composeAtSwapCompletion; - int m_framesToTestForSafety = 30; + int m_framesToTestForSafety = 3; KWIN_SINGLETON_VARIABLE(Compositor, s_compositor) }; -- 2.10.1 ++++++ 0007-Only-call-PostLastGuardedFrame-when-OpenGLCompositin.patch ++++++ >From 9b51560ca83bd9790c633f3a90019b88c45d8fe0 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa <larrosa(a)kde.org> Date: Mon, 24 Oct 2016 17:14:32 +0200 Subject: [PATCH 7/7] Only call PostLastGuardedFrame when OpenGLCompositing is set And a small coding style change in bracets --- composite.cpp | 4 ++-- plugins/platforms/x11/standalone/x11_platform.cpp | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/composite.cpp b/composite.cpp index 573e7a6..41b948e 100644 --- a/composite.cpp +++ b/composite.cpp @@ -745,9 +745,9 @@ void Compositor::performCompositing() kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostFrame); } m_framesToTestForSafety--; - if (m_framesToTestForSafety == 0) { + if (m_framesToTestForSafety == 0 && (m_scene->compositingType() & OpenGLCompositing)) { kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostLastGuardedFrame); - } + } } m_timeSinceStart += m_timeSinceLastVBlank; diff --git a/plugins/platforms/x11/standalone/x11_platform.cpp b/plugins/platforms/x11/standalone/x11_platform.cpp index 88b37ea..05bdd39 100644 --- a/plugins/platforms/x11/standalone/x11_platform.cpp +++ b/plugins/platforms/x11/standalone/x11_platform.cpp @@ -222,9 +222,7 @@ void X11StandalonePlatform::createOpenGLSafePoint(OpenGLSafePoint safePoint) group.sync(); qFatal("Freeze in OpenGL initialization detected"); }, Qt::DirectConnection); - } - else - { + } else { Q_ASSERT(m_openGLFreezeProtection); QMetaObject::invokeMethod(m_openGLFreezeProtection, "start", Qt::QueuedConnection); } -- 2.10.1

1 0

commit kjs for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '16

28 Oct '16

Hello community, here is the log from the commit of package kjs for openSUSE:Factory checked in at 2016-10-28 12:26:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjs (Old) and /work/SRC/openSUSE:Factory/.kjs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kjs" Changes: -------- --- /work/SRC/openSUSE:Factory/kjs/kjs.changes 2016-09-14 23:31:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kjs.new/kjs.changes 2016-10-28 12:26:47.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Oct 2 12:57:07 UTC 2016 - hrvoje.senjan(a)gmail.com + +- Update to 5.27.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.27.0.php + +------------------------------------------------------------------- Old: ---- kjs-5.26.0.tar.xz New: ---- kjs-5.27.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjs.spec ++++++ --- /var/tmp/diff_new_pack.fAuQHH/_old 2016-10-28 12:26:48.000000000 +0200 +++ /var/tmp/diff_new_pack.fAuQHH/_new 2016-10-28 12:26:48.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.26 +%define _tar_path 5.27 Name: kjs -Version: 5.26.0 +Version: 5.27.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -49,7 +49,6 @@ Summary: KDE Javascript engine Group: System/GUI/KDE - %description -n libKF5JS%sonum This library provides an ECMAScript compatible interpreter. The ECMA standard is based on well known scripting languages such as Netscape's JavaScript and ++++++ kjs-5.26.0.tar.xz -> kjs-5.27.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjs-5.26.0/CMakeLists.txt new/kjs-5.27.0/CMakeLists.txt --- old/kjs-5.26.0/CMakeLists.txt 2016-09-06 14:09:00.000000000 +0200 +++ new/kjs-5.27.0/CMakeLists.txt 2016-10-02 11:54:51.000000000 +0200 @@ -4,7 +4,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.26.0 NO_MODULE) +find_package(ECM 5.27.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -16,7 +16,7 @@ include(ECMSetupVersion) include(ECMMarkNonGuiExecutable) -set(KF5_VERSION "5.26.0") # handled by release scripts +set(KF5_VERSION "5.27.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KJS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kjs_version.h"

1 0

commit libktorrent for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '16

28 Oct '16

Hello community, here is the log from the commit of package libktorrent for openSUSE:Factory checked in at 2016-10-28 12:26:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libktorrent (Old) and /work/SRC/openSUSE:Factory/.libktorrent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libktorrent" Changes: -------- --- /work/SRC/openSUSE:Factory/libktorrent/libktorrent.changes 2016-09-07 11:43:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libktorrent.new/libktorrent.changes 2016-10-28 12:26:32.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Oct 23 21:54:45 UTC 2016 - hrvoje.senjan(a)gmail.com + +- Added Fix-logging-framework-spamming.patch (kde#362195) + +------------------------------------------------------------------- New: ---- Fix-logging-framework-spamming.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libktorrent.spec ++++++ --- /var/tmp/diff_new_pack.vOOB6M/_old 2016-10-28 12:26:33.000000000 +0200 +++ /var/tmp/diff_new_pack.vOOB6M/_new 2016-10-28 12:26:33.000000000 +0200 @@ -29,6 +29,8 @@ Source0: http://download.kde.org/stable/ktorrent/%{ktor_ver}/%{name}-%{version}.tar.… # PATCH-FIX-OPENSUSE require-lower-LibGMP.patch Patch0: require-lower-LibGMP.patch +# PATCH-FIX-UPSTREAM Fix-logging-framework-spamming.patch +Patch1: Fix-logging-framework-spamming.patch BuildRequires: boost-devel BuildRequires: doxygen BuildRequires: extra-cmake-modules @@ -74,6 +76,7 @@ %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build ++++++ Fix-logging-framework-spamming.patch ++++++ From: Martin T. H. Sandsmark <martin.sandsmark(a)kde.org> Date: Thu, 06 Oct 2016 21:43:46 +0000 Subject: Fix logging framework spamming X-Git-Url: http://quickgit.kde.org/?p=libktorrent.git&a=commitdiff&h=a65d69e68ad860601… --- Fix logging framework spamming 3945a53ba65125b430e1f681deb2558d01ab052a forced the logging framework to always print all log information (including debug logs) to standard out, this makes it respect the to_stdout again. BUG: 362195 --- --- a/src/util/log.cpp +++ b/src/util/log.cpp @@ -276,7 +276,7 @@ void InitLog(const QString & file,bool rotate,bool handle_qt_messages,bool to_stdout) { global_log->setOutputFile(file,rotate,handle_qt_messages); - global_log->setOutputToConsole(true); + global_log->setOutputToConsole(to_stdout); } void AddLogMonitor(LogMonitorInterface* m)

1 0

commit breeze for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '16

28 Oct '16

Hello community, here is the log from the commit of package breeze for openSUSE:Factory checked in at 2016-10-28 12:26:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/breeze (Old) and /work/SRC/openSUSE:Factory/.breeze.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "breeze" Changes: -------- --- /work/SRC/openSUSE:Factory/breeze/breeze.changes 2016-10-22 13:06:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.breeze.new/breeze.changes 2016-10-28 12:26:22.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Oct 23 18:02:27 UTC 2016 - wbauer(a)tmo.at + +- Update add-support-for-Q3ListView-to-the-KDE4-style.patch to fix + some graphical glitches (boo#1005902) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ breeze4-style.spec: same change ++++++ add-support-for-Q3ListView-to-the-KDE4-style.patch ++++++ --- /var/tmp/diff_new_pack.pc40cA/_old 2016-10-28 12:26:23.000000000 +0200 +++ /var/tmp/diff_new_pack.pc40cA/_new 2016-10-28 12:26:23.000000000 +0200 @@ -1,5 +1,5 @@ diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp -index 8a02d75..359d1ab 100644 +index 8a02d75..c1b9670 100644 --- a/kstyle/breezestyle.cpp +++ b/kstyle/breezestyle.cpp @@ -929,6 +929,7 @@ namespace Breeze @@ -10,7 +10,7 @@ case CC_Slider: fcn = &Style::drawSliderComplexControl; break; case CC_Dial: fcn = &Style::drawDialComplexControl; break; case CC_ScrollBar: fcn = &Style::drawScrollBarComplexControl; break; -@@ -6122,6 +6123,63 @@ namespace Breeze +@@ -6122,6 +6216,67 @@ namespace Breeze } //______________________________________________________________ @@ -50,7 +50,9 @@ + { opt.state |= QStyle::State_Children | ( item.state & QStyle::State_Open ); } + + opt.rect = QRect( optListView->rect.left(), y, optListView->rect.width(), item.height ); ++ painter->save(); + drawIndicatorBranchPrimitive( &opt, painter, widget ); ++ painter->restore(); + + if( ( opt.state & QStyle::State_Sibling ) && item.height < item.totalHeight ) + { @@ -58,7 +60,9 @@ + opt.rect = QRect( + optListView->rect.left(), y + item.height, + optListView->rect.width(), item.totalHeight - item.height ); ++ painter->save(); + drawIndicatorBranchPrimitive( &opt, painter, widget ); ++ painter->restore(); + } + } +

1 0

commit plasma5-workspace for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '16

28 Oct '16

Hello community, here is the log from the commit of package plasma5-workspace for openSUSE:Factory checked in at 2016-10-28 12:26:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old) and /work/SRC/openSUSE:Factory/.plasma5-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma5-workspace" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-workspace/plasma5-workspace.changes 2016-10-22 13:11:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma5-workspace.changes 2016-10-28 12:26:12.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Oct 23 11:59:55 UTC 2016 - fabian(a)ritter-vogt.de + +- Remove Requires again, backport import removal + * remove-sddm-graphicaleffects-dep.patch + +------------------------------------------------------------------- +Sat Oct 22 19:27:37 UTC 2016 - fabian(a)ritter-vogt.de + +- Add Requires: libqt5-qtgraphicaleffects as used by the sddm theme + +------------------------------------------------------------------- New: ---- remove-sddm-graphicaleffects-dep.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-workspace.spec ++++++ --- /var/tmp/diff_new_pack.BgoxNf/_old 2016-10-28 12:26:13.000000000 +0200 +++ /var/tmp/diff_new_pack.BgoxNf/_new 2016-10-28 12:26:13.000000000 +0200 @@ -42,6 +42,8 @@ Patch100: keep-wallpaper-aspect-ratio-wallpaper-on-screen-resolution-change.diff # PATCH-FIX-UPSTREAM fix-sddm-theme-logic.diff boo#1003742 alarrosa(a)suse.com -- Fix sddm logic to use avatar list or text entry when usermodel.count is 0 Patch101: fix-sddm-theme-logic.diff +# PATCH-FIX-UPSTREAM remove-sddm-graphicaleffects-dep.patch kde#371493 kde(a)privat.broulik.de -- Remove unused import QtGraphicalEffects +Patch102: remove-sddm-graphicaleffects-dep.patch # PATCHES 201-300 and above are from upstream master/5.9 branch BuildRequires: breeze5-icons BuildRequires: fdupes @@ -136,7 +138,7 @@ Requires: libkscreen2-plugin >= %{_plasma5_version} # boo#912317 Requires: oxygen5-sounds >= %{_plasma5_version} -# hardcode versions of plasma-framework-componets and plasma-framework-private packages, as upstream doesn't keep backwards compability there +# hardcode versions of plasma-framework-components and plasma-framework-private packages, as upstream doesn't keep backwards compability there %requires_ge plasma-framework-components %requires_ge plasma-framework-private Requires: kactivities5 @@ -214,6 +216,7 @@ %patch3 -p1 %patch100 -p1 %patch101 -p1 +%patch102 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ remove-sddm-graphicaleffects-dep.patch ++++++ From: Kai Uwe Broulik <kde(a)privat.broulik.de> Date: Sun, 23 Oct 2016 11:24:00 +0000 Subject: Remove unused import QtGraphicalEffects X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=b61c232722aa… --- Remove unused import QtGraphicalEffects BUG: 371493 FIXED-IN: 5.8.3 --- --- a/sddm-theme/Background.qml +++ b/sddm-theme/Background.qml @@ -23,8 +23,6 @@ ***************************************************************************/ import QtQuick 2.2 -import QtGraphicalEffects 1.0 - FocusScope { property alias source: image.source

1 0

commit plasma5-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '16

28 Oct '16

Hello community, here is the log from the commit of package plasma5-openSUSE for openSUSE:Factory checked in at 2016-10-28 12:26:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-openSUSE (Old) and /work/SRC/openSUSE:Factory/.plasma5-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma5-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-openSUSE/plasma5-openSUSE.changes 2016-10-22 13:10:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-openSUSE.new/plasma5-openSUSE.changes 2016-10-28 12:26:03.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Oct 23 12:02:28 UTC 2016 - fabian(a)ritter-vogt.de + +- Remove libqt5-qtgraphicaleffects dependency, fixed in plasma-workspace + +------------------------------------------------------------------- +Sat Oct 22 19:26:08 UTC 2016 - fabian(a)ritter-vogt.de + +- Add explicit dependencies to QML modules used by the sddm theme + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.Ihce1t/_old 2016-10-28 12:26:04.000000000 +0200 +++ /var/tmp/diff_new_pack.Ihce1t/_new 2016-10-28 12:26:04.000000000 +0200 @@ -114,6 +114,8 @@ %package -n sddm-theme-openSUSE Summary: SDDM theme for openSUSE Group: System/GUI/KDE +Requires: libqt5-qtquickcontrols +Requires: plasma-framework-components Requires: wallpaper-branding-openSUSE %description -n sddm-theme-openSUSE

1 0

commit threadweaver for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '16

28 Oct '16

Hello community, here is the log from the commit of package threadweaver for openSUSE:Factory checked in at 2016-10-28 12:25:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/threadweaver (Old) and /work/SRC/openSUSE:Factory/.threadweaver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "threadweaver" Changes: -------- --- /work/SRC/openSUSE:Factory/threadweaver/threadweaver.changes 2016-09-14 23:30:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.threadweaver.new/threadweaver.changes 2016-10-28 12:25:52.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Oct 2 13:14:01 UTC 2016 - hrvoje.senjan(a)gmail.com + +- Update to 5.27.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.27.0.php + +------------------------------------------------------------------- Old: ---- threadweaver-5.26.0.tar.xz New: ---- threadweaver-5.27.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ threadweaver.spec ++++++ --- /var/tmp/diff_new_pack.gBYikw/_old 2016-10-28 12:25:53.000000000 +0200 +++ /var/tmp/diff_new_pack.gBYikw/_new 2016-10-28 12:25:53.000000000 +0200 @@ -17,9 +17,9 @@ %define lname libKF5ThreadWeaver5 -%define _tar_path 5.26 +%define _tar_path 5.27 Name: threadweaver -Version: 5.26.0 +Version: 5.27.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ threadweaver-5.26.0.tar.xz -> threadweaver-5.27.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.26.0/CMakeLists.txt new/threadweaver-5.27.0/CMakeLists.txt --- old/threadweaver-5.26.0/CMakeLists.txt 2016-09-06 00:46:54.000000000 +0200 +++ new/threadweaver-5.27.0/CMakeLists.txt 2016-10-02 10:19:47.000000000 +0200 @@ -3,7 +3,7 @@ project(ThreadWeaver) include(FeatureSummary) -find_package(ECM 5.26.0 NO_MODULE) +find_package(ECM 5.27.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -29,7 +29,7 @@ ENDIF() # -- Maintained by scripty -set(KF5_VERSION "5.26.0") # handled by release scripts +set(KF5_VERSION "5.27.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX THREADWEAVER VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/threadweaver_version.h"

1 0