diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-08-24 02:32:11 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-08-24 02:32:11 -0500 |
| commit | cf4289f3b26efabbda6ff265b2bb125359bd3bc7 (patch) | |
| tree | 7f075a61bf4878eb3b4c39683b271594570809cf | |
| parent | e1c04971ea2e85523b80f451883d153e69add39e (diff) | |
| download | gnome-flashback-cf4289f3b26efabbda6ff265b2bb125359bd3bc7.tar.gz gnome-flashback-cf4289f3b26efabbda6ff265b2bb125359bd3bc7.tar.xz gnome-flashback-cf4289f3b26efabbda6ff265b2bb125359bd3bc7.zip | |
Fix crash in display-config (BGO#753927)
| -rw-r--r-- | 0002-display-config-ignore-outputs-modes.patch | 23 | ||||
| -rw-r--r-- | gnome-flashback.spec | 7 |
2 files changed, 29 insertions, 1 deletions
diff --git a/0002-display-config-ignore-outputs-modes.patch b/0002-display-config-ignore-outputs-modes.patch new file mode 100644 index 0000000..25a4df9 --- /dev/null +++ b/0002-display-config-ignore-outputs-modes.patch @@ -0,0 +1,23 @@ +From c375d0f042dd16babf6c930a626e1a69f58f3d85 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com> +Date: Sun, 23 Aug 2015 13:59:36 +0300 +Subject: display-config: ignore outputs that has no modes + +https://bugzilla.gnome.org/show_bug.cgi?id=753927 + +diff --git a/gnome-flashback/libdisplay-config/flashback-monitor-manager.c b/gnome-flashback/libdisplay-config/flashback-monitor-manager.c +index 55470ce..29f80ef 100644 +--- a/gnome-flashback/libdisplay-config/flashback-monitor-manager.c ++++ b/gnome-flashback/libdisplay-config/flashback-monitor-manager.c +@@ -1258,7 +1258,7 @@ read_current_config (FlashbackMonitorManager *manager) + + meta_output = &manager->outputs[n_actual_outputs]; + +- if (output->connection != RR_Disconnected) ++ if (output->connection != RR_Disconnected && output->nmode != 0) + { + GBytes *edid; + +-- +cgit v0.10.2 + diff --git a/gnome-flashback.spec b/gnome-flashback.spec index d2d59f7..843111f 100644 --- a/gnome-flashback.spec +++ b/gnome-flashback.spec @@ -1,6 +1,6 @@ Name: gnome-flashback Version: 3.17.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Classic GNOME session License: GPLv3+ @@ -9,6 +9,7 @@ Source0: http://download.gnome.org/sources/%{name}/3.17/%{name}-%{version # taken from polkit-gnome, license is LGPLv2+, requires because of # http://lists.fedoraproject.org/pipermail/devel-announce/2011-February/000758.html Source1: polkit-gnome-authentication-agent-1.desktop +Patch2: 0002-display-config-ignore-outputs-modes.patch BuildRequires: gnome-common BuildRequires: gettext-devel @@ -45,6 +46,7 @@ by integrating recent changes of the GNOME libraries. %prep %setup -q +%patch2 -p1 %build @@ -88,6 +90,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/xsessions/gnome-flashback-metacity.desktop %changelog +* Mon Aug 24 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.17.2-2 +- Fix crash in display-config (BGO#753927) + * Wed Jul 15 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.17.2-1 - Unstable version bump |