Commit | Line | Data |
---|---|---|
f1e44f77 JB |
1 | diff -purN libXfont-1.4.0.orig/configure libXfont-1.4.0/configure |
2 | --- libXfont-1.4.0.orig/configure 2009-12-17 16:14:35.000000000 +0100 | |
3 | +++ libXfont-1.4.0/configure 2009-12-17 16:35:11.000000000 +0100 | |
4 | @@ -11491,178 +11491,19 @@ fi | |
5 | ||
6 | ||
7 | # | |
8 | -# select libraries to include | |
9 | -# | |
10 | - | |
11 | -XFONT_FONTFILE=no | |
12 | - | |
13 | -# | |
14 | # Scalable fonts in files: | |
15 | # FreeType | |
16 | # Bitstream Speedo rasterizer | |
17 | # | |
18 | # Check whether --enable-freetype was given. | |
19 | -if test "${enable_freetype+set}" = set; then | |
20 | - enableval=$enable_freetype; XFONT_FREETYPE=$enableval | |
21 | -else | |
22 | - XFONT_FREETYPE=yes | |
23 | -fi | |
24 | - | |
25 | - if test x$XFONT_FREETYPE = xyes; then | |
26 | - XFONT_FREETYPE_TRUE= | |
27 | - XFONT_FREETYPE_FALSE='#' | |
28 | -else | |
29 | - XFONT_FREETYPE_TRUE='#' | |
30 | - XFONT_FREETYPE_FALSE= | |
31 | -fi | |
32 | - | |
33 | -if test x$XFONT_FREETYPE = xyes; then | |
34 | - | |
35 | -cat >>confdefs.h <<\_ACEOF | |
36 | -#define XFONT_FREETYPE 1 | |
37 | -_ACEOF | |
38 | - | |
39 | - | |
40 | -# Check whether --with-freetype-config was given. | |
41 | -if test "${with_freetype_config+set}" = set; then | |
42 | - withval=$with_freetype_config; freetype_config=$withval | |
43 | -else | |
44 | - freetype_config=auto | |
45 | -fi | |
46 | - | |
47 | - | |
48 | - if test "$freetype_config" = "auto" ; then | |
49 | - | |
50 | -pkg_failed=no | |
51 | -{ $as_echo "$as_me:$LINENO: checking for FREETYPE" >&5 | |
52 | -$as_echo_n "checking for FREETYPE... " >&6; } | |
53 | - | |
54 | -if test -n "$FREETYPE_CFLAGS"; then | |
55 | - pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS" | |
56 | - elif test -n "$PKG_CONFIG"; then | |
57 | - if test -n "$PKG_CONFIG" && \ | |
58 | - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5 | |
59 | - ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5 | |
60 | - ac_status=$? | |
61 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
62 | - (exit $ac_status); }; then | |
63 | - pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null` | |
64 | -else | |
65 | - pkg_failed=yes | |
66 | -fi | |
67 | - else | |
68 | - pkg_failed=untried | |
69 | -fi | |
70 | -if test -n "$FREETYPE_LIBS"; then | |
71 | - pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS" | |
72 | - elif test -n "$PKG_CONFIG"; then | |
73 | - if test -n "$PKG_CONFIG" && \ | |
74 | - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5 | |
75 | - ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5 | |
76 | - ac_status=$? | |
77 | - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
78 | - (exit $ac_status); }; then | |
79 | - pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null` | |
80 | -else | |
81 | - pkg_failed=yes | |
82 | -fi | |
83 | - else | |
84 | - pkg_failed=untried | |
85 | -fi | |
86 | - | |
87 | - | |
88 | ||
89 | -if test $pkg_failed = yes; then | |
90 | - | |
91 | -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |
92 | - _pkg_short_errors_supported=yes | |
93 | -else | |
94 | - _pkg_short_errors_supported=no | |
95 | -fi | |
96 | - if test $_pkg_short_errors_supported = yes; then | |
97 | - FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "freetype2" 2>&1` | |
98 | - else | |
99 | - FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "freetype2" 2>&1` | |
100 | - fi | |
101 | - # Put the nasty error message in config.log where it belongs | |
102 | - echo "$FREETYPE_PKG_ERRORS" >&5 | |
103 | - | |
104 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | |
105 | -$as_echo "no" >&6; } | |
106 | - freetype_config=yes | |
107 | -elif test $pkg_failed = untried; then | |
108 | - freetype_config=yes | |
109 | -else | |
110 | - FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS | |
111 | - FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS | |
112 | - { $as_echo "$as_me:$LINENO: result: yes" >&5 | |
113 | -$as_echo "yes" >&6; } | |
114 | - freetype_config=no | |
115 | -fi | |
116 | - fi | |
117 | - | |
118 | - if test "$freetype_config" = "yes"; then | |
119 | - # Extract the first word of "freetype-config", so it can be a program name with args. | |
120 | -set dummy freetype-config; ac_word=$2 | |
121 | -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
122 | -$as_echo_n "checking for $ac_word... " >&6; } | |
123 | -if test "${ac_cv_path_ft_config+set}" = set; then | |
124 | - $as_echo_n "(cached) " >&6 | |
125 | -else | |
126 | - case $ft_config in | |
127 | - [\\/]* | ?:[\\/]*) | |
128 | - ac_cv_path_ft_config="$ft_config" # Let the user override the test with a path. | |
129 | - ;; | |
130 | - *) | |
131 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
132 | -for as_dir in $PATH | |
133 | -do | |
134 | - IFS=$as_save_IFS | |
135 | - test -z "$as_dir" && as_dir=. | |
136 | - for ac_exec_ext in '' $ac_executable_extensions; do | |
137 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
138 | - ac_cv_path_ft_config="$as_dir/$ac_word$ac_exec_ext" | |
139 | - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
140 | - break 2 | |
141 | - fi | |
142 | -done | |
143 | -done | |
144 | -IFS=$as_save_IFS | |
145 | - | |
146 | - test -z "$ac_cv_path_ft_config" && ac_cv_path_ft_config="no" | |
147 | - ;; | |
148 | -esac | |
149 | -fi | |
150 | -ft_config=$ac_cv_path_ft_config | |
151 | -if test -n "$ft_config"; then | |
152 | - { $as_echo "$as_me:$LINENO: result: $ft_config" >&5 | |
153 | -$as_echo "$ft_config" >&6; } | |
154 | -else | |
155 | - { $as_echo "$as_me:$LINENO: result: no" >&5 | |
156 | -$as_echo "no" >&6; } | |
157 | -fi | |
158 | - | |
159 | - | |
160 | - if test "$ft_config" = "no"; then | |
161 | - { { $as_echo "$as_me:$LINENO: error: You must have freetype installed; see http://www.freetype.org/" >&5 | |
162 | -$as_echo "$as_me: error: You must have freetype installed; see http://www.freetype.org/" >&2;} | |
163 | - { (exit 1); exit 1; }; } | |
164 | - fi | |
165 | - else | |
166 | - ft_config="$freetype_config" | |
167 | - fi | |
168 | - | |
169 | - if test "$freetype_config" != "no"; then | |
170 | - FREETYPE_CFLAGS="`$ft_config --cflags`" | |
171 | - FREETYPE_LIBS="`$ft_config --libs`" | |
172 | - fi | |
173 | - FREETYPE_REQUIRES="freetype2" | |
174 | - XFONT_FONTFILE=yes | |
175 | -else | |
176 | - FREETYPE_CFLAGS="" | |
177 | - FREETYPE_LIBS="" | |
178 | - FREETYPE_REQUIRES="" | |
179 | -fi | |
180 | +FREETYPE_CFLAGS="-I/usr/include/freetype2" | |
181 | +FREETYPE_LIBS="-lfreetype -lz" | |
182 | +FREETYPE_REQUIRES="freetype2" | |
183 | + | |
184 | +XFONT_FREETYPE=yes | |
185 | +XFONT_FREETYPE_TRUE= | |
186 | +XFONT_FREETYPE_FALSE='#' | |
187 | ||
188 | ||
189 | ||
190 | diff -purN libXfont-1.4.0.orig/src/fc/fserve.h libXfont-1.4.0/src/fc/fserve.h | |
191 | --- libXfont-1.4.0.orig/src/fc/fserve.h 2009-12-17 16:14:35.000000000 +0100 | |
192 | +++ libXfont-1.4.0/src/fc/fserve.h 2009-12-17 16:53:00.000000000 +0100 | |
193 | @@ -71,6 +71,8 @@ typedef struct _fs_fpe_data *FSFpePtr; | |
194 | typedef struct _fs_blocked_bitmaps *FSBlockedBitmapPtr; | |
195 | typedef struct _fs_blocked_extents *FSBlockedExtentPtr; | |
196 | ||
197 | +typedef long fd_mask; | |
198 | + | |
199 | extern void _fs_convert_char_info ( fsXCharInfo *src, xCharInfo *dst ); | |
200 | extern void _fs_free_props (FontInfoPtr pfi); | |
201 | extern FontPtr fs_create_font (FontPathElementPtr fpe, |