[arch-commits] Commit in xfce4-settings/trunk (2 files)

[Evangelos Foutras]

    Date: Sunday, August 7, 2016 @ 09:02:23
  Author: foutrelis
Revision: 273439

upgpkg: xfce4-settings 4.12.0-5

Add unofficial patch to enable crtc if it is disabled after power cycle (FS#48647).

Added:
  xfce4-settings/trunk/xfce4-settings-enable-crtc-after-powercycle.patch
Modified:
  xfce4-settings/trunk/PKGBUILD

---------------------------------------------------+
 PKGBUILD                                          |    7 ++
 xfce4-settings-enable-crtc-after-powercycle.patch |   50 ++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-07 08:49:56 UTC (rev 273438)
+++ PKGBUILD	2016-08-07 09:02:23 UTC (rev 273439)
@@ -5,7 +5,7 @@
 
 pkgname=xfce4-settings
 pkgver=4.12.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Settings manager for xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -16,12 +16,17 @@
 makedepends=('intltool' 'xf86-input-libinput')
 optdepends=('libcanberra: for sound control')
 source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        xfce4-settings-enable-crtc-after-powercycle.patch
         default-xsettings-xml.patch)
 sha256sums=('04becef105c19d0266cfe8dbf42619e7233c3b9fa99b43dbfc9c6a5959501f81'
+            'e6adaa6fe558b4b999db2efe5be32ff5128f03030fdf6888de4012d4b2ea94b7'
             '1c4110fd5ce0f17564cda892b72d59a87b515fdb4580c7154bbb4c1979f5ade7')
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # https://bugzilla.xfce.org/show_bug.cgi?id=11107#c54
+  patch -Np1 -i ../xfce4-settings-enable-crtc-after-powercycle.patch
+
   # Enable GNOME icon theme, Adwaita theme and font hinting by default
   patch -Np1 -i "$srcdir/default-xsettings-xml.patch"
 }

Added: xfce4-settings-enable-crtc-after-powercycle.patch
===================================================================
--- xfce4-settings-enable-crtc-after-powercycle.patch	                        (rev 0)
+++ xfce4-settings-enable-crtc-after-powercycle.patch	2016-08-07 09:02:23 UTC (rev 273439)
@@ -0,0 +1,50 @@
+diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
+index 095e323..af70256 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,