diff --git a/debian/changelog b/debian/changelog index acba213..fba69e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,200 +1,206 @@ +lxqt-config (0.13.0-0ubuntu5) cosmic; urgency=medium + + * Set default GTK theme if rc file doesn't exists. + + -- Hans P. Möller Thu, 04 Oct 2018 14:44:03 -0300 + lxqt-config (0.13.0-0ubuntu4) cosmic; urgency=medium * Make a path for GTK settings if it does not exist. -- Walter Lapchynski Mon, 03 Sep 2018 00:43:25 -7000 lxqt-config (0.13.0-0ubuntu3) cosmic; urgency=medium * Run wrap-and-sort. * Demote qt5-style-plugins to a Suggests, because some of the themes are not working (LP: #1785401). -- Simon Quigley Thu, 09 Aug 2018 14:24:44 -0500 lxqt-config (0.13.0-0ubuntu2) cosmic; urgency=medium * Bump Standards-version to 4.1.5, no changes needed. * Change Uploaders to Ubuntu uploaders. * Add support for modifying GTK themes. -- Simon Quigley Mon, 30 Jul 2018 16:35:02 -0500 lxqt-config (0.13.0-0ubuntu1) cosmic; urgency=medium * New upstream release. * Update Vcs-* and Maintainer to Lubuntu values. * Update build dependencies. -- Simon Quigley Tue, 22 May 2018 23:25:36 -0500 lxqt-config (0.12.0-4) unstable; urgency=medium * Bumped compat to 11 * Bumped debhelper to >=11~ * Bumped Standards to 4.1.4, no changes needed * Changed VCS fields to salsa * Changed Homepage, Source and watch to lxqt * Bumped years in copyright -- Alf Gaida Sat, 28 Apr 2018 00:22:41 +0200 lxqt-config (0.12.0-3) unstable; urgency=medium * Bumped Standards to 4.1.2, no changes needed * Removed debian/gbp.conf * Removed branch from VCS fields -- Alf Gaida Thu, 14 Dec 2017 18:49:33 +0100 lxqt-config (0.12.0-2) unstable; urgency=medium * Transition to unstable * Drop no longer needed patches -- Alf Gaida Mon, 04 Dec 2017 21:33:59 +0100 lxqt-config (0.12.0-1) experimental; urgency=medium * Cherry-picking upstream release: 0.12.0. * Switched to experimental * Bumped Standards to 4.1.1 * Bumped liblxqt to >= 0.12.0 * Removed debian/patches - back to pure upstream -- Alf Gaida Tue, 24 Oct 2017 16:56:57 +0200 lxqt-config (0.11.1-4) unstable; urgency=medium * Ported back some upstream changes. (Closes: #871154) Make lxqt-config work with cmake > 3.7.2 -- Alf Gaida Sat, 12 Aug 2017 16:06:24 +0200 lxqt-config (0.11.1-3) unstable; urgency=medium * Fixed typo lxapperance --> lxappearance * Fixed some arches to [linux-any] -- Alf Gaida Wed, 05 Jul 2017 02:38:44 +0200 lxqt-config (0.11.1-2) unstable; urgency=medium * Bump Standards to 4.0.0 - no changes needed * Recommend lxqt-qtplugin (Closes: #866234) * Recommend lxqt-policykit (Closes: #866739) * Recommend lxqt-session and lxqt-powermanagement (Closes: #866760) * Recommend galternatives and systemconfig-printer, suggest diskmanager, gparted, networkmanagement, synaptic (Closes: #866763) * Recommend qt5-style-plugins and suggest adwaita-qt (Closes: #866774) * Suggest gnome-themes-standard and faenza-icon-theme (Closes: #866775) -- Alf Gaida Sat, 01 Jul 2017 18:24:12 +0200 lxqt-config (0.11.1-1) unstable; urgency=medium * Chery-picking new upstream release 0.11.1. * Removed some build dependencies: -cmake -libqt5xdg-dev -libqt5xdgiconloader-dev -pkg-config -qttools5-dev -qttools5-dev-tools * Bumped build dependency liblxqt0-dev (>= 0.11.1) * Bumped years in d/copyright * Added Recommends galternatives -- Alf Gaida Mon, 02 Jan 2017 12:36:49 +0100 lxqt-config (0.11.0-2) unstable; urgency=medium * Chery-picking new upstream release 0.11.0 * Synced debian foo with experimental * Bumped Standards to 3.9.8, no changes needed * Bumped compat to 10 * Removed --parallel from rules, compat 10 standard * Bumped build dependency debhelper (>= 10) * Bumped build dependency libqtxdg-dev (>= 2.0.0) * Added build-depenedency libqt5xdgiconloader-dev (>= 2.0.0) * Bumped build dependency liblxqt-dev (>= 0.11.0) * Added build dependency libqt5svg5-dev * Added Recommends lxqt-config-l10n * Added README.md to docs * Exported LC_ALL=C.UTF-8 - define language settings for reproducible builds * Fixed .gititgnore, added build-stamp * Fixed VCS fields, use https and plain /git/ * Fixed copyright Format * Added missed new files to copyright * Bumped years in copyright * Fixed lintian-overrides * Added DEB_BUILD_MAINT_OPTIONS = hardening=+all * Added translation control * Added DCMAKE_BUILD_TYPE=RelWithDebInfo -- Alf Gaida Tue, 18 Oct 2016 02:28:02 +0200 lxqt-config (0.10.0-3) unstable; urgency=medium * Remove dbg package in favor of dbgsym. -- Alf Gaida Sat, 26 Dec 2015 18:36:15 +0100 lxqt-config (0.10.0-2) unstable; urgency=medium * Merge from experimental. * New upstream release. * Update Vcs-* fields. * Update copyright. * Remove Debian specific menu in favor of .desktop menu system. * Install manpage for lxqt-config. -- ChangZhuo Chen (陳昌倬) Sun, 15 Nov 2015 15:15:10 +0800 lxqt-config (0.9.0+20150806-2) unstable; urgency=medium * Fixed .gitignore, removed outdated entries * Fixed debian/control sorting and removed outdated versions. -- Alf Gaida Wed, 11 Nov 2015 20:51:11 +0100 lxqt-config (0.9.0+20150806-1) unstable; urgency=medium [ Alf Gaida ] * Initial release. (Closes: #747597) * Added watch file. * Imported Upstream version 0.8.0. * Bump standards to 3.9.6. * Drop build dependency libegl1-mesa-dev, bug in Qt 5.3.0 is fixed. * Min Qt version 5.3.2. * Min liblxqt-qt5-0-dev version 0.8.0. * Mangled symbols added. * Added intian-overrides. * Patch some desktop files. * New release 0.9.0 drop not needed patches cleanup debian $foo add source/options. * Some cleanup in debian $foo. * Removed breaks and replaces. * Fixes in copyright. * Removed debian/symbols. * Added link --as-needed to rules to avoid warnings at build time. * Fixed licenses. [ Andrew Lee (李健秋) ] * Merging upstream version 0.9.0+20150806. * Added myself as Uploader. * Sorting build-depends. * Drop transitional packages which don't need in debian. * Removing whitespaces at EOL and EOF. * Added missing build-deps libqt5svg5-dev and qtbase5-private-dev. * private-lib.patch: install .so file to private lib path. * No need to run ld_config as .so file installed into private lib path. * Drop shlib-without-versioned-soname relared overrides. [ Yukiharu YABUKI ] * Added to ignore *~ files. * Added a uploader. * Added README.source -- mention for License. -- Yukiharu YABUKI Fri, 21 Aug 2015 19:40:47 +0900 diff --git a/debian/patches/series b/debian/patches/series index 5098590..8faf170 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ gtk-appearance-settings.patch +set-default-gtk-theme.patch mkpath-for-null-gtk-settings.patch diff --git a/debian/patches/set-default-gtk-theme.patch b/debian/patches/set-default-gtk-theme.patch new file mode 100644 index 0000000..35e1d7b --- /dev/null +++ b/debian/patches/set-default-gtk-theme.patch @@ -0,0 +1,72 @@ +Description: Set default GTK theme if rc file doesn't exists. +Author: P.L. Lucas +Applied-Upstream: https://github.com/lxqt/lxqt-config/commit/4c3ad403dc14dde4fe41e56cf3272ac11e30346f +Last-Update: 2018-10-05 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/lxqt-config-appearance/configothertoolkits.cpp ++++ b/lxqt-config-appearance/configothertoolkits.cpp +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -246,7 +247,7 @@ QString ConfigOtherToolKits::getGTKTheme + QFile file(gtkrcPath); + if(file.exists()) { + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) +- return QString(); ++ return getDefaultGTKTheme(); + while (!file.atEnd()) { + QByteArray line = file.readLine().trimmed(); + if(line.startsWith("gtk-theme-name")) { +@@ -264,7 +265,7 @@ QString ConfigOtherToolKits::getGTKTheme + QFile file(gtkrcPath); + if(file.exists()) { + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) +- return QString(); ++ return getDefaultGTKTheme(); + bool settingsFound = false; + while (!file.atEnd()) { + QByteArray line = file.readLine().trimmed(); +@@ -283,7 +284,26 @@ QString ConfigOtherToolKits::getGTKTheme + file.close(); + } + } +- return QString(); ++ return getDefaultGTKTheme(); ++} ++ ++QString ConfigOtherToolKits::getDefaultGTKTheme() ++{ ++ // Get the GTK default theme. Command line: ++ // $ gsettings get org.gnome.desktop.interface gtk-theme ++ QProcess gsettings; ++ QStringList args; ++ args << "get" << "org.gnome.desktop.interface" << "gtk-theme"; ++ gsettings.start("gsettings", args); ++ if(! gsettings.waitForFinished()) ++ return QString(); ++ QByteArray defaultTheme = gsettings.readAll().trimmed(); ++ gsettings.close(); ++ if(defaultTheme.size() <= 1) ++ return QString(); ++ // The theme has got quotation marks. Remove it: ++ defaultTheme.replace("'",""); ++ return QString(defaultTheme); + } + + void ConfigOtherToolKits::updateConfigFromSettings() +--- a/lxqt-config-appearance/configothertoolkits.h ++++ b/lxqt-config-appearance/configothertoolkits.h +@@ -42,6 +42,7 @@ public: + QString getGTKThemeFromRCFile(QString version); + QString getGTKConfigPath(QString version); + bool backupGTKSettings(QString version); ++ QString getDefaultGTKTheme(); + + public slots: + void setConfig();