head 1.11; access; symbols pkgsrc-2013Q2:1.11.0.4 pkgsrc-2013Q2-base:1.11 pkgsrc-2012Q4:1.11.0.2 pkgsrc-2012Q4-base:1.11 pkgsrc-2012Q2:1.10.0.22 pkgsrc-2012Q2-base:1.10 pkgsrc-2012Q1:1.10.0.20 pkgsrc-2012Q1-base:1.10 pkgsrc-2011Q4:1.10.0.18 pkgsrc-2011Q4-base:1.10 pkgsrc-2011Q3:1.10.0.16 pkgsrc-2011Q3-base:1.10 pkgsrc-2011Q2:1.10.0.14 pkgsrc-2011Q2-base:1.10 pkgsrc-2011Q1:1.10.0.12 pkgsrc-2011Q1-base:1.10 pkgsrc-2010Q4:1.10.0.10 pkgsrc-2010Q4-base:1.10 pkgsrc-2010Q3:1.10.0.8 pkgsrc-2010Q3-base:1.10 pkgsrc-2010Q2:1.10.0.6 pkgsrc-2010Q2-base:1.10 pkgsrc-2010Q1:1.10.0.4 pkgsrc-2010Q1-base:1.10 pkgsrc-2009Q4:1.10.0.2 pkgsrc-2009Q4-base:1.10 pkgsrc-2009Q3:1.9.0.2 pkgsrc-2009Q3-base:1.9 pkgsrc-2009Q2:1.8.0.2 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.7.0.2 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.5.0.6 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.4 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.2 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.4.0.2 pkgsrc-2008Q2-base:1.4; locks; strict; comment @# @; 1.11 date 2012.07.04.20.25.16; author drochner; state dead; branches; next 1.10; 1.10 date 2009.10.21.10.18.57; author drochner; state Exp; branches; next 1.9; 1.9 date 2009.09.09.19.57.05; author drochner; state Exp; branches; next 1.8; 1.8 date 2009.04.17.16.08.17; author drochner; state Exp; branches; next 1.7; 1.7 date 2009.03.19.12.12.24; author drochner; state Exp; branches 1.7.2.1; next 1.6; 1.6 date 2009.02.12.20.55.07; author drochner; state Exp; branches; next 1.5; 1.5 date 2008.07.15.10.34.21; author drochner; state Exp; branches; next 1.4; 1.4 date 2008.06.05.21.03.38; author drochner; state dead; branches; next 1.3; 1.3 date 2008.05.15.17.51.29; author drochner; state Exp; branches; next 1.2; 1.2 date 2008.04.29.19.23.34; author drochner; state dead; branches; next 1.1; 1.1 date 2008.04.15.19.57.00; author drochner; state Exp; branches; next ; 1.7.2.1 date 2009.04.29.21.29.23; author tron; state Exp; branches; next ; desc @@ 1.11 log @update to 0.20.1 This switches to the 0.20 release branch - many fixes and improvements. (0.18 was skipped) The qt3 frontend isn't supported anymore - the poppler016 pkg is kept for now for KDE3. Atm, it conflicts with newer popper pkgs. This can be fixed by renaming include paths and libraries, but this would need modifications of the KDE3 pkgs. @ text @$NetBSD: patch-ai,v 1.10 2009/10/21 10:18:57 drochner Exp $ --- configure.orig 2009-10-18 01:28:46.000000000 +0200 +++ configure @@@@ -20647,7 +20647,7 @@@@ fi if test x$enable_poppler_qt4 = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 moc" >&5 $as_echo_n "checking for Qt4 moc... " >&6; } - MOCQT4=`which moc` + MOCQT4=${QTDIR}/bin/moc mocversion=`$MOCQT4 -v 2>&1` mocversiongrep=`echo $mocversion | grep "Qt 4"` if test x"$mocversiongrep" != x"$mocversion"; then @ 1.10 log @update to 0.12.1 changes: -Security fixes from xpdf 3.02pl4 -bugfixes -qt4 API improvements pkgsrc change: add patch for CVE-2009-3607 (integer overflow in create_surface_from_thumbnail_data) @ text @d1 1 a1 1 $NetBSD$ @ 1.9 log @update to 0.12.0 This is a major update, switches to the 0.12 release branch. Most notable change is that the color management stuff which we had as patches in pkgsrc is official now. Otherwise - many fixes and enhancements. (while this is a .0 release I've been tracking the 0.11.x snapshots and release candidate for a while so I don't expect big problems) @ text @d3 1 a3 1 --- configure.orig 2009-08-01 17:19:11.000000000 +0200 d5 1 a5 1 @@@@ -25282,7 +25282,7 @@@@ fi d7 1 a7 1 { $as_echo "$as_me:$LINENO: checking for Qt4 moc" >&5 @ 1.8 log @update to 0.10.6 changes: * Fix problems that happen when parsing broken JBIG2 files. CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180 CVE-2009-1181, CVE-2009-1182, CVE-2009-1183, CVE-2009-1187, CVE-2009-1188 * Fix parsing of incorrect border arrays. (was patched in pkgsrc) * Fix clip test for fonts. * Fix getGlyphAdvance to behave correctly on font size changes. * Misc build fixes @ text @d3 1 a3 1 --- configure.orig 2009-04-16 22:21:56.000000000 +0200 d5 1 a5 26 @@@@ -787,6 +787,8 @@@@ ac_subst_vars='LTLIBOBJS LIBOBJS PC_REQUIRES_PRIVATE PC_REQUIRES +USE_CMS_FALSE +USE_CMS_TRUE BUILD_UTILS_FALSE BUILD_UTILS_TRUE BUILD_ABIWORD_OUTPUT_FALSE @@@@ -1005,6 +1007,7 @@@@ enable_gtk_test enable_abiword_output enable_utils enable_compile_warnings +enable_cms ' ac_precious_vars='build_alias host_alias @@@@ -1701,6 +1704,7 @@@@ Optional Features: --enable-compile-warnings=[no/yes/kde] Turn on compiler warnings. + --disable-cms Don't use color management system. Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@@@ -24668,7 +24672,7 @@@@ fi a13 282 @@@@ -25127,6 +25131,259 @@@@ else fi + +# Check whether --enable-cms was given. +if test "${enable_cms+set}" = set; then + enableval=$enable_cms; enable_cms=$enableval +else + enable_cms="yes" +fi + +if test x$enable_cms = xyes; then + +{ $as_echo "$as_me:$LINENO: checking for cmsOpenProfileFromFile in -llcms" >&5 +$as_echo_n "checking for cmsOpenProfileFromFile in -llcms... " >&6; } +if test "${ac_cv_lib_lcms_cmsOpenProfileFromFile+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-llcms $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cmsOpenProfileFromFile (); +int +main () +{ +return cmsOpenProfileFromFile (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_lcms_cmsOpenProfileFromFile=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_lcms_cmsOpenProfileFromFile=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lcms_cmsOpenProfileFromFile" >&5 +$as_echo "$ac_cv_lib_lcms_cmsOpenProfileFromFile" >&6; } +if test "x$ac_cv_lib_lcms_cmsOpenProfileFromFile" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBLCMS 1 +_ACEOF + + LIBS="-llcms $LIBS" + +else + { { $as_echo "$as_me:$LINENO: error: \"*** lcms library not found ***\"" >&5 +$as_echo "$as_me: error: \"*** lcms library not found ***\"" >&2;} + { (exit 1); exit 1; }; } +fi + + +for ac_header in lcms.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +else + { { $as_echo "$as_me:$LINENO: error: \"*** lcms headers not found ***\"" >&5 +$as_echo "$as_me: error: \"*** lcms headers not found ***\"" >&2;} + { (exit 1); exit 1; }; } +fi + +done + + +cat >>confdefs.h <<\_ACEOF +#define USE_CMS 1 +_ACEOF + +fi + if test x$enable_cms = xyes; then + USE_CMS_TRUE= + USE_CMS_FALSE='#' +else + USE_CMS_TRUE='#' + USE_CMS_FALSE= +fi + + if test "x$GCC" != xyes; then enable_compile_warnings=no fi @@@@ -25399,6 +25656,13 @@@@ $as_echo "$as_me: error: conditional \"B Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${USE_CMS_TRUE}" && test -z "${USE_CMS_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"USE_CMS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"USE_CMS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 @@@@ -27938,6 +28202,7 @@@@ echo " use gtk-doc: $enable_gtk_ echo " use libjpeg: $enable_libjpeg" echo " use zlib: $enable_zlib" echo " use libopenjpeg: $enable_libopenjpeg" +echo " use cms: $enable_cms" echo " command line utils: $enable_utils" echo "" @ 1.7 log @update to 0.10.5 Changes since 0.10.4: core: * Read the UF entry if present and prefer it over F in Filespec dictionary * Fix typo that was making CairoOutputDev crash on some files. Bug #17337 * Make JBIG2Stream more robust to corrupt input data * Do not blindly follow loops parsing OutlineItem. Bug #18364 * Set up the error manager before calling jpeg_create_decompress. Bug #20484 * Check there is an optional content config before using it. Bug #20587 * Fix rendering of some PDF with OpenType fonts. Bug #20605 build system: * Yet more support for build on windows * Use AC_CHECK_HEADER to find headers. Bug #20538 * Check for pkgconfig before using it * General autotools improvements @ text @d3 1 a3 1 --- configure.orig 2009-03-12 00:15:52.000000000 +0100 d5 8 a12 1 @@@@ -948,6 +948,8 @@@@ BUILD_ABIWORD_OUTPUT_TRUE d14 9 a22 8 BUILD_UTILS_TRUE BUILD_UTILS_FALSE +USE_CMS_TRUE +USE_CMS_FALSE PC_REQUIRES PC_REQUIRES_PRIVATE LIBOBJS @@@@ -1597,6 +1599,7 @@@@ Optional Features: d30 1 a30 33 @@@@ -20355,13 +20358,11 @@@@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@@@ -20401,13 +20402,11 @@@@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@@@ -24123,7 +24122,7 @@@@ fi d32 2 a33 2 { echo "$as_me:$LINENO: checking for Qt4 moc" >&5 echo $ECHO_N "checking for Qt4 moc... $ECHO_C" >&6; } d39 1 a39 1 @@@@ -24578,6 +24577,249 @@@@ else d53 2 a54 2 +{ echo "$as_me:$LINENO: checking for cmsOpenProfileFromFile in -llcms" >&5 +echo $ECHO_N "checking for cmsOpenProfileFromFile in -llcms... $ECHO_C" >&6; } d56 1 a56 1 + echo $ECHO_N "(cached) $ECHO_C" >&6 d88 2 a89 1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 d95 1 a95 1 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 d99 4 a102 2 + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then d105 1 a105 1 + echo "$as_me: failed program was:" >&5 d111 1 d116 3 a118 3 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_lcms_cmsOpenProfileFromFile" >&5 +echo "${ECHO_T}$ac_cv_lib_lcms_cmsOpenProfileFromFile" >&6; } +if test $ac_cv_lib_lcms_cmsOpenProfileFromFile = yes; then d126 2 a127 2 + { { echo "$as_me:$LINENO: error: \"*** lcms library not found ***\"" >&5 +echo "$as_me: error: \"*** lcms library not found ***\"" >&2;} d134 1 a134 1 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` d136 2 a137 2 + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } d139 1 a139 1 + echo $ECHO_N "(cached) $ECHO_C" >&6 d141 4 a144 3 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } d147 2 a148 2 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } d164 2 a165 1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 d171 1 a171 1 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 d178 1 a178 1 + echo "$as_me: failed program was:" >&5 d185 2 a186 2 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } d189 2 a190 2 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } d204 2 a205 1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 d211 1 a211 1 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 d218 1 a218 1 + echo "$as_me: failed program was:" >&5 d225 2 a226 2 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } d231 4 a234 4 + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} d238 12 a249 12 + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} d253 2 a254 2 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } d256 1 a256 1 + echo $ECHO_N "(cached) $ECHO_C" >&6 d260 4 a263 3 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } d266 3 a268 1 +if test `eval echo '${'$as_ac_Header'}'` = yes; then d270 1 a270 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 d274 2 a275 2 + { { echo "$as_me:$LINENO: error: \"*** lcms headers not found ***\"" >&5 +echo "$as_me: error: \"*** lcms headers not found ***\"" >&2;} d299 1 a299 1 @@@@ -24849,6 +25091,13 @@@@ echo "$as_me: error: conditional \"BUILD d304 1 a304 1 + { { echo "$as_me:$LINENO: error: conditional \"USE_CMS\" was never defined. d306 1 a306 1 +echo "$as_me: error: conditional \"USE_CMS\" was never defined. d312 2 a313 46 ac_clean_files_save=$ac_clean_files @@@@ -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 +USE_CMS_TRUE!$USE_CMS_TRUE$ac_delim +USE_CMS_FALSE!$USE_CMS_FALSE$ac_delim PC_REQUIRES!$PC_REQUIRES$ac_delim PC_REQUIRES_PRIVATE!$PC_REQUIRES_PRIVATE$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - 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 @@@@ -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 >$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_ @ 1.7.2.1 log @Pullup ticket #2751 - requested by drochner poppler: security update Revisions pulled up: - print/poppler-glib/Makefile 1.19-1.20 - print/poppler/Makefile 1.38-1.39 - print/poppler/Makefile.common 1.29 - print/poppler/distinfo 1.42-1.43 - print/poppler/patches/patch-ai 1.8 - print/poppler/patches/patch-al 1.3 - print/poppler/patches/patch-am 1.1 - print/poppler/patches/patch-bc delete --- Module Name: pkgsrc Committed By: drochner Date: Mon Apr 6 09:29:27 UTC 2009 Modified Files: pkgsrc/print/poppler: Makefile distinfo Added Files: pkgsrc/print/poppler/patches: patch-al patch-am Log Message: fix some problems with interactive forms: -if a choice field defines both an "export value" and a "name", use the latter as "value" if selected (according to the PDF spec) -- makes that I can fill in my company's travel expenses form correctly (there is still an issue with captions of check boxes / radio buttons which looks like a font problem) -where iconv() is called to fill in a text field, use "UTF-8" and "UTF-16BE" as encoding names rather than the less portable "UTF8" and "UTF16BE" -- this makes it work on NetBSD bump PKGREVISION --- Module Name: pkgsrc Committed By: drochner Date: Mon Apr 6 09:31:45 UTC 2009 Modified Files: pkgsrc/print/poppler-glib: Makefile Log Message: bump PKGREVISION for font conversion patch added to the base pkg --- Module Name: pkgsrc Committed By: drochner Date: Fri Apr 17 16:08:18 UTC 2009 Modified Files: pkgsrc/print/poppler: Makefile Makefile.common distinfo pkgsrc/print/poppler/patches: patch-ai Removed Files: pkgsrc/print/poppler/patches: patch-bc Log Message: update to 0.10.6 changes: * Fix problems that happen when parsing broken JBIG2 files. CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180 CVE-2009-1181, CVE-2009-1182, CVE-2009-1183, CVE-2009-1187, CVE-2009-1188 * Fix parsing of incorrect border arrays. (was patched in pkgsrc) * Fix clip test for fonts. * Fix getGlyphAdvance to behave correctly on font size changes. * Misc build fixes --- Module Name: pkgsrc Committed By: drochner Date: Fri Apr 17 16:08:54 UTC 2009 Modified Files: pkgsrc/print/poppler-glib: Makefile Log Message: reset PKGREVISION for base pkg update @ text @d3 1 a3 1 --- configure.orig 2009-04-16 22:21:56.000000000 +0200 d5 8 a12 1 @@@@ -787,6 +787,8 @@@@ ac_subst_vars='LTLIBOBJS d14 1 a14 16 PC_REQUIRES_PRIVATE PC_REQUIRES +USE_CMS_FALSE +USE_CMS_TRUE BUILD_UTILS_FALSE BUILD_UTILS_TRUE BUILD_ABIWORD_OUTPUT_FALSE @@@@ -1005,6 +1007,7 @@@@ enable_gtk_test enable_abiword_output enable_utils enable_compile_warnings +enable_cms ' ac_precious_vars='build_alias host_alias @@@@ -1701,6 +1704,7 @@@@ Optional Features: d22 33 a54 1 @@@@ -24668,7 +24672,7 @@@@ fi d56 2 a57 2 { $as_echo "$as_me:$LINENO: checking for Qt4 moc" >&5 $as_echo_n "checking for Qt4 moc... " >&6; } d63 1 a63 1 @@@@ -25127,6 +25131,259 @@@@ else d77 2 a78 2 +{ $as_echo "$as_me:$LINENO: checking for cmsOpenProfileFromFile in -llcms" >&5 +$as_echo_n "checking for cmsOpenProfileFromFile in -llcms... " >&6; } d80 1 a80 1 + $as_echo_n "(cached) " >&6 d112 1 a112 2 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 d118 1 a118 1 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 d122 2 a123 4 + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then d126 1 a126 1 + $as_echo "$as_me: failed program was:" >&5 a131 1 +rm -rf conftest.dSYM d136 3 a138 3 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lcms_cmsOpenProfileFromFile" >&5 +$as_echo "$ac_cv_lib_lcms_cmsOpenProfileFromFile" >&6; } +if test "x$ac_cv_lib_lcms_cmsOpenProfileFromFile" = x""yes; then d146 2 a147 2 + { { $as_echo "$as_me:$LINENO: error: \"*** lcms library not found ***\"" >&5 +$as_echo "$as_me: error: \"*** lcms library not found ***\"" >&2;} d154 1 a154 1 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` d156 2 a157 2 + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } d159 1 a159 1 + $as_echo_n "(cached) " >&6 d161 3 a163 4 +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } d166 2 a167 2 +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } d183 1 a183 2 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 d189 1 a189 1 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 d196 1 a196 1 + $as_echo "$as_me: failed program was:" >&5 d203 2 a204 2 +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } d207 2 a208 2 +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } d222 1 a222 2 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 d228 1 a228 1 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 d235 1 a235 1 + $as_echo "$as_me: failed program was:" >&5 d242 2 a243 2 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } d248 4 a251 4 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} d255 12 a266 12 + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} d270 2 a271 2 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } d273 1 a273 1 + $as_echo_n "(cached) " >&6 d277 3 a279 4 +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } d282 1 a282 3 +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then d284 1 a284 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 d288 2 a289 2 + { { $as_echo "$as_me:$LINENO: error: \"*** lcms headers not found ***\"" >&5 +$as_echo "$as_me: error: \"*** lcms headers not found ***\"" >&2;} d313 1 a313 1 @@@@ -25399,6 +25656,13 @@@@ $as_echo "$as_me: error: conditional \"B d318 1 a318 1 + { { $as_echo "$as_me:$LINENO: error: conditional \"USE_CMS\" was never defined. d320 1 a320 1 +$as_echo "$as_me: error: conditional \"USE_CMS\" was never defined. d326 46 a371 2 ac_write_fail=0 @@@@ -27938,6 +28202,7 @@@@ echo " use gtk-doc: $enable_gtk_ @ 1.6 log @update to 0.10.4 changes: -fixed some crashes and a memory leak -fixed pdfimages to work for jpeg pkgsrc change: pulled in color management support from the development branch (but tested by me for many weeks), as an option which is on per default @ text @d3 1 a3 1 --- configure.orig 2009-02-10 20:06:59.000000000 +0100 d5 1 a5 1 @@@@ -945,6 +945,8 @@@@ BUILD_ABIWORD_OUTPUT_TRUE d14 1 a14 1 @@@@ -1594,6 +1596,7 @@@@ Optional Features: d22 1 a22 1 @@@@ -19915,13 +19918,11 @@@@ _ACEOF d38 1 a38 1 @@@@ -19961,13 +19962,11 @@@@ cat confdefs.h >>conftest.$ac_ext d54 1 a54 10 @@@@ -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 d63 1 a63 1 @@@@ -24142,6 +24141,249 @@@@ else d313 1 a313 1 @@@@ -24413,6 +24655,13 @@@@ echo "$as_me: error: conditional \"BUILD d327 1 a327 1 @@@@ -25542,13 +25791,15 @@@@ BUILD_ABIWORD_OUTPUT_TRUE!$BUILD_ABIWORD d339 2 a340 2 - 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 d344 28 a371 1 @@@@ -26961,6 +27212,7 @@@@ echo " use gtk-doc: $enable_gtk_ @ 1.5 log @update to 0.8.4 changes: -bugfixes -build fix for qt4 (which doesn't work) The security fix for CVE-2008-2950 is not yet integrated upstream. @ text @d3 1 a3 1 --- configure.orig 2008-07-02 16:30:43.000000000 +0200 d5 59 a63 1 @@@@ -27984,7 +27984,7 @@@@ fi d72 289 @ 1.4 log @update to 0.8.3 changes: -fix crashes on certain input -Fix leaks -Do not limit CharCodeToUnicodeString to 8 characters -Support for surrogates outside the BMP plane pkgsrc note: the crashes had been fixed by patches in pkgsrc before @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.3 2008/05/15 17:51:29 drochner Exp $ d3 11 a13 87 --- poppler/OptionalContent.cc.orig 2008-03-26 20:38:52.000000000 +0100 +++ poppler/OptionalContent.cc @@@@ -162,12 +162,18 @@@@ OptionalContentGroup* OCGs::findOcgByRef { //TODO: make this more efficient OptionalContentGroup *ocg = NULL; - for (int i=0; i < optionalContentGroups->getLength(); ++i) { - ocg = (OptionalContentGroup*)optionalContentGroups->get(i); - if ( (ocg->ref().num == ref.num) && (ocg->ref().gen == ref.gen) ) { - return ocg; + if (optionalContentGroups != NULL) + { + for (int i=0; i < optionalContentGroups->getLength(); ++i) { + ocg = (OptionalContentGroup*)optionalContentGroups->get(i); + if ( (ocg->ref().num == ref.num) && (ocg->ref().gen == ref.gen) ) { + return ocg; + } } } + + error(-1, "Could not find a OCG with Ref (%d:%d)", ref.num, ref.gen); + // not found return NULL; } @@@@ -208,7 +214,7 @@@@ bool OCGs::optContentIsVisible( Object * } } else if (ocg.isRef()) { OptionalContentGroup* oc = findOcgByRef( ocg.getRef() ); - if ( oc->state() == OptionalContentGroup::Off ) { + if ( !oc || oc->state() == OptionalContentGroup::Off ) { result = false; } else { result = true ; @@@@ -218,13 +224,10 @@@@ bool OCGs::optContentIsVisible( Object * policy.free(); } else if ( dictType.isName("OCG") ) { OptionalContentGroup* oc = findOcgByRef( dictRef->getRef() ); - if ( oc ) { -// printf("Found valid group object\n"); - if ( oc->state() == OptionalContentGroup::Off ) { - result=false; - } + if ( !oc || oc->state() == OptionalContentGroup::Off ) { + result=false; } - } + } dictType.free(); dictObj.free(); // printf("visibility: %s\n", result? "on" : "off"); @@@@ -238,7 +241,7 @@@@ bool OCGs::allOn( Array *ocgArray ) ocgArray->getNF(i, &ocgItem); if (ocgItem.isRef()) { OptionalContentGroup* oc = findOcgByRef( ocgItem.getRef() ); - if ( oc->state() == OptionalContentGroup::Off ) { + if ( oc && oc->state() == OptionalContentGroup::Off ) { return false; } } @@@@ -253,7 +256,7 @@@@ bool OCGs::allOff( Array *ocgArray ) ocgArray->getNF(i, &ocgItem); if (ocgItem.isRef()) { OptionalContentGroup* oc = findOcgByRef( ocgItem.getRef() ); - if ( oc->state() == OptionalContentGroup::On ) { + if ( oc && oc->state() == OptionalContentGroup::On ) { return false; } } @@@@ -268,7 +271,7 @@@@ bool OCGs::anyOn( Array *ocgArray ) ocgArray->getNF(i, &ocgItem); if (ocgItem.isRef()) { OptionalContentGroup* oc = findOcgByRef( ocgItem.getRef() ); - if ( oc->state() == OptionalContentGroup::On ) { + if ( oc && oc->state() == OptionalContentGroup::On ) { return true; } } @@@@ -283,7 +286,7 @@@@ bool OCGs::anyOff( Array *ocgArray ) ocgArray->getNF(i, &ocgItem); if (ocgItem.isRef()) { OptionalContentGroup* oc = findOcgByRef( ocgItem.getRef() ); - if ( oc->state() == OptionalContentGroup::Off ) { + if ( oc && oc->state() == OptionalContentGroup::Off ) { return true; } } @ 1.3 log @pull another patch from upstream CVS, to fix a possible crash, ride on today's PKGREVISION bump @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @update to 0.8.1 Some fixes which we had patched in pkgsrc are included now. @ text @d1 1 a1 1 $NetBSD: patch-ai,v 1.1 2008/04/15 19:57:00 drochner Exp $ d3 87 a89 11 --- poppler/Gfx.cc.orig 2008-04-15 21:36:33.000000000 +0200 +++ poppler/Gfx.cc @@@@ -3627,7 +3627,7 @@@@ void Gfx::doImage(Object *ref, Stream *s obj1.free(); dict->lookup("CS", &obj1); } - if (obj1.isName()) { + if (obj1.isName() && inlineImg) { res->lookupColorSpace(obj1.getName(), &obj2); if (!obj2.isNull()) { obj1.free(); @ 1.1 log @update to 0.8.0 changes: * Fix caching of members in the glib frontend causing issues with rendering * Change glib public api to have a correct naming * Some better error handling on corner cases * Check the document stream is seekable when opening it * Build fixes with autotools and with cmake * Fix infinite recursion on some malformed documents when consulting the fonts * Fix possible crash when asking for Movie contents @ text @d1 1 a1 1 $NetBSD$ @