Annotation of /trunk/poppler/patches/poppler-0.5.4-glib20-fix.patch
Parent Directory | Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 3794 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 3794 byte(s)
-import
1 | niro | 153 | diff -urN poppler-0.5.4~/configure.ac poppler-0.5.4/configure.ac |
2 | --- poppler-0.5.4~/configure.ac 2006-09-22 01:22:02.000000000 +0200 | ||
3 | +++ poppler-0.5.4/configure.ac 2006-09-22 15:13:48.000000000 +0200 | ||
4 | @@ -183,7 +183,7 @@ | ||
5 | enable_poppler_glib=$enableval, | ||
6 | enable_poppler_glib="try") | ||
7 | if test x$enable_poppler_glib = xyes; then | ||
8 | - PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0 glib >= 2.6) | ||
9 | + PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6) | ||
10 | elif test x$enable_poppler_glib = xtry; then | ||
11 | PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0, | ||
12 | [enable_poppler_glib="yes"], | ||
13 | diff -urN poppler-0.5.4~/configure poppler-0.5.4/configure | ||
14 | --- poppler-0.5.4~/configure 2006-09-22 02:54:32.000000000 +0200 | ||
15 | +++ poppler-0.5.4/configure 2006-09-22 15:14:19.000000000 +0200 | ||
16 | @@ -24957,12 +24957,12 @@ | ||
17 | pkg_cv_POPPLER_GLIB_CFLAGS="$POPPLER_GLIB_CFLAGS" | ||
18 | else | ||
19 | if test -n "$PKG_CONFIG" && \ | ||
20 | - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib >= 2.6\"") >&5 | ||
21 | - ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6") 2>&5 | ||
22 | + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6\"") >&5 | ||
23 | + ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6") 2>&5 | ||
24 | ac_status=$? | ||
25 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
26 | (exit $ac_status); }; then | ||
27 | - pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0 >= 2.4.0 glib >= 2.6" 2>/dev/null` | ||
28 | + pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6" 2>/dev/null` | ||
29 | else | ||
30 | pkg_failed=yes | ||
31 | fi | ||
32 | @@ -24975,12 +24975,12 @@ | ||
33 | pkg_cv_POPPLER_GLIB_LIBS="$POPPLER_GLIB_LIBS" | ||
34 | else | ||
35 | if test -n "$PKG_CONFIG" && \ | ||
36 | - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib >= 2.6\"") >&5 | ||
37 | - ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6") 2>&5 | ||
38 | + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6\"") >&5 | ||
39 | + ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6") 2>&5 | ||
40 | ac_status=$? | ||
41 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
42 | (exit $ac_status); }; then | ||
43 | - pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "gdk-2.0 >= 2.4.0 glib >= 2.6" 2>/dev/null` | ||
44 | + pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6" 2>/dev/null` | ||
45 | else | ||
46 | pkg_failed=yes | ||
47 | fi | ||
48 | @@ -24999,14 +24999,14 @@ | ||
49 | _pkg_short_errors_supported=no | ||
50 | fi | ||
51 | if test $_pkg_short_errors_supported = yes; then | ||
52 | - POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6"` | ||
53 | + POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6"` | ||
54 | else | ||
55 | - POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6"` | ||
56 | + POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6"` | ||
57 | fi | ||
58 | # Put the nasty error message in config.log where it belongs | ||
59 | echo "$POPPLER_GLIB_PKG_ERRORS" >&5 | ||
60 | |||
61 | - { { echo "$as_me:$LINENO: error: Package requirements (gdk-2.0 >= 2.4.0 glib >= 2.6) were not met: | ||
62 | + { { echo "$as_me:$LINENO: error: Package requirements (gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6) were not met: | ||
63 | |||
64 | $POPPLER_GLIB_PKG_ERRORS | ||
65 | |||
66 | @@ -25017,7 +25017,7 @@ | ||
67 | and POPPLER_GLIB_LIBS to avoid the need to call pkg-config. | ||
68 | See the pkg-config man page for more details. | ||
69 | " >&5 | ||
70 | -echo "$as_me: error: Package requirements (gdk-2.0 >= 2.4.0 glib >= 2.6) were not met: | ||
71 | +echo "$as_me: error: Package requirements (gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6) were not met: | ||
72 | |||
73 | $POPPLER_GLIB_PKG_ERRORS | ||
74 |