[100664] trunk/dports/graphics/inkscape
devans at macports.org
devans at macports.org
Wed Dec 19 14:39:51 PST 2012
Revision: 100664
https://trac.macports.org/changeset/100664
Author: devans at macports.org
Date: 2012-12-19 14:39:51 -0800 (Wed, 19 Dec 2012)
Log Message:
-----------
inkscape: update to version 0.48.4, bug fix release.
Modified Paths:
--------------
trunk/dports/graphics/inkscape/Portfile
trunk/dports/graphics/inkscape/files/patch-configure-python26.diff
trunk/dports/graphics/inkscape/files/patch-configure-python27.diff
Removed Paths:
-------------
trunk/dports/graphics/inkscape/files/patch-config.h.in.diff
trunk/dports/graphics/inkscape/files/patch-configure-poppler20.diff
trunk/dports/graphics/inkscape/files/patch-libpng15.diff
trunk/dports/graphics/inkscape/files/patch-src-extension-internal-pdfinput-pdf-parser.cpp.diff
trunk/dports/graphics/inkscape/files/patch-src-extension-internal-pdfinput-svg-builder.cpp.diff
Modified: trunk/dports/graphics/inkscape/Portfile
===================================================================
--- trunk/dports/graphics/inkscape/Portfile 2012-12-19 19:59:52 UTC (rev 100663)
+++ trunk/dports/graphics/inkscape/Portfile 2012-12-19 22:39:51 UTC (rev 100664)
@@ -5,8 +5,7 @@
name inkscape
conflicts inkscape-devel
-version 0.48.3.1
-revision 6
+version 0.48.4
license GPL-2 LGPL-2.1
maintainers devans
categories graphics gnome
@@ -26,8 +25,8 @@
use_bzip2 yes
master_sites sourceforge:project/inkscape/inkscape/${version}
-checksums rmd160 139720f01b987001b558226ec2de60b36fb1123c \
- sha256 073bf585b6a708747485f2de1f5a1b77c3f45a79e6ee128bf946bae99476db88
+checksums rmd160 b089ced7694a9803fac8588d93e7e6239c71d3e8 \
+ sha256 8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d
depends_build port:pkgconfig \
port:intltool \
@@ -53,16 +52,6 @@
universal_variant no
-#
-# backport patches from upstream bzr to allow building with poppler >= 0.20
-#
-
-patchfiles patch-configure-poppler20.diff \
- patch-config.h.in.diff \
- patch-libpng15.diff \
- patch-src-extension-internal-pdfinput-pdf-parser.cpp.diff \
- patch-src-extension-internal-pdfinput-svg-builder.cpp.diff
-
variant python26 conflicts python27 description {Configure to use Python version 2.6} {
depends_lib-append \
port:py26-lxml \
Deleted: trunk/dports/graphics/inkscape/files/patch-config.h.in.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-config.h.in.diff 2012-12-19 19:59:52 UTC (rev 100663)
+++ trunk/dports/graphics/inkscape/files/patch-config.h.in.diff 2012-12-19 22:39:51 UTC (rev 100664)
@@ -1,12 +0,0 @@
---- config.h.in.orig 2012-02-18 17:44:04.000000000 -0800
-+++ config.h.in 2012-07-20 13:58:21.000000000 -0700
-@@ -249,6 +249,9 @@
- /* Use color space API from Poppler >= 0.12.2 */
- #undef POPPLER_NEW_COLOR_SPACE_API
-
-+/* Use new error API from Poppler >= 0.20.0 */
-+#undef POPPLER_NEW_ERRORAPI
-+
- /* Use GfxFont from Poppler >= 0.8.3 */
- #undef POPPLER_NEW_GFXFONT
-
Deleted: trunk/dports/graphics/inkscape/files/patch-configure-poppler20.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-configure-poppler20.diff 2012-12-19 19:59:52 UTC (rev 100663)
+++ trunk/dports/graphics/inkscape/files/patch-configure-poppler20.diff 2012-12-19 22:39:51 UTC (rev 100664)
@@ -1,1355 +0,0 @@
---- configure.orig 2012-02-18 17:43:51.000000000 -0800
-+++ configure 2012-07-20 13:37:33.000000000 -0700
-@@ -1,11 +1,9 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.68 for inkscape 0.48.3.1.
-+# Generated by GNU Autoconf 2.69 for inkscape 0.48.3.1.
- #
- #
--# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
--# Foundation, Inc.
-+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
- #
- #
- # This configure script is free software; the Free Software Foundation
-@@ -134,6 +132,31 @@
- # CDPATH.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-+# Use a proper internal environment variable to ensure we don't fall
-+ # into an infinite loop, continuously re-executing ourselves.
-+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-+ _as_can_reexec=no; export _as_can_reexec;
-+ # We cannot yet assume a decent shell, so we have to provide a
-+# neutralization value for shells without unset; and this also
-+# works around shells that cannot unset nonexistent variables.
-+# Preserve -v and -x to the replacement shell.
-+BASH_ENV=/dev/null
-+ENV=/dev/null
-+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-+case $- in # ((((
-+ *v*x* | *x*v* ) as_opts=-vx ;;
-+ *v* ) as_opts=-v ;;
-+ *x* ) as_opts=-x ;;
-+ * ) as_opts= ;;
-+esac
-+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-+# Admittedly, this is quite paranoid, since all the known shells bail
-+# out after a failed `exec'.
-+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-+as_fn_exit 255
-+ fi
-+ # We don't want this to propagate to other subprocesses.
-+ { _as_can_reexec=; unset _as_can_reexec;}
- if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
-@@ -167,7 +190,8 @@
- else
- exitcode=1; echo positional parameters were not saved.
- fi
--test x\$exitcode = x0 || exit 1"
-+test x\$exitcode = x0 || exit 1
-+test -x / || exit 1"
- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
- eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-@@ -212,21 +236,25 @@
-
-
- if test "x$CONFIG_SHELL" != x; then :
-- # We cannot yet assume a decent shell, so we have to provide a
-- # neutralization value for shells without unset; and this also
-- # works around shells that cannot unset nonexistent variables.
-- # Preserve -v and -x to the replacement shell.
-- BASH_ENV=/dev/null
-- ENV=/dev/null
-- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-- export CONFIG_SHELL
-- case $- in # ((((
-- *v*x* | *x*v* ) as_opts=-vx ;;
-- *v* ) as_opts=-v ;;
-- *x* ) as_opts=-x ;;
-- * ) as_opts= ;;
-- esac
-- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-+ export CONFIG_SHELL
-+ # We cannot yet assume a decent shell, so we have to provide a
-+# neutralization value for shells without unset; and this also
-+# works around shells that cannot unset nonexistent variables.
-+# Preserve -v and -x to the replacement shell.
-+BASH_ENV=/dev/null
-+ENV=/dev/null
-+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-+case $- in # ((((
-+ *v*x* | *x*v* ) as_opts=-vx ;;
-+ *v* ) as_opts=-v ;;
-+ *x* ) as_opts=-x ;;
-+ * ) as_opts= ;;
-+esac
-+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-+# Admittedly, this is quite paranoid, since all the known shells bail
-+# out after a failed `exec'.
-+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-+exit 255
- fi
-
- if test x$as_have_required = xno; then :
-@@ -328,6 +356,14 @@
-
-
- } # as_fn_mkdir_p
-+
-+# as_fn_executable_p FILE
-+# -----------------------
-+# Test if FILE is an executable regular file.
-+as_fn_executable_p ()
-+{
-+ test -f "$1" && test -x "$1"
-+} # as_fn_executable_p
- # as_fn_append VAR VALUE
- # ----------------------
- # Append the text in VALUE to the end of the definition contained in VAR. Take
-@@ -449,6 +485,10 @@
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-+ # already done that, so ensure we don't try to do so again and fall
-+ # in an infinite loop. This has already happened in practice.
-+ _as_can_reexec=no; export _as_can_reexec
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
-@@ -483,16 +523,16 @@
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-- # In both cases, we have to default to `cp -p'.
-+ # In both cases, we have to default to `cp -pR'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-- as_ln_s='cp -p'
-+ as_ln_s='cp -pR'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
-- as_ln_s='cp -p'
-+ as_ln_s='cp -pR'
- fi
- else
-- as_ln_s='cp -p'
-+ as_ln_s='cp -pR'
- fi
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
-@@ -504,28 +544,8 @@
- as_mkdir_p=false
- fi
-
--if test -x / >/dev/null 2>&1; then
-- as_test_x='test -x'
--else
-- if ls -dL / >/dev/null 2>&1; then
-- as_ls_L_option=L
-- else
-- as_ls_L_option=
-- fi
-- as_test_x='
-- eval sh -c '\''
-- if test -d "$1"; then
-- test -d "$1/.";
-- else
-- case $1 in #(
-- -*)set "./$1";;
-- esac;
-- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-- ???[sx]*):;;*)false;;esac;fi
-- '\'' sh
-- '
--fi
--as_executable_p=$as_test_x
-+as_test_x='test -x'
-+as_executable_p=as_fn_executable_p
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -637,6 +657,8 @@
- LIBWPG01_CFLAGS
- INKBOARD_CFLAGS
- INKBOARD_LIBS
-+POPPLER_NEWERRORAPI_LIBS
-+POPPLER_NEWERRORAPI_CFLAGS
- POPPLER_GFXFONT_LIBS
- POPPLER_GFXFONT_CFLAGS
- POPPLER_CAIRO_LIBS
-@@ -886,6 +908,8 @@
- POPPLER_CAIRO_LIBS
- POPPLER_GFXFONT_CFLAGS
- POPPLER_GFXFONT_LIBS
-+POPPLER_NEWERRORAPI_CFLAGS
-+POPPLER_NEWERRORAPI_LIBS
- LIBWPG01_CFLAGS
- LIBWPG01_LIBS
- LIBWPG02_CFLAGS
-@@ -1357,8 +1381,6 @@
- if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
-- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-- If a cross compiler is detected then cross compile mode will be used" >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
- fi
-@@ -1523,11 +1545,13 @@
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-lsb LSB-compatible build configuration
-- --disable-dependency-tracking speeds up one-time build
-- --enable-dependency-tracking do not reject slow dependency extractors
-+ --enable-dependency-tracking
-+ do not reject slow dependency extractors
-+ --disable-dependency-tracking
-+ speeds up one-time build
- --disable-nls do not use Native Language Support
-- --enable-silent-rules less verbose build output (undo: `make V=1')
-- --disable-silent-rules verbose build output (undo: `make V=0')
-+ --enable-silent-rules less verbose build output (undo: "make V=1")
-+ --disable-silent-rules verbose build output (undo: "make V=0")
- --enable-lcms enable LittleCms for color management
- --enable-poppler-cairo Enable libpoppler-cairo for rendering PDF preview
- --enable-binreloc compile with binary relocation support
-@@ -1592,6 +1616,10 @@
- C compiler flags for POPPLER_GFXFONT, overriding pkg-config
- POPPLER_GFXFONT_LIBS
- linker flags for POPPLER_GFXFONT, overriding pkg-config
-+ POPPLER_NEWERRORAPI_CFLAGS
-+ C compiler flags for POPPLER_NEWERRORAPI, overriding pkg-config
-+ POPPLER_NEWERRORAPI_LIBS
-+ linker flags for POPPLER_NEWERRORAPI, overriding pkg-config
- LIBWPG01_CFLAGS
- C compiler flags for LIBWPG01, overriding pkg-config
- LIBWPG01_LIBS
-@@ -1692,9 +1720,9 @@
- if $ac_init_version; then
- cat <<\_ACEOF
- inkscape configure 0.48.3.1
--generated by GNU Autoconf 2.68
-+generated by GNU Autoconf 2.69
-
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2012 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1770,7 +1798,7 @@
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-+ test -x conftest$ac_exeext
- }; then :
- ac_retval=0
- else
-@@ -2000,7 +2028,7 @@
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-+ test -x conftest$ac_exeext
- }; then :
- ac_retval=0
- else
-@@ -2252,7 +2280,7 @@
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by inkscape $as_me 0.48.3.1, which was
--generated by GNU Autoconf 2.68. Invocation command line was
-+generated by GNU Autoconf 2.69. Invocation command line was
-
- $ $0 $@
-
-@@ -2701,7 +2729,7 @@
-
-
-
--am__api_version='1.11'
-+am__api_version='1.12'
-
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -2740,7 +2768,7 @@
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
-@@ -2798,9 +2826,6 @@
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
- $as_echo_n "checking whether build environment is sane... " >&6; }
--# Just in case
--sleep 1
--echo timestamp > conftest.file
- # Reject unsafe characters in $srcdir or the absolute working directory
- # name. Accept space and tab only in the latter.
- am_lf='
-@@ -2811,32 +2836,40 @@
- esac
- case $srcdir in
- *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
-- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
- esac
-
--# Do `set' in a subshell so we don't clobber the current shell's
-+# Do 'set' in a subshell so we don't clobber the current shell's
- # arguments. Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
-- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-- if test "$*" = "X"; then
-- # -L didn't work.
-- set X `ls -t "$srcdir/configure" conftest.file`
-- fi
-- rm -f conftest.file
-- if test "$*" != "X $srcdir/configure conftest.file" \
-- && test "$*" != "X conftest.file $srcdir/configure"; then
--
-- # If neither matched, then we have a broken ls. This can happen
-- # if, for instance, CONFIG_SHELL is bash and it inherits a
-- # broken ls alias from the environment. This has actually
-- # happened. Such a system could not be considered "sane".
-- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
--alias in your environment" "$LINENO" 5
-- fi
-+ am_has_slept=no
-+ for am_try in 1 2; do
-+ echo "timestamp, slept: $am_has_slept" > conftest.file
-+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+ if test "$*" = "X"; then
-+ # -L didn't work.
-+ set X `ls -t "$srcdir/configure" conftest.file`
-+ fi
-+ if test "$*" != "X $srcdir/configure conftest.file" \
-+ && test "$*" != "X conftest.file $srcdir/configure"; then
-
-+ # If neither matched, then we have a broken ls. This can happen
-+ # if, for instance, CONFIG_SHELL is bash and it inherits a
-+ # broken ls alias from the environment. This has actually
-+ # happened. Such a system could not be considered "sane".
-+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-+ alias in your environment" "$LINENO" 5
-+ fi
-+ if test "$2" = conftest.file || test $am_try -eq 2; then
-+ break
-+ fi
-+ # Just in case.
-+ sleep 1
-+ am_has_slept=yes
-+ done
- test "$2" = conftest.file
- )
- then
-@@ -2848,6 +2881,16 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-+# If we didn't sleep, we still need to ensure time stamps of config.status and
-+# generated files are strictly newer.
-+am_sleep_pid=
-+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-+ ( sleep 1 ) &
-+ am_sleep_pid=$!
-+fi
-+
-+rm -f conftest.file
-+
- test "$program_prefix" != NONE &&
- program_transform_name="s&^&$program_prefix&;$program_transform_name"
- # Use a double $ so make ignores it.
-@@ -2874,8 +2917,8 @@
- am_missing_run="$MISSING --run "
- else
- am_missing_run=
-- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
--$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
- fi
-
- if test x"${install_sh}" != xset; then
-@@ -2887,10 +2930,10 @@
- esac
- fi
-
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'. However `strip' might not be the right
-+# Installed binaries are usually stripped using 'strip' when the user
-+# run "make install-strip". However 'strip' might not be the right
- # tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
-+# will honor the 'STRIP' environment variable to overrule this program.
- if test "$cross_compiling" != no; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-@@ -2909,7 +2952,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -2949,7 +2992,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -3000,7 +3043,7 @@
- test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 'mkdir (GNU coreutils) '* | \
- 'mkdir (coreutils) '* | \
-@@ -3029,12 +3072,6 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
- $as_echo "$MKDIR_P" >&6; }
-
--mkdir_p="$MKDIR_P"
--case $mkdir_p in
-- [\\/$]* | ?:[\\/]*) ;;
-- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
--esac
--
- for ac_prog in gawk mawk nawk awk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -3053,7 +3090,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -3167,6 +3204,12 @@
-
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-+# For better backward compatibility. To be removed once Automake 1.9.x
-+# dies out for good. For more background, see:
-+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-+mkdir_p='$(MKDIR_P)'
-+
- # We need awk for the "check" target. The system "awk" is bad on
- # some platforms.
- # Always define AMTAR for backward compatibility. Yes, it's still used
-@@ -3180,7 +3223,7 @@
- _am_tools='gnutar pax cpio none'
- _am_tools=${am_cv_prog_tar_pax-$_am_tools}
- # Do not fold the above two line into one, because Tru64 sh and
--# Solaris sh will not grok spaces in the rhs of `-'.
-+# Solaris sh will not grok spaces in the rhs of '-'.
- for _am_tool in $_am_tools
- do
- case $_am_tool in
-@@ -3301,7 +3344,7 @@
- _am_result=none
- # First try GNU make style include.
- echo "include confinc" > confmf
--# Ignore all kinds of additional output from `make'.
-+# Ignore all kinds of additional output from 'make'.
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=include
-@@ -3373,7 +3416,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -3417,7 +3460,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -3863,8 +3906,8 @@
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
-- # making a dummy file named `D' -- because `-MD' means `put the output
-- # in D'.
-+ # making a dummy file named 'D' -- because '-MD' means "put the output
-+ # in D".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
-@@ -3899,16 +3942,16 @@
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-- # Solaris 8's {/usr,}/bin/sh.
-- touch sub/conftst$i.h
-+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-+ # Solaris 10 /bin/sh.
-+ echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-- # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
-- # handle `-M -o', and we need to detect this. Also, some Intel
-- # versions had trouble with output in subdirs
-+ # handle '-M -o', and we need to detect this. Also, some Intel
-+ # versions had trouble with output in subdirs.
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
-@@ -3917,8 +3960,8 @@
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
-- # after this tag, mechanisms are not by side-effect, so they'll
-- # only be used when explicitly requested
-+ # After this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested.
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
-@@ -3926,7 +3969,7 @@
- fi
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-- # This compiler won't grok `-c -o', but also, the minuso test has
-+ # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
-@@ -4065,7 +4108,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4109,7 +4152,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4305,8 +4348,8 @@
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
-- # making a dummy file named `D' -- because `-MD' means `put the output
-- # in D'.
-+ # making a dummy file named 'D' -- because '-MD' means "put the output
-+ # in D".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
-@@ -4341,16 +4384,16 @@
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-- # Solaris 8's {/usr,}/bin/sh.
-- touch sub/conftst$i.h
-+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-+ # Solaris 10 /bin/sh.
-+ echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-- # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
-- # handle `-M -o', and we need to detect this. Also, some Intel
-- # versions had trouble with output in subdirs
-+ # handle '-M -o', and we need to detect this. Also, some Intel
-+ # versions had trouble with output in subdirs.
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
-@@ -4359,8 +4402,8 @@
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
-- # after this tag, mechanisms are not by side-effect, so they'll
-- # only be used when explicitly requested
-+ # After this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested.
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
-@@ -4368,7 +4411,7 @@
- fi
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-- # This compiler won't grok `-c -o', but also, the minuso test has
-+ # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
-@@ -4444,7 +4487,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4484,7 +4527,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4537,7 +4580,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4578,7 +4621,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
-@@ -4636,7 +4679,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4680,7 +4723,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -4876,8 +4919,7 @@
- /* end confdefs.h. */
- #include <stdarg.h>
- #include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
-+struct stat;
- /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
- struct buf { int x; };
- FILE * (*rcsopen) (struct buf *, struct stat *, int);
-@@ -4973,8 +5015,8 @@
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
-- # making a dummy file named `D' -- because `-MD' means `put the output
-- # in D'.
-+ # making a dummy file named 'D' -- because '-MD' means "put the output
-+ # in D".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
-@@ -5009,16 +5051,16 @@
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-- # Solaris 8's {/usr,}/bin/sh.
-- touch sub/conftst$i.h
-+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-+ # Solaris 10 /bin/sh.
-+ echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-- # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
-- # handle `-M -o', and we need to detect this. Also, some Intel
-- # versions had trouble with output in subdirs
-+ # handle '-M -o', and we need to detect this. Also, some Intel
-+ # versions had trouble with output in subdirs.
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
-@@ -5027,8 +5069,8 @@
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
-- # after this tag, mechanisms are not by side-effect, so they'll
-- # only be used when explicitly requested
-+ # After this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested.
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
-@@ -5036,7 +5078,7 @@
- fi
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-- # This compiler won't grok `-c -o', but also, the minuso test has
-+ # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
-@@ -5111,8 +5153,8 @@
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
-- # making a dummy file named `D' -- because `-MD' means `put the output
-- # in D'.
-+ # making a dummy file named 'D' -- because '-MD' means "put the output
-+ # in D".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
-@@ -5145,16 +5187,16 @@
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-- # Solaris 8's {/usr,}/bin/sh.
-- touch sub/conftst$i.h
-+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-+ # Solaris 10 /bin/sh.
-+ echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-- # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
-- # handle `-M -o', and we need to detect this. Also, some Intel
-- # versions had trouble with output in subdirs
-+ # handle '-M -o', and we need to detect this. Also, some Intel
-+ # versions had trouble with output in subdirs.
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
-@@ -5163,8 +5205,8 @@
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
-- # after this tag, mechanisms are not by side-effect, so they'll
-- # only be used when explicitly requested
-+ # After this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested.
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
-@@ -5172,7 +5214,7 @@
- fi
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-- # This compiler won't grok `-c -o', but also, the minuso test has
-+ # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
-@@ -5243,7 +5285,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -5283,7 +5325,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -5342,14 +5384,12 @@
- ;;
- esac
-
-+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.22 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- if test -n "0.22"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.22" >&5
- $as_echo_n "checking for intltool >= 0.22... " >&6; }
--
-- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.22 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-- INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
- $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-@@ -5374,7 +5414,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -5414,7 +5454,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -5454,7 +5494,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -5510,7 +5550,11 @@
- INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
-+else
-+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
-+fi
- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -5634,7 +5678,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -5674,7 +5718,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -5714,7 +5758,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -5754,7 +5798,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -5805,7 +5849,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -6045,7 +6089,7 @@
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-+ as_fn_executable_p "$ac_path_GREP" || continue
- # Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
- case `"$ac_path_GREP" --version 2>&1` in
-@@ -6111,7 +6155,7 @@
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+ as_fn_executable_p "$ac_path_EGREP" || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
- case `"$ac_path_EGREP" --version 2>&1` in
-@@ -6300,10 +6344,10 @@
- enableval=$enable_silent_rules;
- fi
-
--case $enable_silent_rules in
--yes) AM_DEFAULT_VERBOSITY=0;;
--no) AM_DEFAULT_VERBOSITY=1;;
--*) AM_DEFAULT_VERBOSITY=0;;
-+case $enable_silent_rules in # (((
-+ yes) AM_DEFAULT_VERBOSITY=0;;
-+ no) AM_DEFAULT_VERBOSITY=1;;
-+ *) AM_DEFAULT_VERBOSITY=0;;
- esac
- am_make=${MAKE-make}
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-@@ -6357,7 +6401,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -6397,7 +6441,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -6450,7 +6494,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -6491,7 +6535,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
-@@ -6549,7 +6593,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -6593,7 +6637,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -6789,8 +6833,7 @@
- /* end confdefs.h. */
- #include <stdarg.h>
- #include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
-+struct stat;
- /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
- struct buf { int x; };
- FILE * (*rcsopen) (struct buf *, struct stat *, int);
-@@ -6886,8 +6929,8 @@
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
-- # making a dummy file named `D' -- because `-MD' means `put the output
-- # in D'.
-+ # making a dummy file named 'D' -- because '-MD' means "put the output
-+ # in D".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
-@@ -6922,16 +6965,16 @@
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-- # Solaris 8's {/usr,}/bin/sh.
-- touch sub/conftst$i.h
-+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-+ # Solaris 10 /bin/sh.
-+ echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-- # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
-- # handle `-M -o', and we need to detect this. Also, some Intel
-- # versions had trouble with output in subdirs
-+ # handle '-M -o', and we need to detect this. Also, some Intel
-+ # versions had trouble with output in subdirs.
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
-@@ -6940,8 +6983,8 @@
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
-- # after this tag, mechanisms are not by side-effect, so they'll
-- # only be used when explicitly requested
-+ # After this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested.
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
-@@ -6949,7 +6992,7 @@
- fi
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-- # This compiler won't grok `-c -o', but also, the minuso test has
-+ # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
-@@ -7176,7 +7219,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -7219,7 +7262,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -8077,7 +8120,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -8306,7 +8349,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -8351,7 +8394,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -8392,7 +8435,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -9066,7 +9109,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_FREETYPE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
-@@ -10258,6 +10301,84 @@
-
- fi
-
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_NEWERRORAPI" >&5
-+$as_echo_n "checking for POPPLER_NEWERRORAPI... " >&6; }
-+
-+if test -n "$POPPLER_NEWERRORAPI_CFLAGS"; then
-+ pkg_cv_POPPLER_NEWERRORAPI_CFLAGS="$POPPLER_NEWERRORAPI_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.20.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "poppler >= 0.20.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_POPPLER_NEWERRORAPI_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.20.0" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$POPPLER_NEWERRORAPI_LIBS"; then
-+ pkg_cv_POPPLER_NEWERRORAPI_LIBS="$POPPLER_NEWERRORAPI_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.20.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "poppler >= 0.20.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_POPPLER_NEWERRORAPI_LIBS=`$PKG_CONFIG --libs "poppler >= 0.20.0" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ POPPLER_NEWERRORAPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler >= 0.20.0" 2>&1`
-+ else
-+ POPPLER_NEWERRORAPI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler >= 0.20.0" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$POPPLER_NEWERRORAPI_PKG_ERRORS" >&5
-+
-+ popplernewerror=no
-+elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ popplernewerror=no
-+else
-+ POPPLER_NEWERRORAPI_CFLAGS=$pkg_cv_POPPLER_NEWERRORAPI_CFLAGS
-+ POPPLER_NEWERRORAPI_LIBS=$pkg_cv_POPPLER_NEWERRORAPI_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ popplernewerror=yes
-+fi
-+if test "x$popplernewerror" = "xyes"; then
-+
-+$as_echo "#define POPPLER_NEW_ERRORAPI 1" >>confdefs.h
-+
-+fi
-+
-+
- ink_svd_CPPFLAGS=$CPPFLAGS
- ink_svd_LIBS=$LIBS
- CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
-@@ -12195,6 +12316,14 @@
- LTLIBOBJS=$ac_ltlibobjs
-
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-+$as_echo_n "checking that generated files are newer than configure... " >&6; }
-+ if test -n "$am_sleep_pid"; then
-+ # Hide warnings about reused PIDs.
-+ wait $am_sleep_pid 2>/dev/null
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-+$as_echo "done" >&6; }
- if test -n "$EXEEXT"; then
- am__EXEEXT_TRUE=
- am__EXEEXT_FALSE='#'
-@@ -12582,16 +12711,16 @@
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-- # In both cases, we have to default to `cp -p'.
-+ # In both cases, we have to default to `cp -pR'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-- as_ln_s='cp -p'
-+ as_ln_s='cp -pR'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
-- as_ln_s='cp -p'
-+ as_ln_s='cp -pR'
- fi
- else
-- as_ln_s='cp -p'
-+ as_ln_s='cp -pR'
- fi
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
-@@ -12651,28 +12780,16 @@
- as_mkdir_p=false
- fi
-
--if test -x / >/dev/null 2>&1; then
-- as_test_x='test -x'
--else
-- if ls -dL / >/dev/null 2>&1; then
-- as_ls_L_option=L
-- else
-- as_ls_L_option=
-- fi
-- as_test_x='
-- eval sh -c '\''
-- if test -d "$1"; then
-- test -d "$1/.";
-- else
-- case $1 in #(
-- -*)set "./$1";;
-- esac;
-- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-- ???[sx]*):;;*)false;;esac;fi
-- '\'' sh
-- '
--fi
--as_executable_p=$as_test_x
-+
-+# as_fn_executable_p FILE
-+# -----------------------
-+# Test if FILE is an executable regular file.
-+as_fn_executable_p ()
-+{
-+ test -f "$1" && test -x "$1"
-+} # as_fn_executable_p
-+as_test_x='test -x'
-+as_executable_p=as_fn_executable_p
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -12694,7 +12811,7 @@
- # values after options handling.
- ac_log="
- This file was extended by inkscape $as_me 0.48.3.1, which was
--generated by GNU Autoconf 2.68. Invocation command line was
-+generated by GNU Autoconf 2.69. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -12760,10 +12877,10 @@
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- inkscape config.status 0.48.3.1
--configured by $0, generated by GNU Autoconf 2.68,
-+configured by $0, generated by GNU Autoconf 2.69,
- with options \\"\$ac_cs_config\\"
-
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2012 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
-
-@@ -12854,7 +12971,7 @@
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- if \$ac_cs_recheck; then
-- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
- CONFIG_SHELL='$SHELL'
-@@ -13573,7 +13690,7 @@
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
-- # We used to match only the files named `Makefile.in', but
-+ # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
-@@ -13607,21 +13724,19 @@
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
-- # from the Makefile without running `make'.
-+ # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-- # When using ansi2knr, U may be empty or an underscore; expand it
-- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
Modified: trunk/dports/graphics/inkscape/files/patch-configure-python26.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-configure-python26.diff 2012-12-19 19:59:52 UTC (rev 100663)
+++ trunk/dports/graphics/inkscape/files/patch-configure-python26.diff 2012-12-19 22:39:51 UTC (rev 100664)
@@ -1,6 +1,6 @@
---- configure.orig 2011-07-08 12:25:02.000000000 -0700
-+++ configure 2011-09-10 10:56:33.000000000 -0700
-@@ -9739,11 +9739,11 @@
+--- configure.orig 2012-12-15 08:56:08.000000000 -0800
++++ configure 2012-12-19 13:33:23.000000000 -0800
+@@ -9646,11 +9646,11 @@
if test "x$with_python" = "xyes"; then
Modified: trunk/dports/graphics/inkscape/files/patch-configure-python27.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-configure-python27.diff 2012-12-19 19:59:52 UTC (rev 100663)
+++ trunk/dports/graphics/inkscape/files/patch-configure-python27.diff 2012-12-19 22:39:51 UTC (rev 100664)
@@ -1,6 +1,6 @@
---- configure.orig 2011-07-08 12:25:02.000000000 -0700
-+++ configure 2011-09-10 10:56:33.000000000 -0700
-@@ -9739,11 +9739,11 @@
+--- configure.orig 2012-12-15 08:56:08.000000000 -0800
++++ configure 2012-12-19 13:33:23.000000000 -0800
+@@ -9646,11 +9646,11 @@
if test "x$with_python" = "xyes"; then
Deleted: trunk/dports/graphics/inkscape/files/patch-libpng15.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-libpng15.diff 2012-12-19 19:59:52 UTC (rev 100663)
+++ trunk/dports/graphics/inkscape/files/patch-libpng15.diff 2012-12-19 22:39:51 UTC (rev 100664)
@@ -1,33 +0,0 @@
---- src/helper/png-write.cpp.orig 2012-09-04 16:04:30.000000000 -0400
-+++ src/helper/png-write.cpp 2012-09-04 16:04:30.000000000 -0400
-@@ -165,7 +165,7 @@
- /* Set error handling. REQUIRED if you aren't supplying your own
- * error hadnling functions in the png_create_write_struct() call.
- */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- /* If we get here, we had a problem reading the file */
- fclose(fp);
- png_destroy_write_struct(&png_ptr, &info_ptr);
---- src/sp-image.cpp.orig 2012-09-04 16:04:30.000000000 -0400
-+++ src/sp-image.cpp 2012-09-04 16:04:30.000000000 -0400
-@@ -396,7 +396,7 @@
- {
- char* name = 0;
- int compression_type = 0;
-- char* profile = 0;
-+ png_bytep profile = 0;
- png_uint_32 proflen = 0;
- if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
- // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
---- src/extension/internal/pdfinput/svg-builder.cpp.orig 2012-09-04 16:04:30.000000000 -0400
-+++ src/extension/internal/pdfinput/svg-builder.cpp 2012-09-04 16:04:30.000000000 -0400
-@@ -1443,7 +1443,7 @@
- return NULL;
- }
- // Set error handler
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_write_struct(&png_ptr, &info_ptr);
- return NULL;
- }
Deleted: trunk/dports/graphics/inkscape/files/patch-src-extension-internal-pdfinput-pdf-parser.cpp.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-src-extension-internal-pdfinput-pdf-parser.cpp.diff 2012-12-19 19:59:52 UTC (rev 100663)
+++ trunk/dports/graphics/inkscape/files/patch-src-extension-internal-pdfinput-pdf-parser.cpp.diff 2012-12-19 22:39:51 UTC (rev 100664)
@@ -1,652 +0,0 @@
---- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2011-07-08 11:25:09.000000000 -0700
-+++ src/extension/internal/pdfinput/pdf-parser.cpp 2012-07-20 18:03:59.000000000 -0700
-@@ -367,15 +367,23 @@
- for (i = 0; i < obj->arrayGetLength(); ++i) {
- obj->arrayGet(i, &obj2);
- if (!obj2.isStream()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errInternal, -1, "Weird page contents");
-+#else
- error(-1, const_cast<char*>("Weird page contents"));
-+#endif
- obj2.free();
- return;
- }
- obj2.free();
- }
- } else if (!obj->isStream()) {
-- error(-1, const_cast<char*>("Weird page contents"));
-- return;
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errInternal, -1, "Weird page contents");
-+#else
-+ error(-1, const_cast<char*>("Weird page contents"));
-+#endif
-+ return;
- }
- parser = new Parser(xref, new Lexer(xref, obj), gFalse);
- go(topLevel);
-@@ -419,7 +427,11 @@
-
- // too many arguments - something is wrong
- } else {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Too many args in content stream");
-+#else
- error(getPos(), const_cast<char*>("Too many args in content stream"));
-+#endif
- if (printCommands) {
- printf("throwing away arg: ");
- obj.print(stdout);
-@@ -436,7 +448,11 @@
-
- // args at end with no command
- if (numArgs > 0) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Leftover args in content stream");
-+#else
- error(getPos(), const_cast<char*>("Leftover args in content stream"));
-+#endif
- if (printCommands) {
- printf("%d leftovers:", numArgs);
- for (i = 0; i < numArgs; ++i) {
-@@ -502,7 +518,11 @@
- name = cmd->getCmd();
- if (!(op = findOp(name))) {
- if (ignoreUndef == 0)
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Unknown operator '{0:s}'", name);
-+#else
- error(getPos(), const_cast<char*>("Unknown operator '%s'"), name);
-+#endif
- return;
- }
-
-@@ -510,26 +530,42 @@
- argPtr = args;
- if (op->numArgs >= 0) {
- if (numArgs < op->numArgs) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Too few ({0:d}) args to '{1:d}' operator", numArgs, name);
-+#else
- error(getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
-+#endif
- return;
- }
- if (numArgs > op->numArgs) {
- #if 0
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Too many ({0:d}) args to '{1:s}' operator", numArgs, name);
-+#else
- error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
- #endif
-+#endif
- argPtr += numArgs - op->numArgs;
- numArgs = op->numArgs;
- }
- } else {
- if (numArgs > -op->numArgs) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Too many ({0:d}) args to '{1:s}' operator",
-+#else
- error(getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
-+#endif
- numArgs, name);
- return;
- }
- }
- for (i = 0; i < numArgs; ++i) {
- if (!checkArg(&argPtr[i], op->tchk[i])) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Arg #{0:d} to '{1:s}' operator is wrong type ({2:s})",
-+#else
- error(getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
-+#endif
- i, name, argPtr[i].getTypeName());
- return;
- }
-@@ -690,7 +726,11 @@
- return;
- }
- if (!obj1.isDict()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "ExtGState '{0:s}' is wrong type"), args[0].getName();
-+#else
- error(getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
-+#endif
- obj1.free();
- return;
- }
-@@ -705,7 +745,11 @@
- if (state->parseBlendMode(&obj2, &mode)) {
- state->setBlendMode(mode);
- } else {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Invalid blend mode in ExtGState");
-+#else
- error(getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
-+#endif
- }
- }
- obj2.free();
-@@ -764,7 +808,11 @@
- state->setTransfer(funcs);
- }
- } else if (!obj2.isNull()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Invalid transfer function in ExtGState");
-+#else
- error(getPos(), const_cast<char*>("Invalid transfer function in ExtGState"));
-+#endif
- }
- obj2.free();
-
-@@ -784,8 +832,11 @@
- funcs[0] = Function::parse(&obj3);
- if (funcs[0]->getInputSize() != 1 ||
- funcs[0]->getOutputSize() != 1) {
-- error(getPos(),
-- const_cast<char*>("Invalid transfer function in soft mask in ExtGState"));
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Invalid transfer function in soft mask in ExtGState");
-+#else
-+ error(getPos(), const_cast<char*>("Invalid transfer function in soft mask in ExtGState"));
-+#endif
- delete funcs[0];
- funcs[0] = NULL;
- }
-@@ -809,7 +860,7 @@
- blendingColorSpace = NULL;
- isolated = knockout = gFalse;
- if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-+#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
- #else
- blendingColorSpace = GfxColorSpace::parse(&obj5);
-@@ -840,15 +891,27 @@
- delete funcs[0];
- }
- } else {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState - missing group");
-+#else
- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-+#endif
- }
- obj4.free();
- } else {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState - missing group");
-+#else
- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-+#endif
- }
- obj3.free();
- } else if (!obj2.isNull()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState");
-+#else
- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState"));
-+#endif
- }
- }
- obj2.free();
-@@ -876,7 +939,11 @@
- // check form type
- dict->lookup(const_cast<char*>("FormType"), &obj1);
- if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Unknown form type");
-+#else
- error(getPos(), const_cast<char*>("Unknown form type"));
-+#endif
- }
- obj1.free();
-
-@@ -884,7 +951,11 @@
- dict->lookup(const_cast<char*>("BBox"), &obj1);
- if (!obj1.isArray()) {
- obj1.free();
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Bad form bounding box");
-+#else
- error(getPos(), const_cast<char*>("Bad form bounding box"));
-+#endif
- return;
- }
- for (i = 0; i < 4; ++i) {
-@@ -1012,7 +1083,7 @@
-
- state->setFillPattern(NULL);
- res->lookupColorSpace(args[0].getName(), &obj);
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-+#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0], NULL);
- } else {
-@@ -1032,7 +1103,11 @@
- state->setFillColor(&color);
- builder->updateStyle(state);
- } else {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Bad color space (fill)");
-+#else
- error(getPos(), const_cast<char*>("Bad color space (fill)"));
-+#endif
- }
- }
-
-@@ -1043,7 +1118,7 @@
-
- state->setStrokePattern(NULL);
- res->lookupColorSpace(args[0].getName(), &obj);
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-+#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0], NULL);
- } else {
-@@ -1063,7 +1138,11 @@
- state->setStrokeColor(&color);
- builder->updateStyle(state);
- } else {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Bad color space (stroke)");
-+#else
- error(getPos(), const_cast<char*>("Bad color space (stroke)"));
-+#endif
- }
- }
-
-@@ -1072,7 +1151,11 @@
- int i;
-
- if (numArgs != state->getFillColorSpace()->getNComps()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Incorrect number of arguments in 'sc' command");
-+#else
- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command"));
-+#endif
- return;
- }
- state->setFillPattern(NULL);
-@@ -1088,7 +1171,11 @@
- int i;
-
- if (numArgs != state->getStrokeColorSpace()->getNComps()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Incorrect number of arguments in 'SC' command");
-+#else
- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command"));
-+#endif
- return;
- }
- state->setStrokePattern(NULL);
-@@ -1109,7 +1196,11 @@
- if (!((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder() ||
- numArgs - 1 != ((GfxPatternColorSpace *)state->getFillColorSpace())
- ->getUnder()->getNComps()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Incorrect number of arguments in 'scn' command");
-+#else
- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-+#endif
- return;
- }
- for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
-@@ -1120,7 +1211,7 @@
- state->setFillColor(&color);
- builder->updateStyle(state);
- }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-+#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- if (args[numArgs-1].isName() &&
- (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
- state->setFillPattern(pattern);
-@@ -1136,7 +1227,11 @@
-
- } else {
- if (numArgs != state->getFillColorSpace()->getNComps()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Incorrect number of arguments in 'scn' command");
-+#else
- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-+#endif
- return;
- }
- state->setFillPattern(NULL);
-@@ -1161,7 +1256,11 @@
- ->getUnder() ||
- numArgs - 1 != ((GfxPatternColorSpace *)state->getStrokeColorSpace())
- ->getUnder()->getNComps()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Incorrect number of arguments in 'SCN' command");
-+#else
- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-+#endif
- return;
- }
- for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
-@@ -1172,7 +1271,7 @@
- state->setStrokeColor(&color);
- builder->updateStyle(state);
- }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-+#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- if (args[numArgs-1].isName() &&
- (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
- state->setStrokePattern(pattern);
-@@ -1188,7 +1287,11 @@
-
- } else {
- if (numArgs != state->getStrokeColorSpace()->getNComps()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Incorrect number of arguments in 'SCN' command");
-+#else
- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-+#endif
- return;
- }
- state->setStrokePattern(NULL);
-@@ -1212,7 +1315,11 @@
-
- void PdfParser::opLineTo(Object args[], int numArgs) {
- if (!state->isCurPt()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "No current point in lineto");
-+#else
- error(getPos(), const_cast<char*>("No current point in lineto"));
-+#endif
- return;
- }
- state->lineTo(args[0].getNum(), args[1].getNum());
-@@ -1222,7 +1329,11 @@
- double x1, y1, x2, y2, x3, y3;
-
- if (!state->isCurPt()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "No current point in curveto");
-+#else
- error(getPos(), const_cast<char*>("No current point in curveto"));
-+#endif
- return;
- }
- x1 = args[0].getNum();
-@@ -1238,7 +1349,11 @@
- double x1, y1, x2, y2, x3, y3;
-
- if (!state->isCurPt()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "No current point in curveto1");
-+#else
- error(getPos(), const_cast<char*>("No current point in curveto1"));
-+#endif
- return;
- }
- x1 = state->getCurX();
-@@ -1254,7 +1369,11 @@
- double x1, y1, x2, y2, x3, y3;
-
- if (!state->isCurPt()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "No current point in curveto2");
-+#else
- error(getPos(), const_cast<char*>("No current point in curveto2"));
-+#endif
- return;
- }
- x1 = args[0].getNum();
-@@ -1282,7 +1401,11 @@
-
- void PdfParser::opClosePath(Object args[], int numArgs) {
- if (!state->isCurPt()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "No current point in closepath");
-+#else
- error(getPos(), const_cast<char*>("No current point in closepath"));
-+#endif
- return;
- }
- state->closePath();
-@@ -1440,7 +1563,11 @@
- doShadingPatternFillFallback((GfxShadingPattern *)pattern, gFalse, eoFill);
- break;
- default:
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errUnimplemented, getPos(), "Unimplemented pattern type (%d) in fill",
-+#else
- error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"),
-+#endif
- pattern->getType());
- break;
- }
-@@ -1459,7 +1586,11 @@
- doShadingPatternFillFallback((GfxShadingPattern *)pattern, gTrue, gFalse);
- break;
- default:
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errUnimplemented, getPos(), "Unimplemented pattern type ({0:d}) in stroke",
-+#else
- error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"),
-+#endif
- pattern->getType());
- break;
- }
-@@ -1579,7 +1710,7 @@
- double *matrix = NULL;
- GBool savedState = gFalse;
-
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-+#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
- return;
- }
-@@ -2156,7 +2287,11 @@
-
- void PdfParser::opShowText(Object args[], int numArgs) {
- if (!state->getFont()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "No font in show");
-+#else
- error(getPos(), const_cast<char*>("No font in show"));
-+#endif
- return;
- }
- if (fontChanged) {
-@@ -2170,7 +2305,11 @@
- double tx, ty;
-
- if (!state->getFont()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "No font in move/show");
-+#else
- error(getPos(), const_cast<char*>("No font in move/show"));
-+#endif
- return;
- }
- if (fontChanged) {
-@@ -2188,7 +2327,11 @@
- double tx, ty;
-
- if (!state->getFont()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "No font in move/set/show");
-+#else
- error(getPos(), const_cast<char*>("No font in move/set/show"));
-+#endif
- return;
- }
- if (fontChanged) {
-@@ -2211,7 +2354,11 @@
- int i;
-
- if (!state->getFont()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "No font in show/space");
-+#else
- error(getPos(), const_cast<char*>("No font in show/space"));
-+#endif
- return;
- }
- if (fontChanged) {
-@@ -2236,7 +2383,11 @@
- } else if (obj.isString()) {
- doShowText(obj.getString());
- } else {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Element of show/space array must be number or string");
-+#else
- error(getPos(), const_cast<char*>("Element of show/space array must be number or string"));
-+#endif
- }
- obj.free();
- }
-@@ -2334,7 +2485,11 @@
- if (charProc.isStream()) {
- //parse(&charProc, gFalse); // TODO: parse into SVG font
- } else {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Missing or bad Type3 CharProc entry");
-+#else
- error(getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry"));
-+#endif
- }
- //out->endType3Char(state);
- if (resDict) {
-@@ -2410,7 +2565,11 @@
- return;
- }
- if (!obj1.isStream()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "XObject '{0:s}' is wrong type", name);
-+#else
- error(getPos(), const_cast<char*>("XObject '%s' is wrong type"), name);
-+#endif
- obj1.free();
- return;
- }
-@@ -2426,9 +2585,17 @@
- /* out->psXObject(obj1.getStream(),
- obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/
- } else if (obj2.isName()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Unknown XObject subtype '{0:s}'", obj2.getName());
-+#else
- error(getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName());
-+#endif
- } else {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "XObject subtype is missing or wrong type");
-+#else
- error(getPos(), const_cast<char*>("XObject subtype is missing or wrong type"));
-+#endif
- }
- obj2.free();
- obj1.free();
-@@ -2559,7 +2726,7 @@
- }
- }
- if (!obj1.isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-+#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- colorSpace = GfxColorSpace::parse(&obj1, NULL);
- #else
- colorSpace = GfxColorSpace::parse(&obj1);
-@@ -2648,7 +2815,7 @@
- obj2.free();
- }
- }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-+#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
- #else
- maskColorSpace = GfxColorSpace::parse(&obj1);
-@@ -2758,7 +2925,11 @@
- err2:
- obj1.free();
- err1:
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Bad image parameters");
-+#else
- error(getPos(), const_cast<char*>("Bad image parameters"));
-+#endif
- }
-
- void PdfParser::doForm(Object *str) {
-@@ -2783,7 +2954,11 @@
- // check form type
- dict->lookup(const_cast<char*>("FormType"), &obj1);
- if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Unknown form type");
-+#else
- error(getPos(), const_cast<char*>("Unknown form type"));
-+#endif
- }
- obj1.free();
-
-@@ -2791,7 +2966,11 @@
- dict->lookup(const_cast<char*>("BBox"), &bboxObj);
- if (!bboxObj.isArray()) {
- bboxObj.free();
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Bad form bounding box");
-+#else
- error(getPos(), const_cast<char*>("Bad form bounding box"));
-+#endif
- return;
- }
- for (i = 0; i < 4; ++i) {
-@@ -2827,7 +3006,7 @@
- if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
- transpGroup = gTrue;
- if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-+#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
- blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
- #else
- blendingColorSpace = GfxColorSpace::parse(&obj3);
-@@ -2990,7 +3169,11 @@
- parser->getObj(&obj);
- while (!obj.isCmd(const_cast<char*>("ID")) && !obj.isEOF()) {
- if (!obj.isName()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Inline image dictionary key must be a name object");
-+#else
- error(getPos(), const_cast<char*>("Inline image dictionary key must be a name object"));
-+#endif
- obj.free();
- } else {
- key = copyString(obj.getName());
-@@ -3005,7 +3188,11 @@
- parser->getObj(&obj);
- }
- if (obj.isEOF()) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "End of file in inline image");
-+#else
- error(getPos(), const_cast<char*>("End of file in inline image"));
-+#endif
- obj.free();
- dict.free();
- return NULL;
-@@ -3020,11 +3207,19 @@
- }
-
- void PdfParser::opImageData(Object args[], int numArgs) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Internal: got 'ID' operator");
-+#else
- error(getPos(), const_cast<char*>("Internal: got 'ID' operator"));
-+#endif
- }
-
- void PdfParser::opEndImage(Object args[], int numArgs) {
-+#ifdef POPPLER_NEW_ERRORAPI
-+ error(errSyntaxError, getPos(), "Internal: got 'EI' operator");
-+#else
- error(getPos(), const_cast<char*>("Internal: got 'EI' operator"));
-+#endif
- }
-
- //------------------------------------------------------------------------
Deleted: trunk/dports/graphics/inkscape/files/patch-src-extension-internal-pdfinput-svg-builder.cpp.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-src-extension-internal-pdfinput-svg-builder.cpp.diff 2012-12-19 19:59:52 UTC (rev 100663)
+++ trunk/dports/graphics/inkscape/files/patch-src-extension-internal-pdfinput-svg-builder.cpp.diff 2012-12-19 22:39:51 UTC (rev 100664)
@@ -1,13 +0,0 @@
---- src/extension/internal/pdfinput/svg-builder.cpp.orig 2011-07-08 11:25:09.000000000 -0700
-+++ src/extension/internal/pdfinput/svg-builder.cpp 2012-07-20 11:59:29.000000000 -0700
-@@ -961,9 +961,7 @@
- _font_style = sp_repr_css_attr_new();
- GfxFont *font = state->getFont();
- // Store original name
-- if (font->getOrigName()) {
-- _font_specification = font->getOrigName()->getCString();
-- } else if (font->getName()) {
-+ if (font->getName()) {
- _font_specification = font->getName()->getCString();
- } else {
- _font_specification = (char*) "Arial";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121219/50aad3c4/attachment-0001.html>
More information about the macports-changes
mailing list