|
Lucio Andrés Illanes Albornoz |
1f9485 |
diff -ru pango-1.40.11.orig/configure pango-1.40.11/configure
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
--- pango-1.40.11.orig/configure 2017-08-19 15:28:44.000000000 +0200
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
+++ pango-1.40.11/configure 2017-08-25 21:29:22.922827837 +0200
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
@@ -19005,33 +19005,11 @@
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
fi
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
if $have_cairo ; then
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- pango_save_libs=$LIBS
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- LIBS="$LIBS $CAIRO_LIBS"
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- pango_save_ldflags=$LDFLAGS
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- LDFLAGS="$LDFLAGS $CAIRO_LIBS"
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
-
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- have_cairo=false
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- cairo_font_backends=""
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
-
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- if $have_freetype; then
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- if test -n "$PKG_CONFIG" && \
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-ft >= \$cairo_required\""; } >&5
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- ($PKG_CONFIG --exists --print-errors "cairo-ft >= $cairo_required") 2>&5
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- ac_status=$?
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- test $ac_status = 0; }; then
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- have_cairo_freetype=true
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
-else
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- :
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
-fi
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- fi
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- if $have_cairo_freetype; then
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
$as_echo "#define HAVE_CAIRO_FREETYPE 1" >>confdefs.h
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
cairo_font_backends="freetype $cairo_font_backends"
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
have_cairo=true
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
- fi
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
if $have_win32; then
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
if test -n "$PKG_CONFIG" && \
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
--- pango-1.40.11/pango/pangocairo-fontmap.c.orig 2016-10-22 07:00:37.000000000 +0200
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
+++ pango-1.40.11/pango/pangocairo-fontmap.c 2017-08-25 22:30:01.766561892 +0200
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
@@ -35,6 +35,10 @@
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
# include "pangocairo-fc.h"
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
#endif
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
+PANGO_AVAILABLE_IN_ALL
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
+GType __attribute__((weak)) pango_cairo_fc_font_map_get_type (void) {
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
+ return NULL;
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
+}
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
typedef PangoCairoFontMapIface PangoCairoFontMapInterface;
|
|
Lucio Andrés Illanes Albornoz |
1f9485 |
G_DEFINE_INTERFACE (PangoCairoFontMap, pango_cairo_font_map, PANGO_TYPE_FONT_MAP)
|