diff options
Diffstat (limited to 'print/poppler/patches/patch-ai')
| -rw-r--r-- | print/poppler/patches/patch-ai | 62 |
1 files changed, 40 insertions, 22 deletions
diff --git a/print/poppler/patches/patch-ai b/print/poppler/patches/patch-ai index c52cdd8aac1..011a5a5bb1f 100644 --- a/print/poppler/patches/patch-ai +++ b/print/poppler/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.6 2009/02/12 20:55:07 drochner Exp $ +$NetBSD: patch-ai,v 1.7 2009/03/19 12:12:24 drochner Exp $ ---- configure.orig 2009-02-10 20:06:59.000000000 +0100 +--- configure.orig 2009-03-12 00:15:52.000000000 +0100 +++ configure -@@ -945,6 +945,8 @@ BUILD_ABIWORD_OUTPUT_TRUE +@@ -948,6 +948,8 @@ BUILD_ABIWORD_OUTPUT_TRUE BUILD_ABIWORD_OUTPUT_FALSE BUILD_UTILS_TRUE BUILD_UTILS_FALSE @@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.6 2009/02/12 20:55:07 drochner Exp $ PC_REQUIRES PC_REQUIRES_PRIVATE LIBOBJS -@@ -1594,6 +1596,7 @@ Optional Features: +@@ -1597,6 +1599,7 @@ Optional Features: --enable-compile-warnings=[no/yes/kde] Turn on compiler warnings. @@ -19,7 +19,7 @@ $NetBSD: patch-ai,v 1.6 2009/02/12 20:55:07 drochner Exp $ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -19915,13 +19918,11 @@ _ACEOF +@@ -20355,13 +20358,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -35,7 +35,7 @@ $NetBSD: patch-ai,v 1.6 2009/02/12 20:55:07 drochner Exp $ ; return 0; } -@@ -19961,13 +19962,11 @@ cat confdefs.h >>conftest.$ac_ext +@@ -20401,13 +20402,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 @@ -51,16 +51,7 @@ $NetBSD: patch-ai,v 1.6 2009/02/12 20:55:07 drochner Exp $ ; return 0; } -@@ -21325,7 +21324,7 @@ for i in $jpeg_incdirs; - do - for j in jpeglib.h; - do -- echo "configure: 21328: $i/$j" >&5 -+ echo "configure: 21327: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - jpeg_incdir=$i -@@ -23687,7 +23686,7 @@ fi +@@ -24123,7 +24122,7 @@ fi if test x$enable_poppler_qt4 = xyes; then { echo "$as_me:$LINENO: checking for Qt4 moc" >&5 echo $ECHO_N "checking for Qt4 moc... $ECHO_C" >&6; } @@ -69,7 +60,7 @@ $NetBSD: patch-ai,v 1.6 2009/02/12 20:55:07 drochner Exp $ mocversion=`$MOCQT4 -v 2>&1` mocversiongrep=`echo $mocversion | grep "Qt 4"` if test x"$mocversiongrep" != x"$mocversion"; then -@@ -24142,6 +24141,249 @@ else +@@ -24578,6 +24577,249 @@ else fi @@ -319,7 +310,7 @@ $NetBSD: patch-ai,v 1.6 2009/02/12 20:55:07 drochner Exp $ if test "x$GCC" != xyes; then enable_compile_warnings=no fi -@@ -24413,6 +24655,13 @@ echo "$as_me: error: conditional \"BUILD +@@ -24849,6 +25091,13 @@ echo "$as_me: error: conditional \"BUILD Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -333,7 +324,7 @@ $NetBSD: patch-ai,v 1.6 2009/02/12 20:55:07 drochner Exp $ : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files -@@ -25542,13 +25791,15 @@ BUILD_ABIWORD_OUTPUT_TRUE!$BUILD_ABIWORD +@@ -25984,13 +26233,15 @@ BUILD_ABIWORD_OUTPUT_TRUE!$BUILD_ABIWORD BUILD_ABIWORD_OUTPUT_FALSE!$BUILD_ABIWORD_OUTPUT_FALSE$ac_delim BUILD_UTILS_TRUE!$BUILD_UTILS_TRUE$ac_delim BUILD_UTILS_FALSE!$BUILD_UTILS_FALSE$ac_delim @@ -345,12 +336,39 @@ $NetBSD: patch-ai,v 1.6 2009/02/12 20:55:07 drochner Exp $ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -@@ -26961,6 +27212,7 @@ echo " use gtk-doc: $enable_gtk_ +@@ -26009,7 +26260,7 @@ fi + + cat >>$CONFIG_STATUS <<_ACEOF + cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b + _ACEOF + sed ' + s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +@@ -26022,8 +26273,6 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!! + ' >>$CONFIG_STATUS <conf$$subs.sed + rm -f conf$$subs.sed + cat >>$CONFIG_STATUS <<_ACEOF +-:end +-s/|#_!!_#|//g + CEOF$ac_eof + _ACEOF + +@@ -26277,7 +26526,7 @@ s&@abs_top_builddir@&$ac_abs_top_builddi + s&@INSTALL@&$ac_INSTALL&;t t + s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack +-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out ++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed 's/|#_!!_#|//g' >$tmp/out + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && +@@ -27412,6 +27661,7 @@ echo " use gtk-doc: $enable_gtk_ echo " use libjpeg: $enable_libjpeg" echo " use zlib: $enable_zlib" echo " use libopenjpeg: $enable_libopenjpeg" |