diff options
Diffstat (limited to 'source/xfce/xfce4-settings')
4 files changed, 94 insertions, 12 deletions
diff --git a/source/xfce/xfce4-settings/0001-Make-sure-icon-NULL-if-no-icon-is-found.patch b/source/xfce/xfce4-settings/0001-Make-sure-icon-NULL-if-no-icon-is-found.patch new file mode 100644 index 00000000..c8f9cd8c --- /dev/null +++ b/source/xfce/xfce4-settings/0001-Make-sure-icon-NULL-if-no-icon-is-found.patch @@ -0,0 +1,24 @@ +From b2c3df6015d2ab1b57e2532b05298803b28f2902 Mon Sep 17 00:00:00 2001 +From: Peter de Ridder <peter@xfce.org> +Date: Wed, 4 Mar 2015 11:03:28 +0100 +Subject: [PATCH] Make sure icon == NULL if no icon is found + +--- + dialogs/appearance-settings/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dialogs/appearance-settings/main.c b/dialogs/appearance-settings/main.c +index 3eeb348..6532182 100644 +--- a/dialogs/appearance-settings/main.c ++++ b/dialogs/appearance-settings/main.c +@@ -720,6 +720,7 @@ appearance_settings_load_icon_themes (preview_data *pd) + + for (p = 0; p < 4; p++) + { ++ icon = NULL; + if (gtk_icon_theme_has_icon (icon_theme, preview_icons[p])) + icon = gtk_icon_theme_load_icon (icon_theme, preview_icons[p], 16, 0, NULL); + else if (gtk_icon_theme_has_icon (icon_theme, "image-missing")) +-- +2.3.1 + diff --git a/source/xfce/xfce4-settings/xfce.xfsettingsd.display.crtc.diff b/source/xfce/xfce4-settings/xfce.xfsettingsd.display.crtc.diff new file mode 100644 index 00000000..73fc826b --- /dev/null +++ b/source/xfce/xfce4-settings/xfce.xfsettingsd.display.crtc.diff @@ -0,0 +1,51 @@ +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, + diff --git a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild index 6e400455..cc85ed8c 100755 --- a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild +++ b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,13 +22,13 @@ PKGNAM=xfce4-settings VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; armv7hl) export ARCH=$MARCH ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: @@ -38,8 +38,8 @@ fi NUMJOBS=${NUMJOBS:--j6} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -74,6 +74,11 @@ find . \ zcat $CWD/xfce4-settings.theme.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/xfce4-settings.xft.defaults.diff.gz | patch -p1 --verbose || exit 1 +# Fix monitor wake from standby with 4.4.x kernel: +zcat $CWD/xfce.xfsettingsd.display.crtc.diff.gz | patch -p1 --verbose || exit 1 + +patch -p1 < $CWD/0001-Make-sure-icon-NULL-if-no-icon-is-found.patch + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/xfce/xfce4-settings/xfce4-settings.theme.diff b/source/xfce/xfce4-settings/xfce4-settings.theme.diff index ebdcf88f..7b18303b 100644 --- a/source/xfce/xfce4-settings/xfce4-settings.theme.diff +++ b/source/xfce/xfce4-settings/xfce4-settings.theme.diff @@ -1,12 +1,14 @@ -diff -Nur xfce4-settings-4.10.0.orig/xfsettingsd/xsettings.xml xfce4-settings-4.10.0/xfsettingsd/xsettings.xml ---- xfce4-settings-4.10.0.orig/xfsettingsd/xsettings.xml 2012-04-28 15:48:30.000000000 -0500 -+++ xfce4-settings-4.10.0/xfsettingsd/xsettings.xml 2012-05-02 10:16:35.422408879 -0500 -@@ -7,7 +7,7 @@ +diff -Nur xfce4-settings-4.11.4.orig/xfsettingsd/xsettings.xml xfce4-settings-4.11.4/xfsettingsd/xsettings.xml +--- xfce4-settings-4.11.4.orig/xfsettingsd/xsettings.xml 2015-02-16 15:03:11.000000000 -0600 ++++ xfce4-settings-4.11.4/xfsettingsd/xsettings.xml 2015-02-17 21:01:05.021259913 -0600 +@@ -6,8 +6,8 @@ + <?xml version="1.0" encoding="UTF-8"?> <channel name="xsettings" version="1.0"> <property name="Net" type="empty"> - <property name="ThemeName" type="empty"/> +- <property name="ThemeName" type="empty"/> - <property name="IconThemeName" type="empty"/> -+ <property name="IconThemeName" type="string" value="gnome"/> - <property name="DoubleClickTime" type="int" value="250"/> ++ <property name="ThemeName" type="string" value="Adwaita"/> ++ <property name="IconThemeName" type="string" value="Adwaita"/> + <property name="DoubleClickTime" type="int" value="400"/> <property name="DoubleClickDistance" type="int" value="5"/> <property name="DndDragThreshold" type="int" value="8"/> |