CMakeLists.txt | 4 ++-- NEWS | 13 +++++++++++++ configure.ac | 2 +- cpp/Doxyfile | 2 +- gtk-doc.make | 20 ++++++++++++-------- poppler/Makefile.am | 2 +- qt4/src/CMakeLists.txt | 2 +- qt4/src/Doxyfile | 2 +- qt4/src/Makefile.am | 2 +- qt5/src/CMakeLists.txt | 2 +- qt5/src/Doxyfile | 2 +- qt5/src/Makefile.am | 2 +- 12 files changed, 36 insertions(+), 19 deletions(-)
New commits: commit 44e1a2f715d0da8bb2941da296faab7ee144cfc2 Author: Albert Astals Cid <[email protected]> Date: Fri Oct 9 23:28:03 2015 +0200 Poppler 0.37 diff --git a/CMakeLists.txt b/CMakeLists.txt index ac3d090..ff81531 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ if (ECM_FOUND) endif() set(POPPLER_MAJOR_VERSION "0") -set(POPPLER_MINOR_VERSION "36") +set(POPPLER_MINOR_VERSION "37") set(POPPLER_MICRO_VERSION "0") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") @@ -478,7 +478,7 @@ add_library(poppler STATIC ${poppler_SRCS}) else(MSVC) add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) -set_target_properties(poppler PROPERTIES VERSION 55.0.0 SOVERSION 55) +set_target_properties(poppler PROPERTIES VERSION 56.0.0 SOVERSION 56) 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 c4d83ef..949f817 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,16 @@ +Release 0.37.0 + core: + * CairoOutputDev: Use mask for even-odd fill. Bug #84527 + * SplashOuputDev: Protect calls to set/getAA with the proper #if guards. Bug #92006 + * SplashOuputDev: Try to use an external font if the internal one is invalid + * PageTransition D is a number not an int. Bug #92040 + * Catalog::getNumPages(): validate page count + * Catalog::cachePageTree(): recover from out of memory condition + * Fix crashes in malformed documents + + build system: + * configure: fix openjpeg detection + Release 0.36.0 core: * Patch to support RichMedia annotations diff --git a/configure.ac b/configure.ac index bfdfe23..e826adf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ m4_define([poppler_version_major],[0]) -m4_define([poppler_version_minor],[36]) +m4_define([poppler_version_minor],[37]) m4_define([poppler_version_micro],[0]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) diff --git a/cpp/Doxyfile b/cpp/Doxyfile index 87e6bc0..68bd179 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.36.0 +PROJECT_NUMBER = 0.37.0 # 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 e791656..9ccd0b0 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -25,6 +25,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) SETUP_FILES = \ $(content_files) \ + $(expand_content_files) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt @@ -86,7 +87,7 @@ GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ destdir=`dirname $(abs_builddir)/$$file`; \ @@ -118,7 +119,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ scanobj_options="--verbose"; \ fi; \ @@ -162,17 +163,17 @@ GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkhtml_options="$$mkhtml_options --verbose"; \ fi; \ fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @@ -194,11 +195,11 @@ GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkpdf_options="$$mkpdf_options --verbose"; \ fi; \ @@ -223,12 +224,15 @@ clean-local: @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ rm -f $(DOC_MODULE).types; \ fi + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ + rm -f $(DOC_MODULE)-sections.txt; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ + rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ fi maintainer-clean-local: diff --git a/poppler/Makefile.am b/poppler/Makefile.am index 9a5d026..85ee13b 100644 --- a/poppler/Makefile.am +++ b/poppler/Makefile.am @@ -296,7 +296,7 @@ libpoppler_la_LIBADD = \ $(win32_libs) libpoppler_la_LDFLAGS = \ - -version-info 55:0:0 \ + -version-info 56:0:0 \ @create_shared_lib@ \ @auto_import_flags@ diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt index 5ec1b48..189eca2 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.8.0 SOVERSION 4) +set_target_properties(poppler-qt4 PROPERTIES VERSION 4.9.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 044cf62..19301ce 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.36.0 +PROJECT_NUMBER = 0.37.0 # 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 997e5bf..df37fe3 100644 --- a/qt4/src/Makefile.am +++ b/qt4/src/Makefile.am @@ -60,7 +60,7 @@ libpoppler_qt4_la_LIBADD = \ $(POPPLER_QT4_LIBS) libpoppler_qt4_la_LDFLAGS = \ - -version-info 12:0:8 \ + -version-info 13:0:9 \ @create_shared_lib@ \ @auto_import_flags@ diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt index cf4b97f..1eef04a 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.5.0 SOVERSION 1) +set_target_properties(poppler-qt5 PROPERTIES VERSION 1.6.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 7fee355..751732a 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.36.0 +PROJECT_NUMBER = 0.37.0 # 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 ea13250..4f9f2a9 100644 --- a/qt5/src/Makefile.am +++ b/qt5/src/Makefile.am @@ -60,7 +60,7 @@ libpoppler_qt5_la_LIBADD = \ $(POPPLER_QT5_LIBS) libpoppler_qt5_la_LDFLAGS = \ - -version-info 6:0:5 \ + -version-info 7:0:6 \ @create_shared_lib@ \ @auto_import_flags@ _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
