poppler 21.06.0poppler-21.06.0

7 files changed, 27 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 603d908a..7517f3c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ if (ECM_FOUND)
 endif()
 
 set(POPPLER_MAJOR_VERSION "21")
-set(POPPLER_MINOR_VERSION_STRING "05")
+set(POPPLER_MINOR_VERSION_STRING "06")
 # We want the string version to have 08 but the integer version can't have a leading 0 since otherwise it's considered octal
 # So strip a leading 0 if found in POPPLER_MINOR_VERSION_STRING and store the result in POPPLER_MINOR_VERSION
 string(REGEX REPLACE "^0?(.+)$" "\\1" POPPLER_MINOR_VERSION "${POPPLER_MINOR_VERSION_STRING}")
@@ -575,7 +575,7 @@ else()
 add_library(poppler ${poppler_SRCS})
 endif()
 generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h")
-set_target_properties(poppler PROPERTIES VERSION 110.0.0 SOVERSION 110)
+set_target_properties(poppler PROPERTIES VERSION 111.0.0 SOVERSION 111)
 if(MINGW AND BUILD_SHARED_LIBS)
     get_target_property(POPPLER_SOVERSION poppler SOVERSION)
     set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
diff --git a/NEWS b/NEWS
index fd46d27d..69ae33ea 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+Release 21.06.0:
+        core:
+         * Fix rendering of some extended latin1 characters in annotations. Issue #1070
+         * Support some not so well formed documents with password. Issue #1083
+         * Add API to get notified if the xref is reconstructed
+         * Add somewhat fancier left/right signature visual representation
+         * Fix crashes in malformed files
+         * Minor code improvements
+
+        qt6:
+         * Change some functions to return std::unique_ptr
+
+        qt5/qt6:
+         * Add API to get notified if the xref is reconstructed
+         * Add somewhat fancier left/right signature visual representation
+         * Don't assert when trying to invert singular matrices
+
+        build system:
+         * make boost opt-out if building splash
+
 Release 21.05.0:
         core:
          * Fix crashes in malformed files
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index b16a1e4a..8aa1dc81 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         = 21.05.0
+PROJECT_NUMBER         = 21.06.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/CMakeLists.txt b/qt5/src/CMakeLists.txt
index 564cf270..d80c81f3 100644
--- a/qt5/src/CMakeLists.txt
+++ b/qt5/src/CMakeLists.txt
@@ -38,7 +38,7 @@ set(poppler_qt5_SRCS
 )
 add_library(poppler-qt5 ${poppler_qt5_SRCS})
 generate_export_header(poppler-qt5 BASE_NAME poppler-qt5 EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h")
-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.28.0 SOVERSION 1)
+set_target_properties(poppler-qt5 PROPERTIES VERSION 1.29.0 SOVERSION 1)
 if(MINGW AND BUILD_SHARED_LIBS)
     get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION)
     set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
diff --git a/qt5/src/Doxyfile b/qt5/src/Doxyfile
index c41b27e7..02a75f37 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         = 21.05.0
+PROJECT_NUMBER         = 21.06.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/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt
index 9fbc234f..f30b1a8a 100644
--- a/qt6/src/CMakeLists.txt
+++ b/qt6/src/CMakeLists.txt
@@ -38,7 +38,7 @@ set(poppler_qt6_SRCS
 )
 add_library(poppler-qt6 ${poppler_qt6_SRCS})
 generate_export_header(poppler-qt6 BASE_NAME poppler-qt6 EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h")
-set_target_properties(poppler-qt6 PROPERTIES VERSION 1.2.0 SOVERSION 1)
+set_target_properties(poppler-qt6 PROPERTIES VERSION 2.0.0 SOVERSION 2)
 if(MINGW AND BUILD_SHARED_LIBS)
     get_target_property(POPPLER_QT6_SOVERSION poppler-qt6 SOVERSION)
     set_target_properties(poppler-qt6 PROPERTIES SUFFIX "-${POPPLER_QT6_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
diff --git a/qt6/src/Doxyfile b/qt6/src/Doxyfile
index 12d80d57..1c709466 100644
--- a/qt6/src/Doxyfile
+++ b/qt6/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = "Poppler Qt6"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 21.05.0
+PROJECT_NUMBER         = 21.06.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.