Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/quassel.git;a=commitdiff;h=73e481b
The following commit has been merged in the master branch:
commit 73e481b8ff9408f0d619a18ed9edf514b20b6246
Author: Felix Geyer <fgeyer at debian.org>
Date: Thu Sep 10 22:31:20 2015 +0200
Work around missing icon theme fallback in KF5.
* Work around missing icon theme fallback in KF5.
- Add 03_force_icon_theme.patch
- Add oxygen-icon-theme to quassel-data/Recommends.
---
debian/changelog | 3 +++
debian/control | 1 +
debian/patches/03_force_icon_theme.patch | 15 +++++++++++++++
debian/patches/series | 1 +
4 files changed, 20 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 5ee9727..48d75af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ quassel (1:0.12.2-1) UNRELEASED; urgency=medium
* Build with -Wl,--as-needed.
* Fix detection of OpenSSL when building against Qt5.
- Add 02_set-required-libs-and-flags.patch from openSUSE.
+ * Work around missing icon theme fallback in KF5.
+ - Add 03_force_icon_theme.patch
+ - Add oxygen-icon-theme to quassel-data/Recommends.
[ Scott Kitterman ]
* Add systemd service file and associated changes for quasselcore.
diff --git a/debian/control b/debian/control
index 4f8d2d7..2ffe649 100644
--- a/debian/control
+++ b/debian/control
@@ -72,6 +72,7 @@ Description: distributed IRC client - monolithic core+client
Package: quassel-data
Architecture: all
Depends: ${misc:Depends}
+Recommends: oxygen-icon-theme
Conflicts: quassel-data-kde4
Description: distributed IRC client - shared data
Quassel is a modern, cross-platform, distributed IRC client, meaning that
diff --git a/debian/patches/03_force_icon_theme.patch b/debian/patches/03_force_icon_theme.patch
new file mode 100644
index 0000000..9f8615c
--- /dev/null
+++ b/debian/patches/03_force_icon_theme.patch
@@ -0,0 +1,15 @@
+Description: Work around missing icon theme fallback in KF5.
+ Only oxygen and breeze ship the icons quassel uses.
+Author: Felix Geyer <fgeyer at debian.org>
+
+--- a/src/qtui/qtuiapplication.cpp
++++ b/src/qtui/qtuiapplication.cpp
+@@ -145,7 +145,7 @@ bool QtUiApplication::init()
+ // Set the icon theme
+ if (Quassel::isOptionSet("icontheme"))
+ QIcon::setThemeName(Quassel::optionValue("icontheme"));
+- else if (QIcon::themeName().isEmpty())
++ else if (QIcon::themeName() != "oxygen" && QIcon::themeName() != "breeze")
+ // Some platforms don't set a default icon theme; chances are we can find our bundled Oxygen theme though
+ QIcon::setThemeName("oxygen");
+
diff --git a/debian/patches/series b/debian/patches/series
index 6c62b02..ed795b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_default_network_channel.patch
02_set-required-libs-and-flags.patch
+03_force_icon_theme.patch
--
quassel packaging