[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.7.1+dfsg-2ubuntu2-4-g86833a5
Timo Jyrinki
timo at moszumanska.debian.org
Tue Feb 14 13:15:38 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=86833a5
The following commit has been merged in the ubuntu branch:
commit 86833a5a94eca97ac39bf427761bf6880969ae50
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Thu Feb 9 08:25:37 2017 +0000
debian/patch/qdbus-tray-icon-use-runtimedir.patch:
* debian/patch/qdbus-tray-icon-use-runtimedir.patch:
- QDBusTrayIcon: try use runtime or cache for icons (LP: #1600136)
* debian/patch/qdbus-tray-icon-always-save-icon-in-unity.patch:
- QDBusTrayIcon: always save the temp icon in Unity (LP: #1600136)
---
debian/changelog | 10 ++++
...qdbus-tray-icon-always-save-icon-in-unity.patch | 43 ++++++++++++++
.../patches/qdbus-tray-icon-use-runtimedir.patch | 66 ++++++++++++++++++++++
debian/patches/series | 2 +
4 files changed, 121 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index e08cea1..9d93827 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+qtbase-opensource-src (5.7.1+dfsg-2ubuntu4) UNRELEASED; urgency=medium
+
+ [ Marco Trevisan (Treviño) ]
+ * debian/patch/qdbus-tray-icon-use-runtimedir.patch:
+ - QDBusTrayIcon: try use runtime or cache for icons (LP: #1600136)
+ * debian/patch/qdbus-tray-icon-always-save-icon-in-unity.patch:
+ - QDBusTrayIcon: always save the temp icon in Unity (LP: #1600136)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Thu, 09 Feb 2017 08:42:30 +0000
+
qtbase-opensource-src (5.7.1+dfsg-2ubuntu3~2) zesty; urgency=medium
[ Dmitry Shachnev ]
diff --git a/debian/patches/qdbus-tray-icon-always-save-icon-in-unity.patch b/debian/patches/qdbus-tray-icon-always-save-icon-in-unity.patch
new file mode 100644
index 0000000..2f2a4ea
--- /dev/null
+++ b/debian/patches/qdbus-tray-icon-always-save-icon-in-unity.patch
@@ -0,0 +1,43 @@
+Description: QDBusTrayIcon: always save the temp icon in Unity
+Author: Marco Trevisan <marco.trevisan at canonical.com>
+Bug-Ubuntu: 1600136
+Forwarded: yes
+Applied-Upstream: http://code.qt.io/cgit/qt/qtbase.git/commit/?id=b934572
+
+
+From b934572b30ca64ea0f85dffaeb9ff3c30add1e7e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail at 3v1n0.net>
+Date: Fri, 13 Jan 2017 17:40:56 +0100
+Subject: QDBusTrayIcon: always save the temp icon in Unity
+
+We enforce the check of saving the icon when the indicator
+process name isn't available (as we might be running in a
+confined world), but we're running in Unity.
+
+Change-Id: I80d3be1a8c6eba8c391364260746e78cf89a5b98
+Reviewed-by: Dmitry Shachnev <mitya57 at gmail.com>
+Reviewed-by: Shawn Rutledge <shawn.rutledge at qt.io>
+---
+ src/platformsupport/dbustray/qdbustrayicon.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/platformsupport/dbustray/qdbustrayicon.cpp b/src/platformsupport/dbustray/qdbustrayicon.cpp
+index 5c4157c..b55ace3 100644
+--- a/src/platformsupport/dbustray/qdbustrayicon.cpp
++++ b/src/platformsupport/dbustray/qdbustrayicon.cpp
+@@ -171,6 +171,12 @@ QTemporaryFile *QDBusTrayIcon::tempIcon(const QIcon &icon)
+ uint pid = session.interface()->servicePid(KDEWatcherService).value();
+ QString processName = QLockFilePrivate::processNameByPid(pid);
+ necessary = processName.endsWith(QLatin1String("indicator-application-service"));
++ if (!necessary && QGuiApplication::desktopSettingsAware()) {
++ // Accessing to process name might be not allowed if the application
++ // is confined, thus we can just rely on the current desktop in use
++ const QPlatformServices *services = QGuiApplicationPrivate::platformIntegration()->services();
++ necessary = services->desktopEnvironment().split(':').contains("UNITY");
++ }
+ necessity_checked = true;
+ }
+ if (!necessary)
+--
+cgit v1.0-4-g1e03
+
diff --git a/debian/patches/qdbus-tray-icon-use-runtimedir.patch b/debian/patches/qdbus-tray-icon-use-runtimedir.patch
new file mode 100644
index 0000000..7b7ed0c
--- /dev/null
+++ b/debian/patches/qdbus-tray-icon-use-runtimedir.patch
@@ -0,0 +1,66 @@
+Description: QDBusTrayIcon: try use runtime or cache for icons
+Author: Marco Trevisan <marco.trevisan at canonical.com>
+Bug-Ubuntu: 1600136
+Forwarded: yes
+Applied-Upstream: http://code.qt.io/cgit/qt/qtbase.git/commit/?id=e1c93cc74
+
+
+From e1c93cc74b43d8c49208b38dde824298590ac788 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail at 3v1n0.net>
+Date: Fri, 13 Jan 2017 17:17:14 +0100
+Subject: QDBusTrayIcon: try use runtime or cache for icons
+
+It's better to save icons in $XDG_RUNTIME_DIR or
+$XDG_CACHE_HOME paths than in $TMPDIR as these
+places are readable from the desktop environment
+when an app is ran confined in a sandbox (as in
+snap packages)
+
+Change-Id: I1a3e4c5714f8ea51034d18fb87cead87ed21d6be
+Reviewed-by: Shawn Rutledge <shawn.rutledge at qt.io>
+Reviewed-by: Dmitry Shachnev <mitya57 at gmail.com>
+---
+ .../themes/genericunix/dbustray/qdbustrayicon.cpp | 25 +++++++++++++++++++++-
+ 1 file changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/src/platformsupport/dbustray/qdbustrayicon.cpp b/src/platformsupport/dbustray/qdbustrayicon.cpp
+index b55ace3..9baf947 100644
+--- a/src/platformsupport/dbustray/qdbustrayicon.cpp
++++ b/src/platformsupport/dbustray/qdbustrayicon.cpp
+@@ -65,9 +65,32 @@ QT_BEGIN_NAMESPACE
+
+ Q_LOGGING_CATEGORY(qLcTray, "qt.qpa.tray")
+
++static QString iconTempPath()
++{
++ QString tempPath = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
++ if (!tempPath.isEmpty())
++ return tempPath;
++
++ tempPath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation);
++
++ if (!tempPath.isEmpty()) {
++ QDir tempDir(tempPath);
++ if (tempDir.exists())
++ return tempPath;
++
++ if (tempDir.mkpath(QStringLiteral("."))) {
++ const QFile::Permissions permissions = QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner;
++ if (QFile(tempPath).setPermissions(permissions))
++ return tempPath;
++ }
++ }
++
++ return QDir::tempPath();
++}
++
+ static const QString KDEItemFormat = QStringLiteral("org.kde.StatusNotifierItem-%1-%2");
+ static const QString KDEWatcherService = QStringLiteral("org.kde.StatusNotifierWatcher");
+-static const QString TempFileTemplate = QDir::tempPath() + QLatin1String("/qt-trayicon-XXXXXX.png");
++static const QString TempFileTemplate = iconTempPath() + QLatin1String("/qt-trayicon-XXXXXX.png");
+ static const QString XdgNotificationService = QStringLiteral("org.freedesktop.Notifications");
+ static const QString XdgNotificationPath = QStringLiteral("/org/freedesktop/Notifications");
+ static const QString DefaultAction = QStringLiteral("default");
+--
+cgit v1.0-4-g1e03
+
diff --git a/debian/patches/series b/debian/patches/series
index e616e41..734a0b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,5 @@ enable-tests.patch
skip-largefile-test-s390x.patch
qnam-ubuntu-fix6.patch
#disable_overlay_scrollbars.diff
+qdbus-tray-icon-always-save-icon-in-unity.patch
+qdbus-tray-icon-use-runtimedir.patch
--
qtbase packaging
More information about the pkg-kde-commits
mailing list