Commit 513f2c27 authored by Natanael Copa's avatar Natanael Copa
Browse files

main/xfce4-settings: upgrade to 4.12.1

parent bdb8e13e
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xfce4-settings
pkgver=4.12.0
pkgrel=5
pkgver=4.12.1
pkgrel=0
pkgdesc="Settings manager for xfce"
url="http://www.xfce.org/"
arch="all"
......@@ -13,7 +13,6 @@ makedepends="libxfce4ui-dev exo-dev libxi-dev libxrandr-dev libxklavier-dev
xf86-input-libinput-dev"
source="http://archive.xfce.org/src/xfce/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
alpine-defaults.patch
enable-crt-if-disabled-after-power-cycle.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
......@@ -49,6 +48,5 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
sha512sums="4a61c16f1f03de98c9968a00b50595e2934aaf28b80613c59403d33a293a7f8ef9ebb6fad98b0eeb97a6590b9100e91f73dd6363133d5d8bd06714f1126d8856 xfce4-settings-4.12.0.tar.bz2
e0efdee2eaf833ae1ff8c428e3b2925191bdd3dad8a747705295d7c8bf170725906f4a96b3b332ba9ef958c4b5899448de6461b97503e997747e91d800138f8b alpine-defaults.patch
088c28b0fd598ed7169b50d1bcf820aef07cc683688897f3243cca987bb4fe3f64c88286da750bed0e3424b49a3311d28f61d9a379a87d985ce79db7cfb3bb15 enable-crt-if-disabled-after-power-cycle.patch"
sha512sums="20aca9c6337433b0b7165acfb373bce14e13e368345844799cfe71bcf433a38c4d1f57d3ffe01eda347d167c3098f46ac77d0364b64a2a59bbe82e45d76a9623 xfce4-settings-4.12.1.tar.bz2
e0efdee2eaf833ae1ff8c428e3b2925191bdd3dad8a747705295d7c8bf170725906f4a96b3b332ba9ef958c4b5899448de6461b97503e997747e91d800138f8b alpine-defaults.patch"
https://bugzilla.xfce.org/show_bug.cgi?id=11107
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,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment