diff -Nru inkscape-0.48.3/build.xml inkscape-0.48.3.1/build.xml --- inkscape-0.48.3/build.xml 2012-02-15 19:07:42.631376491 +0000 +++ inkscape-0.48.3.1/build.xml 2012-02-19 01:43:10.789370951 +0000 @@ -42,7 +42,7 @@ - + @@ -153,7 +153,7 @@ #define HAVE_OPENMP 1 #define HAVE_TR1_UNORDERED_SET 1 - #define ENABLE_LCMS 1 + #define HAVE_LIBLCMS1 1 #define ENABLE_NLS 1 #define HAVE_BIND_TEXTDOMAIN_CODESET 1 diff -Nru inkscape-0.48.3/config.guess inkscape-0.48.3.1/config.guess --- inkscape-0.48.3/config.guess 2012-02-14 03:23:03.913004594 +0000 +++ inkscape-0.48.3.1/config.guess 2012-02-19 01:43:48.410289083 +0000 @@ -2,9 +2,9 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-05-11' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -792,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -807,6 +804,9 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -861,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -895,13 +902,16 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -943,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -978,13 +988,13 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -1315,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -Nru inkscape-0.48.3/config.sub inkscape-0.48.3.1/config.sub --- inkscape-0.48.3/config.sub 2012-02-14 03:23:03.917004689 +0000 +++ inkscape-0.48.3.1/config.sub 2012-02-19 01:43:48.414289181 +0000 @@ -2,9 +2,9 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-03-23' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -132,6 +130,10 @@ os=-$maybe_os basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -247,17 +249,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -291,7 +298,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -300,7 +307,7 @@ | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -315,8 +322,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -329,7 +335,10 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -352,11 +361,13 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ @@ -365,8 +376,10 @@ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -400,7 +413,7 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -408,10 +421,11 @@ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -711,7 +725,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -808,10 +821,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -1120,13 +1141,8 @@ basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1336,7 +1352,7 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1548,9 +1564,6 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout diff -Nru inkscape-0.48.3/configure inkscape-0.48.3.1/configure --- inkscape-0.48.3/configure 2012-02-15 19:08:07.151966837 +0000 +++ inkscape-0.48.3.1/configure 2012-02-19 01:43:51.010352534 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for inkscape 0.48.3. +# Generated by GNU Autoconf 2.68 for inkscape 0.48.3.1. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -557,8 +557,8 @@ # Identity of this package. PACKAGE_NAME='inkscape' PACKAGE_TARNAME='inkscape' -PACKAGE_VERSION='0.48.3' -PACKAGE_STRING='inkscape 0.48.3' +PACKAGE_VERSION='0.48.3.1' +PACKAGE_STRING='inkscape 0.48.3.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -665,8 +665,6 @@ USE_GNOME_VFS_TRUE GNOME_VFS_LIBS GNOME_VFS_CFLAGS -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH PLATFORM_SOLARIS_FALSE PLATFORM_SOLARIS_TRUE PLATFORM_OSX_FALSE @@ -677,7 +675,6 @@ FREETYPE_LIBS FREETYPE_CFLAGS FREETYPE_CONFIG -PKG_CONFIG MKINSTALLDIRS POSUB POFILES @@ -690,6 +687,11 @@ CATALOGS MSGFMT_OPTS GETTEXT_PACKAGE +NEW_GLIBMM_LIBS +NEW_GLIBMM_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG AM_BACKSLASH AM_DEFAULT_V AM_V @@ -866,6 +868,8 @@ PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR +NEW_GLIBMM_CFLAGS +NEW_GLIBMM_LIBS GNOME_VFS_CFLAGS GNOME_VFS_LIBS LCMS2_CFLAGS @@ -1440,7 +1444,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures inkscape 0.48.3 to adapt to many kinds of systems. +\`configure' configures inkscape 0.48.3.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1510,7 +1514,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of inkscape 0.48.3:";; + short | recursive ) echo "Configuration of inkscape 0.48.3.1:";; esac cat <<\_ACEOF @@ -1555,6 +1559,10 @@ directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path + NEW_GLIBMM_CFLAGS + C compiler flags for NEW_GLIBMM, overriding pkg-config + NEW_GLIBMM_LIBS + linker flags for NEW_GLIBMM, overriding pkg-config GNOME_VFS_CFLAGS C compiler flags for GNOME_VFS, overriding pkg-config GNOME_VFS_LIBS @@ -1683,7 +1691,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -inkscape configure 0.48.3 +inkscape configure 0.48.3.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2243,7 +2251,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by inkscape $as_me 0.48.3, which was +It was created by inkscape $as_me 0.48.3.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3131,7 +3139,7 @@ # Define the identity of the package. PACKAGE='inkscape' - VERSION='0.48.3' + VERSION='0.48.3.1' cat >>confdefs.h <<_ACEOF @@ -7141,7 +7149,200 @@ # Enable all default warnings CPPFLAGS="-Wall $CPPFLAGS" # Enforce including only (required since 2.31) - CPPFLAGS="-DG_DISABLE_SINGLE_INCLUDES $CPPFLAGS" + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + 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 + 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 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + 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 + 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 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NEW_GLIBMM" >&5 +$as_echo_n "checking for NEW_GLIBMM... " >&6; } + +if test -n "$NEW_GLIBMM_CFLAGS"; then + pkg_cv_NEW_GLIBMM_CFLAGS="$NEW_GLIBMM_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4 >= 2.28\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glibmm-2.4 >= 2.28") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NEW_GLIBMM_CFLAGS=`$PKG_CONFIG --cflags "glibmm-2.4 >= 2.28" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$NEW_GLIBMM_LIBS"; then + pkg_cv_NEW_GLIBMM_LIBS="$NEW_GLIBMM_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4 >= 2.28\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glibmm-2.4 >= 2.28") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NEW_GLIBMM_LIBS=`$PKG_CONFIG --libs "glibmm-2.4 >= 2.28" 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 + NEW_GLIBMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glibmm-2.4 >= 2.28" 2>&1` + else + NEW_GLIBMM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glibmm-2.4 >= 2.28" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$NEW_GLIBMM_PKG_ERRORS" >&5 + + new_glibmm=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + new_glibmm=no +else + NEW_GLIBMM_CFLAGS=$pkg_cv_NEW_GLIBMM_CFLAGS + NEW_GLIBMM_LIBS=$pkg_cv_NEW_GLIBMM_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + new_glibmm=yes +fi + if test "x$new_glibmm" = "xyes"; then + CPPFLAGS="-DG_DISABLE_SINGLE_INCLUDES $CPPFLAGS" + fi # Test for -Werror=... (introduced some time post-4.0) # If we hit a format error -- it should be fatal. @@ -8975,126 +9176,6 @@ gnome_vfs=no else - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - 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 - 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 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - 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 - 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 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi - pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_VFS" >&5 $as_echo_n "checking for GNOME_VFS... " >&6; } @@ -12612,7 +12693,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by inkscape $as_me 0.48.3, which was +This file was extended by inkscape $as_me 0.48.3.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12678,7 +12759,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -inkscape config.status 0.48.3 +inkscape config.status 0.48.3.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru inkscape-0.48.3/configure.ac inkscape-0.48.3.1/configure.ac --- inkscape-0.48.3/configure.ac 2012-02-15 19:07:50.959577070 +0000 +++ inkscape-0.48.3.1/configure.ac 2012-02-19 01:43:03.393190443 +0000 @@ -7,7 +7,7 @@ # `dpkg --compare-versions'. (ii) We don't always know what the next # version is going to be called until about the time we release it # (whereas we always know what the previous version was called). -AC_INIT(inkscape, 0.48.3) +AC_INIT(inkscape, 0.48.3.1) AC_CANONICAL_HOST AC_CONFIG_SRCDIR([src/main.cpp]) @@ -54,7 +54,11 @@ # Enable all default warnings CPPFLAGS="-Wall $CPPFLAGS" # Enforce including only (required since 2.31) - CPPFLAGS="-DG_DISABLE_SINGLE_INCLUDES $CPPFLAGS" + PKG_CHECK_MODULES(NEW_GLIBMM, glibmm-2.4 >= 2.28, new_glibmm=yes, +new_glibmm=no) + if test "x$new_glibmm" = "xyes"; then + CPPFLAGS="-DG_DISABLE_SINGLE_INCLUDES $CPPFLAGS" + fi # Test for -Werror=... (introduced some time post-4.0) # If we hit a format error -- it should be fatal. diff -Nru inkscape-0.48.3/debian/changelog inkscape-0.48.3.1/debian/changelog --- inkscape-0.48.3/debian/changelog 2012-03-01 18:38:52.000000000 +0000 +++ inkscape-0.48.3.1/debian/changelog 2012-03-01 18:38:54.000000000 +0000 @@ -1,3 +1,11 @@ +inkscape (0.48.3.1-0ubuntu1) precise; urgency=low + + * New upstream release (LP: #943984) + - Fixes build errors with glibmm < 2.28 + * Allow building against either lcms1 or lcms2 (LP: #885324) + + -- Alex Valavanis Thu, 01 Mar 2012 15:38:35 +0000 + inkscape (0.48.3-0ubuntu1) precise; urgency=low * New upstream release (LP: #933188). Fixes several Ubuntu bugs: diff -Nru inkscape-0.48.3/debian/control inkscape-0.48.3.1/debian/control --- inkscape-0.48.3/debian/control 2012-03-01 18:38:52.000000000 +0000 +++ inkscape-0.48.3.1/debian/control 2012-03-01 18:38:54.000000000 +0000 @@ -22,7 +22,7 @@ libgtkmm-2.4-dev, libgtkspell-dev, libgsl0-dev, - liblcms1-dev, + liblcms2-dev | liblcms1-dev, libmagick++-dev, libpango1.0-dev, libpng12-dev, diff -Nru inkscape-0.48.3/doc/Makefile.in inkscape-0.48.3.1/doc/Makefile.in --- inkscape-0.48.3/doc/Makefile.in 2012-02-15 19:08:07.311970687 +0000 +++ inkscape-0.48.3.1/doc/Makefile.in 2012-02-19 01:43:48.526291912 +0000 @@ -148,6 +148,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -268,9 +270,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign doc/Makefile + $(AUTOMAKE) --gnu doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/Info.plist inkscape-0.48.3.1/Info.plist --- inkscape-0.48.3/Info.plist 2012-02-15 19:08:20.320283606 +0000 +++ inkscape-0.48.3.1/Info.plist 2012-02-19 01:44:03.330653189 +0000 @@ -7,7 +7,7 @@ CFBundleExecutable Inkscape CFBundleGetInfoString - 0.48.3, Copyright 2003-2009 Inkscape Developers + 0.48.3.1, Copyright 2003-2009 Inkscape Developers CFBundleIconFile Inkscape.icns CFBundleIdentifier @@ -323,11 +323,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.48.3 + 0.48.3.1 CFBundleSignature Inks CFBundleVersion - 0.48.3 + 0.48.3.1 NSHumanReadableCopyright Copyright 2009 Inkscape Developers, GNU General Public License. LSMinimumSystemVersion diff -Nru inkscape-0.48.3/inkscape.spec inkscape-0.48.3.1/inkscape.spec --- inkscape-0.48.3/inkscape.spec 2012-02-15 19:08:20.292282932 +0000 +++ inkscape-0.48.3.1/inkscape.spec 2012-02-19 01:44:03.314652799 +0000 @@ -7,7 +7,7 @@ Name: inkscape Summary: A Vector Drawing Application -Version: 0.48.3 +Version: 0.48.3.1 # Use release "0" so that distro-released versions will override ours. Release: 0 License: GPL diff -Nru inkscape-0.48.3/Makefile.in inkscape-0.48.3.1/Makefile.in --- inkscape-0.48.3/Makefile.in 2012-02-15 19:08:09.020011786 +0000 +++ inkscape-0.48.3.1/Makefile.in 2012-02-19 01:43:50.578341991 +0000 @@ -296,6 +296,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff -Nru inkscape-0.48.3/share/clipart/Makefile.in inkscape-0.48.3.1/share/clipart/Makefile.in --- inkscape-0.48.3/share/clipart/Makefile.in 2012-02-15 19:08:07.399972804 +0000 +++ inkscape-0.48.3.1/share/clipart/Makefile.in 2012-02-19 01:43:48.674295527 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -291,9 +293,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/clipart/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/clipart/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/clipart/Makefile + $(AUTOMAKE) --gnu share/clipart/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/examples/Makefile.in inkscape-0.48.3.1/share/examples/Makefile.in --- inkscape-0.48.3/share/examples/Makefile.in 2012-02-15 19:08:07.439973769 +0000 +++ inkscape-0.48.3.1/share/examples/Makefile.in 2012-02-19 01:43:48.726296796 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -316,9 +318,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/examples/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/examples/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/examples/Makefile + $(AUTOMAKE) --gnu share/examples/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/extensions/alphabet_soup/Makefile.in inkscape-0.48.3.1/share/extensions/alphabet_soup/Makefile.in --- inkscape-0.48.3/share/extensions/alphabet_soup/Makefile.in 2012-02-15 19:08:07.623978197 +0000 +++ inkscape-0.48.3.1/share/extensions/alphabet_soup/Makefile.in 2012-02-19 01:43:48.970302750 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -357,9 +359,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/extensions/alphabet_soup/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/extensions/alphabet_soup/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/extensions/alphabet_soup/Makefile + $(AUTOMAKE) --gnu share/extensions/alphabet_soup/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/extensions/Barcode/Makefile.in inkscape-0.48.3.1/share/extensions/Barcode/Makefile.in --- inkscape-0.48.3/share/extensions/Barcode/Makefile.in 2012-02-15 19:08:07.483974827 +0000 +++ inkscape-0.48.3.1/share/extensions/Barcode/Makefile.in 2012-02-19 01:43:48.774297964 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -299,9 +301,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/extensions/Barcode/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/extensions/Barcode/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/extensions/Barcode/Makefile + $(AUTOMAKE) --gnu share/extensions/Barcode/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/extensions/Makefile.in inkscape-0.48.3.1/share/extensions/Makefile.in --- inkscape-0.48.3/share/extensions/Makefile.in 2012-02-15 19:08:07.543976272 +0000 +++ inkscape-0.48.3.1/share/extensions/Makefile.in 2012-02-19 01:43:48.850299819 +0000 @@ -221,6 +221,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -637,9 +639,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/extensions/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/extensions/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/extensions/Makefile + $(AUTOMAKE) --gnu share/extensions/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/extensions/Poly3DObjects/Makefile.in inkscape-0.48.3.1/share/extensions/Poly3DObjects/Makefile.in --- inkscape-0.48.3/share/extensions/Poly3DObjects/Makefile.in 2012-02-15 19:08:07.583977230 +0000 +++ inkscape-0.48.3.1/share/extensions/Poly3DObjects/Makefile.in 2012-02-19 01:43:48.910301285 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -312,9 +314,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/extensions/Poly3DObjects/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/extensions/Poly3DObjects/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/extensions/Poly3DObjects/Makefile + $(AUTOMAKE) --gnu share/extensions/Poly3DObjects/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/extensions/test/Makefile.in inkscape-0.48.3.1/share/extensions/test/Makefile.in --- inkscape-0.48.3/share/extensions/test/Makefile.in 2012-02-15 19:08:07.659979059 +0000 +++ inkscape-0.48.3.1/share/extensions/test/Makefile.in 2012-02-19 01:43:49.018303921 +0000 @@ -152,6 +152,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -310,9 +312,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/extensions/test/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/extensions/test/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/extensions/test/Makefile + $(AUTOMAKE) --gnu share/extensions/test/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/extensions/xaml2svg/Makefile.in inkscape-0.48.3.1/share/extensions/xaml2svg/Makefile.in --- inkscape-0.48.3/share/extensions/xaml2svg/Makefile.in 2012-02-15 19:08:07.699980025 +0000 +++ inkscape-0.48.3.1/share/extensions/xaml2svg/Makefile.in 2012-02-19 01:43:49.074305288 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -298,9 +300,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/extensions/xaml2svg/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/extensions/xaml2svg/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/extensions/xaml2svg/Makefile + $(AUTOMAKE) --gnu share/extensions/xaml2svg/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/filters/Makefile.in inkscape-0.48.3.1/share/filters/Makefile.in --- inkscape-0.48.3/share/filters/Makefile.in 2012-02-15 19:08:07.735980889 +0000 +++ inkscape-0.48.3.1/share/filters/Makefile.in 2012-02-19 01:43:49.130306652 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -290,9 +292,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/filters/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/filters/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/filters/Makefile + $(AUTOMAKE) --gnu share/filters/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/fonts/Makefile.in inkscape-0.48.3.1/share/fonts/Makefile.in --- inkscape-0.48.3/share/fonts/Makefile.in 2012-02-15 19:08:07.775981852 +0000 +++ inkscape-0.48.3.1/share/fonts/Makefile.in 2012-02-19 01:43:49.182307921 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -286,9 +288,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/fonts/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/fonts/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/fonts/Makefile + $(AUTOMAKE) --gnu share/fonts/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/gradients/Makefile.in inkscape-0.48.3.1/share/gradients/Makefile.in --- inkscape-0.48.3/share/gradients/Makefile.in 2012-02-15 19:08:07.815982814 +0000 +++ inkscape-0.48.3.1/share/gradients/Makefile.in 2012-02-19 01:43:49.230309095 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -286,9 +288,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/gradients/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/gradients/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/gradients/Makefile + $(AUTOMAKE) --gnu share/gradients/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/icons/application/16x16/Makefile.in inkscape-0.48.3.1/share/icons/application/16x16/Makefile.in --- inkscape-0.48.3/share/icons/application/16x16/Makefile.in 2012-02-15 19:08:07.903984930 +0000 +++ inkscape-0.48.3.1/share/icons/application/16x16/Makefile.in 2012-02-19 01:43:49.334311633 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -284,9 +286,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/icons/application/16x16/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/icons/application/16x16/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/icons/application/16x16/Makefile + $(AUTOMAKE) --gnu share/icons/application/16x16/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/icons/application/22x22/Makefile.in inkscape-0.48.3.1/share/icons/application/22x22/Makefile.in --- inkscape-0.48.3/share/icons/application/22x22/Makefile.in 2012-02-15 19:08:07.943985897 +0000 +++ inkscape-0.48.3.1/share/icons/application/22x22/Makefile.in 2012-02-19 01:43:49.386312902 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -284,9 +286,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/icons/application/22x22/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/icons/application/22x22/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/icons/application/22x22/Makefile + $(AUTOMAKE) --gnu share/icons/application/22x22/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/icons/application/24x24/Makefile.in inkscape-0.48.3.1/share/icons/application/24x24/Makefile.in --- inkscape-0.48.3/share/icons/application/24x24/Makefile.in 2012-02-15 19:08:07.979986764 +0000 +++ inkscape-0.48.3.1/share/icons/application/24x24/Makefile.in 2012-02-19 01:43:49.438314171 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -284,9 +286,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/icons/application/24x24/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/icons/application/24x24/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/icons/application/24x24/Makefile + $(AUTOMAKE) --gnu share/icons/application/24x24/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/icons/application/256x256/Makefile.in inkscape-0.48.3.1/share/icons/application/256x256/Makefile.in --- inkscape-0.48.3/share/icons/application/256x256/Makefile.in 2012-02-15 19:08:08.019987725 +0000 +++ inkscape-0.48.3.1/share/icons/application/256x256/Makefile.in 2012-02-19 01:43:49.490315440 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -284,9 +286,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/icons/application/256x256/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/icons/application/256x256/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/icons/application/256x256/Makefile + $(AUTOMAKE) --gnu share/icons/application/256x256/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/icons/application/32x32/Makefile.in inkscape-0.48.3.1/share/icons/application/32x32/Makefile.in --- inkscape-0.48.3/share/icons/application/32x32/Makefile.in 2012-02-15 19:08:08.059988684 +0000 +++ inkscape-0.48.3.1/share/icons/application/32x32/Makefile.in 2012-02-19 01:43:49.546316804 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -284,9 +286,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/icons/application/32x32/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/icons/application/32x32/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/icons/application/32x32/Makefile + $(AUTOMAKE) --gnu share/icons/application/32x32/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/icons/application/48x48/Makefile.in inkscape-0.48.3.1/share/icons/application/48x48/Makefile.in --- inkscape-0.48.3/share/icons/application/48x48/Makefile.in 2012-02-15 19:08:08.099989650 +0000 +++ inkscape-0.48.3.1/share/icons/application/48x48/Makefile.in 2012-02-19 01:43:49.602318170 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -284,9 +286,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/icons/application/48x48/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/icons/application/48x48/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/icons/application/48x48/Makefile + $(AUTOMAKE) --gnu share/icons/application/48x48/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/icons/application/Makefile.in inkscape-0.48.3.1/share/icons/application/Makefile.in --- inkscape-0.48.3/share/icons/application/Makefile.in 2012-02-15 19:08:08.139990609 +0000 +++ inkscape-0.48.3.1/share/icons/application/Makefile.in 2012-02-19 01:43:49.658319539 +0000 @@ -188,6 +188,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -293,9 +295,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/icons/application/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/icons/application/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/icons/application/Makefile + $(AUTOMAKE) --gnu share/icons/application/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/icons/Makefile.in inkscape-0.48.3.1/share/icons/Makefile.in --- inkscape-0.48.3/share/icons/Makefile.in 2012-02-15 19:08:07.859983875 +0000 +++ inkscape-0.48.3.1/share/icons/Makefile.in 2012-02-19 01:43:49.286310459 +0000 @@ -218,6 +218,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -376,9 +378,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/icons/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/icons/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/icons/Makefile + $(AUTOMAKE) --gnu share/icons/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/keys/Makefile.in inkscape-0.48.3.1/share/keys/Makefile.in --- inkscape-0.48.3/share/keys/Makefile.in 2012-02-15 19:08:08.179991575 +0000 +++ inkscape-0.48.3.1/share/keys/Makefile.in 2012-02-19 01:43:49.710320808 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -294,9 +296,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/keys/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/keys/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/keys/Makefile + $(AUTOMAKE) --gnu share/keys/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/Makefile.in inkscape-0.48.3.1/share/Makefile.in --- inkscape-0.48.3/share/Makefile.in 2012-02-15 19:08:07.355971748 +0000 +++ inkscape-0.48.3.1/share/Makefile.in 2012-02-19 01:43:48.602293769 +0000 @@ -188,6 +188,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -307,9 +309,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/Makefile + $(AUTOMAKE) --gnu share/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/markers/Makefile.in inkscape-0.48.3.1/share/markers/Makefile.in --- inkscape-0.48.3/share/markers/Makefile.in 2012-02-15 19:08:08.219992535 +0000 +++ inkscape-0.48.3.1/share/markers/Makefile.in 2012-02-19 01:43:49.762322077 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -286,9 +288,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/markers/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/markers/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/markers/Makefile + $(AUTOMAKE) --gnu share/markers/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/palettes/Makefile.in inkscape-0.48.3.1/share/palettes/Makefile.in --- inkscape-0.48.3/share/palettes/Makefile.in 2012-02-15 19:08:08.259993501 +0000 +++ inkscape-0.48.3.1/share/palettes/Makefile.in 2012-02-19 01:43:49.818323442 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -305,9 +307,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/palettes/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/palettes/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/palettes/Makefile + $(AUTOMAKE) --gnu share/palettes/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/patterns/Makefile.in inkscape-0.48.3.1/share/patterns/Makefile.in --- inkscape-0.48.3/share/patterns/Makefile.in 2012-02-15 19:08:08.295994364 +0000 +++ inkscape-0.48.3.1/share/patterns/Makefile.in 2012-02-19 01:43:49.870324711 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -288,9 +290,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/patterns/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/patterns/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/patterns/Makefile + $(AUTOMAKE) --gnu share/patterns/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/screens/Makefile.in inkscape-0.48.3.1/share/screens/Makefile.in --- inkscape-0.48.3/share/screens/Makefile.in 2012-02-15 19:08:08.355995806 +0000 +++ inkscape-0.48.3.1/share/screens/Makefile.in 2012-02-19 01:43:49.930326177 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -286,9 +288,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/screens/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/screens/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/screens/Makefile + $(AUTOMAKE) --gnu share/screens/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/templates/Makefile.in inkscape-0.48.3.1/share/templates/Makefile.in --- inkscape-0.48.3/share/templates/Makefile.in 2012-02-15 19:08:08.423997446 +0000 +++ inkscape-0.48.3.1/share/templates/Makefile.in 2012-02-19 01:43:49.978327348 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -336,9 +338,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/templates/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/templates/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/templates/Makefile + $(AUTOMAKE) --gnu share/templates/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/tutorials/Makefile.in inkscape-0.48.3.1/share/tutorials/Makefile.in --- inkscape-0.48.3/share/tutorials/Makefile.in 2012-02-15 19:08:08.475998697 +0000 +++ inkscape-0.48.3.1/share/tutorials/Makefile.in 2012-02-19 01:43:50.042328911 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -471,9 +473,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/tutorials/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/tutorials/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/tutorials/Makefile + $(AUTOMAKE) --gnu share/tutorials/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/share/ui/Makefile.in inkscape-0.48.3.1/share/ui/Makefile.in --- inkscape-0.48.3/share/ui/Makefile.in 2012-02-15 19:08:08.540000237 +0000 +++ inkscape-0.48.3.1/share/ui/Makefile.in 2012-02-19 01:43:50.090330082 +0000 @@ -178,6 +178,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -290,9 +292,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign share/ui/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu share/ui/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign share/ui/Makefile + $(AUTOMAKE) --gnu share/ui/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff -Nru inkscape-0.48.3/src/color-profile.cpp inkscape-0.48.3.1/src/color-profile.cpp --- inkscape-0.48.3/src/color-profile.cpp 2012-02-15 14:44:43.360507000 +0000 +++ inkscape-0.48.3.1/src/color-profile.cpp 2012-02-19 01:41:36.476182000 +0000 @@ -821,7 +821,7 @@ #ifdef WIN32 wchar_t pathBuf[MAX_PATH + 1]; pathBuf[0] = 0; - cmsUInt32Number pathSize = sizeof(pathBuf); + DWORD pathSize = sizeof(pathBuf); g_assert(sizeof(wchar_t) == sizeof(gunichar2)); if ( GetColorDirectoryW( NULL, pathBuf, &pathSize ) ) { gchar * utf8Path = g_utf16_to_utf8( (gunichar2*)(&pathBuf[0]), -1, NULL, NULL, NULL ); diff -Nru inkscape-0.48.3/src/display/nr-filter-flood.cpp inkscape-0.48.3.1/src/display/nr-filter-flood.cpp --- inkscape-0.48.3/src/display/nr-filter-flood.cpp 2011-07-08 19:25:09.468790000 +0100 +++ inkscape-0.48.3.1/src/display/nr-filter-flood.cpp 2012-02-19 01:41:36.476182000 +0000 @@ -58,10 +58,11 @@ b = CLAMP_D_TO_U8((color >> 8) % 256); a = CLAMP_D_TO_U8(opacity*255); -#if ENABLE_LCMS +#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) + if (icc) { icc_color_to_sRGB(icc, &r, &g, &b); -//g_message("result: r:%d g:%d b:%d", r, g, b); -#endif //ENABLE_LCMS + } +#endif for(i=0; i < 4*in_h*in_w; i+=4){ out_data[i]=r; diff -Nru inkscape-0.48.3/src/inkscape-version.cpp inkscape-0.48.3.1/src/inkscape-version.cpp --- inkscape-0.48.3/src/inkscape-version.cpp 2012-02-15 19:08:26.204425092 +0000 +++ inkscape-0.48.3.1/src/inkscape-version.cpp 2012-02-19 01:44:11.898862276 +0000 @@ -1 +1 @@ -namespace Inkscape { char const *version_string = "0.48.3 r9882"; } +namespace Inkscape { char const *version_string = "0.48.3.1 r9886"; } diff -Nru inkscape-0.48.3/src/Makefile.in inkscape-0.48.3.1/src/Makefile.in --- inkscape-0.48.3/src/Makefile.in 2012-02-15 19:08:08.932009666 +0000 +++ inkscape-0.48.3.1/src/Makefile.in 2012-02-19 01:43:50.470339355 +0000 @@ -1654,6 +1654,8 @@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ +NEW_GLIBMM_CFLAGS = @NEW_GLIBMM_CFLAGS@ +NEW_GLIBMM_LIBS = @NEW_GLIBMM_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -3021,9 +3023,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/Makefile + $(AUTOMAKE) --gnu src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \