diff -Nru xfce4-settings-4.12.0/debian/changelog xfce4-settings-4.12.0/debian/changelog --- xfce4-settings-4.12.0/debian/changelog 2015-05-13 21:25:37.000000000 -0400 +++ xfce4-settings-4.12.0/debian/changelog 2019-03-26 21:52:13.000000000 -0400 @@ -1,3 +1,10 @@ +xfce4-settings (4.12.0-2ubuntu1.16.04.1) xenial; urgency=medium + + * debian/patches/lp1308105.patch: + - Fix Xfce resetting TV mode to NULL when power cycled (LP: #1308105) + + -- Sean Davis Tue, 26 Mar 2019 21:52:13 -0400 + xfce4-settings (4.12.0-2ubuntu1) wily; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru xfce4-settings-4.12.0/debian/patches/lp1308105.patch xfce4-settings-4.12.0/debian/patches/lp1308105.patch --- xfce4-settings-4.12.0/debian/patches/lp1308105.patch 1969-12-31 19:00:00.000000000 -0500 +++ xfce4-settings-4.12.0/debian/patches/lp1308105.patch 2019-03-26 21:51:37.000000000 -0400 @@ -0,0 +1,63 @@ +From 2233f20a7ec6d7cb7dcc5752d62d98e37d9c21ad Mon Sep 17 00:00:00 2001 +From: Sean Davis +Date: Thu, 11 Aug 2016 20:29:27 -0400 +Subject: Fix: xfsettingsd resets TV mode to NULL on power cycle (Xfce #11107), + thanks to patch by jkampe68 + +--- + xfsettingsd/displays.c | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c +index 095e3236..af70256e 100644 +--- a/xfsettingsd/displays.c ++++ b/xfsettingsd/displays.c +@@ -415,6 +415,7 @@ xfce_displays_helper_screen_on_event (GdkXEvent *xevent, + XfceRROutput *output, *o; + XEvent *e = xevent; + gint event_num; ++ gint j; + guint n, m, nactive = 0; + gboolean found = FALSE, changed = FALSE; + +@@ -496,9 +497,37 @@ xfce_displays_helper_screen_on_event (GdkXEvent *xevent, + { + xfsettings_dbg (XFSD_DEBUG_DISPLAYS, "New output connected: %s", + output->info->name); ++ /* need to enable crtc for output ? */ ++ if (output->info->crtc == None) ++ { ++ xfsettings_dbg (XFSD_DEBUG_DISPLAYS, "enabling crtc for %s", output->info->name); ++ crtc = xfce_displays_helper_find_usable_crtc (helper, output); ++ if (crtc) ++ { ++ crtc->mode = output->preferred_mode; ++ crtc->rotation = RR_Rotate_0; ++ crtc->x = crtc->y = 0; ++ /* set width and height */ ++ for (j = 0; j < helper->resources->nmode; ++j) ++ { ++ if (helper->resources->modes[j].id == output->preferred_mode) ++ { ++ crtc->width = helper->resources->modes[j].width; ++ crtc->height = helper->resources->modes[j].height; ++ break; ++ } ++ } ++ xfce_displays_helper_set_outputs (crtc, output); ++ crtc->changed = TRUE; ++ } ++ } ++ + changed = TRUE; + } + } ++ if (changed) ++ xfce_displays_helper_apply_all (helper); ++ + /* Start the minimal dialog according to the user preferences */ + if (changed && xfconf_channel_get_bool (helper->channel, NOTIFY_PROP, FALSE)) + xfce_spawn_command_line_on_screen (NULL, "xfce4-display-settings -m", FALSE, +-- +cgit v1.2.1 + diff -Nru xfce4-settings-4.12.0/debian/patches/series xfce4-settings-4.12.0/debian/patches/series --- xfce4-settings-4.12.0/debian/patches/series 2015-05-07 01:34:19.000000000 -0400 +++ xfce4-settings-4.12.0/debian/patches/series 2019-03-26 21:51:58.000000000 -0400 @@ -1,2 +1,3 @@ 01_use-tango-icon-theme.patch xubuntu_vanilla-session-themes.patch +lp1308105.patch