From 14653f8f444923d855c7157ba0a826b31b579dd5 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Wed, 20 Jul 2016 20:29:15 +0000 Subject: [PATCH] * d/p/0001-Fix-division-by-zero-when-calculating-the-refresh-ra.patch: + New patch. Fix division by zero when running under Xvfb. --- debian/changelog | 2 ++ ...zero-when-calculating-the-refresh-ra.patch | 26 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) create mode 100644 debian/patches/0001-Fix-division-by-zero-when-calculating-the-refresh-ra.patch diff --git a/debian/changelog b/debian/changelog index af225af70b..973a7d4a52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ gtk+3.0 (3.21.4-1) UNRELEASED; urgency=medium for wayland-protocols and glib. * debian/patches/wayland-add-extended-state-for-tiled.patch: + Dropped, included upstream. + * d/p/0001-Fix-division-by-zero-when-calculating-the-refresh-ra.patch: + + New patch. Fix division by zero when running under Xvfb. -- Emilio Pozuelo Monfort Mon, 18 Jul 2016 19:11:22 +0200 diff --git a/debian/patches/0001-Fix-division-by-zero-when-calculating-the-refresh-ra.patch b/debian/patches/0001-Fix-division-by-zero-when-calculating-the-refresh-ra.patch new file mode 100644 index 0000000000..f75b857f54 --- /dev/null +++ b/debian/patches/0001-Fix-division-by-zero-when-calculating-the-refresh-ra.patch @@ -0,0 +1,26 @@ +From 791a6a1835485a621d54f59f33f7bb9d56874200 Mon Sep 17 00:00:00 2001 +From: Emilio Pozuelo Monfort +Date: Wed, 20 Jul 2016 17:09:15 +0200 +Subject: [PATCH] Fix division by zero when calculating the refresh rate + +--- + gdk/x11/gdkscreen-x11.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c +index 34dfccc..1916bb6 100644 +--- a/gdk/x11/gdkscreen-x11.c ++++ b/gdk/x11/gdkscreen-x11.c +@@ -474,7 +474,8 @@ init_randr15 (GdkScreen *screen, gboolean *changed) + XRRModeInfo *xmode = &resources->modes[j]; + if (xmode->id == crtc->mode) + { +- refresh_rate = (1000 * xmode->dotClock) / (xmode->hTotal *xmode->vTotal); ++ if (xmode->hTotal && xmode->vTotal) ++ refresh_rate = (1000 * xmode->dotClock) / (xmode->hTotal *xmode->vTotal); + break; + } + } +-- +2.8.1 + diff --git a/debian/patches/series b/debian/patches/series index a0e75dae1d..f346da8cf9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ no-accessibility-dump.patch reftest-known-fail.patch Don-t-apply-GDK_HINT_RESIZE_INC-to-GDK_WINDOW_STATE_.patch +0001-Fix-division-by-zero-when-calculating-the-refresh-ra.patch