diff -Nru pdf2djvu-0.9.11/configure pdf2djvu-0.9.12/configure
--- pdf2djvu-0.9.11/configure 2018-10-25 21:08:30.000000000 +0000
+++ pdf2djvu-0.9.12/configure 2019-01-02 15:46:56.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pdf2djvu 0.9.11.
+# Generated by GNU Autoconf 2.69 for pdf2djvu 0.9.12.
#
# Report bugs to .
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='pdf2djvu'
PACKAGE_TARNAME='pdf2djvu'
-PACKAGE_VERSION='0.9.11'
-PACKAGE_STRING='pdf2djvu 0.9.11'
+PACKAGE_VERSION='0.9.12'
+PACKAGE_STRING='pdf2djvu 0.9.12'
PACKAGE_BUGREPORT='https://github.com/jwilk/pdf2djvu/issues'
PACKAGE_URL='http://jwilk.net/software/pdf2djvu'
@@ -1277,7 +1277,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 pdf2djvu 0.9.11 to adapt to many kinds of systems.
+\`configure' configures pdf2djvu 0.9.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1343,7 +1343,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pdf2djvu 0.9.11:";;
+ short | recursive ) echo "Configuration of pdf2djvu 0.9.12:";;
esac
cat <<\_ACEOF
@@ -1471,7 +1471,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-pdf2djvu configure 0.9.11
+pdf2djvu configure 0.9.12
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1689,7 +1689,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by pdf2djvu $as_me 0.9.11, which was
+It was created by pdf2djvu $as_me 0.9.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8563,7 +8563,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by pdf2djvu $as_me 0.9.11, which was
+This file was extended by pdf2djvu $as_me 0.9.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8630,7 +8630,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-pdf2djvu config.status 0.9.11
+pdf2djvu config.status 0.9.12
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Nru pdf2djvu-0.9.11/configure.ac pdf2djvu-0.9.12/configure.ac
--- pdf2djvu-0.9.11/configure.ac 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/configure.ac 2019-01-02 15:46:36.000000000 +0000
@@ -12,7 +12,7 @@
dnl | General Public License for more details.
AC_PREREQ(2.62)
-AC_INIT([pdf2djvu], [0.9.11], [https://github.com/jwilk/pdf2djvu/issues], [pdf2djvu], [http://jwilk.net/software/pdf2djvu])
+AC_INIT([pdf2djvu], [0.9.12], [https://github.com/jwilk/pdf2djvu/issues], [pdf2djvu], [http://jwilk.net/software/pdf2djvu])
AC_CONFIG_AUX_DIR([tools])
AC_CONFIG_MACRO_DIR([m4])
AC_LANG([C++])
diff -Nru pdf2djvu-0.9.11/debian/changelog pdf2djvu-0.9.12/debian/changelog
--- pdf2djvu-0.9.11/debian/changelog 2018-11-23 17:58:36.000000000 +0000
+++ pdf2djvu-0.9.12/debian/changelog 2019-01-03 10:56:53.000000000 +0000
@@ -1,8 +1,12 @@
-pdf2djvu (0.9.11-1build1) disco; urgency=medium
+pdf2djvu (0.9.12-1) unstable; urgency=medium
- * No-change rebuild against latest poppler
+ * New upstream release.
+ * deb/control:
+ + bump standards to 4.3.0 (no changes needed).
+ * deb/copyright:
+ + expand copyright spans to 2019.
- -- Jeremy Bicha Fri, 23 Nov 2018 12:58:36 -0500
+ -- Daniel Stender Thu, 03 Jan 2019 11:56:53 +0100
pdf2djvu (0.9.11-1) unstable; urgency=medium
diff -Nru pdf2djvu-0.9.11/debian/control pdf2djvu-0.9.12/debian/control
--- pdf2djvu-0.9.11/debian/control 2018-10-31 15:48:42.000000000 +0000
+++ pdf2djvu-0.9.12/debian/control 2019-01-03 10:53:41.000000000 +0000
@@ -16,7 +16,7 @@
locales
Build-Conflicts:
locales-all
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
Homepage: http://jwilk.net/software/pdf2djvu
Vcs-Browser: https://salsa.debian.org/debian/pdf2djvu
Vcs-Git: https://salsa.debian.org/debian/pdf2djvu.git
diff -Nru pdf2djvu-0.9.11/debian/copyright pdf2djvu-0.9.12/debian/copyright
--- pdf2djvu-0.9.11/debian/copyright 2018-05-05 10:16:02.000000000 +0000
+++ pdf2djvu-0.9.12/debian/copyright 2019-01-03 10:56:51.000000000 +0000
@@ -4,7 +4,7 @@
Source: https://github.com/jwilk/pdf2djvu
Files: *
-Copyright: 2007-2018 Jakub Wilk
+Copyright: 2007-2019 Jakub Wilk
2009 Mateusz Turcza
License: GPL-2
@@ -12,7 +12,7 @@
Copyright: 2008 Steve Stalcup
2009 Luca Bruno
2010 Jakub Wilk
- 2010-2018 Daniel Stender
+ 2010-2019 Daniel Stender
License: GPL-2
License: GPL-2
diff -Nru pdf2djvu-0.9.11/doc/changelog pdf2djvu-0.9.12/doc/changelog
--- pdf2djvu-0.9.11/doc/changelog 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/doc/changelog 2019-01-02 15:46:36.000000000 +0000
@@ -1,3 +1,22 @@
+pdf2djvu (0.9.12) unstable; urgency=low
+
+ * Fix build failure with Poppler ≥ 0.72.
+ * Improve the test suite.
+ * Improve typography in the manual page.
+ * Upgrade libraries bundled with the Windows package:
+ - Poppler 0.72;
+ - poppler-data 0.4.9;
+ - GraphicsMagick 1.3.31;
+ - FreeType 2.9.1;
+ - Expat 2.2.6.
+ * Windows: fix GraphicsMagick configuration search path.
+ * Windows: install miscellaneous documentation files.
+ Regression introduced in 0.8.1.
+ * Windows build system: don't download sources without explicit user's
+ consent.
+
+ -- Jakub Wilk Wed, 02 Jan 2019 16:46:27 +0100
+
pdf2djvu (0.9.11) unstable; urgency=low
* Fix build failure with Poppler ≥ 0.70.
@@ -310,6 +329,7 @@
* Build with “-Werror=narrowing”.
* Document what software is required to run the tests.
* Windows: fix loading Poppler data files.
+ * Windows: don't install build-related documentation.
* Improve the test suite.
-- Jakub Wilk Thu, 13 Aug 2015 17:48:55 +0200
diff -Nru pdf2djvu-0.9.11/doc/manpage.xml pdf2djvu-0.9.12/doc/manpage.xml
--- pdf2djvu-0.9.11/doc/manpage.xml 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/doc/manpage.xml 2019-01-02 15:46:36.000000000 +0000
@@ -2,7 +2,7 @@
-
+
]>
diff -Nru pdf2djvu-0.9.11/doc/pdf2djvu.1 pdf2djvu-0.9.12/doc/pdf2djvu.1
--- pdf2djvu-0.9.11/doc/pdf2djvu.1 2018-10-25 21:08:33.000000000 +0000
+++ pdf2djvu-0.9.12/doc/pdf2djvu.1 2019-01-02 15:46:58.000000000 +0000
@@ -2,12 +2,12 @@
.\" Title: pdf2djvu
.\" Author: Jakub Wilk
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 2018-10-25
+.\" Date: 2019-01-02
.\" Manual: pdf2djvu manual
-.\" Source: pdf2djvu 0.9.11
+.\" Source: pdf2djvu 0.9.12
.\" Language: English
.\"
-.TH "PDF2DJVU" "1" "2018-10-25" "pdf2djvu 0\&.9\&.11" "pdf2djvu manual"
+.TH "PDF2DJVU" "1" "2019-01-02" "pdf2djvu 0\&.9\&.12" "pdf2djvu manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -145,7 +145,7 @@
.PP
\fB\-\-no\-page\-titles\fR
.RS 4
-Don\*(Aqt set page titles\&.
+Don't set page titles\&.
.RE
.SS "Resolution, page size"
.PP
@@ -255,7 +255,7 @@
.PP
\fB\-\-no\-metadata\fR
.RS 4
-Don\*(Aqt extract the metadata\&.
+Don't extract the metadata\&.
.sp
By default:
.sp
@@ -313,7 +313,7 @@
.PP
\fB\-\-no\-outline\fR
.RS 4
-Don\*(Aqt extract the document outline\&.
+Don't extract the document outline\&.
.RE
.PP
\fB\-\-hyperlinks=border\-avis\fR
@@ -330,12 +330,12 @@
.PP
\fB\-\-no\-hyperlinks\fR, \fB\-\-hyperlinks=none\fR
.RS 4
-Don\*(Aqt extract hyperlinks\&.
+Don't extract hyperlinks\&.
.RE
.PP
\fB\-\-no\-text\fR
.RS 4
-Don\*(Aqt extract the text\&.
+Don't extract the text\&.
.RE
.PP
\fB\-\-words\fR
@@ -403,7 +403,7 @@
.PP
\fB\-q\fR, \fB\-\-quiet\fR
.RS 4
-Don\*(Aqt display informational messages while converting the file\&.
+Don't display informational messages while converting the file\&.
.RE
.PP
\fB\-\-version\fR
diff -Nru pdf2djvu-0.9.11/doc/po/de.po pdf2djvu-0.9.12/doc/po/de.po
--- pdf2djvu-0.9.11/doc/po/de.po 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/de.po 2019-01-02 15:46:36.000000000 +0000
@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: pdf2djvu 0.9.11\n"
+"Project-Id-Version: pdf2djvu 0.9.12\n"
"Report-Msgid-Bugs-To: https://github.com/jwilk/pdf2djvu/issues\n"
"POT-Creation-Date: 2016-10-03 15:53+0200\n"
"PO-Revision-Date: 2016-02-06 15:54+0100\n"
@@ -21,8 +21,8 @@
msgstr "pdf2djvu"
#. type: Content of the version entity
-msgid "0.9.11"
-msgstr "0.9.11"
+msgid "0.9.12"
+msgstr "0.9.12"
#. type: Attribute 'lang' of:
msgid "en"
diff -Nru pdf2djvu-0.9.11/doc/po/de.xml pdf2djvu-0.9.12/doc/po/de.xml
--- pdf2djvu-0.9.11/doc/po/de.xml 2018-10-25 21:08:43.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/de.xml 2019-01-02 15:47:09.000000000 +0000
@@ -2,7 +2,7 @@
-
+
]>
diff -Nru pdf2djvu-0.9.11/doc/po/fr.po pdf2djvu-0.9.12/doc/po/fr.po
--- pdf2djvu-0.9.11/doc/po/fr.po 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/fr.po 2019-01-02 15:46:36.000000000 +0000
@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: pdf2djvu 0.9.11\n"
+"Project-Id-Version: pdf2djvu 0.9.12\n"
"Report-Msgid-Bugs-To: https://github.com/jwilk/pdf2djvu/issues\n"
"POT-Creation-Date: 2016-10-03 15:53+0200\n"
"PO-Revision-Date: 2016-02-16 09:50+0100\n"
@@ -21,8 +21,8 @@
msgstr "pdf2djvu"
#. type: Content of the version entity
-msgid "0.9.11"
-msgstr "0.9.11"
+msgid "0.9.12"
+msgstr "0.9.12"
#. type: Attribute 'lang' of:
msgid "en"
diff -Nru pdf2djvu-0.9.11/doc/po/fr.xml pdf2djvu-0.9.12/doc/po/fr.xml
--- pdf2djvu-0.9.11/doc/po/fr.xml 2018-10-25 21:08:40.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/fr.xml 2019-01-02 15:47:07.000000000 +0000
@@ -2,7 +2,7 @@
-
+
]>
diff -Nru pdf2djvu-0.9.11/doc/po/manpage.pot pdf2djvu-0.9.12/doc/po/manpage.pot
--- pdf2djvu-0.9.11/doc/po/manpage.pot 2018-10-25 21:08:46.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/manpage.pot 2019-01-02 15:47:13.000000000 +0000
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: pdf2djvu 0.9.11\n"
+"Project-Id-Version: pdf2djvu 0.9.12\n"
"Report-Msgid-Bugs-To: https://github.com/jwilk/pdf2djvu/issues\n"
-"POT-Creation-Date: 2018-10-25 23:08+0200\n"
+"POT-Creation-Date: 2019-01-02 16:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -24,7 +24,7 @@
#. type: Content of the version entity
#: ../manpage.xml:5
-msgid "0.9.11"
+msgid "0.9.12"
msgstr ""
#. type: Attribute 'lang' of:
diff -Nru pdf2djvu-0.9.11/doc/po/pdf2djvu.de.1 pdf2djvu-0.9.12/doc/po/pdf2djvu.de.1
--- pdf2djvu-0.9.11/doc/po/pdf2djvu.de.1 2018-10-25 21:08:44.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/pdf2djvu.de.1 2019-01-02 15:47:11.000000000 +0000
@@ -2,12 +2,12 @@
.\" Title: pdf2djvu
.\" Author: Jakub Wilk
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 25.10.2018
+.\" Date: 02.01.2019
.\" Manual: pdf2djvu Handbuch
-.\" Source: pdf2djvu 0.9.11
+.\" Source: pdf2djvu 0.9.12
.\" Language: German
.\"
-.TH "PDF2DJVU" "1" "25.10.2018" "pdf2djvu 0\&.9\&.11" "pdf2djvu Handbuch"
+.TH "PDF2DJVU" "1" "02.01.2019" "pdf2djvu 0\&.9\&.12" "pdf2djvu Handbuch"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Nru pdf2djvu-0.9.11/doc/po/pdf2djvu.fr.1 pdf2djvu-0.9.12/doc/po/pdf2djvu.fr.1
--- pdf2djvu-0.9.11/doc/po/pdf2djvu.fr.1 2018-10-25 21:08:42.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/pdf2djvu.fr.1 2019-01-02 15:47:08.000000000 +0000
@@ -2,12 +2,12 @@
.\" Title: pdf2djvu
.\" Author: Jakub Wilk
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 25/10/2018
+.\" Date: 02/01/2019
.\" Manual: pdf2djvu Manual
-.\" Source: pdf2djvu 0.9.11
+.\" Source: pdf2djvu 0.9.12
.\" Language: French
.\"
-.TH "PDF2DJVU" "1" "25/10/2018" "pdf2djvu 0\&.9\&.11" "pdf2djvu Manual"
+.TH "PDF2DJVU" "1" "02/01/2019" "pdf2djvu 0\&.9\&.12" "pdf2djvu Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Nru pdf2djvu-0.9.11/doc/po/pdf2djvu.pl.1 pdf2djvu-0.9.12/doc/po/pdf2djvu.pl.1
--- pdf2djvu-0.9.11/doc/po/pdf2djvu.pl.1 2018-10-25 21:08:37.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/pdf2djvu.pl.1 2019-01-02 15:47:03.000000000 +0000
@@ -2,12 +2,12 @@
.\" Title: pdf2djvu
.\" Author: Jakub Wilk
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 25.10.2018
+.\" Date: 02.01.2019
.\" Manual: podręcznik pdf2djvu
-.\" Source: pdf2djvu 0.9.11
+.\" Source: pdf2djvu 0.9.12
.\" Language: Polish
.\"
-.TH "PDF2DJVU" "1" "25.10.2018" "pdf2djvu 0\&.9\&.11" "podręcznik pdf2djvu"
+.TH "PDF2DJVU" "1" "02.01.2019" "pdf2djvu 0\&.9\&.12" "podręcznik pdf2djvu"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Nru pdf2djvu-0.9.11/doc/po/pdf2djvu.pt.1 pdf2djvu-0.9.12/doc/po/pdf2djvu.pt.1
--- pdf2djvu-0.9.11/doc/po/pdf2djvu.pt.1 2018-10-25 21:08:39.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/pdf2djvu.pt.1 2019-01-02 15:47:06.000000000 +0000
@@ -2,12 +2,12 @@
.\" Title: pdf2djvu
.\" Author: Jakub Wilk
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 25/10/2018
+.\" Date: 02/01/2019
.\" Manual: Manual do pdf2djvu
-.\" Source: pdf2djvu 0.9.11
+.\" Source: pdf2djvu 0.9.12
.\" Language: Portuguese
.\"
-.TH "PDF2DJVU" "1" "25/10/2018" "pdf2djvu 0\&.9\&.11" "Manual do pdf2djvu"
+.TH "PDF2DJVU" "1" "02/01/2019" "pdf2djvu 0\&.9\&.12" "Manual do pdf2djvu"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Nru pdf2djvu-0.9.11/doc/po/pdf2djvu.ru.1 pdf2djvu-0.9.12/doc/po/pdf2djvu.ru.1
--- pdf2djvu-0.9.11/doc/po/pdf2djvu.ru.1 2018-10-25 21:08:35.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/pdf2djvu.ru.1 2019-01-02 15:47:01.000000000 +0000
@@ -2,12 +2,12 @@
.\" Title: pdf2djvu
.\" Author: Jakub Wilk
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 25.10.2018
+.\" Date: 02.01.2019
.\" Manual: руководство по pdf2djvu
-.\" Source: pdf2djvu 0.9.11
+.\" Source: pdf2djvu 0.9.12
.\" Language: Russian
.\"
-.TH "pdf2djvu" "1" "25.10.2018" "pdf2djvu 0\&.9\&.11" "руководство по pdf2djvu"
+.TH "pdf2djvu" "1" "02.01.2019" "pdf2djvu 0\&.9\&.12" "руководство по pdf2djvu"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Nru pdf2djvu-0.9.11/doc/po/pl.po pdf2djvu-0.9.12/doc/po/pl.po
--- pdf2djvu-0.9.11/doc/po/pl.po 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/pl.po 2019-01-02 15:46:36.000000000 +0000
@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: pdf2djvu 0.9.11\n"
+"Project-Id-Version: pdf2djvu 0.9.12\n"
"Report-Msgid-Bugs-To: https://github.com/jwilk/pdf2djvu/issues\n"
"POT-Creation-Date: 2016-10-03 15:53+0200\n"
"PO-Revision-Date: 2015-05-25 16:43+0200\n"
@@ -21,8 +21,8 @@
msgstr "pdf2djvu"
#. type: Content of the version entity
-msgid "0.9.11"
-msgstr "0.9.11"
+msgid "0.9.12"
+msgstr "0.9.12"
#. type: Attribute 'lang' of:
msgid "en"
diff -Nru pdf2djvu-0.9.11/doc/po/pl.xml pdf2djvu-0.9.12/doc/po/pl.xml
--- pdf2djvu-0.9.11/doc/po/pl.xml 2018-10-25 21:08:36.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/pl.xml 2019-01-02 15:47:02.000000000 +0000
@@ -2,7 +2,7 @@
-
+
]>
diff -Nru pdf2djvu-0.9.11/doc/po/pt.po pdf2djvu-0.9.12/doc/po/pt.po
--- pdf2djvu-0.9.11/doc/po/pt.po 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/pt.po 2019-01-02 15:46:36.000000000 +0000
@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: pdf2djvu 0.9.11\n"
+"Project-Id-Version: pdf2djvu 0.9.12\n"
"Report-Msgid-Bugs-To: https://github.com/jwilk/pdf2djvu/issues\n"
"POT-Creation-Date: 2016-10-03 15:54+0200\n"
"PO-Revision-Date: 2016-02-06 16:38+0000\n"
@@ -21,8 +21,8 @@
msgstr "pdf2djvu"
#. type: Content of the version entity
-msgid "0.9.11"
-msgstr "0.9.11"
+msgid "0.9.12"
+msgstr "0.9.12"
#. type: Attribute 'lang' of:
msgid "en"
diff -Nru pdf2djvu-0.9.11/doc/po/pt.xml pdf2djvu-0.9.12/doc/po/pt.xml
--- pdf2djvu-0.9.11/doc/po/pt.xml 2018-10-25 21:08:38.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/pt.xml 2019-01-02 15:47:04.000000000 +0000
@@ -2,7 +2,7 @@
-
+
]>
diff -Nru pdf2djvu-0.9.11/doc/po/ru.po pdf2djvu-0.9.12/doc/po/ru.po
--- pdf2djvu-0.9.11/doc/po/ru.po 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/ru.po 2019-01-02 15:46:36.000000000 +0000
@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: pdf2djvu 0.9.11\n"
+"Project-Id-Version: pdf2djvu 0.9.12\n"
"Report-Msgid-Bugs-To: https://github.com/jwilk/pdf2djvu/issues\n"
"POT-Creation-Date: 2016-10-03 15:54+0200\n"
"PO-Revision-Date: 2016-02-08 11:42+0300\n"
@@ -21,8 +21,8 @@
msgstr "pdf2djvu"
#. type: Content of the version entity
-msgid "0.9.11"
-msgstr "0.9.11"
+msgid "0.9.12"
+msgstr "0.9.12"
#. type: Attribute 'lang' of:
msgid "en"
diff -Nru pdf2djvu-0.9.11/doc/po/ru.xml pdf2djvu-0.9.12/doc/po/ru.xml
--- pdf2djvu-0.9.11/doc/po/ru.xml 2018-10-25 21:08:34.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/ru.xml 2019-01-02 15:46:59.000000000 +0000
@@ -2,7 +2,7 @@
-
+
]>
diff -Nru pdf2djvu-0.9.11/doc/po/uk.po pdf2djvu-0.9.12/doc/po/uk.po
--- pdf2djvu-0.9.11/doc/po/uk.po 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/doc/po/uk.po 2019-01-02 15:46:36.000000000 +0000
@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: pdf2djvu 0.9.11\n"
+"Project-Id-Version: pdf2djvu 0.9.12\n"
"Report-Msgid-Bugs-To: https://github.com/jwilk/pdf2djvu/issues\n"
"POT-Creation-Date: 2016-10-03 15:54+0200\n"
"PO-Revision-Date: 2012-05-31 11:57+0300\n"
@@ -21,8 +21,8 @@
msgstr "pdf2djvu"
#. type: Content of the version entity
-msgid "0.9.11"
-msgstr "0.9.11"
+msgid "0.9.12"
+msgstr "0.9.12"
#. type: Attribute 'lang' of:
msgid "en"
diff -Nru pdf2djvu-0.9.11/pdf2djvu.cc pdf2djvu-0.9.12/pdf2djvu.cc
--- pdf2djvu-0.9.11/pdf2djvu.cc 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/pdf2djvu.cc 2019-01-02 15:46:36.000000000 +0000
@@ -456,7 +456,7 @@
switch (link_action->getKind())
{
case actionURI:
- uri += dynamic_cast(link_action)->getURI()->getCString();
+ uri += pdf::get_c_string(dynamic_cast(link_action)->getURI());
break;
case actionGoTo:
{
@@ -1396,7 +1396,7 @@
#pragma omp critical
{
debug(0)--;
- debug(1) << doc->getFileName()->getCString() << ":" << std::endl;
+ debug(1) << pdf::get_c_string(doc->getFileName()) << ":" << std::endl;
debug(0)++;
}
out1.reset(new MainRenderer(paper_color, config.monochrome));
diff -Nru pdf2djvu-0.9.11/pdf-backend.cc pdf2djvu-0.9.12/pdf-backend.cc
--- pdf2djvu-0.9.11/pdf-backend.cc 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/pdf-backend.cc 2019-01-02 15:46:36.000000000 +0000
@@ -32,7 +32,7 @@
#include
#include
#include
-#include
+#include
#include
#include
@@ -226,7 +226,7 @@
mstring.reset(this->readMetadata());
if (mstring.get() == nullptr)
return "";
- const char *cstring = mstring->getCString();
+ const char *cstring = pdf::get_c_string(mstring.get());
if (strncmp(cstring, "isString())
continue;
- const char *input = object.getString()->getCString();
+ const char *input = pdf::get_c_string(object.getString());
if (input[0] == 'D' && input[1] == ':')
input += 2;
int year = scan_date_digits(input, 4);
@@ -619,4 +619,16 @@
}
}
+#if POPPLER_VERSION >= 7200
+const char * pdf::get_c_string(const pdf::String *str)
+{
+ return str->c_str();
+}
+#else
+const char * pdf::get_c_string(const pdf::String *str)
+{
+ return str->getCString();
+}
+#endif
+
// vim:ts=2 sts=2 sw=2 et
diff -Nru pdf2djvu-0.9.11/pdf-backend.hh pdf2djvu-0.9.12/pdf-backend.hh
--- pdf2djvu-0.9.11/pdf-backend.hh 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/pdf-backend.hh 2019-01-02 15:46:36.000000000 +0000
@@ -40,7 +40,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -433,6 +433,8 @@
double get_path_area(pdf::splash::Path &path);
+ const char * get_c_string(const pdf::String *str);
+
}
#endif
diff -Nru pdf2djvu-0.9.11/pdf-unicode.cc pdf2djvu-0.9.12/pdf-unicode.cc
--- pdf2djvu-0.9.11/pdf-unicode.cc 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/pdf-unicode.cc 2019-01-02 15:46:36.000000000 +0000
@@ -53,7 +53,7 @@
* for description of both UTF-16 and UTF-8.
*/
const static uint32_t replacement_character = 0xFFFD;
- const char *cstring = string->getCString();
+ const char *cstring = pdf::get_c_string(string);
#if POPPLER_VERSION < 3500
size_t clength = const_cast(string)->getLength();
#else
Binary files /tmp/tmpTDoGOG/bfgD0DflsN/pdf2djvu-0.9.11/po/de.mo and /tmp/tmpTDoGOG/fKxWffilUh/pdf2djvu-0.9.12/po/de.mo differ
diff -Nru pdf2djvu-0.9.11/po/de.po pdf2djvu-0.9.12/po/de.po
--- pdf2djvu-0.9.11/po/de.po 2018-10-25 21:08:30.000000000 +0000
+++ pdf2djvu-0.9.12/po/de.po 2019-01-02 15:46:56.000000000 +0000
@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: pdf2djvu 0.9.11\n"
+"Project-Id-Version: pdf2djvu 0.9.12\n"
"Report-Msgid-Bugs-To: https://github.com/jwilk/pdf2djvu/issues\n"
"POT-Creation-Date: 2016-12-08 00:14+0100\n"
"PO-Revision-Date: 2016-12-09 15:41+0200\n"
diff -Nru pdf2djvu-0.9.11/po/pdf2djvu.pot pdf2djvu-0.9.12/po/pdf2djvu.pot
--- pdf2djvu-0.9.11/po/pdf2djvu.pot 2018-10-25 21:08:30.000000000 +0000
+++ pdf2djvu-0.9.12/po/pdf2djvu.pot 2019-01-02 15:46:56.000000000 +0000
@@ -14,9 +14,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: pdf2djvu 0.9.11\n"
+"Project-Id-Version: pdf2djvu 0.9.12\n"
"Report-Msgid-Bugs-To: https://github.com/jwilk/pdf2djvu/issues\n"
-"POT-Creation-Date: 2018-10-25 23:08+0200\n"
+"POT-Creation-Date: 2019-01-02 16:46+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Binary files /tmp/tmpTDoGOG/bfgD0DflsN/pdf2djvu-0.9.11/po/pl.mo and /tmp/tmpTDoGOG/fKxWffilUh/pdf2djvu-0.9.12/po/pl.mo differ
diff -Nru pdf2djvu-0.9.11/po/pl.po pdf2djvu-0.9.12/po/pl.po
--- pdf2djvu-0.9.11/po/pl.po 2018-10-25 21:08:30.000000000 +0000
+++ pdf2djvu-0.9.12/po/pl.po 2019-01-02 15:46:56.000000000 +0000
@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: pdf2djvu 0.9.11\n"
+"Project-Id-Version: pdf2djvu 0.9.12\n"
"Report-Msgid-Bugs-To: https://github.com/jwilk/pdf2djvu/issues\n"
"POT-Creation-Date: 2016-12-08 00:14+0100\n"
"PO-Revision-Date: 2016-12-08 00:17+0100\n"
Binary files /tmp/tmpTDoGOG/bfgD0DflsN/pdf2djvu-0.9.11/po/pt.mo and /tmp/tmpTDoGOG/fKxWffilUh/pdf2djvu-0.9.12/po/pt.mo differ
diff -Nru pdf2djvu-0.9.11/po/pt.po pdf2djvu-0.9.12/po/pt.po
--- pdf2djvu-0.9.11/po/pt.po 2018-10-25 21:08:30.000000000 +0000
+++ pdf2djvu-0.9.12/po/pt.po 2019-01-02 15:46:56.000000000 +0000
@@ -13,7 +13,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: pdf2djvu 0.9.11\n"
+"Project-Id-Version: pdf2djvu 0.9.12\n"
"Report-Msgid-Bugs-To: https://github.com/jwilk/pdf2djvu/issues\n"
"POT-Creation-Date: 2016-12-08 00:14+0100\n"
"PO-Revision-Date: 2016-12-08 10:40+0000\n"
Binary files /tmp/tmpTDoGOG/bfgD0DflsN/pdf2djvu-0.9.11/po/ru.mo and /tmp/tmpTDoGOG/fKxWffilUh/pdf2djvu-0.9.12/po/ru.mo differ
diff -Nru pdf2djvu-0.9.11/po/ru.po pdf2djvu-0.9.12/po/ru.po
--- pdf2djvu-0.9.11/po/ru.po 2018-10-25 21:08:30.000000000 +0000
+++ pdf2djvu-0.9.12/po/ru.po 2019-01-02 15:46:56.000000000 +0000
@@ -3,7 +3,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: pdf2djvu 0.9.11\n"
+"Project-Id-Version: pdf2djvu 0.9.12\n"
"Report-Msgid-Bugs-To: https://github.com/jwilk/pdf2djvu/issues\n"
"POT-Creation-Date: 2016-12-08 00:14+0100\n"
"PO-Revision-Date: 2016-12-13 19:08+0300\n"
Binary files /tmp/tmpTDoGOG/bfgD0DflsN/pdf2djvu-0.9.11/po/uk.mo and /tmp/tmpTDoGOG/fKxWffilUh/pdf2djvu-0.9.12/po/uk.mo differ
diff -Nru pdf2djvu-0.9.11/po/uk.po pdf2djvu-0.9.12/po/uk.po
--- pdf2djvu-0.9.11/po/uk.po 2018-10-25 21:08:30.000000000 +0000
+++ pdf2djvu-0.9.12/po/uk.po 2019-01-02 15:46:56.000000000 +0000
@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: pdf2djvu 0.9.11\n"
+"Project-Id-Version: pdf2djvu 0.9.12\n"
"Report-Msgid-Bugs-To: https://github.com/jwilk/pdf2djvu/issues\n"
"POT-Creation-Date: 2016-12-08 00:14+0100\n"
"PO-Revision-Date: 2015-03-26 15:30+0300\n"
diff -Nru pdf2djvu-0.9.11/private/request-translations pdf2djvu-0.9.12/private/request-translations
--- pdf2djvu-0.9.11/private/request-translations 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/private/request-translations 2019-01-02 15:46:36.000000000 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright © 2015-2016 Jakub Wilk
+# Copyright © 2015-2018 Jakub Wilk
#
# This file is part of pdf2djvu.
#
@@ -34,7 +34,7 @@
translators="$translators;$translator"
fi
done
-version=$(IFS='()' read _ v _ < "$srcdir/doc/changelog" && echo $v)
+IFS='()' read _ version _ < "$srcdir/doc/changelog"
printf '%s' "$translators" \
| tr ';' '\n' \
| LC_ALL=C sort -u \
@@ -52,8 +52,8 @@
You can download current versions of the PO files here:
EOF
(
- IFS=';';
- printf 'https://github.com/jwilk/pdf2djvu/raw/master/%s\n' ${pofiles#;}
+ IFS=';'
+ printf 'https://github.com/jwilk/pdf2djvu/raw/master/%s\n' ${pofiles#';'}
)
printf '\nThanks in advance!\n'
diff -Nru pdf2djvu-0.9.11/sys-command-posix.cc pdf2djvu-0.9.12/sys-command-posix.cc
--- pdf2djvu-0.9.11/sys-command-posix.cc 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/sys-command-posix.cc 2019-01-02 15:46:36.000000000 +0000
@@ -139,7 +139,7 @@
static const char * get_signal_name(int sig)
{
switch (sig) {
-#define s(n) case n: return "" # n "";
+#define s(n) case n: return #n;
// POSIX.1-1990:
s(SIGHUP);
s(SIGINT);
diff -Nru pdf2djvu-0.9.11/tests/.pylintrc pdf2djvu-0.9.12/tests/.pylintrc
--- pdf2djvu-0.9.11/tests/.pylintrc 1970-01-01 00:00:00.000000000 +0000
+++ pdf2djvu-0.9.12/tests/.pylintrc 2019-01-02 15:46:36.000000000 +0000
@@ -0,0 +1,24 @@
+[MASTER]
+load-plugins = pylint.extensions.check_elif
+
+[MESSAGES CONTROL]
+disable =
+ bad-continuation,
+ deprecated-method,
+ duplicate-code,
+ fixme,
+ invalid-name,
+ missing-docstring,
+ no-self-use,
+ too-few-public-methods,
+
+[REPORTS]
+reports = no
+score = no
+msg-template = {path}:{line}: {C}: {symbol} [{obj}] {msg}
+
+[FORMAT]
+max-line-length = 120
+expected-line-ending-format = LF
+
+# vim:ft=dosini ts=4 sts=4 sw=4 et
diff -Nru pdf2djvu-0.9.11/tests/test-1px-font.pdf pdf2djvu-0.9.12/tests/test-1px-font.pdf
--- pdf2djvu-0.9.11/tests/test-1px-font.pdf 2018-10-25 21:08:53.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-1px-font.pdf 2019-01-02 15:47:22.000000000 +0000
@@ -34,7 +34,7 @@
<>
endobj
10 0 obj
-<>
+<>
endobj
xref
0 11
diff -Nru pdf2djvu-0.9.11/tests/test-antialias-off.pdf pdf2djvu-0.9.12/tests/test-antialias-off.pdf
--- pdf2djvu-0.9.11/tests/test-antialias-off.pdf 2018-10-25 21:09:01.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-antialias-off.pdf 2019-01-02 15:47:32.000000000 +0000
@@ -34,7 +34,7 @@
<>
endobj
10 0 obj
-<>
+<>
endobj
xref
0 11
diff -Nru pdf2djvu-0.9.11/tests/test-antialias-on.pdf pdf2djvu-0.9.12/tests/test-antialias-on.pdf
--- pdf2djvu-0.9.11/tests/test-antialias-on.pdf 2018-10-25 21:08:55.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-antialias-on.pdf 2019-01-02 15:47:25.000000000 +0000
@@ -34,7 +34,7 @@
<>
endobj
10 0 obj
-<>
+<>
endobj
xref
0 11
diff -Nru pdf2djvu-0.9.11/tests/test-big-outline.pdf pdf2djvu-0.9.12/tests/test-big-outline.pdf
--- pdf2djvu-0.9.11/tests/test-big-outline.pdf 2018-10-25 21:08:54.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-big-outline.pdf 2019-01-02 15:47:24.000000000 +0000
@@ -10032,7 +10032,7 @@
<>
endobj
3010 0 obj
-<>
+<>
endobj
xref
0 3011
diff -Nru pdf2djvu-0.9.11/tests/test-broken-hyperlinks.pdf pdf2djvu-0.9.12/tests/test-broken-hyperlinks.pdf
--- pdf2djvu-0.9.11/tests/test-broken-hyperlinks.pdf 2018-10-25 21:08:56.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-broken-hyperlinks.pdf 2019-01-02 15:47:26.000000000 +0000
@@ -285,7 +285,7 @@
<>
endobj
65 0 obj
-<>
+<>
endobj
xref
0 66
diff -Nru pdf2djvu-0.9.11/tests/test-broken-outline.pdf pdf2djvu-0.9.12/tests/test-broken-outline.pdf
--- pdf2djvu-0.9.11/tests/test-broken-outline.pdf 2018-10-25 21:08:56.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-broken-outline.pdf 2019-01-02 15:47:26.000000000 +0000
@@ -46,7 +46,7 @@
<>
endobj
13 0 obj
-<>
+<>
endobj
xref
0 14
diff -Nru pdf2djvu-0.9.11/tests/test-crop-text.pdf pdf2djvu-0.9.12/tests/test-crop-text.pdf
--- pdf2djvu-0.9.11/tests/test-crop-text.pdf 2018-10-25 21:08:56.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-crop-text.pdf 2019-01-02 15:47:25.000000000 +0000
@@ -34,7 +34,7 @@
<>
endobj
10 0 obj
-<>
+<>
endobj
xref
0 11
diff -Nru pdf2djvu-0.9.11/tests/test-crop-text.py pdf2djvu-0.9.12/tests/test-crop-text.py
--- pdf2djvu-0.9.11/tests/test-crop-text.py 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-crop-text.py 2019-01-02 15:46:36.000000000 +0000
@@ -1,6 +1,6 @@
# encoding=UTF-8
-# Copyright © 2009-2017 Jakub Wilk
+# Copyright © 2009-2018 Jakub Wilk
#
# This file is part of pdf2djvu.
#
@@ -13,12 +13,12 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
+import re
+
from tools import (
case,
)
-import re
-
class test(case):
# Bug: https://github.com/jwilk/pdf2djvu/issues/20
# + fixed in 0.5.4 [46b70e11778f984c2db302a1c8a18bc0996a387c]
Binary files /tmp/tmpTDoGOG/bfgD0DflsN/pdf2djvu-0.9.11/tests/test-dpi-detection.pdf and /tmp/tmpTDoGOG/fKxWffilUh/pdf2djvu-0.9.12/tests/test-dpi-detection.pdf differ
diff -Nru pdf2djvu-0.9.11/tests/test-dpi-detection.py pdf2djvu-0.9.12/tests/test-dpi-detection.py
--- pdf2djvu-0.9.11/tests/test-dpi-detection.py 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-dpi-detection.py 2019-01-02 15:46:36.000000000 +0000
@@ -1,6 +1,6 @@
# encoding=UTF-8
-# Copyright © 2009-2017 Jakub Wilk
+# Copyright © 2009-2018 Jakub Wilk
#
# This file is part of pdf2djvu.
#
@@ -13,12 +13,12 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
+import re
+
from tools import (
case,
)
-import re
-
class test(case):
def test(self):
self.pdf2djvu('--guess-dpi').assert_()
diff -Nru pdf2djvu-0.9.11/tests/test-duplicate-pages.pdf pdf2djvu-0.9.12/tests/test-duplicate-pages.pdf
--- pdf2djvu-0.9.11/tests/test-duplicate-pages.pdf 2018-10-25 21:08:51.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-duplicate-pages.pdf 2019-01-02 15:47:20.000000000 +0000
@@ -19,7 +19,7 @@
<>
endobj
6 0 obj
-<>
+<>
endobj
xref
0 7
diff -Nru pdf2djvu-0.9.11/tests/test-duplicate-pages.py pdf2djvu-0.9.12/tests/test-duplicate-pages.py
--- pdf2djvu-0.9.11/tests/test-duplicate-pages.py 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-duplicate-pages.py 2019-01-02 15:46:36.000000000 +0000
@@ -1,6 +1,6 @@
# encoding=UTF-8
-# Copyright © 2009-2017 Jakub Wilk
+# Copyright © 2009-2018 Jakub Wilk
#
# This file is part of pdf2djvu.
#
@@ -13,13 +13,13 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
+import re
+
from tools import (
assert_not_equal,
case,
)
-import re
-
class test(case):
# Bug: https://github.com/jwilk/pdf2djvu/issues/23
# + fixed in 0.5.5 [ad11da594a254f203f603fd4105fb05c8b508c64]
diff -Nru pdf2djvu-0.9.11/tests/test-duplicate-page-title.pdf pdf2djvu-0.9.12/tests/test-duplicate-page-title.pdf
--- pdf2djvu-0.9.11/tests/test-duplicate-page-title.pdf 2018-10-25 21:08:52.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-duplicate-page-title.pdf 2019-01-02 15:47:22.000000000 +0000
@@ -43,7 +43,7 @@
<>>>>>
endobj
12 0 obj
-<>
+<>
endobj
xref
0 13
diff -Nru pdf2djvu-0.9.11/tests/test-duplicate-page-title.py pdf2djvu-0.9.12/tests/test-duplicate-page-title.py
--- pdf2djvu-0.9.11/tests/test-duplicate-page-title.py 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-duplicate-page-title.py 2019-01-02 15:46:36.000000000 +0000
@@ -1,6 +1,6 @@
# encoding=UTF-8
-# Copyright © 2015-2017 Jakub Wilk
+# Copyright © 2015-2018 Jakub Wilk
#
# This file is part of pdf2djvu.
#
@@ -13,12 +13,12 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
+import re
+
from tools import (
case,
)
-import re
-
class test(case):
# Bug: https://github.com/jwilk/pdf2djvu/issues/113
diff -Nru pdf2djvu-0.9.11/tests/test-empty-outline.pdf pdf2djvu-0.9.12/tests/test-empty-outline.pdf
--- pdf2djvu-0.9.11/tests/test-empty-outline.pdf 2018-10-25 21:09:01.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-empty-outline.pdf 2019-01-02 15:47:32.000000000 +0000
@@ -22,7 +22,7 @@
<>
endobj
7 0 obj
-<>
+<>
endobj
xref
0 8
diff -Nru pdf2djvu-0.9.11/tests/test-fg-colors-gm.pdf pdf2djvu-0.9.12/tests/test-fg-colors-gm.pdf
--- pdf2djvu-0.9.11/tests/test-fg-colors-gm.pdf 2018-10-25 21:08:53.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-fg-colors-gm.pdf 2019-01-02 15:47:23.000000000 +0000
@@ -2947,7 +2947,7 @@
<>
endobj
10 0 obj
-<>
+<>
endobj
xref
0 11
diff -Nru pdf2djvu-0.9.11/tests/test-fg-colors-gm.py pdf2djvu-0.9.12/tests/test-fg-colors-gm.py
--- pdf2djvu-0.9.11/tests/test-fg-colors-gm.py 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-fg-colors-gm.py 2019-01-02 15:46:36.000000000 +0000
@@ -1,6 +1,6 @@
# encoding=UTF-8
-# Copyright © 2010-2017 Jakub Wilk
+# Copyright © 2010-2018 Jakub Wilk
#
# This file is part of pdf2djvu.
#
@@ -53,8 +53,9 @@
def t(i):
self.require_feature('GraphicsMagick')
r = self.pdf2djvu('--fg-colors={0}'.format(i))
+ msg = 'The specified number of foreground colors is outside the allowed range: 1 .. 4080'
r.assert_(
- stderr=re.compile('^The specified number of foreground colors is outside the allowed range: 1 .. 4080\n'),
+ stderr=re.compile('^' + re.escape(msg) + '\n'),
rc=1,
)
t('-1')
diff -Nru pdf2djvu-0.9.11/tests/test-fg-colors.pdf pdf2djvu-0.9.12/tests/test-fg-colors.pdf
--- pdf2djvu-0.9.11/tests/test-fg-colors.pdf 2018-10-25 21:08:58.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-fg-colors.pdf 2019-01-02 15:47:28.000000000 +0000
@@ -2947,7 +2947,7 @@
<>
endobj
10 0 obj
-<>
+<>
endobj
xref
0 11
diff -Nru pdf2djvu-0.9.11/tests/test-filter-text.pdf pdf2djvu-0.9.12/tests/test-filter-text.pdf
--- pdf2djvu-0.9.11/tests/test-filter-text.pdf 2018-10-25 21:09:00.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-filter-text.pdf 2019-01-02 15:47:30.000000000 +0000
@@ -34,7 +34,7 @@
<>
endobj
10 0 obj
-<>
+<>
endobj
xref
0 11
diff -Nru pdf2djvu-0.9.11/tests/test-hyperlinks.pdf pdf2djvu-0.9.12/tests/test-hyperlinks.pdf
--- pdf2djvu-0.9.11/tests/test-hyperlinks.pdf 2018-10-25 21:08:59.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-hyperlinks.pdf 2019-01-02 15:47:29.000000000 +0000
@@ -96,7 +96,7 @@
<>
endobj
26 0 obj
-<>
+<>
endobj
xref
0 27
Binary files /tmp/tmpTDoGOG/bfgD0DflsN/pdf2djvu-0.9.11/tests/test-interpolation.pdf and /tmp/tmpTDoGOG/fKxWffilUh/pdf2djvu-0.9.12/tests/test-interpolation.pdf differ
Binary files /tmp/tmpTDoGOG/bfgD0DflsN/pdf2djvu-0.9.11/tests/test-jpeg2000.pdf and /tmp/tmpTDoGOG/fKxWffilUh/pdf2djvu-0.9.12/tests/test-jpeg2000.pdf differ
diff -Nru pdf2djvu-0.9.11/tests/test-labels-null.pdf pdf2djvu-0.9.12/tests/test-labels-null.pdf
--- pdf2djvu-0.9.11/tests/test-labels-null.pdf 2018-10-25 21:08:51.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-labels-null.pdf 2019-01-02 15:47:20.000000000 +0000
@@ -31,7 +31,7 @@
<>>1<>]>>>>
endobj
9 0 obj
-<>
+<>
endobj
xref
0 10
diff -Nru pdf2djvu-0.9.11/tests/test-labels.pdf pdf2djvu-0.9.12/tests/test-labels.pdf
--- pdf2djvu-0.9.11/tests/test-labels.pdf 2018-10-25 21:08:57.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-labels.pdf 2019-01-02 15:47:28.000000000 +0000
@@ -55,7 +55,7 @@
<>1<
>>2<>3<>]>>>>
endobj
15 0 obj
-<>
+<>
endobj
xref
0 16
diff -Nru pdf2djvu-0.9.11/tests/test-miniexp-thread-safety.pdf pdf2djvu-0.9.12/tests/test-miniexp-thread-safety.pdf
--- pdf2djvu-0.9.11/tests/test-miniexp-thread-safety.pdf 2018-10-25 21:08:54.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-miniexp-thread-safety.pdf 2019-01-02 15:47:24.000000000 +0000
@@ -30122,7 +30122,7 @@
<>
endobj
5978 0 obj
-<>
+<>
endobj
xref
0 5979
Binary files /tmp/tmpTDoGOG/bfgD0DflsN/pdf2djvu-0.9.11/tests/test-monochrome.pdf and /tmp/tmpTDoGOG/fKxWffilUh/pdf2djvu-0.9.12/tests/test-monochrome.pdf differ
diff -Nru pdf2djvu-0.9.11/tests/test-multipage.pdf pdf2djvu-0.9.12/tests/test-multipage.pdf
--- pdf2djvu-0.9.11/tests/test-multipage.pdf 2018-10-25 21:08:51.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-multipage.pdf 2019-01-02 15:47:20.000000000 +0000
@@ -49,7 +49,7 @@
<>
endobj
13 0 obj
-<>
+<>
endobj
xref
0 14
diff -Nru pdf2djvu-0.9.11/tests/test-nfkc-apf.pdf pdf2djvu-0.9.12/tests/test-nfkc-apf.pdf
--- pdf2djvu-0.9.11/tests/test-nfkc-apf.pdf 2018-10-25 21:08:55.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-nfkc-apf.pdf 2019-01-02 15:47:25.000000000 +0000
@@ -34,7 +34,7 @@
<>
endobj
10 0 obj
-<>
+<>
endobj
xref
0 11
diff -Nru pdf2djvu-0.9.11/tests/test-nfkc.pdf pdf2djvu-0.9.12/tests/test-nfkc.pdf
--- pdf2djvu-0.9.11/tests/test-nfkc.pdf 2018-10-25 21:08:58.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-nfkc.pdf 2019-01-02 15:47:28.000000000 +0000
@@ -34,7 +34,7 @@
<>
endobj
10 0 obj
-<>
+<>
endobj
xref
0 11
diff -Nru pdf2djvu-0.9.11/tests/test-no-meta.pdf pdf2djvu-0.9.12/tests/test-no-meta.pdf
--- pdf2djvu-0.9.11/tests/test-no-meta.pdf 2018-10-25 21:08:51.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-no-meta.pdf 2019-01-02 15:47:20.000000000 +0000
@@ -19,7 +19,7 @@
<>
endobj
6 0 obj
-<>
+<>
endobj
xref
0 7
diff -Nru pdf2djvu-0.9.11/tests/test-oom.pdf pdf2djvu-0.9.12/tests/test-oom.pdf
--- pdf2djvu-0.9.11/tests/test-oom.pdf 2018-10-25 21:08:52.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-oom.pdf 2019-01-02 15:47:21.000000000 +0000
@@ -31,7 +31,7 @@
<>
endobj
9 0 obj
-<>
+<>
endobj
xref
0 10
diff -Nru pdf2djvu-0.9.11/tests/test-outline.pdf pdf2djvu-0.9.12/tests/test-outline.pdf
--- pdf2djvu-0.9.11/tests/test-outline.pdf 2018-10-25 21:08:58.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-outline.pdf 2019-01-02 15:47:29.000000000 +0000
@@ -122,7 +122,7 @@
<>
endobj
37 0 obj
-<>
+<>
endobj
xref
0 38
diff -Nru pdf2djvu-0.9.11/tests/test-oversized-outline.pdf pdf2djvu-0.9.12/tests/test-oversized-outline.pdf
--- pdf2djvu-0.9.11/tests/test-oversized-outline.pdf 2018-10-25 21:08:53.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-oversized-outline.pdf 2019-01-02 15:47:23.000000000 +0000
@@ -32,7 +32,7 @@
<>
endobj
10 0 obj
-<>
+<>
endobj
xref
0 11
diff -Nru pdf2djvu-0.9.11/tests/test-overwrite.pdf pdf2djvu-0.9.12/tests/test-overwrite.pdf
--- pdf2djvu-0.9.11/tests/test-overwrite.pdf 2018-10-25 21:08:57.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-overwrite.pdf 2019-01-02 15:47:27.000000000 +0000
@@ -19,7 +19,7 @@
<>
endobj
6 0 obj
-<>
+<>
endobj
xref
0 7
diff -Nru pdf2djvu-0.9.11/tests/test-page-id.pdf pdf2djvu-0.9.12/tests/test-page-id.pdf
--- pdf2djvu-0.9.11/tests/test-page-id.pdf 2018-10-25 21:08:57.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-page-id.pdf 2019-01-02 15:47:27.000000000 +0000
@@ -31,7 +31,7 @@
<>
endobj
9 0 obj
-<>
+<>
endobj
xref
0 10
Binary files /tmp/tmpTDoGOG/bfgD0DflsN/pdf2djvu-0.9.11/tests/test-rotated-page.pdf and /tmp/tmpTDoGOG/fKxWffilUh/pdf2djvu-0.9.12/tests/test-rotated-page.pdf differ
diff -Nru pdf2djvu-0.9.11/tests/test-solid-nonwhite-background.pdf pdf2djvu-0.9.12/tests/test-solid-nonwhite-background.pdf
--- pdf2djvu-0.9.11/tests/test-solid-nonwhite-background.pdf 2018-10-25 21:08:59.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-solid-nonwhite-background.pdf 2019-01-02 15:47:30.000000000 +0000
@@ -35,7 +35,7 @@
<>
endobj
10 0 obj
-<>
+<>
endobj
xref
0 11
Binary files /tmp/tmpTDoGOG/bfgD0DflsN/pdf2djvu-0.9.11/tests/test-subsample.pdf and /tmp/tmpTDoGOG/fKxWffilUh/pdf2djvu-0.9.12/tests/test-subsample.pdf differ
diff -Nru pdf2djvu-0.9.11/tests/test-title.pdf pdf2djvu-0.9.12/tests/test-title.pdf
--- pdf2djvu-0.9.11/tests/test-title.pdf 2018-10-25 21:09:00.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-title.pdf 2019-01-02 15:47:30.000000000 +0000
@@ -31,7 +31,7 @@
<>
endobj
9 0 obj
-<>
+<>
endobj
xref
0 10
diff -Nru pdf2djvu-0.9.11/tests/test-utf16-meta.pdf pdf2djvu-0.9.12/tests/test-utf16-meta.pdf
--- pdf2djvu-0.9.11/tests/test-utf16-meta.pdf 2018-10-25 21:09:00.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-utf16-meta.pdf 2019-01-02 15:47:31.000000000 +0000
@@ -21,7 +21,7 @@
6 0 obj
<<
/Title (\376\377\003\232\003\311\003\264\003\271\003\272\003\277\003\300\003\277\003\257\003\267\003\303\003\267\000\040\003\307\003\261\003\301\003\261\003\272\003\304\003\256\003\301\003\311\003\275)
-/Producer (LuaTeX-1.07.0)/Creator (TeX)/CreationDate (D:20181025230900+02'00')/ModDate (D:20181025230900+02'00')/Trapped/False>>
+/Producer (LuaTeX-1.07.0)/Creator (TeX)/CreationDate (D:20190102164731+01'00')/ModDate (D:20190102164731+01'00')/Trapped/False>>
endobj
xref
0 7
diff -Nru pdf2djvu-0.9.11/tests/test-vector-fg.pdf pdf2djvu-0.9.12/tests/test-vector-fg.pdf
--- pdf2djvu-0.9.11/tests/test-vector-fg.pdf 2018-10-25 21:09:01.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-vector-fg.pdf 2019-01-02 15:47:31.000000000 +0000
@@ -20,7 +20,7 @@
<>
endobj
6 0 obj
-<>
+<>
endobj
xref
0 7
diff -Nru pdf2djvu-0.9.11/tests/test-version.py pdf2djvu-0.9.12/tests/test-version.py
--- pdf2djvu-0.9.11/tests/test-version.py 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-version.py 2019-01-02 15:46:36.000000000 +0000
@@ -19,7 +19,7 @@
from tools import (
assert_equal,
- assert_true,
+ assert_fail,
case,
)
@@ -30,22 +30,22 @@
def __init__(self):
path = os.path.join(srcdir, 'doc', 'changelog')
- with open(path) as file:
- line = file.readline()
+ with open(path) as fp:
+ line = fp.readline()
self.changelog_version = line.split()[1].strip('()')
def test_manpage(self):
path = os.path.join(srcdir, 'doc', 'manpage.xml')
- for event, elem in etree.iterparse(path):
+ for dummy_event, elem in etree.iterparse(path):
if elem.tag == 'refmiscinfo' and elem.get('class') == 'version':
assert_equal(elem.text, self.changelog_version)
break
else:
- assert_true(False, msg="missing ")
+ assert_fail("missing ")
def test_executable(self):
r = self.pdf2djvu('--version')
- r.assert_(stdout=re.compile('^pdf2djvu [0-9.]+$', re.M), rc=0)
+ r.assert_(stdout=re.compile(r'^pdf2djvu [0-9.]+\r?\n', re.M), rc=0)
exec_version = r.stdout.splitlines()[0]
_, exec_version = exec_version.split()
assert_equal(exec_version, self.changelog_version)
diff -Nru pdf2djvu-0.9.11/tests/test-xmp-broken.pdf pdf2djvu-0.9.12/tests/test-xmp-broken.pdf
--- pdf2djvu-0.9.11/tests/test-xmp-broken.pdf 2018-10-25 21:08:56.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-xmp-broken.pdf 2019-01-02 15:47:26.000000000 +0000
@@ -32,7 +32,7 @@
<>
endobj
8 0 obj
-<>
+<>
endobj
xref
0 9
diff -Nru pdf2djvu-0.9.11/tests/test-xmp-mediatype.pdf pdf2djvu-0.9.12/tests/test-xmp-mediatype.pdf
--- pdf2djvu-0.9.11/tests/test-xmp-mediatype.pdf 2018-10-25 21:08:52.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-xmp-mediatype.pdf 2019-01-02 15:47:21.000000000 +0000
@@ -32,7 +32,7 @@
<>
endobj
8 0 obj
-<>
+<>
endobj
xref
0 9
diff -Nru pdf2djvu-0.9.11/tests/test-xmp-recreate.pdf pdf2djvu-0.9.12/tests/test-xmp-recreate.pdf
--- pdf2djvu-0.9.11/tests/test-xmp-recreate.pdf 2018-10-25 21:08:53.000000000 +0000
+++ pdf2djvu-0.9.12/tests/test-xmp-recreate.pdf 2019-01-02 15:47:22.000000000 +0000
@@ -19,7 +19,7 @@
<>
endobj
6 0 obj
-<>
+<>
endobj
xref
0 7
diff -Nru pdf2djvu-0.9.11/tests/tools.py pdf2djvu-0.9.12/tests/tools.py
--- pdf2djvu-0.9.11/tests/tools.py 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/tests/tools.py 2019-01-02 15:46:36.000000000 +0000
@@ -1,6 +1,6 @@
# encoding=UTF-8
-# Copyright © 2009-2017 Jakub Wilk
+# Copyright © 2009-2018 Jakub Wilk
#
# This file is part of pdf2djvu.
#
@@ -15,6 +15,7 @@
from __future__ import print_function
+import ast
import codecs
import collections
import inspect
@@ -35,12 +36,14 @@
assert_true,
)
-b'' # Python >= 2.6 is required
-if sys.version_info >= (3, 0):
- raise RuntimeError('Python 2.X is required')
+if not isinstance(b'', str): # Python 2.6 or 2.7 is required
+ raise RuntimeError('Python 2.6 or 2.7 is required')
re_type = type(re.compile(''))
+def assert_fail(msg):
+ assert_true(False, msg=msg) # pylint: disable=redundant-unittest-assert
+
def noseimport(vmaj, vmin, name=None):
def wrapper(f):
if sys.version_info >= (vmaj, vmin):
@@ -96,7 +99,7 @@
regex = re.compile(regex)
if not regex.search(text):
message = "Regex didn't match: {0!r} not found in {1!r}".format(regex.pattern, text)
- assert_true(False, msg=message)
+ assert_fail(message)
def _get_signal_names():
signame_pattern = re.compile('^SIG[A-Z0-9]*$')
@@ -180,7 +183,7 @@
_poppler_version = None
def get_pdf2djvu_command(self):
- if re.compile(r'\A[[a-zA-Z0-9_+/=.,:%-]+\Z').match(self._pdf2djvu_command):
+ if re.compile(r'\A[a-zA-Z0-9_+/=.,:%-]+\Z').match(self._pdf2djvu_command):
return (self._pdf2djvu_command,)
return ('sh', '-c', self._pdf2djvu_command + ' "$@"', 'sh')
@@ -188,8 +191,7 @@
result = inspect.getsourcefile(type(self))
if strip_py and result.endswith('.py'):
return result[:-3]
- else:
- return result
+ return result
def get_pdf_path(self):
return self.get_source_path(strip_py=True) + '.pdf'
@@ -285,12 +287,12 @@
assert_equal(r.stderr, '')
assert_equal(r.rc, 0)
xmp_lines = [line for line in r.stdout.splitlines() if line.startswith('(xmp "')]
- if len(xmp_lines) == 0:
- return
+ if not xmp_lines:
+ return None
[xmp_line] = xmp_lines
assert_equal(xmp_line[-2:], '")')
xmp = xmp_line[5:-1]
- xmp = eval(xmp)
+ xmp = ast.literal_eval(xmp)
return xmp
def require_poppler(self, *version):
@@ -386,6 +388,8 @@
'assert_is_not_none',
'assert_multi_line_equal',
'assert_regex',
+ # misc assert:
+ 'assert_fail',
# helper classes:
'ipc_result',
'case',
diff -Nru pdf2djvu-0.9.11/tools/build-manpage pdf2djvu-0.9.12/tools/build-manpage
--- pdf2djvu-0.9.11/tools/build-manpage 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/tools/build-manpage 2019-01-02 15:46:36.000000000 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright © 2014-2018 Jakub Wilk
+# Copyright © 2014-2019 Jakub Wilk
#
# This file is part of pdf2djvu.
#
@@ -42,10 +42,14 @@
set -x
$xmllint "$src"
$xsltproc "$xsl" "$src"
-perl -pi -e '# work-arounds for DocBook XSL capitalization bugs
+perl -pi -e '
if (/^[.]SH /) {
+ # work-arounds for DocBook XSL capitalization bugs
s/(\\[(][,~\x27][a-z])/\U$1/g; # https://bugs.debian.org/758262#20
s/\\[(]ss/SS/g; # https://bugs.debian.org/773444
-}' "$dst"
+}
+'"# prefer ' to \(aq when used as an apostrophe"'
+s/([a-z])\\[*][(]Aq([a-z])/$1\x27$2/gi
+' "$dst"
# vim:ts=4 sts=4 sw=4 et
diff -Nru pdf2djvu-0.9.11/win32/Makefile pdf2djvu-0.9.12/win32/Makefile
--- pdf2djvu-0.9.11/win32/Makefile 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/win32/Makefile 2019-01-02 15:46:36.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2009-2018 Jakub Wilk
+# Copyright © 2009-2019 Jakub Wilk
#
# This file is part of pdf2djvu.
#
@@ -25,9 +25,9 @@
djvulibre_tools = bzz c44 cjb2 csepdjvu djvuextract djvumake djvused djvmcvt
-WGET = wget
+download =
untar = tar --strip-components=1 -xf
-ship_dll = cp bin/$1*.dll dist/ && $(STRIP) dist/$1*.dll && chmod a-x dist/$1*.dll
+ship_dll = install -m 644 bin/$1*.dll dist/ && $(STRIP) dist/$1*.dll
cmake_options = \
-DCMAKE_SYSTEM_NAME=Windows \
@@ -57,13 +57,15 @@
export WINE = wine
export WINESERVER = /usr/lib/wine/wineserver32
+ifneq "$(download)" ""
+export PDF2DJVU_DOWNLOAD = 1
+endif
+
.PHONY: all
all:
@echo Usage:
@echo ' make source-dist'
@echo ' make binary-dist'
- @echo
- @echo Note: This makefile downloads third-party libraries from the Internet.
.PHONY: clean
@@ -71,7 +73,7 @@
src_tarball_topdir = pdf2djvu-win32-source-$(version)
src_tarball_name = pdf2djvu-win32-source-$(version)
-tar_opts = --owner root --group root --mode a+rX --format ustar --sort name
+tar_opts = --owner root --group root --mode u=rwX,go=rX --format ustar --sort name
xz_opts = -8e
.PHONY: source-dist
@@ -100,11 +102,13 @@
.PHONY: binary-dist
binary-dist: install
- mkdir -p $(zipball_topdir)
+ rm -rf $(zipball_topdir)
+ mkdir $(zipball_topdir)
! strings -f dist/*.exe dist/*.dll | grep -F '$(CURDIR)'
+ ! strings -l e -f dist/*.exe dist/*.dll | grep -F '$(CURDIR)'
cp -rl dist/* $(zipball_topdir)
chmod a-x $(zipball_topdir)/*.exe
- chmod -R a+rX $(zipball_topdir)
+ chmod -R u=rwX,go=rX $(zipball_topdir)
zip $(zip_opts) $(zipball_name).zip $(zipball_topdir)
rm -r $(zipball_topdir)
@@ -124,7 +128,7 @@
# pdf2djvu
-src/pdf2djvu/source-stamp: dcache/$(orig_src_tarball)
+src/pdf2djvu/source-stamp: src.tar/$(orig_src_tarball)
mkdir -p $(dir $@)
$(untar) $(<) -C $(dir $@)
rm -f $(dir $@)/paths.hh
@@ -150,7 +154,7 @@
touch $(@)
src/pdf2djvu/install-stamp: src/pdf2djvu/build-stamp
- mkdir -p dist/doc/
+ install -d dist/doc/
$(MAKE) install -C $(dir $@)
$(STRIP) dist/pdf2djvu.exe
xsltproc --nonet $(docbook_xsl) src/pdf2djvu/doc/manpage.xml > dist/doc/manpage.html
@@ -161,9 +165,9 @@
xsltproc --nonet $(docbook_xsl) $$file > $(usr)/dist/doc/manpage-$$locale.html; \
done
sed -e 's/$$/\r/' < src/pdf2djvu/doc/COPYING > dist/doc/COPYING.txt
- cd src/pdf2djvu/doc \
- ls *.txt | sed -e '/build-/d; s/[.]txt$$//' \
- | xargs -I{file} -t rst2html {file}.txt $(usr)/dist/doc/{file}.html
+ cd src/pdf2djvu/doc && \
+ ls README credits djvudigital \
+ | xargs -I{file} -t rst2html {file} $(usr)/dist/doc/{file}.html
sed -e 's/$$/\r/' < src/pdf2djvu/doc/changelog > dist/doc/changelog.txt
touch $(@)
@@ -179,7 +183,7 @@
src/libs-install-stamp: src/exiv2/install-stamp
src/libs-install-stamp: src/poppler/install-stamp
src/libs-install-stamp: src/winiconv/install-stamp
- mkdir -p dist/doc/
+ install -d dist/doc/
rst2html doc/COPYING.libs.txt > dist/doc/COPYING.libs.html
touch $(@)
@@ -187,8 +191,8 @@
src/poppler/source-stamp:
mkdir -p $(dir $@)
- tools/wget https://poppler.freedesktop.org/poppler-0.62.0.tar.xz 5b9a73dfd4d6f61d165ada1e4f0abd2d420494bf9d0b1c15d0db3f7b83a729c6
- $(untar) dcache/poppler-0.62.0.tar.xz -C $(dir $@)
+ tools/wget https://poppler.freedesktop.org/poppler-0.72.0.tar.xz c1747eb8f26e9e753c4001ed951db2896edc1021b6d0f547a0bd2a27c30ada51
+ $(untar) src.tar/poppler-0.72.0.tar.xz -C $(dir $@)
cd $(dir $@) && QUILT_PATCHES=../../patches/poppler quilt push -a
rm -rf $(dir $@)/*.cache $(dir $@)/*~
touch $(@)
@@ -220,7 +224,10 @@
find $(dir $@) -name build.make -print0 \
| xargs -0 sed -i -e 's,\([ ]\)\(/[^ ]\+/\($(CC)\|$(CXX)\)\) ,\1$(CURDIR)/tools/enforce-relative-paths \2 ,'
-src/poppler/build-stamp: src/poppler/Makefile
+include/dummy-mutex: misc/dummy-mutex.hh
+ install -m 644 $(<) $(@)
+
+src/poppler/build-stamp: src/poppler/Makefile include/dummy-mutex
$(MAKE) -C $(dir $@)
touch $(@)
@@ -233,8 +240,8 @@
src/poppler-data/source-stamp:
mkdir -p $(dir $@)
- tools/wget https://poppler.freedesktop.org/poppler-data-0.4.8.tar.gz 1096a18161f263cccdc6d8a2eb5548c41ff8fcf9a3609243f1b6296abdf72872
- $(untar) dcache/poppler-data-0.4.8.tar.gz -C $(dir $@)
+ tools/wget https://poppler.freedesktop.org/poppler-data-0.4.9.tar.gz 1f9c7e7de9ecd0db6ab287349e31bf815ca108a5a175cf906a90163bdbe32012
+ $(untar) src.tar/poppler-data-0.4.9.tar.gz -C $(dir $@)
touch $(@)
src/poppler-data/build-stamp: src/poppler-data/source-stamp
@@ -243,9 +250,9 @@
src/poppler-data/install-stamp: src/poppler-data/build-stamp
$(MAKE) -C $(dir $@) install prefix=$(usr)
- mkdir -p dist/share/
+ install -d dist/share/
cp -a share/poppler dist/share/
- mkdir -p dist/doc/
+ install -d dist/doc/
rst2html doc/COPYING.poppler-data.txt > dist/doc/COPYING.poppler-data.html
touch $(@)
@@ -254,7 +261,7 @@
src/djvulibre/source-stamp:
mkdir -p $(dir $@)
tools/wget https://downloads.sourceforge.net/project/djvu/DjVuLibre/3.5.27/djvulibre-3.5.27.tar.gz e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f
- $(untar) dcache/djvulibre-*.tar.gz -C $(dir $@)
+ $(untar) src.tar/djvulibre-*.tar.gz -C $(dir $@)
sed -i -e 's/[A-Z]\+_EXPORT/DLL_EXPORT/' $(dir $@)/libdjvu/*.h
sed -i -e 's/#if.*def.*AUTOCONF.*/#if 0/' $(dir $@)/libdjvu/DjVuMessage.cpp
touch $(@)
@@ -271,13 +278,13 @@
touch $(@)
src/djvulibre/install-stamp: src/djvulibre/build-stamp
- mkdir -p dist/
+ install -d dist/
$(MAKE) -C $(dir $@)/libdjvu install
$(MAKE) -C $(dir $@)/tools install
set -e && \
for tool in $(djvulibre_tools); do \
- cp bin/$$tool.exe bin/$$tool; \
- cp bin/$$tool.exe dist/; \
+ install bin/$$tool.exe bin/$$tool; \
+ install bin/$$tool.exe dist/; \
$(STRIP) dist/$$tool.exe; \
done
$(call ship_dll,libdjvulibre)
@@ -287,8 +294,8 @@
src/graphicsmagick/source-stamp:
mkdir -p $(dir $@)
- tools/wget https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/1.3.27/GraphicsMagick-1.3.27.tar.xz d03278d2790efc1dc72309f85a539810d2a81deb47932f7e6720d09ac72d0367
- $(untar) dcache/GraphicsMagick-1.3.27.tar.xz -C $(dir $@)
+ tools/wget https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/1.3.31/GraphicsMagick-1.3.31.tar.xz 096bbb59d6f3abd32b562fc3b34ea90d88741dc5dd888731d61d17e100394278
+ $(untar) src.tar/GraphicsMagick-1.3.31.tar.xz -C $(dir $@)
cd $(dir $@) && QUILT_PATCHES=../../patches/graphicsmagick quilt push -a
cd $(dir $@) && autoreconf -vfi
rm -rf $(dir $@)/*.cache $(dir $@)/magick/*~
@@ -306,12 +313,10 @@
--without-bzlib \
--without-dps \
--without-fpx \
- --without-gslib \
--without-jbig \
--without-webp \
--without-jpeg \
--without-jp2 \
- --without-lcms \
--without-lcms2 \
--without-lzma \
--without-png \
@@ -330,23 +335,26 @@
touch $(@)
src/graphicsmagick/install-stamp: src/graphicsmagick/build-stamp
- mkdir -p dist/
+ install -d dist/
$(MAKE) -C $(dir $@) install
$(call ship_dll,libGraphicsMagick)
rm dist/libGraphicsMagickWand*.dll
+ install -d dist/share/GraphicsMagick
+ install -m 644 share/GraphicsMagick-1.3.31/config/*.mgk dist/share/GraphicsMagick
touch $(@)
# Expat
src/expat/source-stamp:
mkdir -p $(dir $@)
- tools/wget https://github.com/libexpat/libexpat/releases/download/R_2_2_5/expat-2.2.5.tar.bz2 d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6
- $(untar) dcache/expat-2.2.5.tar.bz2 -C $(dir $@)
+ tools/wget https://github.com/libexpat/libexpat/releases/download/R_2_2_6/expat-2.2.6.tar.bz2 17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2
+ $(untar) src.tar/expat-2.2.6.tar.bz2 -C $(dir $@)
touch $(@)
src/expat/config.status: src/expat/source-stamp
cd $(dir $@) && \
./configure --host=$(host) --prefix=$(usr) \
+ --without-docbook \
--disable-static
src/expat/build-stamp: src/expat/config.status
@@ -354,7 +362,7 @@
touch $(@)
src/expat/install-stamp: src/expat/build-stamp
- mkdir -p dist/
+ install -d dist/
$(MAKE) -C $(dir $@) install
$(call ship_dll,libexpat)
touch $(@)
@@ -363,8 +371,8 @@
src/exiv2/source-stamp:
mkdir -p $(dir $@)
- tools/wget http://www.exiv2.org/exiv2-0.25.tar.gz c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4
- $(untar) dcache/exiv2-0.25.tar.gz -C $(dir $@)
+ tools/wget http://www.exiv2.org/releases/exiv2-0.25.tar.gz c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4
+ $(untar) src.tar/exiv2-0.25.tar.gz -C $(dir $@)
cd $(dir $@) && QUILT_PATCHES=../../patches/exiv2 quilt push -a
touch $(@)
@@ -382,7 +390,7 @@
touch $(@)
src/exiv2/install-stamp: src/exiv2/build-stamp
- mkdir -p dist/
+ install -d dist/
$(MAKE) -C $(dir $@) install
$(call ship_dll,libexiv2)
touch $(@)
@@ -391,8 +399,8 @@
src/freetype/source-stamp:
mkdir -p $(dir $@)
- tools/wget https://download.savannah.gnu.org/releases/freetype/freetype-2.9.tar.bz2 e6ffba3c8cef93f557d1f767d7bc3dee860ac7a3aaff588a521e081bc36f4c8a
- $(untar) dcache/freetype-2.9.tar.bz2 -C $(dir $@)
+ tools/wget https://download.savannah.gnu.org/releases/freetype/freetype-2.9.1.tar.bz2 db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d
+ $(untar) src.tar/freetype-2.9.1.tar.bz2 -C $(dir $@)
cd $(dir $@) && ./autogen.sh
rm -rf $(dir $@)/builds/unix/*.cache/
touch $(@)
@@ -411,7 +419,7 @@
touch $(@)
src/freetype/install-stamp: src/freetype/build-stamp
- mkdir -p dist/
+ install -d dist/
$(MAKE) -C $(dir $@) install
$(call ship_dll,libfreetype)
touch $(@)
@@ -421,7 +429,7 @@
src/fontconfig/source-stamp:
mkdir -p $(dir $@)
tools/wget https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.4.tar.bz2 668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c
- $(untar) dcache/fontconfig-2.12.4.tar.bz2 -C $(dir $@)
+ $(untar) src.tar/fontconfig-2.12.4.tar.bz2 -C $(dir $@)
cd $(dir $@) && autoreconf -vfi
rm -rf $(dir $@)/*.cache $(dir $@)/*~
sed -i -e 's/"append"/"prepend"/g' $(dir $@)/conf.d/*-urw-aliases.conf
@@ -441,11 +449,11 @@
touch $(@)
src/fontconfig/install-stamp: src/fontconfig/build-stamp
- mkdir -p dist/etc/fonts/conf.d/
+ install -d dist/etc/fonts/conf.d/
$(MAKE) -C $(dir $@)/ install RUN_FC_CACHE_TEST=false
$(call ship_dll,libfontconfig)
- cp etc/fonts/fonts.conf dist/etc/fonts/
- cp etc/fonts/conf.d/[3-6]*.conf dist/etc/fonts/conf.d/
+ install -m 644 etc/fonts/fonts.conf dist/etc/fonts/
+ install -m 644 etc/fonts/conf.d/[3-6]*.conf dist/etc/fonts/conf.d/
touch $(@)
# GNU gettext
@@ -453,7 +461,7 @@
src/gettext/source-stamp:
mkdir -p $(dir $@)
tools/wget https://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.8.1.tar.xz 105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938be4
- $(untar) dcache/gettext-0.19.8.1.tar.xz --exclude='gettext-tools' -C $(dir $@)
+ $(untar) src.tar/gettext-0.19.8.1.tar.xz --exclude='gettext-tools' -C $(dir $@)
sed -E -i -e '/(#undef|#define|extern .*) (v?sn?printf|[*]?setlocale)/d' $(dir $@)/gettext-runtime/intl/libgnuintl.in.h
sed -E -i -e 's/-D(ENABLE_RELOCATABLE)=1/-U\1/' $(dir $@)/gettext-runtime/intl/Makefile.in
touch $(@)
@@ -475,7 +483,7 @@
touch $(@)
src/gettext/install-stamp: src/gettext/build-stamp
- mkdir -p dist/
+ install -d dist/
$(MAKE) -C $(dir $@)/gettext-runtime/intl/ install
$(call ship_dll,libintl)
touch $(@)
@@ -485,7 +493,7 @@
src/winiconv/source-stamp:
mkdir -p $(dir $@)
tools/wget https://github.com/win-iconv/win-iconv/archive/v0.0.8.tar.gz -n win-iconv-0.0.8.tar.gz 23adea990a8303c6e69e32a64a30171efcb1b73824a1c2da1bbf576b0ae7c520
- $(untar) dcache/win-iconv-0.0.8.tar.gz -C $(dir $@)
+ $(untar) src.tar/win-iconv-0.0.8.tar.gz -C $(dir $@)
touch $(@)
src/winiconv/build-stamp: src/winiconv/source-stamp
@@ -502,7 +510,7 @@
src/libjpeg/source-stamp:
mkdir -p $(dir $@)
tools/wget https://jpegclub.org/support/files/jpegsrc.v6b2.tar.gz 6d2be0db82dda2e50c908b72aa22ed8cf42cc5aa5ae5f2b081498be6ef16eabc
- $(untar) dcache/jpegsrc.v6b2.tar.gz -C $(dir $@)
+ $(untar) src.tar/jpegsrc.v6b2.tar.gz -C $(dir $@)
cd $(dir $@) && QUILT_PATCHES=../../patches/libjpeg quilt push -a
cd $(dir $@) && ACLOCAL=aclocal-1.11 AUTOMAKE=automake-1.11 autoreconf -vfi
rm -rf $(dir $@)/*.cache $(dir $@)/*~
@@ -518,7 +526,7 @@
touch $(@)
src/libjpeg/install-stamp: src/libjpeg/build-stamp
- mkdir -p dist/
+ install -d dist/
$(MAKE) -C $(dir $@) install
$(call ship_dll,libjpeg)
touch $(@)
@@ -528,7 +536,7 @@
src/openjpeg/source-stamp:
mkdir -p $(dir $@)
tools/wget https://github.com/uclouvain/openjpeg/archive/v2.3.0.tar.gz -n openjpeg-2.3.0.tar.gz 3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a
- $(untar) dcache/openjpeg-2.3.0.tar.gz -C $(dir $@)
+ $(untar) src.tar/openjpeg-2.3.0.tar.gz -C $(dir $@)
rm -rf $(dir $@)/thirdparty/*/
touch $(@)
@@ -544,7 +552,7 @@
touch $(@)
src/openjpeg/install-stamp: src/openjpeg/build-stamp
- mkdir -p dist/
+ install -d dist/
$(MAKE) -C $(dir $@) install
$(call ship_dll,libopenjp2)
touch $(@)
@@ -570,15 +578,15 @@
src/urw-fonts/source-stamp:
mkdir -p $(dir $@)
tools/wget https://src.fedoraproject.org/repo/pkgs/urw-fonts/urw-fonts-1.0.7pre44.tar.bz2/51c6c2690593cd9bd92f197a6f2ff8bd/urw-fonts-1.0.7pre44.tar.bz2 df0ad8413f1e4bc0b6e5f964192879b0dc66d7be521f9666357ac30bad4c7a32
- $(untar) dcache/urw-fonts-1.0.7pre44.tar.bz2 -C $(dir $@) --strip-components=0
+ $(untar) src.tar/urw-fonts-1.0.7pre44.tar.bz2 -C $(dir $@) --strip-components=0
touch $(@)
src/urw-fonts/build-stamp: src/urw-fonts/source-stamp
touch $(@)
src/urw-fonts/install-stamp: src/urw-fonts/build-stamp
- mkdir -p dist/fonts/ dist/doc/
- cp $(addprefix $(dir $@)/,$(standard-fonts)) dist/fonts/
+ install -d dist/fonts/ dist/doc/
+ install -m 644 $(addprefix $(dir $@)/,$(standard-fonts)) dist/fonts/
rst2html doc/COPYING.fonts.txt > dist/doc/COPYING.fonts.html
touch $(@)
diff -Nru pdf2djvu-0.9.11/win32/misc/dummy-mutex.hh pdf2djvu-0.9.12/win32/misc/dummy-mutex.hh
--- pdf2djvu-0.9.11/win32/misc/dummy-mutex.hh 1970-01-01 00:00:00.000000000 +0000
+++ pdf2djvu-0.9.12/win32/misc/dummy-mutex.hh 2019-01-02 15:46:36.000000000 +0000
@@ -0,0 +1,39 @@
+/* Copyright © 2018 Jakub Wilk
+ *
+ * This file is part of pdf2djvu.
+ *
+ * pdf2djvu is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * pdf2djvu is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef PDF2DJVU_DUMMY_MUTEX
+#define PDF2DJVU_DUMMY_MUTEX
+
+#include
+
+#if !defined(_GLIBCXX_HAS_GTHREADS)
+
+namespace std {
+
+ class recursive_mutex {
+ public:
+ void lock() { }
+ void unlock() { }
+ bool try_lock() {
+ return true;
+ }
+ };
+
+}
+
+#endif
+
+#endif
+
+// vim:ts=4 sts=4 sw=4 et
diff -Nru pdf2djvu-0.9.11/win32/patches/graphicsmagick/config-paths.diff pdf2djvu-0.9.12/win32/patches/graphicsmagick/config-paths.diff
--- pdf2djvu-0.9.11/win32/patches/graphicsmagick/config-paths.diff 1970-01-01 00:00:00.000000000 +0000
+++ pdf2djvu-0.9.12/win32/patches/graphicsmagick/config-paths.diff 2019-01-02 15:46:36.000000000 +0000
@@ -0,0 +1,53 @@
+Adjust configuration paths.
+
+Load configuration from /share/GraphicsMagick/.
+Don't load it from the current working directory.
+
+Last-Update: 2018-12-17
+
+--- a/magick/blob.c
++++ b/magick/blob.c
+@@ -1999,6 +1999,7 @@
+
+ #else /* !defined(UseInstalledMagick) */
+
++#if 0
+ {
+ const char
+ *magick_home;
+@@ -2024,6 +2025,7 @@
+ #endif /* defined(POSIX) */
+ }
+ }
++
+
+ if (getenv("HOME") != (char *) NULL)
+ {
+@@ -2034,6 +2036,7 @@
+ *getenv("HOME") == '/' ? "/.magick" : "",DirectorySeparator);
+ AddConfigurePath(path_map,&path_index,path,exception);
+ }
++#endif
+
+ if (*SetClientPath((char *) NULL) != '\0')
+ {
+@@ -2053,16 +2056,18 @@
+ FormatString(path,"%.1024s/share/%s/",prefix,MagickShareConfigSubDir);
+ AddConfigurePath(path_map,&path_index,path,exception);
+ #else /* defined(POSIX) */
+- FormatString(path,"%.1024s%s",SetClientPath((char *) NULL),
++ FormatString(path,"%.1024s/share/GraphicsMagick/%s",SetClientPath((char *) NULL),
+ DirectorySeparator);
+ AddConfigurePath(path_map,&path_index,path,exception);
+ #endif /* !defined(POSIX) */
+ }
+
++#if 0
+ /*
+ Search current directory.
+ */
+ AddConfigurePath(path_map,&path_index,"",exception);
++#endif
+ #endif /* !defined(UseInstalledMagick) */
+
+ path_map_iterator=MagickMapAllocateIterator(path_map);
diff -Nru pdf2djvu-0.9.11/win32/patches/graphicsmagick/no-gm-build.diff pdf2djvu-0.9.12/win32/patches/graphicsmagick/no-gm-build.diff
--- pdf2djvu-0.9.11/win32/patches/graphicsmagick/no-gm-build.diff 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/win32/patches/graphicsmagick/no-gm-build.diff 2019-01-02 15:46:36.000000000 +0000
@@ -4,7 +4,7 @@
--- a/magick/command.c
+++ b/magick/command.c
-@@ -17074,6 +17074,7 @@
+@@ -17088,6 +17088,7 @@
#endif /* defined(HasZLIB) */
PrintFeature("ZLIB", supported);
@@ -12,7 +12,7 @@
#if defined(GM_BUILD_HOST)
(void) fprintf(stdout,"\nHost type: %.1024s\n", GM_BUILD_HOST);
#endif /* defined(GM_BUILD_HOST) */
-@@ -17111,6 +17112,7 @@
+@@ -17125,6 +17126,7 @@
#if defined(GM_BUILD_LIBS)
(void) fprintf(stdout," LIBS = %.1024s\n", GM_BUILD_LIBS);
#endif /* defined(GM_BUILD_LIBS) */
diff -Nru pdf2djvu-0.9.11/win32/patches/graphicsmagick/no-modules.diff pdf2djvu-0.9.12/win32/patches/graphicsmagick/no-modules.diff
--- pdf2djvu-0.9.11/win32/patches/graphicsmagick/no-modules.diff 1970-01-01 00:00:00.000000000 +0000
+++ pdf2djvu-0.9.12/win32/patches/graphicsmagick/no-modules.diff 2019-01-02 15:46:36.000000000 +0000
@@ -0,0 +1,15 @@
+Disable module loading.
+
+Last-Update: 2018-12-17
+
+--- a/magick/studio.h
++++ b/magick/studio.h
+@@ -413,7 +413,7 @@
+ # define PATH_MAX 4096
+ #endif
+
+-#if defined(HasLTDL) || ( defined(MSWINDOWS) && defined(_DLL) )
++#if 0
+ # define SupportMagickModules
+ #endif
+
diff -Nru pdf2djvu-0.9.11/win32/patches/graphicsmagick/series pdf2djvu-0.9.12/win32/patches/graphicsmagick/series
--- pdf2djvu-0.9.11/win32/patches/graphicsmagick/series 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/win32/patches/graphicsmagick/series 2019-01-02 15:46:36.000000000 +0000
@@ -1 +1,3 @@
no-gm-build.diff
+no-modules.diff
+config-paths.diff
diff -Nru pdf2djvu-0.9.11/win32/patches/poppler/mutex.diff pdf2djvu-0.9.12/win32/patches/poppler/mutex.diff
--- pdf2djvu-0.9.11/win32/patches/poppler/mutex.diff 1970-01-01 00:00:00.000000000 +0000
+++ pdf2djvu-0.9.12/win32/patches/poppler/mutex.diff 2019-01-02 15:46:36.000000000 +0000
@@ -0,0 +1,81 @@
+Use dummy implementation of mutexes.
+
+Last-Update: 2018-12-15
+
+--- a/poppler/Annot.h
++++ b/poppler/Annot.h
+@@ -42,7 +42,7 @@
+
+ #include
+ #include
+-#include
++#include
+ #include
+
+ #include "Object.h"
+--- a/poppler/Array.h
++++ b/poppler/Array.h
+@@ -29,7 +29,7 @@
+ #define ARRAY_H
+
+ #include
+-#include
++#include
+ #include
+
+ #include "poppler-config.h"
+--- a/poppler/CairoFontEngine.h
++++ b/poppler/CairoFontEngine.h
+@@ -30,7 +30,7 @@
+ #ifndef CAIROFONTENGINE_H
+ #define CAIROFONTENGINE_H
+
+-#include
++#include
+
+ #include "poppler-config.h"
+ #include "goo/gtypes.h"
+--- a/poppler/Dict.h
++++ b/poppler/Dict.h
+@@ -31,7 +31,7 @@
+ #define DICT_H
+
+ #include
+-#include
++#include
+ #include
+ #include
+ #include
+--- a/poppler/GlobalParams.h
++++ b/poppler/GlobalParams.h
+@@ -44,7 +44,7 @@
+ #include "UnicodeMap.h"
+ #include
+ #include
+-#include
++#include
+
+ class GooString;
+ class GooList;
+--- a/poppler/PDFDoc.h
++++ b/poppler/PDFDoc.h
+@@ -41,7 +41,7 @@
+ #ifndef PDFDOC_H
+ #define PDFDOC_H
+
+-#include
++#include
+
+ #include "poppler-config.h"
+ #include
+--- a/poppler/Page.h
++++ b/poppler/Page.h
+@@ -33,7 +33,7 @@
+ #ifndef PAGE_H
+ #define PAGE_H
+
+-#include
++#include
+
+ #include "poppler-config.h"
+ #include "Object.h"
diff -Nru pdf2djvu-0.9.11/win32/patches/poppler/poppler-data-path.diff pdf2djvu-0.9.12/win32/patches/poppler/poppler-data-path.diff
--- pdf2djvu-0.9.11/win32/patches/poppler/poppler-data-path.diff 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/win32/patches/poppler/poppler-data-path.diff 2019-01-02 15:46:36.000000000 +0000
@@ -4,7 +4,7 @@
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
-@@ -173,11 +173,6 @@
+@@ -141,11 +141,6 @@
p = _mbsrchr ((unsigned char *) retval, '\\');
*p = '\0';
diff -Nru pdf2djvu-0.9.11/win32/patches/poppler/series pdf2djvu-0.9.12/win32/patches/poppler/series
--- pdf2djvu-0.9.11/win32/patches/poppler/series 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/win32/patches/poppler/series 2019-01-02 15:46:36.000000000 +0000
@@ -1 +1,3 @@
poppler-data-path.diff
+strndup.diff
+mutex.diff
diff -Nru pdf2djvu-0.9.11/win32/patches/poppler/strndup.diff pdf2djvu-0.9.12/win32/patches/poppler/strndup.diff
--- pdf2djvu-0.9.11/win32/patches/poppler/strndup.diff 1970-01-01 00:00:00.000000000 +0000
+++ pdf2djvu-0.9.12/win32/patches/poppler/strndup.diff 2019-01-02 15:46:36.000000000 +0000
@@ -0,0 +1,24 @@
+Add strndup(3) implementation.
+
+Last-Update: 2018-12-15
+
+--- a/poppler/GlobalParams.cc
++++ b/poppler/GlobalParams.cc
+@@ -697,6 +697,17 @@
+ return lang;
+ }
+
++static char *strndup(const char *s, size_t n)
++{
++ size_t len = strnlen(s, n);
++ char *ds = (char*) malloc(len + 1);
++ if (ds == NULL)
++ return NULL;
++ memcpy(ds, s, len);
++ ds[len] = '\0';
++ return ds;
++}
++
+ static FcPattern *buildFcPattern(GfxFont *font, const GooString *base14Name)
+ {
+ int weight = -1,
diff -Nru pdf2djvu-0.9.11/win32/tools/wget pdf2djvu-0.9.12/win32/tools/wget
--- pdf2djvu-0.9.11/win32/tools/wget 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/win32/tools/wget 2019-01-02 15:46:36.000000000 +0000
@@ -47,14 +47,22 @@
set -e
here=$(basename "$0")
-cd "$here/../dcache"
+mkdir -p "$here/../src.tar"
+cd "$here/../src.tar"
if [ -e "$name" ] && echo "$sha256sum $name" | sha256sum --strict -c
then
exit 0
fi
-${WGET:-wget} -c "$url" -O "$name"
+if [ -z "${PDF2DJVU_DOWNLOAD-}" ]
+then
+ printf 'src.tar/%s is missing.\n' "$name" >&2
+ printf 'Set PDF2DJVU_DOWNLOAD=1 to download it automatically.\n' >&2
+ exit 1
+fi
+
+wget -c "$url" -O "$name"
echo "$sha256sum $name" | sha256sum --strict -c
diff -Nru pdf2djvu-0.9.11/win32-version.rc pdf2djvu-0.9.12/win32-version.rc
--- pdf2djvu-0.9.11/win32-version.rc 2018-10-25 21:07:29.000000000 +0000
+++ pdf2djvu-0.9.12/win32-version.rc 2019-01-02 15:46:36.000000000 +0000
@@ -2,8 +2,8 @@
#include "autoconf.hh"
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,11,0
- PRODUCTVERSION 0,9,11,0
+ FILEVERSION 0,9,12,0
+ PRODUCTVERSION 0,9,12,0
BEGIN
BLOCK "StringFileInfo"
BEGIN