Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/mozilla-firefox/patches/mozilla-firefox-1.5.0.3-pango-cairo.patch

    Annotation of /trunk/mozilla-firefox/patches/mozilla-firefox-1.5.0.3-pango-cairo.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (hide annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
    File size: 4372 byte(s) 
    -import
    1 niro 153 Index: config/autoconf.mk.in
    2     ===================================================================
    3     RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v
    4     retrieving revision 3.363.2.1
    5     diff -u -p -6 -r3.363.2.1 autoconf.mk.in
    6     --- config/autoconf.mk.in 17 Aug 2005 17:17:17 -0000 3.363.2.1
    7     +++ config/autoconf.mk.in 27 Aug 2005 19:57:29 -0000
    8     @@ -456,12 +456,13 @@ MOZ_XFT_CFLAGS = @MOZ_XFT_CFLAGS@
    9     MOZ_XFT_LIBS = @MOZ_XFT_LIBS@
    10     MOZ_ENABLE_COREXFONTS = @MOZ_ENABLE_COREXFONTS@
    11    
    12     MOZ_ENABLE_PANGO = @MOZ_ENABLE_PANGO@
    13     MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@
    14     MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@
    15     +MOZ_PANGOCAIRO = @MOZ_PANGOCAIRO@
    16    
    17     MOZ_EXTRA_X11CONVERTERS = @MOZ_EXTRA_X11CONVERTERS@
    18    
    19     MOZ_ENABLE_XINERAMA = @MOZ_ENABLE_XINERAMA@
    20     MOZ_XINERAMA_LIBS = @MOZ_XINERAMA_LIBS@
    21    
    22     Index: gfx/src/gtk/mozilla-decoder.cpp
    23     ===================================================================
    24     RCS file: /cvsroot/mozilla/gfx/src/gtk/mozilla-decoder.cpp,v
    25     retrieving revision 1.3
    26     diff -u -p -6 -r1.3 mozilla-decoder.cpp
    27     --- gfx/src/gtk/mozilla-decoder.cpp 7 Nov 2004 23:59:23 -0000 1.3
    28     +++ gfx/src/gtk/mozilla-decoder.cpp 27 Aug 2005 19:57:49 -0000
    29     @@ -37,13 +37,17 @@
    30     * ***** END LICENSE BLOCK ***** */
    31    
    32     #define PANGO_ENABLE_BACKEND
    33     #define PANGO_ENABLE_ENGINE
    34    
    35     #include "mozilla-decoder.h"
    36     +#ifdef MOZ_PANGOCAIRO
    37     +#include <pango/pangocairo.h>
    38     +#else
    39     #include <pango/pangoxft.h>
    40     +#endif
    41     #include <pango/pangofc-fontmap.h>
    42     #include <pango/pangofc-font.h>
    43     #include <gdk/gdkx.h>
    44    
    45     #include "nsString.h"
    46     #include "nsIPersistentProperties2.h"
    47     @@ -205,13 +209,17 @@ mozilla_decoders_init(void)
    48     }
    49     else {
    50     printf("unknown suffix used for mapping\n");
    51     }
    52     }
    53    
    54     +#ifdef MOZ_PANGOCAIRO
    55     + pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
    56     +#else
    57     pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
    58     +#endif
    59     mozilla_find_decoder,
    60     NULL,
    61     NULL);
    62    
    63     initialized = PR_TRUE;
    64    
    65     Index: configure.in
    66     ===================================================================
    67     RCS file: /cvsroot/mozilla/configure.in,v
    68     retrieving revision 1.1503.2.6
    69     diff -u -p -6 -r1.1503.2.6 configure.in
    70     --- configure.in 25 Aug 2005 19:05:34 -0000 1.1503.2.6
    71     +++ configure.in 29 Aug 2005 08:03:32 -0000
    72     @@ -3707,14 +3707,14 @@ gtk)
    73     ;;
    74    
    75     gtk2)
    76     MOZ_ENABLE_GTK2=1
    77     MOZ_ENABLE_XREMOTE=1
    78     MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-}
    79     - TK_CFLAGS='$(MOZ_GTK2_CFLAGS)'
    80     - TK_LIBS='$(MOZ_GTK2_LIBS)'
    81     + TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)'
    82     + TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)'
    83     AC_DEFINE(MOZ_WIDGET_GTK2)
    84     ;;
    85    
    86     xlib)
    87     MOZ_ENABLE_XLIB=1
    88     if test "$_HAVE_FREETYPE2"; then
    89     @@ -4277,33 +4277,44 @@ if test "$MOZ_ENABLE_XFT" && test "$MOZ_
    90     fi
    91    
    92     if test "$MOZ_ENABLE_XFT"
    93     then
    94     AC_DEFINE(MOZ_ENABLE_XFT)
    95     PKG_CHECK_MODULES(MOZ_XFT, xft)
    96     - PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0)
    97     + PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.1.0 pangox)
    98     fi
    99    
    100     AC_SUBST(MOZ_ENABLE_XFT)
    101     AC_SUBST(MOZ_XFT_CFLAGS)
    102     AC_SUBST(MOZ_XFT_LIBS)
    103     +AC_SUBST(MOZ_PANGO_CFLAGS)
    104     +AC_SUBST(MOZ_PANGO_LIBS)
    105    
    106     dnl ========================================================
    107     dnl = pango font rendering
    108     dnl ========================================================
    109     MOZ_ARG_ENABLE_BOOL(pango,
    110     [ --enable-pango Enable Pango font rendering support],
    111     MOZ_ENABLE_PANGO=1,
    112     MOZ_ENABLE_PANGO=)
    113    
    114     if test "$MOZ_ENABLE_PANGO"
    115     then
    116     AC_DEFINE(MOZ_ENABLE_PANGO)
    117     - PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.6.0 pangoft2 >= 1.6.0)
    118     + PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.6.0)
    119     + PKG_CHECK_MODULES(PANGOCAIRO_CHK, pangocairo >= 1.10.0,
    120     + [
    121     + MOZ_PANGOCAIRO=1
    122     + AC_DEFINE(MOZ_PANGOCAIRO)
    123     + MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS"
    124     + MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS"
    125     + ],
    126     + [:])
    127    
    128     AC_SUBST(MOZ_ENABLE_PANGO)
    129     + AC_SUBST(MOZ_PANGOCAIRO)
    130     AC_SUBST(MOZ_PANGO_CFLAGS)
    131     AC_SUBST(MOZ_PANGO_LIBS)
    132     fi
    133    
    134     dnl ========================================================
    135     dnl = x11 core font support (default and ability to enable depend on toolkit)