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 - [email protected] + +- Fix SLE build: Fixes-for-building-plasma-framework-with-Qt-55.patch + +------------------------------------------------------------------- +Thu Oct 27 19:25:57 UTC 2016 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- 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 - [email protected] + +- 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}.tar.xz -Source: %{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz 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 <[email protected]> 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=f82d76eb2b915d5097f41a22a9f218e0bb23bb03 --- 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 <[email protected]> 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=65706d3878d556c7a1eac18984ec41b1a1d96d56 --- 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)
