[ooo-build-commit] patches/dev300

[Petr Mladek]

 patches/dev300/apply                                             |    3 +
 patches/dev300/ooo64508.vcl.honourfontconfighinting-gtk-2.8.diff |   18 ++++++++++
 2 files changed, 21 insertions(+)

New commits:
commit 679393e858710ef9ac9770ea21d2f6b5edf68d6e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Oct 29 15:41:12 2009 +0100

    Hack to build with gtk-2.8 on SLED10
    
    * patches/dev300/ooo64508.vcl.honourfontconfighinting-gtk-2.8.diff:
    * patches/dev300/apply: temporary disable the gdk_screen_get_font_options
      unsupported call; will use default setting

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7423ded..47a602c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2277,6 +2277,9 @@ human-icons-i18n.diff, mklose
 [ FedoraLinuxOnlyFixes > dev300-m60 > ooo320-m1 ]
 ooo64508.vcl.honourfontconfighinting.diff
 
+[ GTK28 ]
+ooo64508.vcl.honourfontconfighinting-gtk-2.8.diff
+
 [ FedoraCommonFixes ]
 ooo67658.sfx2.reloadcrash.diff
 
diff --git a/patches/dev300/ooo64508.vcl.honourfontconfighinting-gtk-2.8.diff b/patches/dev300/ooo64508.vcl.honourfontconfighinting-gtk-2.8.diff
new file mode 100644
index 0000000..a77a8f3
--- /dev/null
+++ b/patches/dev300/ooo64508.vcl.honourfontconfighinting-gtk-2.8.diff
@@ -0,0 +1,18 @@
+--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx.old	2009-10-29 15:25:08.000000000 +0100
++++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	2009-10-29 15:24:44.000000000 +0100
+@@ -3449,10 +3449,11 @@ void GtkSalGraphics::updateSettings( All
+     //  FIXME: need some way of fetching toolbar icon size.
+ //	aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_SMALL );
+ 
+-    const cairo_font_options_t *pNewOptions = 0;
+-    if (GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(), m_nScreen ))
+-        pNewOptions = gdk_screen_get_font_options(pScreen);
+-    aStyleSet.SetCairoFontOptions( pNewOptions );
++// FIXME: gdk_screen_get_font_options is not supported by gdk2-2.8 on SLED10
++//    const cairo_font_options_t *pNewOptions = 0;
++//    if (GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(), m_nScreen ))
++//        pNewOptions = gdk_screen_get_font_options(pScreen);
++//    aStyleSet.SetCairoFontOptions( pNewOptions );
+ 
+     // finally update the collected settings
+     rSettings.SetStyleSettings( aStyleSet );