Hello community,
here is the log from the commit of package libe-book for openSUSE:Factory
checked in at 2013-11-22 18:46:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libe-book (Old)
and /work/SRC/openSUSE:Factory/.libe-book.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libe-book"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libe-book/libe-book.changes 2013-11-19
16:28:16.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libe-book.new/libe-book.changes 2013-11-22
18:46:05.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Nov 22 10:14:54 UTC 2013 - tchva...@suse.com
+
+- Version bump to 0.0.2:
+ * Fix installed headers
+ * Various build fixes
+
+-------------------------------------------------------------------
Old:
----
libe-book-0.0.1.tar.bz2
New:
----
libe-book-0.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libe-book.spec ++++++
--- /var/tmp/diff_new_pack.FP1NB7/_old 2013-11-22 18:46:06.000000000 +0100
+++ /var/tmp/diff_new_pack.FP1NB7/_new 2013-11-22 18:46:06.000000000 +0100
@@ -17,7 +17,7 @@
Name: libe-book
-Version: 0.0.1
+Version: 0.0.2
Release: 0
Summary: A library for import of non-HTML reflowable e-book formats
License: LGPL-2.1+ and MPL-2.0+
++++++ libe-book-0.0.1.tar.bz2 -> libe-book-0.0.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/ChangeLog
new/libe-book-0.0.2/ChangeLog
--- old/libe-book-0.0.1/ChangeLog 2013-11-10 21:14:26.000000000 +0100
+++ new/libe-book-0.0.2/ChangeLog 2013-11-16 20:17:19.000000000 +0100
@@ -1,3 +1,93 @@
+2013-11-16 David Tardon <dtar...@redhat.com>
[5e471a34312148a1727670437fd591a1ab8c3974]
+
+ prepare for release
+
+
+2013-11-16 David Tardon <dtar...@redhat.com>
[95b2982b54ad0ac0df80d8a77f3388a57b48eeb6]
+
+ drop nonsensical comment
+
+
+2013-11-16 David Tardon <dtar...@redhat.com>
[6035490c8a12bc3c2c703ade9a6552ee409a9055]
+
+ fb2: improve alt. image text output
+
+
+2013-11-16 David Tardon <dtar...@redhat.com>
[aff10960c68754a29e305b14692ec545dedc2d71]
+
+ fb2: recover if decoding of image data throws
+
+
+2013-11-16 David Tardon <dtar...@redhat.com>
[1c421be1efb29e6fd6b0d4aabf106a0033d4ba4b]
+
+ move breaks inside blocks
+
+
+2013-11-16 David Tardon <dtar...@redhat.com>
[ebaed4f08c58c46d0edc819b412ac1a5b018048e]
+
+ fb2: do not leak memory on error
+
+
+2013-11-16 David Tardon <dtar...@redhat.com>
[edd75976445f38a6592cdf368798ffb220f078d2]
+
+ drop superfluous break
+
+
+2013-11-16 David Tardon <dtar...@redhat.com>
[a33210f3d839ed7bef4cfadabbbe33b041d90946]
+
+ fb2: skip unknown elements
+
+
+2013-11-16 David Tardon <dtar...@redhat.com>
[f622a15505fc4f901a44f5aa9fa9cffcbe771627]
+
+ do not create generators unless they are needed
+
+
+2013-11-16 David Tardon <dtar...@redhat.com>
[ef539b843ed909db4db7bbb61297e7eb6e39c1ae]
+
+ fix return value of conv. tools
+
+
+2013-11-14 David Tardon <dtar...@redhat.com>
[2ed5f706d19105ec4b6b10eae69b075765ce8827]
+
+ misplaced break
+
+
+2013-11-14 David Tardon <dtar...@redhat.com>
[e2bd13eb707c92bc3deb7a0c59702f584e8d44c7]
+
+ misplaced break
+
+
+2013-11-14 David Tardon <dtar...@redhat.com>
[3986e4f52c7b0288d2a16a3cccfb371878175628]
+
+ silence coverity
+
+
+2013-11-14 David Tardon <dtar...@redhat.com>
[d72574ebb2512c92bc3593980cf406aa46ce8865]
+
+ make sure the object has stream
+
+
+2013-11-14 David Tardon <dtar...@redhat.com>
[7387351a62d728d197db07762324de67cbf98c13]
+
+ set default values
+
+
+2013-11-14 David Tardon <dtar...@redhat.com>
[449cc2faeb65eca30e70509543ad97384b096345]
+
+ check return value
+
+
+2013-11-11 David Tardon <dtar...@redhat.com>
[6e3e03c1518962c9427f44ba0df36fd1e1620fe5]
+
+ library name fix
+
+
+2013-11-11 David Tardon <dtar...@redhat.com>
[fa53cfb9d44912a24726de2c04111bfc3486e2a9]
+
+ install all public headers
+
+
2013-11-10 David Tardon <dtar...@redhat.com>
[c94ab9f6b283da218c9f3110a0d2625ac8748d40]
bump version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/NEWS new/libe-book-0.0.2/NEWS
--- old/libe-book-0.0.1/NEWS 2013-11-10 21:06:35.000000000 +0100
+++ new/libe-book-0.0.2/NEWS 2013-11-16 20:15:26.000000000 +0100
@@ -1,3 +1,11 @@
+libe-book 0.0.2
+
+- install all public headers
+- fix library name in .pc file
+- fix a handful of defects found by coverity
+- fix return value of conversion tools
+- make FictionBook v.2 parser more robust
+
libe-book 0.0.1
- build fix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/aclocal.m4
new/libe-book-0.0.2/aclocal.m4
--- old/libe-book-0.0.1/aclocal.m4 2013-11-10 21:14:09.000000000 +0100
+++ new/libe-book-0.0.2/aclocal.m4 2013-11-16 20:16:35.000000000 +0100
@@ -220,6 +220,21 @@
m4_popdef([pkg_description])
]) dnl PKG_NOARCH_INSTALLDIR
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/ar-lib new/libe-book-0.0.2/ar-lib
--- old/libe-book-0.0.1/ar-lib 2013-05-25 09:49:00.000000000 +0200
+++ new/libe-book-0.0.2/ar-lib 2013-06-15 20:18:09.000000000 +0200
@@ -4,7 +4,7 @@
me=ar-lib
scriptversion=2012-03-01.08; # UTC
-# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2012 Free Software Foundation, Inc.
# Written by Peter Rosin <p...@lysator.liu.se>.
#
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/config.guess
new/libe-book-0.0.2/config.guess
--- old/libe-book-0.0.1/config.guess 2013-05-25 09:49:00.000000000 +0200
+++ new/libe-book-0.0.2/config.guess 2013-06-15 20:18:09.000000000 +0200
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2012-06-10'
+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
@@ -1256,7 +1256,7 @@
NEO-?:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSE-*:NONSTOP_KERNEL:*:*)
+ NSE-?:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/config.sub
new/libe-book-0.0.2/config.sub
--- old/libe-book-0.0.1/config.sub 2013-05-25 09:49:00.000000000 +0200
+++ new/libe-book-0.0.2/config.sub 2013-06-15 20:18:09.000000000 +0200
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2012-04-18'
+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
@@ -225,12 +225,6 @@
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
- -lynx*178)
- os=-lynxos178
- ;;
- -lynx*5)
- os=-lynxos5
- ;;
-lynx*)
os=-lynxos
;;
@@ -1543,9 +1537,6 @@
c4x-* | tic4x-*)
os=-coff
;;
- hexagon-*)
- os=-elf
- ;;
tic54x-*)
os=-coff
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/configure
new/libe-book-0.0.2/configure
--- old/libe-book-0.0.1/configure 2013-11-10 21:14:10.000000000 +0100
+++ new/libe-book-0.0.2/configure 2013-11-16 20:16:39.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libe-book 0.0.1.
+# Generated by GNU Autoconf 2.69 for libe-book 0.0.2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='libe-book'
PACKAGE_TARNAME='libe-book'
-PACKAGE_VERSION='0.0.1'
-PACKAGE_STRING='libe-book 0.0.1'
+PACKAGE_VERSION='0.0.2'
+PACKAGE_STRING='libe-book 0.0.2'
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 libe-book 0.0.1 to adapt to many kinds of systems.
+\`configure' configures libe-book 0.0.2 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 libe-book 0.0.1:";;
+ short | recursive ) echo "Configuration of libe-book 0.0.2:";;
esac
cat <<\_ACEOF
@@ -1582,7 +1582,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libe-book configure 0.0.1
+libe-book configure 0.0.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2012,7 +2012,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libe-book $as_me 0.0.1, which was
+It was created by libe-book $as_me 0.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2878,7 +2878,7 @@
# Define the identity of the package.
PACKAGE='libe-book'
- VERSION='0.0.1'
+ VERSION='0.0.2'
cat >>confdefs.h <<_ACEOF
@@ -7462,7 +7462,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7480,7 +7480,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -7499,7 +7502,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -16748,9 +16754,9 @@
EBOOK_MINOR_VERSION=0
-EBOOK_MICRO_VERSION=1
+EBOOK_MICRO_VERSION=2
-EBOOK_VERSION=0.0.1
+EBOOK_VERSION=0.0.2
# AC_SUBST(LT_RELEASE, [libe_book_version_major.libe_book_version_minor])
LT_CURRENT=`expr 100 '*' 0 + 0`
@@ -16758,7 +16764,7 @@
LT_AGE=0
# LT_AGE=libe_book_version_minor
-LT_REVISION=1
+LT_REVISION=2
@@ -17863,7 +17869,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libe-book $as_me 0.0.1, which was
+This file was extended by libe-book $as_me 0.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17929,7 +17935,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libe-book config.status 0.0.1
+libe-book config.status 0.0.2
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/libe-book-0.0.1/configure.ac
new/libe-book-0.0.2/configure.ac
--- old/libe-book-0.0.1/configure.ac 2013-11-10 21:04:01.000000000 +0100
+++ new/libe-book-0.0.2/configure.ac 2013-11-16 20:07:48.000000000 +0100
@@ -8,7 +8,7 @@
# ====================
m4_define([libe_book_version_major],[0])
m4_define([libe_book_version_minor],[0])
-m4_define([libe_book_version_micro],[1])
+m4_define([libe_book_version_micro],[2])
m4_define([libe_book_version],[libe_book_version_major.libe_book_version_minor.libe_book_version_micro])
# =============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/depcomp new/libe-book-0.0.2/depcomp
--- old/libe-book-0.0.1/depcomp 2013-05-25 09:49:00.000000000 +0200
+++ new/libe-book-0.0.2/depcomp 2013-06-15 20:18:10.000000000 +0200
@@ -3,7 +3,8 @@
scriptversion=2012-03-27.16; # UTC
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011, 2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/install-sh
new/libe-book-0.0.2/install-sh
--- old/libe-book-0.0.1/install-sh 2013-05-25 09:49:00.000000000 +0200
+++ new/libe-book-0.0.2/install-sh 2013-06-15 20:18:09.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2011-01-19.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
+# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
- # Protect names problematic for 'test' and other utilities.
+ # Protect names problematic for `test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
@@ -190,7 +190,7 @@
fi
shift # arg
dst_arg=$arg
- # Protect names problematic for 'test' and other utilities.
+ # Protect names problematic for `test' and other utilities.
case $dst_arg in
-* | [=\(\)!]) dst_arg=./$dst_arg;;
esac
@@ -202,7 +202,7 @@
echo "$0: no input file specified." >&2
exit 1
fi
- # It's OK to call 'install-sh -d' without argument.
+ # It's OK to call `install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
@@ -240,7 +240,7 @@
for src
do
- # Protect names problematic for 'test' and other utilities.
+ # Protect names problematic for `test' and other utilities.
case $src in
-* | [=\(\)!]) src=./$src;;
esac
@@ -354,7 +354,7 @@
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writable bit of parent directory when it shouldn't.
+ # other-writeable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/libe-book.pc.in
new/libe-book-0.0.2/libe-book.pc.in
--- old/libe-book-0.0.1/libe-book.pc.in 2013-11-10 20:54:17.000000000 +0100
+++ new/libe-book-0.0.2/libe-book.pc.in 2013-11-15 15:54:30.000000000 +0100
@@ -7,5 +7,5 @@
Description: Library for parsing various reflowable ebook formats
Version: @VERSION@
Requires: libwpd-0.9 libwpd-stream-0.9
-Libs: -L${libdir} -lebook-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@ -lz
+Libs: -L${libdir} -le-book-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@ -lz
Cflags: -I${includedir}/libe-book-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/libe-book.spec
new/libe-book-0.0.2/libe-book.spec
--- old/libe-book-0.0.1/libe-book.spec 2013-11-10 21:14:25.000000000 +0100
+++ new/libe-book-0.0.2/libe-book.spec 2013-11-16 20:17:15.000000000 +0100
@@ -1,5 +1,5 @@
%define name libe-book
-%define version 0.0.1
+%define version 0.0.2
%define RELEASE 1
%define release %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/m4/libtool.m4
new/libe-book-0.0.2/m4/libtool.m4
--- old/libe-book-0.0.1/m4/libtool.m4 2013-11-10 20:55:53.000000000 +0100
+++ new/libe-book-0.0.2/m4/libtool.m4 2013-11-16 08:46:13.000000000 +0100
@@ -1312,7 +1312,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -1326,7 +1326,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1345,7 +1348,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/missing new/libe-book-0.0.2/missing
--- old/libe-book-0.0.1/missing 2013-11-09 13:03:09.000000000 +0100
+++ new/libe-book-0.0.2/missing 2013-06-15 20:18:09.000000000 +0200
@@ -1,10 +1,11 @@
#! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
+# Common stub for a few missing GNU programs while installing.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2012-01-06.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,40 +26,68 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try '$0 --help' for more information"
+ echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
-case $1 in
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
- --is-lightweight)
- # Used by our autoconf macros to check whether the available missing
- # script is modern enough.
- exit 0
- ;;
+msg="missing on your system"
- --run)
- # Back-compat with the calling convention used by older automake.
- shift
- ;;
+case $1 in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
-to PROGRAM being missing or too old.
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal autoconf autoheader autom4te automake makeinfo
- bison yacc flex lex help2man
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
-'g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
Send bug reports to <bug-autom...@gnu.org>."
exit $?
@@ -70,141 +99,228 @@
;;
-*)
- echo 1>&2 "$0: unknown '$1' option"
- echo 1>&2 "Try '$0 --help' for more information"
+ echo 1>&2 "$0: Unknown \`$1' option"
+ echo 1>&2 "Try \`$0 --help' for more information"
exit 1
;;
esac
-# Run the given program, remember its exit status.
-"$@"; st=$?
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
+ # Not GNU programs, they don't have --version.
+ ;;
-# If it succeeded, we are done.
-test $st -eq 0 && exit 0
+ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
+ fi
+ ;;
+esac
-# Also exit now if we it failed (or wasn't found), and '--version' was
-# passed; such an option is passed most likely to detect whether the
-# program is present and works.
-case $2 in --version|--help) exit $st;; esac
-
-# Exit code 63 means version mismatch. This often happens when the user
-# tries to use an ancient version of a tool on a file that requires a
-# minimum version.
-if test $st -eq 63; then
- msg="probably too old"
-elif test $st -eq 127; then
- # Program was missing.
- msg="missing on your system"
-else
- # Program was found and executed, but failed. Give up.
- exit $st
-fi
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+ aclocal*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
+ to install the \`Automake' and \`Perl' packages. Grab them from
+ any GNU archive site."
+ touch aclocal.m4
+ ;;
+
+ autoconf*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+ archive site."
+ touch configure
+ ;;
+
+ autoheader*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
+ from any GNU archive site."
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p'
${configure_ac}`
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+ case $f in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+ esac
+ done
+ touch $touch_files
+ ;;
+
+ automake*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+ You might want to install the \`Automake' and \`Perl' packages.
+ Grab them from any GNU archive site."
+ find . -type f -name Makefile.am -print |
+ sed 's/\.am$/.in/' |
+ while read f; do touch "$f"; done
+ ;;
+
+ autom4te*)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
+ bison*|yacc*)
+ echo 1>&2 "\
+WARNING: \`$1' $msg. You should only need it if
+ you modified a \`.y' file. You may need the \`Bison' package
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+ if test $# -ne 1; then
+ eval LASTARG=\${$#}
+ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+ if test ! -f y.tab.h; then
+ echo >y.tab.h
+ fi
+ if test ! -f y.tab.c; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+
+ lex*|flex*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.l' file. You may need the \`Flex' package
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+ if test $# -ne 1; then
+ eval LASTARG=\${$#}
+ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+ if test ! -f lex.yy.c; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+
+ help2man*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit $?
+ fi
+ ;;
+
+ makeinfo*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.texi' or \`.texinfo' file, or any other file
+ indirectly affecting the aspect of the manual. The spurious
+ call might also be the consequence of using a buggy \`make' (AIX,
+ DU, IRIX). You might want to install the \`Texinfo' package or
+ the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -z "$file"; then
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
+ touch $file
+ ;;
+
+ *)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them. Check the \`README' file,
+ it often tells you about the needed prerequisites for installing
+ this package. You may also peek at any GNU archive site, in case
+ some other package would contain this missing \`$1' program."
+ exit 1
+ ;;
+esac
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
-
-program_details ()
-{
- case $1 in
- aclocal|automake)
- echo "The '$1' program is part of the GNU Automake package:"
- echo "<$gnu_software_URL/automake>"
- echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
- echo "<$gnu_software_URL/autoconf>"
- echo "<$gnu_software_URL/m4/>"
- echo "<$perl_URL>"
- ;;
- autoconf|autom4te|autoheader)
- echo "The '$1' program is part of the GNU Autoconf package:"
- echo "<$gnu_software_URL/autoconf/>"
- echo "It also requires GNU m4 and Perl in order to run:"
- echo "<$gnu_software_URL/m4/>"
- echo "<$perl_URL>"
- ;;
- esac
-}
-
-give_advice ()
-{
- # Normalize program name to check for.
- normalized_program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
- printf '%s\n' "'$1' is $msg."
-
- configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
- case $normalized_program in
- autoconf*)
- echo "You should only need it if you modified 'configure.ac',"
- echo "or m4 files included by it."
- program_details 'autoconf'
- ;;
- autoheader*)
- echo "You should only need it if you modified 'acconfig.h' or"
- echo "$configure_deps."
- program_details 'autoheader'
- ;;
- automake*)
- echo "You should only need it if you modified 'Makefile.am' or"
- echo "$configure_deps."
- program_details 'automake'
- ;;
- aclocal*)
- echo "You should only need it if you modified 'acinclude.m4' or"
- echo "$configure_deps."
- program_details 'aclocal'
- ;;
- autom4te*)
- echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
- program_details 'autom4te'
- ;;
- bison*|yacc*)
- echo "You should only need it if you modified a '.y' file."
- echo "You may want to install the GNU Bison package:"
- echo "<$gnu_software_URL/bison/>"
- ;;
- lex*|flex*)
- echo "You should only need it if you modified a '.l' file."
- echo "You may want to install the Fast Lexical Analyzer package:"
- echo "<$flex_URL>"
- ;;
- help2man*)
- echo "You should only need it if you modified a dependency" \
- "of a man page."
- echo "You may want to install the GNU Help2man package:"
- echo "<$gnu_software_URL/help2man/>"
- ;;
- makeinfo*)
- echo "You should only need it if you modified a '.texi' file, or"
- echo "any other file indirectly affecting the aspect of the manual."
- echo "You might want to install the Texinfo package:"
- echo "<$gnu_software_URL/texinfo/>"
- echo "The spurious makeinfo call might also be the consequence of"
- echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
- echo "want to install GNU make:"
- echo "<$gnu_software_URL/make/>"
- ;;
- *)
- echo "You might have modified some files without having the proper"
- echo "tools for further handling them. Check the 'README' file, it"
- echo "often tells you about the needed prerequisites for installing"
- echo "this package. You may also peek at any GNU archive site, in"
- echo "case some other package contains this missing '$1' program."
- ;;
- esac
-}
-
-give_advice "$1" | sed -e '1s/^/WARNING: /' \
- -e '2,$s/^/ /' >&2
-
-# Propagate the correct exit status (expected to be 127 for a program
-# not found, 63 for a program that failed due to version mismatch).
-exit $st
+exit 0
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/src/conv/html/ebook2html.cpp
new/libe-book-0.0.2/src/conv/html/ebook2html.cpp
--- old/libe-book-0.0.1/src/conv/html/ebook2html.cpp 2013-11-10
20:54:17.000000000 +0100
+++ new/libe-book-0.0.2/src/conv/html/ebook2html.cpp 2013-11-16
09:03:37.000000000 +0100
@@ -76,12 +76,12 @@
WPXFileStream input(file);
- HtmlDocumentGenerator documentGenerator;
+ if (!EBOOKDocument::isSupported(&input))
+ return 1;
- if (EBOOKDocument::isSupported(&input))
- return EBOOKDocument::parse(&input, &documentGenerator);
+ HtmlDocumentGenerator documentGenerator;
- return 0;
+ return EBOOKDocument::parse(&input, &documentGenerator) ? 0 : 1;
}
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/src/conv/raw/ebook2raw.cpp
new/libe-book-0.0.2/src/conv/raw/ebook2raw.cpp
--- old/libe-book-0.0.1/src/conv/raw/ebook2raw.cpp 2013-11-10
20:54:17.000000000 +0100
+++ new/libe-book-0.0.2/src/conv/raw/ebook2raw.cpp 2013-11-16
09:04:36.000000000 +0100
@@ -80,12 +80,12 @@
WPXFileStream input(file);
- RawDocumentGenerator documentGenerator(printIndentLevel);
+ if (!EBOOKDocument::isSupported(&input))
+ return 1;
- if (EBOOKDocument::isSupported(&input))
- return EBOOKDocument::parse(&input, &documentGenerator);
+ RawDocumentGenerator documentGenerator(printIndentLevel);
- return 0;
+ return EBOOKDocument::parse(&input, &documentGenerator) ? 0 : 1;
}
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/src/conv/text/ebook2text.cpp
new/libe-book-0.0.2/src/conv/text/ebook2text.cpp
--- old/libe-book-0.0.1/src/conv/text/ebook2text.cpp 2013-11-10
20:54:17.000000000 +0100
+++ new/libe-book-0.0.2/src/conv/text/ebook2text.cpp 2013-11-16
09:03:37.000000000 +0100
@@ -80,12 +80,12 @@
WPXFileStream input(szInputFile);
- TextDocumentGenerator documentGenerator(isInfo);
+ if (!EBOOKDocument::isSupported(&input))
+ return 1;
- if (EBOOKDocument::isSupported(&input))
- return EBOOKDocument::parse(&input, &documentGenerator);
+ TextDocumentGenerator documentGenerator(isInfo);
- return 0;
+ return EBOOKDocument::parse(&input, &documentGenerator) ? 0 : 1;
}
/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/src/lib/FB2BlockContext.cpp
new/libe-book-0.0.2/src/lib/FB2BlockContext.cpp
--- old/libe-book-0.0.1/src/lib/FB2BlockContext.cpp 2013-11-10
20:54:17.000000000 +0100
+++ new/libe-book-0.0.2/src/lib/FB2BlockContext.cpp 2013-11-16
18:07:39.000000000 +0100
@@ -202,14 +202,24 @@
m_valid = false;
if (m_valid)
- getCollector()->insertBitmap(m_href.substr(1).c_str());
- else
{
- // The image is not internal. Use alternative text.
+ try
+ {
+ getCollector()->insertBitmap(m_href.substr(1).c_str());
+ }
+ catch (...)
+ {
+ m_valid = false;
+ }
+ }
+
+ if (!m_valid)
+ {
+ // The image is not internal or it is broken. Use alternative text.
// TODO: maybe extend later to support external URLs?
getCollector()->openParagraph(FB2BlockFormat());
getCollector()->openSpan(FB2Style(FB2BlockFormat()));
- const std::string altText = "[Image: " + m_altText + "]";
+ const std::string altText = std::string("[Image") + (m_altText.empty() ?
"" : ": ") + m_altText + "]";
getCollector()->insertText(altText.c_str());
getCollector()->closeSpan();
getCollector()->closeParagraph();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/src/lib/FB2Parser.cpp
new/libe-book-0.0.2/src/lib/FB2Parser.cpp
--- old/libe-book-0.0.1/src/lib/FB2Parser.cpp 2013-11-10 20:54:17.000000000
+0100
+++ new/libe-book-0.0.2/src/lib/FB2Parser.cpp 2013-11-16 17:24:11.000000000
+0100
@@ -359,13 +359,16 @@
{
const EBOOKToken *name = getFB2Token(xmlTextReaderConstLocalName(reader));
const EBOOKToken *ns = getFB2Token(xmlTextReaderConstNamespaceUri(reader));
+
if (!name || !ns)
- {
- newContext = 0;
- break;
- }
+ // TODO: unknown elements should not be skipped entirely, but
+ // their content should be processed as if they did not exist.
+ // Unfortunately this would be quite hard (if not impossible) to
+ // do in the current parser framework
+ newContext = new FB2SkipElementContext(dynamic_cast<FB2ParserContext
*>(context));
+ else
+ newContext = context->element(*name, *ns);
- newContext = context->element(*name, *ns);
if (newContext)
{
newContext->startOfElement();
@@ -374,14 +377,16 @@
if (xmlTextReaderHasAttributes(reader))
{
int ret = xmlTextReaderMoveToFirstAttribute(reader);
- do
+ while (1 == ret)
{
processAttribute(newContext, reader);
ret = xmlTextReaderMoveToNextAttribute(reader);
}
- while (1 == ret);
if (0 > ret) // some error while reading
+ {
+ delete newContext;
newContext = 0;
+ }
}
if (newContext)
newContext->endOfAttributes();
@@ -392,33 +397,26 @@
newContext = newContext->leaveContext();
}
}
+
+ break;
}
- break;
case XML_READER_TYPE_ATTRIBUTE :
assert(!"How did i ever got there?");
processAttribute(context, reader);
break;
case XML_READER_TYPE_END_ELEMENT :
{
- const EBOOKToken *name = getFB2Token(xmlTextReaderConstLocalName(reader));
- const EBOOKToken *ns = getFB2Token(xmlTextReaderConstNamespaceUri(reader));
- if (!name || !ns)
- {
- newContext = 0;
- break;
- }
-
context->endOfElement();
newContext = context->leaveContext();
+ break;
}
- break;
case XML_READER_TYPE_TEXT :
{
xmlChar *const text = xmlTextReaderReadString(reader);
context->text(reinterpret_cast<char *>(text));
xmlFree(text);
+ break;
}
- break;
default :
// ignore other types of XML content
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/src/lib/FB2ParserContext.cpp
new/libe-book-0.0.2/src/lib/FB2ParserContext.cpp
--- old/libe-book-0.0.1/src/lib/FB2ParserContext.cpp 2013-11-10
20:54:17.000000000 +0100
+++ new/libe-book-0.0.2/src/lib/FB2ParserContext.cpp 2013-11-16
16:58:25.000000000 +0100
@@ -193,7 +193,6 @@
return new FB2CodeContext(this, getStyle());
case FB2Token::image :
return new FB2InlineImageContext(this, getStyle());
- break;
default :
break;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/src/lib/LRFParser.cpp
new/libe-book-0.0.2/src/lib/LRFParser.cpp
--- old/libe-book-0.0.1/src/lib/LRFParser.cpp 2013-11-10 20:54:17.000000000
+0100
+++ new/libe-book-0.0.2/src/lib/LRFParser.cpp 2013-11-16 09:04:02.000000000
+0100
@@ -570,6 +570,12 @@
}
}
+ if (!streamData)
+ {
+ EBOOK_DEBUG_MSG(("No stream data in PageObject\n"));
+ throw ParserException();
+ }
+
m_collector.openPage(pageAtrID, attributes);
if (0 == streamFlags)
@@ -660,6 +666,12 @@
}
}
+ if (!streamData)
+ {
+ EBOOK_DEBUG_MSG(("No stream data in BlockObject\n"));
+ throw ParserException();
+ }
+
m_collector.openBlock(blockAtrID, attributes);
if (0 == streamFlags)
@@ -860,10 +872,10 @@
void LRFParser::readImageObject(WPXInputStream *const object)
{
- unsigned x;
- unsigned y;
- unsigned width;
- unsigned height;
+ unsigned x = 0;
+ unsigned y = 0;
+ unsigned width = 0;
+ unsigned height = 0;
while (!object->atEOS())
{
@@ -956,6 +968,12 @@
}
}
+ if (!streamData)
+ {
+ EBOOK_DEBUG_MSG(("No stream data in ImageStreamObject\n"));
+ throw ParserException();
+ }
+
switch (streamType)
{
case STREAM_TYPE_JPEG :
@@ -1101,8 +1119,8 @@
}
case TAG_TEXT_COLOR :
attributes.textColor = LRFColor(readU32(input));
- case TAG_TEXT_BG_COLOR :
break;
+ case TAG_TEXT_BG_COLOR :
attributes.textBgColor = LRFColor(readU32(input));
break;
case TAG_WORD_SPACE :
@@ -1326,6 +1344,7 @@
case TAG_OBJECT_START :
EBOOK_DEBUG_MSG(("Object Start tag should never appear\n"));
+ // fall-through intended
case TAG_F529 :
case TAG_F5F9 :
skip(input, 6);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/src/lib/Makefile.am
new/libe-book-0.0.2/src/lib/Makefile.am
--- old/libe-book-0.0.1/src/lib/Makefile.am 2013-11-10 21:00:00.000000000
+0100
+++ new/libe-book-0.0.2/src/lib/Makefile.am 2013-11-15 15:54:30.000000000
+0100
@@ -10,6 +10,7 @@
lib_LTLIBRARIES = libe-book-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@.la
libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_includedir =
$(includedir)/libe-book-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@/libe-book
libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_include_HEADERS = \
+ $(top_srcdir)/inc/libe-book/EBOOKDocument.h \
$(top_srcdir)/inc/libe-book/FB2Document.h \
$(top_srcdir)/inc/libe-book/IMPDocument.h \
$(top_srcdir)/inc/libe-book/LRFDocument.h \
@@ -20,6 +21,7 @@
$(top_srcdir)/inc/libe-book/TCRDocument.h \
$(top_srcdir)/inc/libe-book/TDDocument.h \
$(top_srcdir)/inc/libe-book/ZTXTDocument.h \
+ $(top_srcdir)/inc/libe-book/ZVRDocument.h \
$(top_srcdir)/inc/libe-book/libe-book.h
AM_CXXFLAGS = -I$(top_srcdir)/inc $(WPD_CFLAGS) $(XML_CFLAGS) $(ICU_CFLAGS)
$(ZLIB_CFLAGS) $(BOOST_CFLAGS) $(DEBUG_CXXFLAGS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/src/lib/Makefile.in
new/libe-book-0.0.2/src/lib/Makefile.in
--- old/libe-book-0.0.1/src/lib/Makefile.in 2013-11-10 21:14:10.000000000
+0100
+++ new/libe-book-0.0.2/src/lib/Makefile.in 2013-11-16 20:16:38.000000000
+0100
@@ -373,6 +373,7 @@
lib_LTLIBRARIES = libe-book-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@.la
libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_includedir =
$(includedir)/libe-book-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@/libe-book
libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_include_HEADERS = \
+ $(top_srcdir)/inc/libe-book/EBOOKDocument.h \
$(top_srcdir)/inc/libe-book/FB2Document.h \
$(top_srcdir)/inc/libe-book/IMPDocument.h \
$(top_srcdir)/inc/libe-book/LRFDocument.h \
@@ -383,6 +384,7 @@
$(top_srcdir)/inc/libe-book/TCRDocument.h \
$(top_srcdir)/inc/libe-book/TDDocument.h \
$(top_srcdir)/inc/libe-book/ZTXTDocument.h \
+ $(top_srcdir)/inc/libe-book/ZVRDocument.h \
$(top_srcdir)/inc/libe-book/libe-book.h
AM_CXXFLAGS = -I$(top_srcdir)/inc $(WPD_CFLAGS) $(XML_CFLAGS) $(ICU_CFLAGS)
$(ZLIB_CFLAGS) $(BOOST_CFLAGS) $(DEBUG_CXXFLAGS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/src/lib/PDBParser.cpp
new/libe-book-0.0.2/src/lib/PDBParser.cpp
--- old/libe-book-0.0.1/src/lib/PDBParser.cpp 2013-11-10 20:54:17.000000000
+0100
+++ new/libe-book-0.0.2/src/lib/PDBParser.cpp 2013-11-16 19:36:01.000000000
+0100
@@ -82,8 +82,8 @@
m_recordSize = readU16(input, true);
// check consistency
- assert(m_recordCount == getDataRecordCount());
- assert(PDB_BLOCK_SIZE == m_recordSize);
+ // assert(m_recordCount == getDataRecordCount());
+ // assert(PDB_BLOCK_SIZE == m_recordSize);
}
void PDBParser::readDataRecord(WPXInputStream *input, const bool last)
@@ -93,7 +93,6 @@
boost::scoped_ptr<WPXInputStream> compressedInput;
- // This should not happen, but it is the easier case anyway :-)
if (m_compressed)
{
compressedInput.reset(new PDXLZ77Stream(input));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libe-book-0.0.1/src/lib/PLKRParser.cpp
new/libe-book-0.0.2/src/lib/PLKRParser.cpp
--- old/libe-book-0.0.1/src/lib/PLKRParser.cpp 2013-11-10 20:54:17.000000000
+0100
+++ new/libe-book-0.0.2/src/lib/PLKRParser.cpp 2013-11-15 15:54:30.000000000
+0100
@@ -607,8 +607,8 @@
break;
}
case DATA_TYPE_METADATA :
- break;
readMetadata(record.get(), header);
+ break;
default :
// not interesting
break;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
