diff -Nru gnome-desktop3-3.8.4/debian/changelog gnome-desktop3-3.8.4/debian/changelog --- gnome-desktop3-3.8.4/debian/changelog 2015-12-02 17:13:46.000000000 +0100 +++ gnome-desktop3-3.8.4/debian/changelog 2018-11-30 08:27:43.000000000 +0100 @@ -1,3 +1,12 @@ +gnome-desktop3 (3.8.4-0ubuntu3.3) trusty; urgency=medium + + * libgnome-desktop/display-name.c + - some vendors encode the screen ratio (e.g 16/9) in the EDID instead + of including the screen size, detect those cases and display + the product name instead of the screen diagonal. (lp: #1755490) + + -- Dariusz Gadomski Fri, 30 Nov 2018 08:27:43 +0100 + gnome-desktop3 (3.8.4-0ubuntu3.2) trusty-proposed; urgency=medium * Apply the similar method from the power plugin in unity-settings-daemon to diff -Nru gnome-desktop3-3.8.4/debian/control gnome-desktop3-3.8.4/debian/control --- gnome-desktop3-3.8.4/debian/control 2014-03-17 05:30:27.000000000 +0100 +++ gnome-desktop3-3.8.4/debian/control 2018-11-30 08:27:43.000000000 +0100 @@ -1,5 +1,5 @@ # This file is autogenerated. DO NOT EDIT! -# +# # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: gnome-desktop3 @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Jeremy Bicha +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Tim Lunn Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-desktop3 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-desktop3 Standards-Version: 3.9.4 diff -Nru gnome-desktop3-3.8.4/debian/patches/detect-and-replace-edid-ratio.patch gnome-desktop3-3.8.4/debian/patches/detect-and-replace-edid-ratio.patch --- gnome-desktop3-3.8.4/debian/patches/detect-and-replace-edid-ratio.patch 1970-01-01 01:00:00.000000000 +0100 +++ gnome-desktop3-3.8.4/debian/patches/detect-and-replace-edid-ratio.patch 2018-11-30 08:27:43.000000000 +0100 @@ -0,0 +1,83 @@ +Description: Replace incorrect diagonal with the product name. + Some vendors encode the screen ratio (e.g 16/9) in the EDID instead + of including the screen size, detect those cases and display + the product name instead of the screen diagonal. + . + gnome-desktop3 (3.8.4-0ubuntu3.3) UNRELEASED; urgency=medium + . + * libgnome-desktop/desktop-name.c + - some vendors record the screen ratio (e.g 16/9) in the EDID instead + of including the screen size, detect those cases and display + the product name instead of the screen diagonal. (lp: #1755490) + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: upstream, https://bazaar.launchpad.net/~unity-settings-daemon-team/unity-settings-daemon/trunk/revision/4183 +Author: Dariusz Gadomski +Bug-Ubuntu: https://launchpad.net/bugs/1755490 +Last-Update: 2018-11-30 + +--- gnome-desktop3-3.8.4.orig/libgnome-desktop/display-name.c ++++ gnome-desktop3-3.8.4/libgnome-desktop/display-name.c +@@ -88,12 +88,23 @@ make_display_size_string (int width_mm, + return inches; + } + ++static gboolean ++has_aspect_as_size(int width_mm, int height_mm) ++{ ++ return (width_mm == 1600 && height_mm == 900) || ++ (width_mm == 1600 && height_mm == 1000) || ++ (width_mm == 160 && height_mm == 90) || ++ (width_mm == 160 && height_mm == 100) || ++ (width_mm == 16 && height_mm == 9) || ++ (width_mm == 16 && height_mm == 10); ++} ++ + char * + make_display_name (const MonitorInfo *info) + { + const char *vendor; + int width_mm, height_mm; +- char *inches, *ret; ++ char *suffix, *ret; + + if (info) + { +@@ -123,22 +134,27 @@ make_display_name (const MonitorInfo *in + height_mm = -1; + } + +- if (width_mm != -1 && height_mm != -1) ++ // are we dealing with aspect coded in EDID size fields? ++ if (has_aspect_as_size(width_mm, height_mm)) ++ { ++ suffix = g_strdup(info->dsc_product_name); ++ } ++ else if (width_mm != -1 && height_mm != -1) + { + double d = sqrt (width_mm * width_mm + height_mm * height_mm); + +- inches = diagonal_to_str (d / 25.4); ++ suffix = diagonal_to_str (d / 25.4); + } + else + { +- inches = NULL; ++ suffix = NULL; + } + +- if (!inches) ++ if (!suffix) + return g_strdup (vendor); + +- ret = g_strdup_printf ("%s %s", vendor, inches); +- g_free (inches); ++ ret = g_strdup_printf ("%s %s", vendor, suffix); ++ g_free (suffix); + + return ret; + } diff -Nru gnome-desktop3-3.8.4/debian/patches/series gnome-desktop3-3.8.4/debian/patches/series --- gnome-desktop3-3.8.4/debian/patches/series 2015-12-02 17:13:46.000000000 +0100 +++ gnome-desktop3-3.8.4/debian/patches/series 2018-11-30 08:27:43.000000000 +0100 @@ -10,3 +10,4 @@ backlight-property-name.patch idletime_sanity_checks.patch fix_lowest_brightness.patch +detect-and-replace-edid-ratio.patch