blob: 539bef79a035c53970430ec7d25ce278cfa7e952 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
--- misc/pango-1.28.3/configure 2010-09-29 13:02:33.000000000 +0200
+++ misc/build/pango-1.28.3/configure 2011-03-01 17:56:26.000000000 +0100
@@ -17980,8 +17980,6 @@
if test x$no_x = xyes ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: X development libraries not found" >&5
-$as_echo "$as_me: WARNING: X development libraries not found" >&2;}
have_x=false
else
X_LIBS="$X_LIBS -lX11"
@@ -18596,16 +18594,16 @@
fi
if $have_atsui; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-quartz-font >= \$cairo_required\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo-quartz-font >= $cairo_required") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
+# if test -n "$PKG_CONFIG" && \
+# { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-quartz-font >= \$cairo_required\""; } >&5
+# ($PKG_CONFIG --exists --print-errors "cairo-quartz-font >= $cairo_required") 2>&5
+# ac_status=$?
+# $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+# test $ac_status = 0; }; then
have_cairo_atsui=true
-else
- :
-fi
+#else
+# :
+#fi
fi
if $have_cairo_atsui; then
@@ -18858,20 +18856,20 @@
fi
# Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled.
-GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-
+#GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+GLIB_MKENUMS=glib-mkenums
# Add in gthread-2.0 to CFLAGS but not to LIBS so we get any
# necesary defines for thread-safety.
-GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0`
+#GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0`
# See if it's safe to turn G_DISABLE_DEPRECATED on.
-GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
-GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo $GLIB_REQUIRED_VERSION | sed "s/\.[^.]*\$//"`
-if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
+#GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
+#GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo $GLIB_REQUIRED_VERSION | sed "s/\.[^.]*\$//"`
+#if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
GLIB_CFLAGS="-DG_DISABLE_DEPRECATED $GLIB_CFLAGS"
-fi
+#fi
#
# Checks for LibThai
--- misc/pango-1.28.3/pango/pangoatsui-fontmap.c
+++ misc/build/pango-1.28.3/pango/pangoatsui-fontmap.c
@@ -27,6 +27,12 @@
#include "pango-impl-utils.h"
#include "modules.h"
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
+@class CALayer;
+@class NSViewController;
+typedef int NSColorRenderingIntent;
+#endif
+
#import <Cocoa/Cocoa.h>
typedef struct _FontHashKey FontHashKey;
--- misc/pango-1.28.3/pango/pangocairo-atsuifont.c
+++ misc/build/pango-1.28.3/pango/pangocairo-atsuifont.c
@@ -22,6 +22,12 @@
#include "config.h"
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
+@class CALayer;
+@class NSViewController;
+typedef int NSColorRenderingIntent;
+#endif
+
#import <Cocoa/Cocoa.h>
#include "pango-impl-utils.h"
|
