diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2010-12-05 13:20:49 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2010-12-05 13:20:49 +0000 |
| commit | 182e054079718d6fdcbc5f21bbb3421cf8c2073f (patch) | |
| tree | 4491e935b4e92342a8177f64dae9b4c7aa8fdaa4 /gnome-base/gnome-settings-daemon | |
| parent | Fix Darwin Makefile patch, it was obviously blindly ported to a newer version... (diff) | |
| download | gentoo-2-182e054079718d6fdcbc5f21bbb3421cf8c2073f.tar.gz gentoo-2-182e054079718d6fdcbc5f21bbb3421cf8c2073f.tar.bz2 gentoo-2-182e054079718d6fdcbc5f21bbb3421cf8c2073f.zip | |
Add forgotten patches (bug #347769 by fkhp).
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-settings-daemon')
3 files changed, 98 insertions, 1 deletions
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog index 2985fc87dbec..ecf6b6d7d511 100644 --- a/gnome-base/gnome-settings-daemon/ChangeLog +++ b/gnome-base/gnome-settings-daemon/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gnome-settings-daemon # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.66 2010/12/04 16:50:12 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.67 2010/12/05 13:20:49 pacho Exp $ + + 05 Dec 2010; Pacho Ramos <pacho@gentoo.org> + +files/gnome-settings-daemon-2.32.1-lcdfilter.patch, + +files/gnome-settings-daemon-2.32.1-netfs-monitor.patch: + Add forgotten patches (bug #347769 by fkhp). *gnome-settings-daemon-2.32.1 (04 Dec 2010) diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-lcdfilter.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-lcdfilter.patch new file mode 100644 index 000000000000..0b01f8434eeb --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-lcdfilter.patch @@ -0,0 +1,34 @@ +From 6cf315249ab27d4396b0f5b5edb1e689a5cafc68 Mon Sep 17 00:00:00 2001 +From: Chris Coleman <chrsclmn@gmail.com> +Date: Sat, 16 Oct 2010 00:44:12 +0000 +Subject: xsettings: Export Xft.lcdfilter for OO.o's benefit + +Export Xft.lcdfilter legacy setting for the benefit of OpenOffice.org +which doesn't follow the other fontconfig settings. + +https://bugzilla.gnome.org/show_bug.cgi?id=631924 +--- +diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c +index 0d9df70..8798a9e 100644 +--- a/plugins/xsettings/gsd-xsettings-manager.c ++++ b/plugins/xsettings/gsd-xsettings-manager.c +@@ -357,6 +357,8 @@ xft_settings_set_xsettings (GnomeXSettingsManager *manager, + xsettings_manager_set_string (manager->priv->managers [i], "Xft/HintStyle", settings->hintstyle); + xsettings_manager_set_int (manager->priv->managers [i], "Xft/DPI", settings->dpi); + xsettings_manager_set_string (manager->priv->managers [i], "Xft/RGBA", settings->rgba); ++ xsettings_manager_set_string (manager->priv->managers [i], "Xft/lcdfilter", ++ g_str_equal (settings->rgba, "rgb") ? "lcddefault" : "none"); + } + gnome_settings_profile_end (NULL); + } +@@ -416,6 +418,8 @@ xft_settings_set_xresources (GnomeXftSettings *settings) + settings->hintstyle); + update_property (add_string, "Xft.rgba", + settings->rgba); ++ update_property (add_string, "Xft.lcdfilter", ++ g_str_equal (settings->rgba, "rgb") ? "lcddefault" : "none"); + + g_debug("xft_settings_set_xresources: new res '%s'", add_string->str); + +-- +cgit v0.8.3.1 diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-netfs-monitor.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-netfs-monitor.patch new file mode 100644 index 000000000000..58150e56dd17 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-netfs-monitor.patch @@ -0,0 +1,58 @@ +From 54ce24f4947256e1991970eed40bafd1b7028cf6 Mon Sep 17 00:00:00 2001 +From: Josselin Mouette <joss@debian.org> +Date: Tue, 12 Oct 2010 19:19:44 +0000 +Subject: housekeeping: More network filesystems not to monitor + +https://bugzilla.gnome.org/show_bug.cgi?id=606421 +--- +diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c +index e1385ea..2fcc523 100644 +--- a/plugins/housekeeping/gsd-disk-space.c ++++ b/plugins/housekeeping/gsd-disk-space.c +@@ -304,25 +304,41 @@ ldsm_mount_should_ignore (GUnixMountEntry *mount) + * expose this in a way that allows it to be used for this + * purpose + */ ++ ++ /* We also ignore network filesystems */ + + const gchar *ignore_fs[] = { ++ "adfs", ++ "afs", + "auto", + "autofs", ++ "autofs4", ++ "cifs", ++ "cxfs", + "devfs", + "devpts", + "ecryptfs", ++ "gfs", ++ "gfs2", + "kernfs", + "linprocfs", ++ "linsysfs", ++ "lustre", ++ "lustre_lite", ++ "ncpfs", ++ "nfs", ++ "nfs4", ++ "nfsd", ++ "ocfs2", + "proc", + "procfs", + "ptyfs", ++ "rpc_pipefs", + "selinuxfs", +- "linsysfs", ++ "smbfs", + "sysfs", + "tmpfs", + "usbfs", +- "nfsd", +- "rpc_pipefs", + "zfs", + NULL + }; +-- +cgit v0.8.3.1 |