Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=201359575b14412732a53e7b530d35f57a2485fa

commit 201359575b14412732a53e7b530d35f57a2485fa
Author: James Buren <r...@frugalware.org>
Date:   Thu Dec 16 12:52:04 2010 -0600

gnome-settings-daemon-2.32.0-3-i686
* patch gnome to use the new LCD filter option

diff --git a/source/gnome/gnome-settings-daemon/FrugalBuild 
b/source/gnome/gnome-settings-daemon/FrugalBuild
index e268cdc..16dff76 100644
--- a/source/gnome/gnome-settings-daemon/FrugalBuild
+++ b/source/gnome/gnome-settings-daemon/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gnome-settings-daemon
pkgver=2.32.0
-pkgrel=2
+pkgrel=3
pkgdesc="Utility library for accessing gnome-settings-daemon over DBUS"
depends=('libgnomekbd>=2.32.0' 'esd' 'gst-plugins-base>=0.10.22-2' 'libgnomeui' 
'libxxf86misc' \
'gnome-desktop>=2.32.0' 'gconf' 'alsa-lib')
@@ -20,9 +20,11 @@ 
_F_gnome_schemas=('/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.sch
_F_gnome_scrollkeeper="y"
_F_gnome_iconcache="y"
Finclude gnome gnome-scriptlet
-source=(${sour...@]} 
gnome-settings-daemon-2.30.0-gst-vol-control-support.patch)
+source=(${sour...@]} gnome-settings-daemon-2.30.0-gst-vol-control-support.patch
+       $pkgname-xres-lcdfilter.patch)
sha1sums=('c4cc7035909843472e9a5060e5cd294322999a32' \
-          '8db1dde75b1866619d6589e989ed27fc45050c50')
+          '8db1dde75b1866619d6589e989ed27fc45050c50' \
+          '8fd41db394be5681e0f2024d9665d6bc7d2c6f36')
Fconfopts="$Fconfopts --enable-gstreamer"

build() {
diff --git 
a/source/gnome/gnome-settings-daemon/gnome-settings-daemon-xres-lcdfilter.patch 
b/source/gnome/gnome-settings-daemon/gnome-settings-daemon-xres-lcdfilter.patch
new file mode 100644
index 0000000..0e0e037
--- /dev/null
+++ 
b/source/gnome/gnome-settings-daemon/gnome-settings-daemon-xres-lcdfilter.patch
@@ -0,0 +1,66 @@
+Description: OpenOffice.org subpixel font rendering broken with new cairo
+Bug: https://bugs.launchpad.net/bugs/271283
+
+Index: gnome-settings-daemon-2.29.5/plugins/xsettings/gsd-xsettings-manager.c
+===================================================================
+--- 
gnome-settings-daemon-2.29.5.orig/plugins/xsettings/gsd-xsettings-manager.c     
   2010-01-21 23:54:11.000000000 +0100
++++ gnome-settings-daemon-2.29.5/plugins/xsettings/gsd-xsettings-manager.c     
2010-01-21 23:54:50.000000000 +0100
+@@ -295,6 +295,9 @@
+         int         dpi;
+         const char *rgba;
+         const char *hintstyle;
++
++      /* priv helper for OOO lcdfilter */
++      gboolean use_rgba;
+ } GnomeXftSettings;
+
+ static const char *rgba_types[] = { "rgb", "bgr", "vbgr", "vrgb" };
+@@ -321,6 +324,7 @@
+         settings->hintstyle = "hintfull";
+         settings->dpi = dpi * 1024; /* Xft wants 1/1024ths of an inch */
+         settings->rgba = "rgb";
++        settings->use_rgba = FALSE;
+
+         if (rgba_order) {
+                 int i;
+@@ -359,7 +363,6 @@
+         }
+
+         if (antialiasing) {
+-                gboolean use_rgba = FALSE;
+
+                 if (strcmp (antialiasing, "none") == 0) {
+                         settings->antialias = 0;
+@@ -367,13 +370,13 @@
+                         settings->antialias = 1;
+                 } else if (strcmp (antialiasing, "rgba") == 0) {
+                         settings->antialias = 1;
+-                        use_rgba = TRUE;
++                        settings->use_rgba = TRUE;
+                 } else {
+                         g_warning ("Invalid value for " FONT_ANTIALIASING_KEY 
" : '%s'",
+                                    antialiasing);
+                 }
+
+-                if (!use_rgba) {
++                if (!settings->use_rgba) {
+                         settings->rgba = "none";
+                 }
+         }
+@@ -397,6 +400,7 @@
+                 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", settings->use_rgba ? "lcddefault" : "none");
+         }
+         gnome_settings_profile_end (NULL);
+ }
+@@ -456,6 +460,8 @@
+                                 settings->hintstyle);
+         update_property (add_string, "Xft.rgba",
+                                 settings->rgba);
++        update_property (add_string, "Xft.lcdfilter",
++                                settings->use_rgba ? "lcddefault" : "none");
+
+         g_debug("xft_settings_set_xresources: new res '%s'", add_string->str);
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to