.gitignore | 4 ++++ CMakeLists.txt | 4 ++-- NEWS | 10 ++++++++++ configure.ac | 10 +++++----- cpp/Doxyfile | 2 +- glib/.gitignore | 2 ++ glib/poppler.h | 2 +- glib/reference/.gitignore | 1 + poppler/Lexer.cc | 2 +- qt4/src/Doxyfile | 2 +- qt4/tests/.gitignore | 3 +++ qt5/src/Doxyfile | 2 +- qt5/tests/.gitignore | 3 +++ utils/pdftohtml.cc | 1 + 14 files changed, 36 insertions(+), 12 deletions(-)
New commits: commit f8f7b3a61bc7eb1e569c25a630b5e127b5dcae62 Merge: 805ff76 aa6205d Author: Albert Astals Cid <[email protected]> Date: Wed Jul 9 00:23:22 2014 +0200 Merge remote-tracking branch 'origin/poppler-0.26' commit aa6205d195c56a77e897bad125bf213aba138422 Author: Jason Crain <[email protected]> Date: Mon Jul 7 23:52:39 2014 -0500 Increase required Qt4 version to 4.7.0 We use Qt::LayoutDirectionAuto, introduced in 4.7.0. bug #81005 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6089cd6..cc7a8c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ set(OPI_SUPPORT ON) set(TEXTOUT_WORD_LIST ON) # setting the minimum required versions for some components -set(QT4_MIN_VERSION "4.4.0") +set(QT4_MIN_VERSION "4.7.0") set(CAIRO_VERSION "1.10.0") set(GLIB_REQUIRED "2.18") diff --git a/configure.ac b/configure.ac index 44d33a7..c9dd0bb 100644 --- a/configure.ac +++ b/configure.ac @@ -568,17 +568,17 @@ AC_ARG_ENABLE(poppler-qt4, enable_poppler_qt4="try") if test x$enable_poppler_qt4 = xyes; then PKG_CHECK_MODULES(POPPLER_QT4, - QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0) + QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0) PKG_CHECK_MODULES(POPPLER_QT4_TEST, - QtTest >= 4.4.0) + QtTest >= 4.7.0) elif test x$enable_poppler_qt4 = xtry; then PKG_CHECK_MODULES(POPPLER_QT4, - QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0, + QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0, [enable_poppler_qt4="yes"], [enable_poppler_qt4="no"]) if test x$enable_poppler_qt4 = xyes; then PKG_CHECK_MODULES(POPPLER_QT4_TEST, - QtTest >= 4.4.0, + QtTest >= 4.7.0, [enable_poppler_qt4="yes"], [enable_poppler_qt4="no"]) fi commit e5862155b1c549b6774bb4f25c09c45857ff1734 Author: Hib Eris <[email protected]> Date: Wed Jun 4 20:58:56 2014 +0200 Add Changelog to .gitignore https://bugs.freedesktop.org/show_bug.cgi?id=79744 diff --git a/.gitignore b/.gitignore index 0e40537..b7b8dd5 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ libtool ltmain.sh missing test-driver +ChangeLog poppler-cairo.pc poppler-cpp.pc poppler-glib.pc commit 5f22649694d64c4170db82847b599576d5377176 Author: Hib Eris <[email protected]> Date: Wed Jun 4 20:56:23 2014 +0200 Add *.gir, *.typelib to glib/.gitignore https://bugs.freedesktop.org/show_bug.cgi?id=79744 diff --git a/glib/.gitignore b/glib/.gitignore index a22390b..45e3b50 100644 --- a/glib/.gitignore +++ b/glib/.gitignore @@ -9,3 +9,5 @@ poppler-enums.h poppler-features.h stamp-* test-poppler-glib +*.gir +*.typelib commit b63f57985719c7884b67f46fc4afd4954c44c5ab Author: Hib Eris <[email protected]> Date: Wed Jun 4 20:54:30 2014 +0200 Add poppler-undeclared.txt to .gitignore https://bugs.freedesktop.org/show_bug.cgi?id=79744 diff --git a/glib/reference/.gitignore b/glib/reference/.gitignore index f908650..cc79cda 100644 --- a/glib/reference/.gitignore +++ b/glib/reference/.gitignore @@ -2,6 +2,7 @@ Makefile Makefile.in poppler-decl-list.txt poppler-decl.txt +poppler-undeclared.txt poppler-undocumented.txt poppler-unused.txt poppler.args commit 5e0f4e2516d5a3997ea9c9a9927e24d4f3abe136 Author: Hib Eris <[email protected]> Date: Wed Jun 4 20:52:15 2014 +0200 Add poppler-forms, stress-threads-qt, test-render-to-file to .gitignore https://bugs.freedesktop.org/show_bug.cgi?id=79744 diff --git a/qt4/tests/.gitignore b/qt4/tests/.gitignore index 5580611..3746eb8 100644 --- a/qt4/tests/.gitignore +++ b/qt4/tests/.gitignore @@ -12,6 +12,9 @@ test-password-qt4 poppler-attachments poppler-fonts poppler-texts +poppler-forms +stress-threads-qt4 +test-render-to-file check_actualtext check_attachments check_dateConversion diff --git a/qt5/tests/.gitignore b/qt5/tests/.gitignore index bd214f6..d187ae8 100644 --- a/qt5/tests/.gitignore +++ b/qt5/tests/.gitignore @@ -12,6 +12,9 @@ test-password-qt5 poppler-attachments poppler-fonts poppler-texts +poppler-forms +stress-threads-qt5 +test-render-to-file check_actualtext check_attachments check_dateConversion commit 4d2400e7bb8ae9208030b9615dda7c53e571be8b Author: Hib Eris <[email protected]> Date: Wed Jun 4 10:09:16 2014 +0200 Add test-driver to .gitignore https://bugs.freedesktop.org/show_bug.cgi?id=79744 diff --git a/.gitignore b/.gitignore index ef80ac4..0e40537 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ install-sh libtool ltmain.sh missing +test-driver poppler-cairo.pc poppler-cpp.pc poppler-glib.pc commit 4c35e0213be26f21b628ff8d9f170252bb0106c9 Author: Hib Eris <[email protected]> Date: Wed Jun 4 10:06:20 2014 +0200 Add poppler-qt5.pc to .gitignore https://bugs.freedesktop.org/show_bug.cgi?id=79744 diff --git a/.gitignore b/.gitignore index 39728b4..ef80ac4 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ poppler-cpp.pc poppler-glib.pc poppler-qt.pc poppler-qt4.pc +poppler-qt5.pc poppler-splash.pc poppler.pc stamp-h1 @@ -30,5 +31,6 @@ poppler-cpp-uninstalled.pc poppler-glib-uninstalled.pc poppler-qt-uninstalled.pc poppler-qt4-uninstalled.pc +poppler-qt5-uninstalled.pc poppler-splash-uninstalled.pc poppler-uninstalled.pc commit 2b455b85168d5c9d8641d9a91bfde81ccab18e54 Author: Pino Toscano <[email protected]> Date: Sun Jul 6 11:13:54 2014 +0200 glib: fix typo in apidox diff --git a/glib/poppler.h b/glib/poppler.h index f5c9563..580479c 100644 --- a/glib/poppler.h +++ b/glib/poppler.h @@ -29,7 +29,7 @@ GQuark poppler_error_quark (void); /** * PopplerError: - * @POPPLER_ERROR_INVALID: Generic error when a document opration fails + * @POPPLER_ERROR_INVALID: Generic error when a document operation fails * @POPPLER_ERROR_ENCRYPTED: Document is encrypted * @POPPLER_ERROR_OPEN_FILE: File could not be opened for writing when saving document * @POPPLER_ERROR_BAD_CATALOG: Failed to read the document catalog commit 266a61ab1c9f536a4fb7d68c8f285c854eb2d6e9 Author: Albert Astals Cid <[email protected]> Date: Thu Jun 19 20:16:19 2014 +0200 0.26.2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ceb643..6089cd6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS() set(POPPLER_MAJOR_VERSION "0") set(POPPLER_MINOR_VERSION "26") -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 diff --git a/NEWS b/NEWS index 9522bfe..afa01d9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,13 @@ +Release 0.26.2 + core: + * Make sure we have an xref before using. KDE Bug #335413 + + build system: + * autoconf: Fix typo in configure.ac + + utils: + * pdftohtml: exit with 0 with -v and -h + Release 0.26.1 core: * Use field value V for radio buttons. Bug #75979 diff --git a/configure.ac b/configure.ac index 4d55bec..44d33a7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ m4_define([poppler_version_major],[0]) m4_define([poppler_version_minor],[26]) -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 a657514..ee6c048 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.26.1 +PROJECT_NUMBER = 0.26.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/Doxyfile b/qt4/src/Doxyfile index b37989e..bfb9184 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.26.1 +PROJECT_NUMBER = 0.26.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/Doxyfile b/qt5/src/Doxyfile index ad50aa8..53ac3f1 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.26.1 +PROJECT_NUMBER = 0.26.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. commit 3381ee20efca2ce27733182d0d6720c1e6936a7f Author: Albert Astals Cid <[email protected]> Date: Thu Jun 19 19:57:31 2014 +0200 Update (C) diff --git a/poppler/Lexer.cc b/poppler/Lexer.cc index a0a5cd0..952967a 100644 --- a/poppler/Lexer.cc +++ b/poppler/Lexer.cc @@ -13,7 +13,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2006-2010, 2012, 2013 Albert Astals Cid <[email protected]> +// Copyright (C) 2006-2010, 2012-2014 Albert Astals Cid <[email protected]> // Copyright (C) 2006 Krzysztof Kowalczyk <[email protected]> // Copyright (C) 2010 Carlos Garcia Campos <[email protected]> // Copyright (C) 2012, 2013 Adrian Johnson <[email protected]> diff --git a/utils/pdftohtml.cc b/utils/pdftohtml.cc index 35e8d84..aabed0b 100644 --- a/utils/pdftohtml.cc +++ b/utils/pdftohtml.cc @@ -22,6 +22,7 @@ // Copyright (C) 2012 Igor Slepchin <[email protected]> // Copyright (C) 2012 Ihar Filipau <[email protected]> // Copyright (C) 2012 Luis Parravicini <[email protected]> +// Copyright (C) 2014 Pino Toscano <[email protected]> // // 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 _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
