Hello community, here is the log from the commit of package plasma5-workspace for openSUSE:Factory checked in at 2014-10-01 11:23:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-09-12 17:05:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma5-workspace.changes 2014-10-01 11:23:25.000000000 +0200 @@ -1,0 +2,26 @@ +Fri Sep 26 09:20:21 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.0.95: + * No changes since previous snapshot +- Install translations +- Add rpmlintrc file for file-not-in-%lang warnings: we don't use + find_lang macro as it doesn't searches in subdirectories +- Swap wallpaper.diff for 0001-take-the-proper-default-at-first-start.patch + it is a simpler solution (kde#339216, kde#339414) +- Add 0002-Fix-NotificationPopup-size.patch: fixes notifications + with latest plasma-framework +- Add 0004-Show-application-title-if-Status-Notifier-Item-does-.patch: + show the application name and icon if none is given. kde#337710 + +------------------------------------------------------------------- +Tue Sep 23 20:24:35 UTC 2014 - hrvoje.senjan@gmail.com + +- Create upstream-branding subpackage, empty for now +- Update to 5.0.95~git20140925 (rdfc15d5): + * Improvements to notifications applet + * Honor settings of look-and-feel package (needed for openSUSE + branding) + * Add timezone support to digital clock +- Add wallpaper.diff to resolve kde#339216 + +------------------------------------------------------------------- Old: ---- plasma-workspace-5.0.95~git20140911.tar.xz New: ---- 0001-take-the-proper-default-at-first-start.patch 0002-Fix-NotificationPopup-size.patch 0004-Show-application-title-if-Status-Notifier-Item-does-.patch plasma-workspace-5.0.95.tar.xz plasma5-workspace-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-workspace.spec ++++++ --- /var/tmp/diff_new_pack.lfBso8/_old 2014-10-01 11:23:27.000000000 +0200 +++ /var/tmp/diff_new_pack.lfBso8/_new 2014-10-01 11:23:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: plasma5-workspace -Version: 5.0.95~git20140911 +Version: 5.0.95 Release: 0 Summary: The KDE Plasma Workspace Components License: GPL-2.0+ @@ -25,12 +25,20 @@ Url: http://www.kde.org/ Source: plasma-workspace-%{version}.tar.xz Source1: baselibs.conf +Source99: %{name}-rpmlintrc # PATCH-FIX_OPENSUSE 0001-Rename-qdbus-in-startkde.patch cgiboudeaux@gmx.com -- Rename the qdbus executable in startkde Patch0: 0001-Rename-qdbus-in-startkde.patch # PATCH-FIX_OPENSUSE create_kdehome.patch -- https://bugs.kde.org/show_bug.cgi?id=338422#c8 Patch1: create_kdehome.patch # PATCH-FIX_OPENSUSE 0003-Remove-export-of-QT_PLUGIN_PATH.patch -- we install plugins to directory known to Qt5, so export just pollutes both Qt4 and Qt5 plugins Patch2: 0003-Remove-export-of-QT_PLUGIN_PATH.patch +# PATCH-FIX_UPSTREAM 0001-take-the-proper-default-at-first-start.patch -- kde#339216, kde#339414 +Patch3: 0001-take-the-proper-default-at-first-start.patch +# PATCHES 100-200 are taken from upstream +# PATCH-FIX_UPSTREAM 0002-Fix-NotificationPopup-size.patch +Patch100: 0002-Fix-NotificationPopup-size.patch +# PATCH-FIX_UPSTREAM 0004-Show-application-title-if-Status-Notifier-Item-does-.patch +Patch101: 0004-Show-application-title-if-Status-Notifier-Item-does-.patch BuildRequires: alsa-devel BuildRequires: baloo5-devel >= 5.0.0 BuildRequires: kactivities5-devel >= 5.0.0 @@ -83,6 +91,7 @@ Obsoletes: baloo5-runner Provides: plasma-workspace5 = %{version} Obsoletes: plasma-workspace5 <= %{version} +Requires: %{name}-branding = %{_plasma5_branding_version} # used within startup Requires: kde-cli-tools5 Requires: kded @@ -118,6 +127,16 @@ %description This package contains the basic packages for a Plasma workspace. +%package branding-upstream +Summary: The KDE Plasma Workspace Components +Group: System/GUI/KDE +Provides: %{name}-branding = %{_plasma5_branding_version} +Supplements: packageand(plasma5-workspace:branding-upstream) +Conflicts: otherproviders(%{name}-branding) + +%description branding-upstream +This package contains the basic packages for a Plasma workspace. + %package -n drkonqi5 Summary: KDE crash handler Group: Development/Tools/Debuggers @@ -154,14 +173,18 @@ This package contains the basic packages for a K Desktop Environment workspace. Development files. +%lang_package %prep %setup -q -n plasma-workspace-%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch100 -p1 +%patch101 -p1 %build - %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DBUILD_po=OFF -DKDE_DEFAULT_HOME=.kde4 + %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 %make_jobs %install @@ -267,6 +290,10 @@ %{_kf5_sharedir}/dbus-1/services/org.kde.kglobalaccel.service %{_kf5_servicesdir}/kglobalaccel5.desktop +%files branding-upstream +%defattr(-,root,root) +%doc COPYING* + %files devel %defattr(-,root,root) %doc COPYING* @@ -285,4 +312,8 @@ %{_kf5_libdir}/libweather_ion.so %{_kf5_sharedir}/dbus-1/interfaces/ +%files lang +%defattr(-,root,root) +%{_kf5_localedir}/ + %changelog ++++++ 0001-take-the-proper-default-at-first-start.patch ++++++ From 3b2d770df42def293dbf4fed6bc2a1431b78490d Mon Sep 17 00:00:00 2001 From: Marco Martin <notmart@gmail.com> Date: Fri, 26 Sep 2014 15:43:22 +0200 Subject: [PATCH 1/1] take the proper default at first start wallpaper.configuration.Image is empty at first start, but the image wallpaper object has the proper default BUG:339414 --- wallpapers/image/imagepackage/contents/ui/main.qml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wallpapers/image/imagepackage/contents/ui/main.qml b/wallpapers/image/imagepackage/contents/ui/main.qml index 3ec8391..d81bd29 100644 --- a/wallpapers/image/imagepackage/contents/ui/main.qml +++ b/wallpapers/image/imagepackage/contents/ui/main.qml @@ -86,6 +86,9 @@ Rectangle { } Component.onCompleted: { + if (!configuredImage && imageWallpaper.wallpaperPath) { + return; + } imageWallpaper.addUrl(configuredImage) if (wallpaper.pluginName == "org.kde.slideshow") { wallpaper.setAction("next", i18nd("plasma_applet_org.kde.image","Next Wallpaper Image"),"user-desktop"); -- 2.1.0 ++++++ 0002-Fix-NotificationPopup-size.patch ++++++ From 268c1d250fad9421c1787355a2b6fae4e8d1ef2a Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik <kde@privat.broulik.de> Date: Sat, 27 Sep 2014 21:32:17 +0200 Subject: [PATCH 2/5] Fix NotificationPopup size REVIEW: 120390 --- applets/notifications/package/contents/ui/NotificationPopup.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/applets/notifications/package/contents/ui/NotificationPopup.qml b/applets/notifications/package/contents/ui/NotificationPopup.qml index 63036f1..26c7ed2 100644 --- a/applets/notifications/package/contents/ui/NotificationPopup.qml +++ b/applets/notifications/package/contents/ui/NotificationPopup.qml @@ -18,6 +18,8 @@ */ import QtQuick 2.0 +import QtQuick.Layouts 1.1 + import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.extras 2.0 as PlasmaExtras @@ -57,8 +59,8 @@ PlasmaCore.Dialog { mainItem: MouseEventListener { id: root - height: Math.max(actionsColumn.height + closeButton.height + (3 * units.smallSpacing), (4.5 * units.gridUnit)) - width: Math.round(23 * units.gridUnit) + Layout.minimumWidth: Math.round(23 * units.gridUnit) + Layout.minimumHeight: Math.max(actionsColumn.height + closeButton.height + (3 * units.smallSpacing), (4.5 * units.gridUnit)) state: "controlsHidden" hoverEnabled: true -- 2.1.0 ++++++ 0004-Show-application-title-if-Status-Notifier-Item-does-.patch ++++++ From 909f1f1ad82248aea6581f8b6576675877ea18b5 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik <kde@privat.broulik.de> Date: Sun, 28 Sep 2014 19:41:15 +0200 Subject: [PATCH 4/5] Show application title if Status Notifier Item does not provide a tooltip A custom tooltip text is not mandated by the SNI spec. Instead, we just show the application name and icon if none is given. This fixes Steam not having a tooltip and restores Plasma 4.x behavior. REVIEW: 120407 BUG: 337710 FIXED-IN: 5.1 --- .../dbussystemtray/dbussystemtraytask.cpp | 42 ++++++++++++++++------ 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp b/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp index 14458e9..f878ffd 100644 --- a/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp +++ b/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp @@ -420,22 +420,42 @@ void DBusSystemTrayTask::syncIcons(const Plasma::DataEngine::Data &properties) void DBusSystemTrayTask::syncToolTip(const QString &title, const QString &subTitle, const QIcon &toolTipIcon) { - if (title != m_tooltipTitle) { - m_tooltipTitle = title; - emit changedTooltipTitle(); - } + if (title.isEmpty() && subTitle.isEmpty()) { + // if empty tooltip use application name as fallback + if (m_tooltipTitle != name()) { + m_tooltipTitle = name(); + emit changedTooltipTitle(); + } + + if (!m_tooltipText.isEmpty()) { + m_tooltipText.clear(); + emit changedTooltipText(); + } + } else { + if (title != m_tooltipTitle) { + m_tooltipTitle = title; + emit changedTooltipTitle(); + } - if (subTitle != m_tooltipText) { - m_tooltipText = subTitle; - emit changedTooltipText(); + if (subTitle != m_tooltipText) { + m_tooltipText = subTitle; + emit changedTooltipText(); + } } - bool is_icon_name_changed = (m_tooltipIcon.name() != toolTipIcon.name()); + bool iconNameChanged = false; - m_tooltipIcon = toolTipIcon; - emit changedTooltip(); + if (toolTipIcon.isNull()) { + iconNameChanged = m_tooltipIcon.name() != m_icon.name(); + m_tooltipIcon = m_icon; + } else { + iconNameChanged = m_tooltipIcon.name() != toolTipIcon.name(); + m_tooltipIcon = toolTipIcon; + emit changedTooltip(); + } - if (is_icon_name_changed) { + emit changedTooltip(); + if (iconNameChanged) { emit changedTooltipIconName(); } } -- 2.1.0 ++++++ plasma-workspace-5.0.95~git20140911.tar.xz -> plasma-workspace-5.0.95.tar.xz ++++++ /work/SRC/openSUSE:Factory/plasma5-workspace/plasma-workspace-5.0.95~git20140911.tar.xz /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma-workspace-5.0.95.tar.xz differ: char 17, line 1 ++++++ plasma5-workspace-rpmlintrc ++++++ # we don't use find_lang macro as it doesn't searches in subdirectories addFilter("file-not-in-%lang .*")-- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org