From 326f8dd6f99e5f3e0b16883f3230719c32b96c8e Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sat, 4 Jun 2016 19:39:41 +0200 Subject: [PATCH] Backported temporary upstream fix for #826311 (https://github.com/lxde/pcmanfm-qt/pull/359) Bumped standards version to 3.9.8 - no changes needed --- debian/changelog | 8 ++++++++ debian/control | 2 +- debian/patches/fallback-icon-theme.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fallback-icon-theme.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 555366c..34dee55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pcmanfm-qt (0.11.0-5) unstable; urgency=medium + + * Backported temporary upstream fix for #826311 + (https://github.com/lxde/pcmanfm-qt/pull/359) + * Bumped standards version to 3.9.8 - no changes needed + + -- Alf Gaida Sat, 04 Jun 2016 19:39:22 +0200 + pcmanfm-qt (0.11.0-4) unstable; urgency=medium * Added oxygen-icon-theme | oxygen5-icon-theme | gnome-icon-theme diff --git a/debian/control b/debian/control index 2e9ca67..d20e57d 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 9.20151219), pkg-config, qttools5-dev, qttools5-dev-tools -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/pcmanfm-qt.git/?h=debian/sid Vcs-Git: https://anonscm.debian.org/cgit/pkg-lxqt/pcmanfm-qt.git -b debian/sid Homepage: https://github.com/lxde/pcmanfm-qt diff --git a/debian/patches/fallback-icon-theme.patch b/debian/patches/fallback-icon-theme.patch new file mode 100644 index 0000000..54146b5 --- /dev/null +++ b/debian/patches/fallback-icon-theme.patch @@ -0,0 +1,19 @@ +Description: Set oxygen as default fallback + until the FIXME is done. That's all i want to do for now. + oxygen is merged upstream so the patch become obsolete with the + upcoming release. +Author: Alf Gaida +Bug-Debian: https://bugs.debian.org/826311 +Last-Update: 2016-06-04 + +--- pcmanfm-qt-0.11.0.orig/pcmanfm/settings.cpp ++++ pcmanfm-qt-0.11.0/pcmanfm/settings.cpp +@@ -163,7 +163,7 @@ bool Settings::loadFile(QString filePath + if(fallbackIconThemeName_.isEmpty()) { + // FIXME: we should choose one from installed icon themes or get + // the value from XSETTINGS instead of hard code a fallback value. +- fallbackIconThemeName_ = "elementary"; // fallback icon theme name ++ fallbackIconThemeName_ = "oxygen"; // fallback icon theme name + } + suCommand_ = settings.value("SuCommand", "lxqt-sudo %s").toString(); + setTerminal(settings.value("Terminal", "xterm").toString()); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..fc8a41d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fallback-icon-theme.patch