Hello community, here is the log from the commit of package libetonyek for openSUSE:Factory checked in at 2014-06-02 07:00:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libetonyek (Old) and /work/SRC/openSUSE:Factory/.libetonyek.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libetonyek" Changes: -------- --- /work/SRC/openSUSE:Factory/libetonyek/libetonyek.changes 2014-01-23 15:47:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libetonyek.new/libetonyek.changes 2014-06-02 07:00:14.000000000 +0200 @@ -1,0 +2,10 @@ +Tue May 20 14:50:32 UTC 2014 - tchva...@suse.com + +- Version bump to 0.0.4: + * Various bugfixes found during the libreoffice-4.2 cycle +- Drop upstreamed patches: + * libetonyek-0.0.3-comma.patch + * libetonyek-0.0.3-lexical_cast.patch + * libetonyek-more-lib64.patch + +------------------------------------------------------------------- Old: ---- libetonyek-0.0.3-comma.patch libetonyek-0.0.3-lexical_cast.patch libetonyek-0.0.3.tar.xz libetonyek-more-lib64.patch New: ---- libetonyek-0.0.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libetonyek.spec ++++++ --- /var/tmp/diff_new_pack.OrUjd3/_old 2014-06-02 07:00:15.000000000 +0200 +++ /var/tmp/diff_new_pack.OrUjd3/_new 2014-06-02 07:00:15.000000000 +0200 @@ -18,27 +18,19 @@ %define libname libetonyek-0_0-0 Name: libetonyek -Version: 0.0.3 +Version: 0.0.4 Release: 0 Summary: Library for Apple Keynote presentations License: MPL-2.0 Group: Productivity/Publishing/Word Url: http://www.freedesktop.org/wiki/Software/libetonyek Source0: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.xz -# Upstream patch for extra comma at the end of an enum -Patch0: libetonyek-0.0.3-comma.patch -# With some boost versions, cannot take an address of a template -Patch1: libetonyek-0.0.3-lexical_cast.patch -# Add ppc64le and aarch64 to 64bit archs of boost detection -Patch2: libetonyek-more-lib64.patch -BuildRequires: automake BuildRequires: boost-devel BuildRequires: cppunit-devel BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gperf -BuildRequires: libtool BuildRequires: libwpd-devel >= 0.9.0 BuildRequires: libxml2-devel BuildRequires: pkgconfig @@ -89,13 +81,9 @@ %prep %setup -q -%patch0 -p1 -b .comma -%patch1 -p1 -b .lexical_cast -%patch2 -b .lib64 %build export CXXFLAGS="%optflags -fvisibility-inlines-hidden" -autoreconf -i %configure \ --disable-werror \ --disable-static \ ++++++ libetonyek-0.0.3.tar.xz -> libetonyek-0.0.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/ChangeLog new/libetonyek-0.0.4/ChangeLog --- old/libetonyek-0.0.3/ChangeLog 2013-12-06 14:41:32.000000000 +0100 +++ new/libetonyek-0.0.4/ChangeLog 2014-04-15 12:16:02.000000000 +0200 @@ -1,3 +1,40 @@ +2014-04-15 David Tardon <dtar...@redhat.com> [8a892aa514419625b7fbb7bf52653f2cbc26d135] + + prepare release 0.0.4 + + Change-Id: I2578600d35f92e80ac77ffa0d337e75625723d77 + +2014-04-15 David Tardon <dtar...@redhat.com> [8691e35d1519da8aad3e469dc8423c4272b783e0] + + fdo#72030 scale images correctly + + Change-Id: I277d0e8b58588a6b1281d7a8fd5e26486806e872 + (cherry picked from commit 0a7f58b0d6a6b268f1633f65279a611ca0a714ef) + Signed-off-by: David Tardon <dtar...@redhat.com> + +2014-04-15 David Tardon <dtar...@redhat.com> [9000653b4bb63dfc74e16efe69a25899a8f507b9] + + skip color profile data when parsing color + + This fixes data loss, as the XML parser is left in inconsistent state + otherwise. + + Change-Id: Idf58afaade36ec4ef7b9037a2a7c7d94eaad5ad2 + (cherry picked from commit aa4614be86be70757c98af8bf6d33aa10ff61902) + Signed-off-by: David Tardon <dtar...@redhat.com> + +2013-12-15 Fridrich Štrba <fridrich.st...@bluewin.ch> [b1ebd32560eec337e19276a719f5e2938c7fea95] + + Some versions of boost don't manage to take an address of template + + Change-Id: Ida12034d189d2c789d7ecb71a58b7e1e94249139 + +2013-12-06 Fridrich Štrba <fridrich.st...@bluewin.ch> [c2065764ae0826409f1dd683e52b7ca65f092972] + + Comma at the end of emum list + + Change-Id: I1370488e5bf682e23a923f37c09e76081aee7493 + 2013-12-06 David Tardon <dtar...@redhat.com> [4302e5efd0ade9ea39f3363cf6242d5c9e1b9679] prepare for a release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/NEWS new/libetonyek-0.0.4/NEWS --- old/libetonyek-0.0.3/NEWS 2013-12-06 14:37:55.000000000 +0100 +++ new/libetonyek-0.0.4/NEWS 2014-04-15 12:14:21.000000000 +0200 @@ -1,3 +1,9 @@ +libetonyek 0.0.4 + +- fix some build problems +- avoid data loss in some cases +- scale images properly + libetonyek 0.0.3 - import text formatting attributes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/config.guess new/libetonyek-0.0.4/config.guess --- old/libetonyek-0.0.3/config.guess 2013-10-30 22:05:42.000000000 +0100 +++ new/libetonyek-0.0.4/config.guess 2014-04-15 11:51:03.000000000 +0200 @@ -1,8 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2012-12-29' # 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 @@ -24,7 +26,7 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD @@ -50,7 +52,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 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,27 +136,6 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in -Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu - - eval $set_cc_for_build - cat <<-EOF > $dummy.c - #include <features.h> - #if defined(__UCLIBC__) - LIBC=uclibc - #elif defined(__dietlibc__) - LIBC=dietlibc - #else - LIBC=gnu - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - ;; -esac - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -874,21 +857,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -901,54 +884,59 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo ${UNAME_MACHINE}-unknown-linux-gnueabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -967,63 +955,54 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-gnu exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-gnu exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} - exit ;; - ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} - exit ;; - ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1256,21 +1235,19 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - fi + case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/config.sub new/libetonyek-0.0.4/config.sub --- old/libetonyek-0.0.3/config.sub 2013-10-30 22:05:42.000000000 +0100 +++ new/libetonyek-0.0.4/config.sub 2014-04-15 11:51:03.000000000 +0200 @@ -1,8 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2013-04-24' +timestamp='2012-12-29' # 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 @@ -68,7 +70,9 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 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." @@ -252,7 +256,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arceb \ + | arc \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | be32 | be64 \ @@ -286,17 +290,16 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ + | nios | nios2 \ | ns16k | ns32k \ | open8 \ - | or1k | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -366,7 +369,7 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ @@ -404,13 +407,12 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -1352,7 +1354,7 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1498,6 +1500,9 @@ -aros*) os=-aros ;; + -kaos*) + os=-kaos + ;; -zvmoe) os=-zvmoe ;; @@ -1589,9 +1594,6 @@ mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/configure new/libetonyek-0.0.4/configure --- old/libetonyek-0.0.3/configure 2013-12-06 14:39:05.000000000 +0100 +++ new/libetonyek-0.0.4/configure 2014-04-15 12:15:54.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libetonyek 0.0.3. +# Generated by GNU Autoconf 2.69 for libetonyek 0.0.4. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='libetonyek' PACKAGE_TARNAME='libetonyek' -PACKAGE_VERSION='0.0.3' -PACKAGE_STRING='libetonyek 0.0.3' +PACKAGE_VERSION='0.0.4' +PACKAGE_STRING='libetonyek 0.0.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1378,7 +1378,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 libetonyek 0.0.3 to adapt to many kinds of systems. +\`configure' configures libetonyek 0.0.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1448,7 +1448,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libetonyek 0.0.3:";; + short | recursive ) echo "Configuration of libetonyek 0.0.4:";; esac cat <<\_ACEOF @@ -1592,7 +1592,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libetonyek configure 0.0.3 +libetonyek configure 0.0.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2109,7 +2109,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libetonyek $as_me 0.0.3, which was +It was created by libetonyek $as_me 0.0.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2975,7 +2975,7 @@ # Define the identity of the package. PACKAGE='libetonyek' - VERSION='0.0.3' + VERSION='0.0.4' cat >>confdefs.h <<_ACEOF @@ -7577,10 +7577,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - powerpcle-*linux*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc-*linux*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -16866,9 +16866,9 @@ ETONYEK_MINOR_VERSION=0 -ETONYEK_MICRO_VERSION=3 +ETONYEK_MICRO_VERSION=4 -KN_VERSION=0.0.3 +KN_VERSION=0.0.4 # AC_SUBST(LT_RELEASE, [libetonyek_version_major.libetonyek_version_minor]) LT_CURRENT=`expr 100 '*' 0 + 0` @@ -16876,7 +16876,7 @@ LT_AGE=0 # LT_AGE=libetonyek_version_minor -LT_REVISION=3 +LT_REVISION=4 @@ -18453,7 +18453,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libetonyek $as_me 0.0.3, which was +This file was extended by libetonyek $as_me 0.0.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18519,7 +18519,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libetonyek config.status 0.0.3 +libetonyek config.status 0.0.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/configure.ac new/libetonyek-0.0.4/configure.ac --- old/libetonyek-0.0.3/configure.ac 2013-12-06 14:36:29.000000000 +0100 +++ new/libetonyek-0.0.4/configure.ac 2014-04-15 12:13:22.000000000 +0200 @@ -7,7 +7,7 @@ # ==================== m4_define([libetonyek_version_major],[0]) m4_define([libetonyek_version_minor],[0]) -m4_define([libetonyek_version_micro],[3]) +m4_define([libetonyek_version_micro],[4]) m4_define([libetonyek_version],[libetonyek_version_major.libetonyek_version_minor.libetonyek_version_micro]) # ============= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/m4/libtool.m4 new/libetonyek-0.0.4/m4/libtool.m4 --- old/libetonyek-0.0.3/m4/libtool.m4 2013-11-30 18:31:52.000000000 +0100 +++ new/libetonyek-0.0.4/m4/libtool.m4 2014-04-15 11:51:01.000000000 +0200 @@ -1326,10 +1326,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - powerpcle-*linux*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc-*linux*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/src/lib/KEY2Parser.cpp new/libetonyek-0.0.4/src/lib/KEY2Parser.cpp --- old/libetonyek-0.0.3/src/lib/KEY2Parser.cpp 2013-12-03 20:00:09.000000000 +0100 +++ new/libetonyek-0.0.4/src/lib/KEY2Parser.cpp 2014-04-15 12:12:11.000000000 +0200 @@ -735,6 +735,7 @@ assert(checkElement(reader, KEY2Token::geometry, KEY2Token::NS_URI_SF)); optional<ID_t> id; + optional<KEYSize> naturalSize; optional<KEYSize> size; optional<KEYPosition> pos; optional<double> angle; @@ -791,11 +792,14 @@ switch (getNameId(element)) { case KEY2Token::naturalSize : - size = readSize(reader); + naturalSize = readSize(reader); break; case KEY2Token::position : pos = readPosition(reader); break; + case KEY2Token::size : + size = readSize(reader); + break; default : skipElement(element); break; @@ -805,7 +809,7 @@ skipElement(element); } - getCollector()->collectGeometry(id, size, pos, angle, shearXAngle, shearYAngle, horizontalFlip, verticalFlip, aspectRatioLocked, sizesLocked); + getCollector()->collectGeometry(id, naturalSize, size, pos, angle, shearXAngle, shearYAngle, horizontalFlip, verticalFlip, aspectRatioLocked, sizesLocked); } void KEY2Parser::parseGroup(const KEYXMLReader &reader) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/src/lib/KEY2ParserUtils.cpp new/libetonyek-0.0.4/src/lib/KEY2ParserUtils.cpp --- old/libetonyek-0.0.3/src/lib/KEY2ParserUtils.cpp 2013-12-01 21:44:51.000000000 +0100 +++ new/libetonyek-0.0.4/src/lib/KEY2ParserUtils.cpp 2014-04-15 11:18:47.000000000 +0200 @@ -125,7 +125,7 @@ return KEYSize(size.second, size.first); } -bool KEY2ParserUtils::bool_cast(const char *const value) +bool KEY2ParserUtils::bool_cast(const char *value) { KEY2Tokenizer tok; switch (tok(value)) @@ -142,6 +142,16 @@ return false; } +double KEY2ParserUtils::double_cast(const char *value) +{ + return lexical_cast<double, const char *>(value); +} + +int KEY2ParserUtils::int_cast(const char *value) +{ + return lexical_cast<int, const char *>(value); +} + double KEY2ParserUtils::deg2rad(double value) { // normalize range diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/src/lib/KEY2ParserUtils.h new/libetonyek-0.0.4/src/lib/KEY2ParserUtils.h --- old/libetonyek-0.0.3/src/lib/KEY2ParserUtils.h 2013-10-30 22:04:38.000000000 +0100 +++ new/libetonyek-0.0.4/src/lib/KEY2ParserUtils.h 2014-04-15 11:18:47.000000000 +0200 @@ -81,6 +81,8 @@ * @returns the boolean value of the string */ static bool bool_cast(const char *value); + static double double_cast(const char *value); + static int int_cast(const char *value); static double deg2rad(double value); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/src/lib/KEY2StyleParser.cpp new/libetonyek-0.0.4/src/lib/KEY2StyleParser.cpp --- old/libetonyek-0.0.3/src/lib/KEY2StyleParser.cpp 2013-12-06 10:36:13.000000000 +0100 +++ new/libetonyek-0.0.4/src/lib/KEY2StyleParser.cpp 2014-04-15 12:01:13.000000000 +0200 @@ -62,12 +62,12 @@ optional<double> readDouble(const KEYXMLReader &reader) { - return readNumber<double>(reader, KEY2Token::f, &lexical_cast<double, const char *>); + return readNumber<double>(reader, KEY2Token::f, &KEY2ParserUtils::double_cast); } optional<int> readInt(const KEYXMLReader &reader) { - return readNumber<int>(reader, KEY2Token::i, &lexical_cast<int, const char *>); + return readNumber<int>(reader, KEY2Token::i, &KEY2ParserUtils::double_cast); } optional<KEYColor> readColor(const KEYXMLReader &reader) @@ -94,6 +94,9 @@ } } + // Ignore sfa:custom-space-color, if present. The color profile is not part of the document anyway. + skipElement(reader); + return color; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/src/lib/KEYCollector.h new/libetonyek-0.0.4/src/lib/KEYCollector.h --- old/libetonyek-0.0.3/src/lib/KEYCollector.h 2013-12-03 19:38:13.000000000 +0100 +++ new/libetonyek-0.0.4/src/lib/KEYCollector.h 2014-04-15 12:12:11.000000000 +0200 @@ -79,8 +79,8 @@ bool ref, bool anonymous) = 0; virtual void collectGeometry(boost::optional<ID_t> &id, - boost::optional<KEYSize> &naturalSize, boost::optional<KEYPosition> &position, - boost::optional<double> &angle, + boost::optional<KEYSize> &naturalSize, boost::optional<KEYSize> &size, + boost::optional<KEYPosition> &position, boost::optional<double> &angle, boost::optional<double> &shearXAngle, boost::optional<double> &shearYAngle, boost::optional<bool> &horizontalFlip, boost::optional<bool> &verticalFlip, boost::optional<bool> &aspectRatioLocked, boost::optional<bool> &sizesLocked) = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/src/lib/KEYCollectorBase.cpp new/libetonyek-0.0.4/src/lib/KEYCollectorBase.cpp --- old/libetonyek-0.0.3/src/lib/KEYCollectorBase.cpp 2013-12-06 14:32:07.000000000 +0100 +++ new/libetonyek-0.0.4/src/lib/KEYCollectorBase.cpp 2014-04-15 12:12:11.000000000 +0200 @@ -349,8 +349,8 @@ } void KEYCollectorBase::collectGeometry(boost::optional<ID_t> &, - boost::optional<KEYSize> &naturalSize, boost::optional<KEYPosition> &position, - boost::optional<double> &angle, + boost::optional<KEYSize> &naturalSize, boost::optional<KEYSize> &size, + boost::optional<KEYPosition> &position, boost::optional<double> &angle, boost::optional<double> &shearXAngle, boost::optional<double> &shearYAngle, boost::optional<bool> &horizontalFlip, boost::optional<bool> &verticalFlip, boost::optional<bool> &aspectRatioLocked, boost::optional<bool> &sizesLocked) @@ -364,6 +364,7 @@ const KEYGeometryPtr_t geometry(new KEYGeometry); geometry->naturalSize = get(naturalSize); + geometry->size = bool(size) ? get(size) : get(naturalSize); geometry->position = get(position); geometry->angle = angle; geometry->shearXAngle = shearXAngle; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/src/lib/KEYCollectorBase.h new/libetonyek-0.0.4/src/lib/KEYCollectorBase.h --- old/libetonyek-0.0.3/src/lib/KEYCollectorBase.h 2013-12-03 19:54:33.000000000 +0100 +++ new/libetonyek-0.0.4/src/lib/KEYCollectorBase.h 2014-04-15 12:12:11.000000000 +0200 @@ -91,8 +91,8 @@ bool ref, bool anonymous); virtual void collectGeometry(boost::optional<ID_t> &id, - boost::optional<KEYSize> &naturalSize, boost::optional<KEYPosition> &position, - boost::optional<double> &angle, + boost::optional<KEYSize> &naturalSize, boost::optional<KEYSize> &size, + boost::optional<KEYPosition> &position, boost::optional<double> &angle, boost::optional<double> &shearXAngle, boost::optional<double> &shearYAngle, boost::optional<bool> &horizontalFlip, boost::optional<bool> &verticalFlip, boost::optional<bool> &aspectRatioLocked, boost::optional<bool> &sizesLocked); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/src/lib/KEYEnum.h new/libetonyek-0.0.4/src/lib/KEYEnum.h --- old/libetonyek-0.0.3/src/lib/KEYEnum.h 2013-12-06 09:40:36.000000000 +0100 +++ new/libetonyek-0.0.4/src/lib/KEYEnum.h 2014-04-15 11:18:47.000000000 +0200 @@ -33,7 +33,7 @@ KEY_CAPITALIZATION_NONE, KEY_CAPITALIZATION_ALL_CAPS, KEY_CAPITALIZATION_SMALL_CAPS, - KEY_CAPITALIZATION_TITLE, + KEY_CAPITALIZATION_TITLE }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/src/lib/KEYTypes.cpp new/libetonyek-0.0.4/src/lib/KEYTypes.cpp --- old/libetonyek-0.0.3/src/lib/KEYTypes.cpp 2013-12-06 10:03:16.000000000 +0100 +++ new/libetonyek-0.0.4/src/lib/KEYTypes.cpp 2014-04-15 12:12:11.000000000 +0200 @@ -121,6 +121,7 @@ KEYGeometry::KEYGeometry() : naturalSize() + , size() , position() , angle() , shearXAngle() @@ -427,8 +428,8 @@ props.insert("svg:x", pt2in(x)); props.insert("svg:y", pt2in(y)); - double width = m_media->geometry->naturalSize.width; - double height = m_media->geometry->naturalSize.height; + double width = m_media->geometry->size.width; + double height = m_media->geometry->size.height; tr(width, height, true); props.insert("svg:width", pt2in(width)); props.insert("svg:height", pt2in(height)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libetonyek-0.0.3/src/lib/KEYTypes.h new/libetonyek-0.0.4/src/lib/KEYTypes.h --- old/libetonyek-0.0.3/src/lib/KEYTypes.h 2013-12-06 10:02:56.000000000 +0100 +++ new/libetonyek-0.0.4/src/lib/KEYTypes.h 2014-04-15 12:12:11.000000000 +0200 @@ -45,6 +45,7 @@ struct KEYGeometry { KEYSize naturalSize; + KEYSize size; KEYPosition position; boost::optional<double> angle; boost::optional<double> shearXAngle; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
