From 54c88a97e4db5a4a9b063c7ee4252a06c2dc6051 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Mon, 12 Feb 2018 19:53:35 +0100 Subject: [PATCH 1/2] Backported colorize-at-start patch * Bumped debhelper 11 * Bumped Standards to 4.1.3, no changes needed * Changed VCS fields for salsa * Bumped compat to 11 * Bumped years in copyright --- debian/changelog | 11 +++++++++++ debian/compat | 2 +- debian/control | 8 ++++---- debian/copyright | 4 ++-- debian/patches/colorizing-at-startup.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 debian/patches/colorizing-at-startup.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 790d713..a8a2344 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +lxqt-qtplugin (0.12.0-5) unstable; urgency=medium + + * Backported colorize-at-start patch + * Bumped debhelper to >= 11 + * Bumped Standards to 4.1.3, no changes needed + * Changed VCS fields for salsa + * Bumped compat to 11 + * Bumped years in copyright + + -- Alf Gaida Mon, 12 Feb 2018 19:52:16 +0100 + lxqt-qtplugin (0.12.0-4) unstable; urgency=medium * Bumped Standards to 4.1.2, no changes needed diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index 401c223..ab116d9 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Uploaders: Alf Gaida , Yukiharu YABUKI Section: x11 Priority: optional -Build-Depends: debhelper (>= 10), +Build-Depends: debhelper (>= 11), libdbusmenu-qt5-dev, libfm-qt-dev (>= 0.12.0), libkf5windowsystem-dev, @@ -14,9 +14,9 @@ Build-Depends: debhelper (>= 10), libx11-dev, lxqt-build-tools (>= 0.4.0), qtbase5-private-dev -Standards-Version: 4.1.2 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-qtplugin.git -Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-qtplugin.git +Standards-Version: 4.1.3 +Vcs-Browser: https://salsa.debian.org/team-lxqt/lxqt-qtplugin.git +Vcs-Git: https://salsa.debian.org/team-lxqt/lxqt-qtplugin.git Homepage: https://github.com/lxde/lxqt-qtplugin Package: lxqt-qtplugin diff --git a/debian/copyright b/debian/copyright index 6f04447..1662b20 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,12 @@ Upstream-Name: lxqt-qtplugin Source: https://github.com/lxde/lxqt-qtplugin Files: * -Copyright: 2013-2017 LXQt team +Copyright: 2013-2018 LXQt team 2010-2012 Razor team License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2017 Alf Gaida +Copyright: 2014-2018 Alf Gaida 2015 ChangZhuo Chen (陳昌倬) 2015 Yukiharu YABUKI License: LGPL-2.1+ diff --git a/debian/patches/colorizing-at-startup.patch b/debian/patches/colorizing-at-startup.patch new file mode 100644 index 0000000..772fae2 --- /dev/null +++ b/debian/patches/colorizing-at-startup.patch @@ -0,0 +1,20 @@ +commit 2283f5ee3c344fc62a74e41a127e3eee53fb2c37 +Author: Tsu Jan +Date: Mon Feb 12 13:10:02 2018 +0330 + + Fix icon colorizing at startup + + Fixes https://github.com/lxde/lxqt/issues/1445. + +diff --git a/src/lxqtplatformtheme.cpp b/src/lxqtplatformtheme.cpp +index 83786f0..8291eab 100644 +--- a/src/lxqtplatformtheme.cpp ++++ b/src/lxqtplatformtheme.cpp +@@ -315,6 +315,7 @@ QVariant LXQtPlatformTheme::themeHint(ThemeHint hint) const { + + QIconEngine *LXQtPlatformTheme::createIconEngine(const QString &iconName) const + { ++ XdgIconLoader::instance()->setFollowColorScheme(iconFollowColorScheme_); + return new XdgIconLoaderEngine(iconName); + } + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..41fa686 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +colorizing-at-startup.patch From cfbf960cd9f2b162626e8d8a040e9267bb6a997d Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Wed, 14 Feb 2018 22:25:20 +0100 Subject: [PATCH 2/2] Backported lxqtplatformtheme-follow-color-scheme.patch * Fixed wrong group in VCS fields * Removed some trailing whitespaces from d/changelog --- debian/changelog | 18 +++-- debian/control | 4 +- ...xqtplatformtheme-follow-color-scheme.patch | 80 +++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 debian/patches/lxqtplatformtheme-follow-color-scheme.patch diff --git a/debian/changelog b/debian/changelog index a8a2344..8f5315c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +lxqt-qtplugin (0.12.0-6) unstable; urgency=medium + + * Backported lxqtplatformtheme-follow-color-scheme.patch + * Fixed wrong group in VCS fields + * Removed some trailing whitespaces from d/changelog + + -- Alf Gaida Wed, 14 Feb 2018 22:42:02 +0100 + lxqt-qtplugin (0.12.0-5) unstable; urgency=medium * Backported colorize-at-start patch @@ -13,13 +21,13 @@ lxqt-qtplugin (0.12.0-4) unstable; urgency=medium * Bumped Standards to 4.1.2, no changes needed * Removed branch from VCS fields - * Removed debian/gbp.conf + * Removed debian/gbp.conf -- Alf Gaida Thu, 14 Dec 2017 22:31:53 +0100 lxqt-qtplugin (0.12.0-3) unstable; urgency=medium - * Transition to unstable + * Transition to unstable -- Alf Gaida Tue, 05 Dec 2017 00:18:17 +0100 @@ -80,7 +88,7 @@ lxqt-qtplugin (0.11.0-3) unstable; urgency=medium * Bumped minimum version libqtxdg-dev (>= 2.0.0) * Added build dependency libqt5svg5-dev * Added build dependency libqt5xdgiconloader-dev - * Fixed VCS fields, using https and plain /git/ + * Fixed VCS fields, using https and plain /git/ * Removed README.debian, no longer needed * Fixed copyrights Format field to https * Bumped years in copyrights @@ -91,12 +99,12 @@ lxqt-qtplugin (0.11.0-3) unstable; urgency=medium * Set CMAKE_BUILD_TYPE=RelWithDebInfo * Exported LC_ALL=C.UTF-8, make builds reproducible * Added a basic gbp.conf - + -- Alf Gaida Tue, 18 Oct 2016 17:44:28 +0200 lxqt-qtplugin (0.10.0-3) unstable; urgency=medium - * Remove dbg package in favor of dbgsym. + * Remove dbg package in favor of dbgsym. -- Alf Gaida Sat, 26 Dec 2015 22:27:15 +0100 diff --git a/debian/control b/debian/control index ab116d9..63a795b 100644 --- a/debian/control +++ b/debian/control @@ -15,8 +15,8 @@ Build-Depends: debhelper (>= 11), lxqt-build-tools (>= 0.4.0), qtbase5-private-dev Standards-Version: 4.1.3 -Vcs-Browser: https://salsa.debian.org/team-lxqt/lxqt-qtplugin.git -Vcs-Git: https://salsa.debian.org/team-lxqt/lxqt-qtplugin.git +Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-qtplugin +Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-qtplugin Homepage: https://github.com/lxde/lxqt-qtplugin Package: lxqt-qtplugin diff --git a/debian/patches/lxqtplatformtheme-follow-color-scheme.patch b/debian/patches/lxqtplatformtheme-follow-color-scheme.patch new file mode 100644 index 0000000..bb88e8e --- /dev/null +++ b/debian/patches/lxqtplatformtheme-follow-color-scheme.patch @@ -0,0 +1,80 @@ +From c78433c32c327d09507976a7b5cecff87c224252 Mon Sep 17 00:00:00 2001 +From: Palo Kisa +Date: Tue, 13 Feb 2018 10:01:10 +0100 +Subject: [PATCH] lxqtplatformtheme: Initialize "folowColorScheme" once + +--- + src/lxqtplatformtheme.cpp | 18 +++++++++++++----- + src/lxqtplatformtheme.h | 4 +++- + 2 files changed, 16 insertions(+), 6 deletions(-) + +diff --git a/src/lxqtplatformtheme.cpp b/src/lxqtplatformtheme.cpp +index 8291eab..467cf07 100644 +--- a/src/lxqtplatformtheme.cpp ++++ b/src/lxqtplatformtheme.cpp +@@ -52,13 +52,20 @@ LXQtPlatformTheme::LXQtPlatformTheme(): + iconFollowColorScheme_(true) + , settingsWatcher_(NULL) + { +- // When the plugin is loaded, it seems that the app is not yet running and ++ loadSettings(); ++ // Note: When the plugin is loaded, it seems that the app is not yet running and + // QThread environment is not completely set up. So creating filesystem watcher + // does not work since it uses QSocketNotifier internally which can only be + // created within QThread thread. So let's schedule a idle handler to initialize + // the watcher in the main event loop. +- loadSettings(); +- QTimer::singleShot(0, this, SLOT(initWatch())); ++ ++ // Note2: the QTimer::singleShot with also needs a QThread environment ++ // (there is a workaround in qtcore for the 0-timer with the old SLOT notation) ++ ++ // TODO: use the "PointerToMemberFunction" overloads of invokeMethod(), but they ++ // are available from Qt v5.10 ++ //QMetaObject::ivokeMethod(this, &LXQtPlatformTheme::lazyInit, Qt::QueuedConnection); ++ QMetaObject::invokeMethod(this, "lazyInit", Qt::QueuedConnection); + } + + LXQtPlatformTheme::~LXQtPlatformTheme() { +@@ -66,11 +73,13 @@ LXQtPlatformTheme::~LXQtPlatformTheme() { + delete settingsWatcher_; + } + +-void LXQtPlatformTheme::initWatch() ++void LXQtPlatformTheme::lazyInit() + { + settingsWatcher_ = new QFileSystemWatcher(); + settingsWatcher_->addPath(settingsFile_); + connect(settingsWatcher_, &QFileSystemWatcher::fileChanged, this, &LXQtPlatformTheme::onSettingsChanged); ++ ++ XdgIconLoader::instance()->setFollowColorScheme(iconFollowColorScheme_); + } + + void LXQtPlatformTheme::loadSettings() { +@@ -315,7 +324,6 @@ QVariant LXQtPlatformTheme::themeHint(ThemeHint hint) const { + + QIconEngine *LXQtPlatformTheme::createIconEngine(const QString &iconName) const + { +- XdgIconLoader::instance()->setFollowColorScheme(iconFollowColorScheme_); + return new XdgIconLoaderEngine(iconName); + } + +diff --git a/src/lxqtplatformtheme.h b/src/lxqtplatformtheme.h +index 3c07c46..d0e7b6e 100644 +--- a/src/lxqtplatformtheme.h ++++ b/src/lxqtplatformtheme.h +@@ -78,11 +78,13 @@ class Q_GUI_EXPORT LXQtPlatformTheme : public QObject, public QPlatformTheme { + + // virtual QString standardButtonText(int button) const; + ++public Q_SLOTS: ++ void lazyInit(); ++ + private: + void loadSettings(); + + private Q_SLOTS: +- void initWatch(); + void onSettingsChanged(); + + private: diff --git a/debian/patches/series b/debian/patches/series index 41fa686..f784bc3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ colorizing-at-startup.patch +lxqtplatformtheme-follow-color-scheme.patch