Magellan Linux

Contents of /trunk/kdegraphics/patches/kdegraphics-3.5.10-ksvg-autotools.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 828 - (show annotations) (download)
Sun May 31 09:19:00 2009 UTC (14 years, 11 months ago) by niro
File size: 13235 byte(s)
fix missing fribidi-config, using *.pc instead and allow use of newer autotools

1 diff -urN kdegraphics-3.5.3.orig/acinclude.m4 kdegraphics-3.5.3/acinclude.m4
2 --- kdegraphics-3.5.3.orig/acinclude.m4 2006-05-24 03:35:37 +0700
3 +++ kdegraphics-3.5.3/acinclude.m4 2006-06-12 08:50:51 +0700
4 @@ -11919,4 +11919,76 @@
5 fi
6 ])
7
8 +dnl An internal macro to compare program versions.
9 +dnl Fixme: get rid of awk. Really?
10 +AC_DEFUN([_PKG_COMPARE_VERSIONS], [
11 + AC_PROG_AWK
12 + if test -n "$AWK"; then
13 + AC_MSG_CHECKING([for version great or equal than $1])
14 + if test `echo $1 | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'` -le `echo $2 | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`; then
15 + AC_MSG_RESULT([yes])
16 + else
17 + pkg_failed=yes
18 + AC_MSG_RESULT([no])
19 + fi
20 + else
21 + pkg_failed=yes
22 + fi
23 + ])
24 +
25 +dnl PKG_CHECK_MODULE_LEGACY(VARIABLE-PREFIX, MODULE, [MIN-VERSION],
26 +dnl [LEGACY_CONFIG], [PATH], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
27 +dnl
28 +dnl This is a variant of PKG_CHECK_MODULES which differs in three aspects:
29 +dnl 1. it takes a single module to check per invocation
30 +dnl 2. if the corresponding pkg-config module was not found, the macro
31 +dnl tries to locate it's legacy pre-pkgconfig configuration script
32 +dnl (usually <MODULE>-config, maybe overridden in LEGACY_CONFIG)
33 +dnl and receive module configuration data from that script.
34 +dnl 3. it defines <MODULE>_VERSION variable if the module is found
35 +dnl MIN-VERSION, LEGACY_CONFIG and PATH are optional.
36 +dnl Internally PKG_CHECK_MODULES is used to check for the pkg-config
37 +dnl module, AC_PATH_PROG is used to detect the location of the legacy
38 +dnl config script
39 +
40 +AC_DEFUN([PKG_CHECK_MODULE_LEGACY], [
41 + PKG_CHECK_MODULES([$1], [m4_ifval([$3], [$2 >= $3], [$2])], [
42 + $1[]_VERSION=`$PKG_CONFIG --modversion $2`
43 + m4_ifval([$6], [$6], [:])
44 + ], [
45 + AC_MSG_RESULT([no])
46 + AC_PATH_PROG([$1_CONFIG], [m4_ifval([$4], [$4], [$2[]-config])],
47 + [], [$5])
48 + if test -n "$[$1_CONFIG]"; then
49 + pkg_failed=no
50 + # first receive the version
51 + $1[]_VERSION=`$[$1_CONFIG] --version` || pkg_failed=yes
52 + m4_ifval([$3], [
53 + if test $pkg_failed = no; then
54 + _PKG_COMPARE_VERSIONS([$3], [$]$1[]_VERSION)
55 + fi
56 + ])
57 + test $pkg_failed = no && $1[]_LIBS=`$[$1_CONFIG] --libs` || pkg_failed=yes
58 + test $pkg_failed = no && $1[]_CFLAGS=`$[$1_CONFIG] --cflags` || pkg_failed=yes
59 + else
60 + pkg_failed=yes
61 + fi
62 + if test $pkg_failed = no; then
63 + m4_ifval([$6], [$6], [:])
64 + m4_ifvaln([$7],[else
65 + $7])dnl
66 + fi
67 + ])
68 + ])
69
70 +AC_DEFUN([KDE_FORM_PACKAGE_RPATH], [
71 + $1[]_RPATH=
72 + for _kde_args in $1[]_LIBS; do
73 + case [$]_kde_args in
74 + -L*)
75 + $1[]_RPATH="[$]$1[]_RPATH [$]_kde_args"
76 + ;;
77 + esac
78 + done
79 + $1[]_RPATH=`echo [$]$1[]_RPATH | sed -e "s/-L/-R/g"`
80 + ])
81 diff -urN kdegraphics-3.5.3.orig/admin/acinclude.m4.in kdegraphics-3.5.3/admin/acinclude.m4.in
82 --- kdegraphics-3.5.3.orig/admin/acinclude.m4.in 2006-05-23 19:55:45 +0700
83 +++ kdegraphics-3.5.3/admin/acinclude.m4.in 2006-06-12 08:50:47 +0700
84 @@ -5972,3 +5972,78 @@
85 KDE_USE_PIE="-pie"
86 fi
87 ])
88 +
89 +dnl An internal macro to compare program versions.
90 +dnl Fixme: get rid of awk. Really?
91 +AC_DEFUN([_PKG_COMPARE_VERSIONS], [
92 + AC_PROG_AWK
93 + if test -n "$AWK"; then
94 + AC_MSG_CHECKING([for version great or equal than $1])
95 + if test `echo $1 | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'` -le `echo $2 | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 1000 + [$]2) * 1000 + [$]3;}'`; then
96 + AC_MSG_RESULT([yes])
97 + else
98 + pkg_failed=yes
99 + AC_MSG_RESULT([no])
100 + fi
101 + else
102 + pkg_failed=yes
103 + fi
104 + ])
105 +
106 +dnl PKG_CHECK_MODULE_LEGACY(VARIABLE-PREFIX, MODULE, [MIN-VERSION],
107 +dnl [LEGACY_CONFIG], [PATH], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
108 +dnl
109 +dnl This is a variant of PKG_CHECK_MODULES which differs in three aspects:
110 +dnl 1. it takes a single module to check per invocation
111 +dnl 2. if the corresponding pkg-config module was not found, the macro
112 +dnl tries to locate it's legacy pre-pkgconfig configuration script
113 +dnl (usually <MODULE>-config, maybe overridden in LEGACY_CONFIG)
114 +dnl and receive module configuration data from that script.
115 +dnl 3. it defines <MODULE>_VERSION variable if the module is found
116 +dnl MIN-VERSION, LEGACY_CONFIG and PATH are optional.
117 +dnl Internally PKG_CHECK_MODULES is used to check for the pkg-config
118 +dnl module, AC_PATH_PROG is used to detect the location of the legacy
119 +dnl config script
120 +
121 +AC_DEFUN([PKG_CHECK_MODULE_LEGACY], [
122 + PKG_CHECK_MODULES([$1], [m4_ifval([$3], [$2 >= $3], [$2])], [
123 + $1[]_VERSION=`$PKG_CONFIG --modversion $2`
124 + m4_ifval([$6], [$6], [:])
125 + ], [
126 + AC_MSG_RESULT([no])
127 + AC_PATH_PROG([$1_CONFIG], [m4_ifval([$4], [$4], [$2[]-config])],
128 + [], [$5])
129 + if test -n "$[$1_CONFIG]"; then
130 + pkg_failed=no
131 + # first receive the version
132 + $1[]_VERSION=`$[$1_CONFIG] --version` || pkg_failed=yes
133 + m4_ifval([$3], [
134 + if test $pkg_failed = no; then
135 + _PKG_COMPARE_VERSIONS([$3], [$]$1[]_VERSION)
136 + fi
137 + ])
138 + test $pkg_failed = no && $1[]_LIBS=`$[$1_CONFIG] --libs` || pkg_failed=yes
139 + test $pkg_failed = no && $1[]_CFLAGS=`$[$1_CONFIG] --cflags` || pkg_failed=yes
140 + else
141 + pkg_failed=yes
142 + fi
143 + if test $pkg_failed = no; then
144 + m4_ifval([$6], [$6], [:])
145 + m4_ifvaln([$7],[else
146 + $7])dnl
147 + fi
148 + ])
149 + ])
150 +
151 +AC_DEFUN([KDE_FORM_PACKAGE_RPATH], [
152 + $1[]_RPATH=
153 + for _kde_args in $1[]_LIBS; do
154 + case [$]_kde_args in
155 + -L*)
156 + $1[]_RPATH="[$]$1[]_RPATH [$]_kde_args"
157 + ;;
158 + esac
159 + done
160 + $1[]_RPATH=`echo [$]$1[]_RPATH | sed -e "s/-L/-R/g"`
161 + ])
162 +
163 diff -urN kdegraphics-3.5.3.orig/ksvg/configure.in.in kdegraphics-3.5.3/ksvg/configure.in.in
164 --- kdegraphics-3.5.3.orig/ksvg/configure.in.in 2006-05-23 01:05:39 +0700
165 +++ kdegraphics-3.5.3/ksvg/configure.in.in 2006-06-12 09:22:25 +0700
166 @@ -1,116 +1,50 @@
167 # Check for libart
168 -KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin],)
169 -
170 -if test -n "$LIBART_CONFIG"; then
171 - vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
172 - if test -n "$vers" && test "$vers" -ge 2003008
173 - then
174 - LIBART_LIBS="`$LIBART_CONFIG --libs`"
175 - LIBART_RPATH=
176 - for args in $LIBART_LIBS; do
177 - case $args in
178 - -L*)
179 - LIBART_RPATH="$LIBART_RPATH $args"
180 - ;;
181 - esac
182 - done
183 - LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
184 - LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
185 -
186 - AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
187 - fi
188 -fi
189 -
190 +PKG_CHECK_MODULE_LEGACY(LIBART, libart2, [2.3.8], [],
191 + [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin],[
192 + KDE_FORM_PACKAGE_RPATH(LIBART)
193 + AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
194 + ], [
195 + AC_MSG_RESULT([Do not compile ksvg due to missing or inappropriate libart libs])
196 + DO_NOT_COMPILE="$DO_NOT_COMPILE ksvg"
197 + ])
198 +
199 AC_SUBST(LIBART_LIBS)
200 AC_SUBST(LIBART_CFLAGS)
201 AC_SUBST(LIBART_RPATH)
202
203 -if test -z "$LIBART_LIBS"; then
204 - DO_NOT_COMPILE="$DO_NOT_COMPILE ksvg"
205 -fi
206 -
207 # Check for fontconfig
208 -KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
209 - KDE_FIND_PATH( pkg-config, PKG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin /usr/bin],)
210 - if test -n "$PKG_CONFIG"; then
211 - if ! $PKG_CONFIG --exists fontconfig; then
212 - unset PKG_CONFIG
213 - fi
214 - fi
215 -])
216 -if test -n "$FONTCONFIG_CONFIG" -o -n "$PKG_CONFIG"; then
217 - if test -n "$FONTCONFIG_CONFIG"; then
218 - fontconfigvers="`$FONTCONFIG_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`"
219 - fontconfiglibs="`$FONTCONFIG_CONFIG --libs`"
220 - fontconfigcflags="`$FONTCONFIG_CONFIG --cflags`"
221 - else
222 - fontconfigvers=`$PKG_CONFIG --modversion fontconfig 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3; }'`
223 - fontconfiglibs=`$PKG_CONFIG --libs fontconfig`
224 - fontconfigcflags="`$PKG_CONFIG --cflags fontconfig`"
225 - fi
226 - if test -n "$vers" && test "$vers" -ge 2002000
227 - then
228 - FONTCONFIG_LIBS=$fontconfiglibs
229 - FONTCONFIG_RPATH=
230 - for args in $FONTCONFIG_LIBS; do
231 - case $args in
232 - -L*)
233 - FONTCONFIG_RPATH="$FONTCONFIG_RPATH $args"
234 - ;;
235 - esac
236 - done
237 - FONTCONFIG_RPATH=`echo $FONTCONFIG_RPATH | sed -e "s/-L/-R/g"`
238 - FONTCONFIG_CFLAGS=$fontconfigcflags
239 -
240 - AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the fontconfig library])
241 - fi
242 -fi
243 -
244 +PKG_CHECK_MODULE_LEGACY(FONTCONFIG, fontconfig, [2.2], [],
245 + [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
246 + KDE_FORM_PACKAGE_RPATH(FONTCONFIG)
247 + AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the fontconfig library])
248 + ], [
249 + AC_MSG_RESULT([Do not compile ksvg due to missing or inappropriate fontconfig libs])
250 + DO_NOT_COMPILE="$DO_NOT_COMPILE ksvg"
251 + ])
252 +
253 AC_SUBST(FONTCONFIG_LIBS)
254 AC_SUBST(FONTCONFIG_CFLAGS)
255 AC_SUBST(FONTCONFIG_RPATH)
256
257 -if test -z "$FONTCONFIG_LIBS"; then
258 - DO_NOT_COMPILE="$DO_NOT_COMPILE ksvg"
259 -fi
260 -
261 -# Check for freetype2
262 -KDE_FIND_PATH(freetype-config, FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin],)
263 -
264 -if test -n "$FREETYPE_CONFIG"; then
265 - vers=`$FREETYPE_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
266 - if test -n "$vers" && test "$vers" -ge 8000002
267 +PKG_CHECK_MODULE_LEGACY(FREETYPE, freetype, [8.0.2], [],
268 + [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
269 + KDE_FORM_PACKAGE_RPATH(FREETYPE)
270 + AC_DEFINE_UNQUOTED(HAVE_FREETYPE, 1, [Defines if your system has the freetype library])
271 + # FIXME/WARNING: FREETYPE_CONFIG is set as side-effect of PKG_CHECK_MODULE_LEGACY
272 + ftvers=`$FREETYPE_CONFIG --ftversion 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
273 + if test -n "$ftvers" && test "$ftvers" -ge 2002000
274 then
275 - FREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
276 - FREETYPE_RPATH=
277 - for args in $FREETYPE_LIBS; do
278 - case $args in
279 - -L*)
280 - FREETYPE_RPATH="$FREETYPE_RPATH $args"
281 - ;;
282 - esac
283 - done
284 - FREETYPE_RPATH=`echo $FREETYPE_RPATH | sed -e "s/-L/-R/g"`
285 - FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
286 -
287 - AC_DEFINE_UNQUOTED(HAVE_FREETYPE, 1, [Defines if your system has the freetype library])
288 -
289 - ftvers=`$FREETYPE_CONFIG --ftversion 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
290 - if test -n "$ftvers" && test "$ftvers" -ge 2002000
291 - then
292 - AC_DEFINE_UNQUOTED(HAVE_FREETYPE_2_2_x, 1, [Defines if your system has the 2.2.x freetype library])
293 - fi
294 + AC_DEFINE_UNQUOTED(HAVE_FREETYPE_2_2_x, 1, [Defines if your system has the 2.2.x freetype library])
295 fi
296 -fi
297 + ], [
298 + AC_MSG_RESULT([Do not compile ksvg due to missing or inappropriate freetype libs])
299 + DO_NOT_COMPILE="$DO_NOT_COMPILE ksvg"
300 + ])
301
302 AC_SUBST(FREETYPE_LIBS)
303 AC_SUBST(FREETYPE_CFLAGS)
304 AC_SUBST(FREETYPE_RPATH)
305
306 -if test -z "$FREETYPE_LIBS"; then
307 - DO_NOT_COMPILE="$DO_NOT_COMPILE ksvg"
308 -fi
309 -
310 # Check for lcms
311 have_lcms_header='no'
312 KDE_CHECK_HEADER(lcms/lcms.h,have_lcms_header='yes',,)
313 @@ -161,42 +95,26 @@
314 fi
315
316 if test -z "$LCMS_LIBS"; then
317 + AC_MSG_RESULT([Do not compile ksvg due to missing or inappropriate liblcms libs])
318 DO_NOT_COMPILE="$DO_NOT_COMPILE ksvg"
319 fi
320
321 AC_SUBST(LCMS_LIBS)
322
323 # Check for fribidi
324 -KDE_FIND_PATH(fribidi-config, FRIBIDI_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin],)
325 -
326 -if test -n "$FRIBIDI_CONFIG"; then
327 - vers=`$FRIBIDI_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
328 - if test -n "$vers" && test "$vers" -ge 10004
329 - then
330 - FRIBIDI_LIBS="`$FRIBIDI_CONFIG --libs`"
331 - FRIBIDI_RPATH=
332 - for args in $FIBIDI_LIBS; do
333 - case $args in
334 - -L*)
335 - FRIBIDI_RPATH="$FRIBIDI_CONFIG $args"
336 - ;;
337 - esac
338 - done
339 - FRIBIDI_RPATH=`echo $FRIBIDI_RPATH | sed -e "s/-L/-R/g"`
340 - FRIBIDI_CFLAGS="`$FRIBIDI_CONFIG --cflags`"
341 -
342 - AC_DEFINE_UNQUOTED(HAVE_FRIBIDI, 1, [Defines if your system has the fribidi library])
343 - fi
344 -fi
345 +PKG_CHECK_MODULE_LEGACY(FRIBIDI, fribidi, [0.10.4], [],
346 + [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin],[
347 + KDE_FORM_PACKAGE_RPATH(FRIBIDI)
348 + AC_DEFINE_UNQUOTED(HAVE_FRIBIDI, 1, [Defines if your system has the fribidi library])
349 + ], [
350 + AC_MSG_RESULT([Do not compile ksvg due to missing or inappropriate fribidi libs])
351 + DO_NOT_COMPILE="$DO_NOT_COMPILE ksvg"
352 + ])
353
354 AC_SUBST(FRIBIDI_LIBS)
355 AC_SUBST(FRIBIDI_CFLAGS)
356 AC_SUBST(FRIBIDI_RPATH)
357
358 -if test -z "$FRIBIDI_LIBS"; then
359 - DO_NOT_COMPILE="$DO_NOT_COMPILE ksvg"
360 -fi
361 -
362 AC_LANG_SAVE
363 AC_LANG_CPLUSPLUS
364 AC_CHECK_HEADERS(sstream)