[poppler] CMakeLists.txt configure.ac cpp/Doxyfile gtk-doc.make m4/gtk-doc.m4 NEWS poppler/CairoOutputDev.h poppler/Hints.cc poppler/Makefile.am poppler/PSOutputDev.cc poppler/PSOutputDev.h poppler/StructElement.cc poppler/StructElement.h poppler/StructTreeRoot.cc poppler/StructTreeRoot.h qt4/src qt5/src utils/pdftocairo.cc utils/pdftops.cc
Albert Astals Cid
aacid at kemper.freedesktop.org
Wed Mar 26 17:14:31 PDT 2014
CMakeLists.txt | 4 +--
NEWS | 48 ++++++++++++++++++++++++++++++++++++++++
configure.ac | 2 -
cpp/Doxyfile | 2 -
gtk-doc.make | 33 +++++++++++++++++++--------
m4/gtk-doc.m4 | 47 ++++++++++++++++++++++++++-------------
poppler/CairoOutputDev.h | 2 -
poppler/Hints.cc | 2 -
poppler/Makefile.am | 2 -
poppler/PSOutputDev.cc | 3 +-
poppler/PSOutputDev.h | 2 -
poppler/StructElement.cc | 2 -
poppler/StructElement.h | 2 -
poppler/StructTreeRoot.cc | 2 -
poppler/StructTreeRoot.h | 2 -
qt4/src/CMakeLists.txt | 2 -
qt4/src/Doxyfile | 2 -
qt4/src/Makefile.am | 2 -
qt4/src/poppler-ps-converter.cc | 1
qt5/src/CMakeLists.txt | 2 -
qt5/src/Doxyfile | 2 -
qt5/src/Makefile.am | 2 -
qt5/src/poppler-ps-converter.cc | 1
utils/pdftocairo.cc | 2 -
utils/pdftops.cc | 1
25 files changed, 127 insertions(+), 45 deletions(-)
New commits:
commit 23ad7fa5253a4fec6543d1435827aa1b59b62ced
Author: Albert Astals Cid <aacid at kde.org>
Date: Thu Mar 27 01:14:05 2014 +0100
0.25.2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc0195d..a522f76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS()
set(POPPLER_MAJOR_VERSION "0")
set(POPPLER_MINOR_VERSION "25")
-set(POPPLER_MICRO_VERSION "1")
+set(POPPLER_MICRO_VERSION "2")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
@@ -427,7 +427,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 45.0.0 SOVERSION 45)
+set_target_properties(poppler PROPERTIES VERSION 46.0.0 SOVERSION 46)
target_link_libraries(poppler ${poppler_LIBS})
target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff --git a/NEWS b/NEWS
index 8da297e..12e6f40 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,51 @@
+Release 0.25.2
+ core:
+ * Tagged-PDF support
+ * Open some broken files. Bug #75232
+ * Fix crashes on broken files
+ * Fix regression parsing some broken files. KDE Bug #329600
+ * Improve compilation under Win 8 with Visual Studio 2012. Bug #73111
+ * PSOutputDev: Ensure paper size takes into account rotation. Bug #72312
+ * PSOutputDev: Fix DocumentMedia/Page/Media/PageBBox DSC comments
+ * PSOutputDev: Use crop box as page size
+ * PSOutputDev: Remove origpagesizes mode and make -origpagesizes an alias for -paper match
+ * PSOutputDev: Only change paper size when different to previous size
+ * PSOutputDev: Ensure there is always a page size in the output
+ * PSOutputDev: Fix regression when creating level1 PS. Bug #75241
+ * CairoOutputDev: Clip to crop box. Gnome Bug #649886
+ * Splash: Blend usage in PDF with spot colors casue random output. Bug #74883
+ * Splash: Fix off by one that caused crash in a file. Bug #76387
+ * Make sure number of least objects in hints table is valid. Bug #74741
+ * Limit numeric parsing of character names. Bug #38456
+
+ glib:
+ * Tagged-PDF support
+ * Annotation improvements
+ * Install error callback. Bug #73269
+ * Fix gobject-introspection warnings
+ * demo: Fix performance in text markup annotations
+ * Increase gtk3 dependency
+
+ qt4:
+ * Improve naming of internal export/import macros
+ * Add GCC visibility export attributes
+ * Expose document-supplied text direction
+
+ qt5:
+ * Improve naming of internal export/import macros
+ * Add GCC visibility export attributes
+ * Expose document-supplied text direction
+
+ utils:
+ * pdftocairo: Ensure page size and crop box works the same as pdftops
+ * Fix TIFF writting in Windows. Bug #75969
+
+ buildsystem:
+ * Learn about automake 1.14
+ * Do not define -ansi. Bug #72499
+ * cmake: Install JpegWriter.h depending on libjpeg
+ * cmake: Use c99 for the c compiler
+
Release 0.25.1
core:
* GooString format: Added some tests + improved documentation
diff --git a/configure.ac b/configure.ac
index 686819b..b21d83e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([poppler_version_major],[0])
m4_define([poppler_version_minor],[25])
-m4_define([poppler_version_micro],[1])
+m4_define([poppler_version_micro],[2])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
AC_PREREQ(2.59)
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index ccfc347..400767e 100644
--- a/cpp/Doxyfile
+++ b/cpp/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler CPP"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.25.1
+PROJECT_NUMBER = 0.25.2
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/gtk-doc.make b/gtk-doc.make
index 104c399..e791656 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -49,9 +49,13 @@ REPORT_FILES = \
$(DOC_MODULE)-undeclared.txt \
$(DOC_MODULE)-unused.txt
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+gtkdoc-check.test: Makefile
+ $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+ echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
+ chmod +x $@
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
-if ENABLE_GTK_DOC
if GTK_DOC_BUILD_HTML
HTML_BUILD_STAMP=html-build.stamp
else
@@ -63,9 +67,11 @@ else
PDF_BUILD_STAMP=
endif
-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-else
-all-local:
+all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+.PHONY: all-gtk-doc
+
+if ENABLE_GTK_DOC
+all-local: all-gtk-doc
endif
docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
@@ -83,8 +89,10 @@ setup-build.stamp:
files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
if test "x$$files" != "x" ; then \
for file in $$files ; do \
+ destdir=`dirname $(abs_builddir)/$$file`; \
+ test -d "$$destdir" || mkdir -p "$$destdir"; \
test -f $(abs_srcdir)/$$file && \
- cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+ cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
done; \
fi; \
fi
@@ -101,7 +109,7 @@ GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V))
GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects";
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
$(GTK_DOC_V_SCAN)_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -212,6 +220,9 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
clean-local:
@rm -f *~ *.bak
@rm -rf .libs
+ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
+ rm -f $(DOC_MODULE).types; \
+ fi
distclean-local:
@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
@@ -256,15 +267,17 @@ uninstall-local:
#
# Require gtk-doc when making dist
#
-if ENABLE_GTK_DOC
+if HAVE_GTK_DOC
dist-check-gtkdoc: docs
else
dist-check-gtkdoc:
- @echo "*** gtk-doc must be installed and enabled in order to make dist"
+ @echo "*** gtk-doc is needed to run 'make dist'. ***"
+ @echo "*** gtk-doc was not found when 'configure' ran. ***"
+ @echo "*** please install gtk-doc and rerun 'configure'. ***"
@false
endif
-dist-hook: dist-check-gtkdoc dist-hook-local
+dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
@mkdir $(distdir)/html
@cp ./html/* $(distdir)/html
@-cp ./$(DOC_MODULE).pdf $(distdir)/
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
index ac2eccb..3675543 100644
--- a/m4/gtk-doc.m4
+++ b/m4/gtk-doc.m4
@@ -1,6 +1,6 @@
dnl -*- mode: autoconf -*-
-# serial 1
+# serial 2
dnl Usage:
dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
@@ -10,8 +10,24 @@ AC_DEFUN([GTK_DOC_CHECK],
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+ ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
+ AC_MSG_CHECKING([for gtk-doc])
+ PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
+ AC_MSG_RESULT($have_gtk_doc)
+
+ if test "$have_gtk_doc" = "no"; then
+ AC_MSG_WARN([
+ You will not be able to create source packages with 'make dist'
+ because $gtk_doc_requires is not found.])
+ fi
+
dnl check for tools we added during development
- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+ dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
+ dnl may not be writable by the user. Currently, automake requires that the
+ dnl test name must end in '.test'.
+ dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
+ AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
+ AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
@@ -28,22 +44,22 @@ AC_DEFUN([GTK_DOC_CHECK],
[use gtk-doc to build documentation [[default=no]]]),,
[enable_gtk_doc=no])
- if test x$enable_gtk_doc = xyes; then
- ifelse([$1],[],
- [PKG_CHECK_EXISTS([gtk-doc],,
- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
- [PKG_CHECK_EXISTS([gtk-doc >= $1],,
- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
- dnl don't check for glib if we build glib
- if test "x$PACKAGE_NAME" != "xglib"; then
- dnl don't fail if someone does not have glib
- PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:])
- fi
- fi
-
AC_MSG_CHECKING([whether to build gtk-doc documentation])
AC_MSG_RESULT($enable_gtk_doc)
+ if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
+ AC_MSG_ERROR([
+ You must have $gtk_doc_requires installed to build documentation for
+ $PACKAGE_NAME. Please install gtk-doc or disable building the
+ documentation by adding '--disable-gtk-doc' to '[$]0'.])
+ fi
+
+ dnl don't check for glib if we build glib
+ if test "x$PACKAGE_NAME" != "xglib"; then
+ dnl don't fail if someone does not have glib
+ PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:])
+ fi
+
dnl enable/disable output formats
AC_ARG_ENABLE([gtk-doc-html],
AS_HELP_STRING([--enable-gtk-doc-html],
@@ -63,6 +79,7 @@ AC_DEFUN([GTK_DOC_CHECK],
fi
AC_SUBST([AM_DEFAULT_VERBOSITY])
+ AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes])
AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
diff --git a/poppler/CairoOutputDev.h b/poppler/CairoOutputDev.h
index 50fdf7b..28f97fd 100644
--- a/poppler/CairoOutputDev.h
+++ b/poppler/CairoOutputDev.h
@@ -18,7 +18,7 @@
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh at redhat.com>
// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev at yandex.ru>
// Copyright (C) 2006-2011, 2013 Carlos Garcia Campos <carlosgc at gnome.org>
-// Copyright (C) 2008, 2009, 2011-2013 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2008, 2009, 2011-2014 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
// Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag at alfa.de>
//
diff --git a/poppler/Hints.cc b/poppler/Hints.cc
index 20bc952..bdd0d32 100644
--- a/poppler/Hints.cc
+++ b/poppler/Hints.cc
@@ -5,7 +5,7 @@
// This file is licensed under the GPLv2 or later
//
// Copyright 2010, 2012 Hib Eris <hib at hiberis.nl>
-// Copyright 2010, 2011, 2013 Albert Astals Cid <aacid at kde.org>
+// Copyright 2010, 2011, 2013, 2014 Albert Astals Cid <aacid at kde.org>
// Copyright 2010, 2013 Pino Toscano <pino at kde.org>
// Copyright 2013 Adrian Johnson <ajohnson at redneon.com>
// Copyright 2014 Fabio D'Urso <fabiodurso at hotmail.it>
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index 07cfb3b..ce6f4b2 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -157,7 +157,7 @@ libpoppler_la_LIBADD = \
$(PTHREAD_LIBS) \
$(win32_libs)
-libpoppler_la_LDFLAGS = -version-info 45:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 46:0:0 @create_shared_lib@ @auto_import_flags@
if ENABLE_XPDF_HEADERS
diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
index cfe47af..149bb62 100644
--- a/poppler/PSOutputDev.cc
+++ b/poppler/PSOutputDev.cc
@@ -25,9 +25,10 @@
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2009, 2011, 2012 William Bader <williambader at hotmail.com>
// Copyright (C) 2009 Kovid Goyal <kovid at kovidgoyal.net>
-// Copyright (C) 2009-2011, 2013 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2009-2011, 2013, 2014 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2012, 2014 Fabio D'Urso <fabiodurso at hotmail.it>
// Copyright (C) 2012 Lu Wang <coolwanglu at gmail.com>
+// Copyright (C) 2014 Till Kamppeter <till.kamppeter at gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
diff --git a/poppler/PSOutputDev.h b/poppler/PSOutputDev.h
index c654d2e..f30204d 100644
--- a/poppler/PSOutputDev.h
+++ b/poppler/PSOutputDev.h
@@ -22,7 +22,7 @@
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2009, 2011 William Bader <williambader at hotmail.com>
// Copyright (C) 2010 Hib Eris <hib at hiberis.nl>
-// Copyright (C) 2011 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2011, 2014 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
//
// To see a description of the changes please see the Changelog file that
diff --git a/poppler/StructElement.cc b/poppler/StructElement.cc
index ed8ee25..8e064a0 100644
--- a/poppler/StructElement.cc
+++ b/poppler/StructElement.cc
@@ -4,7 +4,7 @@
//
// This file is licensed under the GPLv2 or later
//
-// Copyright 2013 Igalia S.L.
+// Copyright 2013, 2014 Igalia S.L.
//
//========================================================================
diff --git a/poppler/StructElement.h b/poppler/StructElement.h
index 96ad2ed..51fd83d 100644
--- a/poppler/StructElement.h
+++ b/poppler/StructElement.h
@@ -4,7 +4,7 @@
//
// This file is licensed under the GPLv2 or later
//
-// Copyright 2013 Igalia S.L.
+// Copyright 2013, 2014 Igalia S.L.
//
//========================================================================
diff --git a/poppler/StructTreeRoot.cc b/poppler/StructTreeRoot.cc
index 56ce945..e46e3e2 100644
--- a/poppler/StructTreeRoot.cc
+++ b/poppler/StructTreeRoot.cc
@@ -4,7 +4,7 @@
//
// This file is licensed under the GPLv2 or later
//
-// Copyright 2013 Igalia S.L.
+// Copyright 2013, 2014 Igalia S.L.
// Copyright 2014 Fabio D'Urso <fabiodurso at hotmail.it>
//
//========================================================================
diff --git a/poppler/StructTreeRoot.h b/poppler/StructTreeRoot.h
index f42cdd5..3b1f3c8 100644
--- a/poppler/StructTreeRoot.h
+++ b/poppler/StructTreeRoot.h
@@ -4,7 +4,7 @@
//
// This file is licensed under the GPLv2 or later
//
-// Copyright 2013 Igalia S.L.
+// Copyright 2013, 2014 Igalia S.L.
//
//========================================================================
diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt
index 59953ed..a2e8223 100644
--- a/qt4/src/CMakeLists.txt
+++ b/qt4/src/CMakeLists.txt
@@ -30,7 +30,7 @@ set(poppler_qt4_SRCS
)
qt4_automoc(${poppler_qt4_SRCS})
add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS})
-set_target_properties(poppler-qt4 PROPERTIES VERSION 4.3.0 SOVERSION 4)
+set_target_properties(poppler-qt4 PROPERTIES VERSION 4.4.0 SOVERSION 4)
target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY})
if(MSVC)
target_link_libraries(poppler-qt4 poppler ${poppler_LIBS})
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index 3aad825..db58f17 100644
--- a/qt4/src/Doxyfile
+++ b/qt4/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt4 "
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.25.1
+PROJECT_NUMBER = 0.25.2
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
index 13ab7ff..83a3b98 100644
--- a/qt4/src/Makefile.am
+++ b/qt4/src/Makefile.am
@@ -62,7 +62,7 @@ libpoppler_qt4_la_LIBADD = \
$(top_builddir)/poppler/libpoppler.la \
$(POPPLER_QT4_LIBS)
-libpoppler_qt4_la_LDFLAGS = -version-info 7:0:3 @create_shared_lib@ @auto_import_flags@
+libpoppler_qt4_la_LDFLAGS = -version-info 8:0:4 @create_shared_lib@ @auto_import_flags@
# This rule lets GNU make create any *.moc from the equivalent *.h
.h.moc:
diff --git a/qt4/src/poppler-ps-converter.cc b/qt4/src/poppler-ps-converter.cc
index 1847eef..d69b345 100644
--- a/qt4/src/poppler-ps-converter.cc
+++ b/qt4/src/poppler-ps-converter.cc
@@ -5,6 +5,7 @@
* Copyright (C) 2011 Glad Deschrijver <glad.deschrijver at gmail.com>
* Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
* Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
+ * Copyright (C) 2014 Adrian Johnson <ajohnson at redneon.com>
*
* 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 --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt
index 8679ae0..439c1d4 100644
--- a/qt5/src/CMakeLists.txt
+++ b/qt5/src/CMakeLists.txt
@@ -32,7 +32,7 @@ set(poppler_qt5_SRCS
ArthurOutputDev.cc
)
add_library(poppler-qt5 SHARED ${poppler_qt5_SRCS})
-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.0.0 SOVERSION 1)
+set_target_properties(poppler-qt5 PROPERTIES VERSION 1.1.0 SOVERSION 1)
target_link_libraries(poppler-qt5 poppler ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Xml_LIBRARIES})
if(MSVC)
target_link_libraries(poppler-qt5 poppler ${poppler_LIBS})
diff --git a/qt5/src/Doxyfile b/qt5/src/Doxyfile
index cb2b794..56fdf55 100644
--- a/qt5/src/Doxyfile
+++ b/qt5/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt5"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.25.1
+PROJECT_NUMBER = 0.25.2
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/qt5/src/Makefile.am b/qt5/src/Makefile.am
index e892f04..81dba68 100644
--- a/qt5/src/Makefile.am
+++ b/qt5/src/Makefile.am
@@ -62,7 +62,7 @@ libpoppler_qt5_la_LIBADD = \
$(top_builddir)/poppler/libpoppler.la \
$(POPPLER_QT5_LIBS)
-libpoppler_qt5_la_LDFLAGS = -version-info 1:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_qt5_la_LDFLAGS = -version-info 2:0:1 @create_shared_lib@ @auto_import_flags@
# This rule lets GNU make create any *.moc from the equivalent *.h
.h.moc:
diff --git a/qt5/src/poppler-ps-converter.cc b/qt5/src/poppler-ps-converter.cc
index 241d2a4..0e81b70 100644
--- a/qt5/src/poppler-ps-converter.cc
+++ b/qt5/src/poppler-ps-converter.cc
@@ -5,6 +5,7 @@
* Copyright (C) 2011 Glad Deschrijver <glad.deschrijver at gmail.com>
* Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
* Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
+ * Copyright (C) 2014 Adrian Johnson <ajohnson at redneon.com>
*
* 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 --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
index 59c1996..b3f57b6 100644
--- a/utils/pdftocairo.cc
+++ b/utils/pdftocairo.cc
@@ -19,7 +19,7 @@
// Copyright (C) 2009 Shen Liang <shenzhuxi at gmail.com>
// Copyright (C) 2009 Stefan Thomas <thomas at eload24.com>
// Copyright (C) 2009, 2010 Albert Astals Cid <aacid at kde.org>
-// Copyright (C) 2010, 2011-2013 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2010, 2011-2014 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2010 Hib Eris <hib at hiberis.nl>
// Copyright (C) 2010 Jonathan Liu <net147 at gmail.com>
// Copyright (C) 2010 William Bader <williambader at hotmail.com>
diff --git a/utils/pdftops.cc b/utils/pdftops.cc
index e003baa..babebed 100644
--- a/utils/pdftops.cc
+++ b/utils/pdftops.cc
@@ -23,6 +23,7 @@
// Copyright (C) 2010 Hib Eris <hib at hiberis.nl>
// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag at alfa.de>
// Copyright (C) 2013 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
+// Copyright (C) 2014 Adrian Johnson <ajohnson at redneon.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
More information about the poppler
mailing list