diff --git a/clementine-disable-systray-gnome.patch b/clementine-disable-systray-gnome.patch index f4df470..9362a60 100644 --- a/clementine-disable-systray-gnome.patch +++ b/clementine-disable-systray-gnome.patch @@ -1,6 +1,6 @@ diff -rupN Clementine-1.3.1.org/src/ui/mainwindow.cpp Clementine-1.3.1/src/ui/mainwindow.cpp --- Clementine-1.3.1.org/src/ui/mainwindow.cpp 2016-04-19 11:08:35.000000000 -0400 -+++ Clementine-1.3.1/src/ui/mainwindow.cpp 2018-09-29 22:56:44.128578136 -0400 ++++ Clementine-1.3.1/src/ui/mainwindow.cpp 2018-10-17 21:53:40.168962770 -0400 @@ -1023,7 +1023,13 @@ MainWindow::~MainWindow() { void MainWindow::ReloadSettings() { @@ -9,7 +9,7 @@ diff -rupN Clementine-1.3.1.org/src/ui/mainwindow.cpp Clementine-1.3.1/src/ui/ma + // Fedora patch. Disable systray on Gnome as it prevents Clementine from starting + bool show_tray; + const char* xdg_desktop = std::getenv("XDG_CURRENT_DESKTOP"); -+ if (std::string(xdg_desktop).find(std::string("GNOME")) != std::string::npos) ++ if (xdg_desktop && std::string(xdg_desktop).find(std::string("GNOME")) != std::string::npos) + show_tray = false; + else + show_tray= settings_.value("showtray", true).toBool(); diff --git a/clementine.spec b/clementine.spec index 610764e..52d9fcd 100644 --- a/clementine.spec +++ b/clementine.spec @@ -2,7 +2,7 @@ Name: clementine Version: 1.3.1 -Release: 28%{?dist} +Release: 29%{?dist} Summary: A music player and library organizer Group: Applications/Multimedia @@ -174,6 +174,9 @@ popd %{_datadir}/kde4/services/clementine-zune.protocol %changelog +* Thu Oct 18 2018 Orcan Ogetbil 1.3.1-29 +- Fix a crash on a system that doesn't define XDG_CURRENT_DESKTOP. RHBZ#1639901 + * Sat Sep 29 2018 Orcan Ogetbil 1.3.1-28 - Disable systray on Gnome. RHBZ#1517748