[poppler] CMakeLists.txt cpp/Doxyfile NEWS qt5/src qt6/src

[GitLab Mirror]

 CMakeLists.txt   |    4 ++--
 NEWS             |    4 ++++
 cpp/Doxyfile     |    2 +-
 qt5/src/Doxyfile |    2 +-
 qt6/src/Doxyfile |    2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit df568263c51950ceed6f1fb42f80e99a2614c275
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Dec 1 21:19:03 2022 +0100

    poppler 22.12.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ebaf6c5..c53a6265 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ if (ECM_FOUND)
 endif()
 
 set(POPPLER_MAJOR_VERSION "22")
-set(POPPLER_MINOR_VERSION_STRING "11")
+set(POPPLER_MINOR_VERSION_STRING "12")
 # 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}")
@@ -579,7 +579,7 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif()
 add_library(poppler ${poppler_SRCS})
 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 125.0.0 SOVERSION 125)
+set_target_properties(poppler PROPERTIES VERSION 126.0.0 SOVERSION 126)
 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 4fde87a9..b62f346b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Release 22.12.0:
+        core:
+         * Form::addFontToDefaultResources: Be stubborn in finding a font we can use. Issue #1272
+
 Release 22.11.0:
         core:
          * CairoOutputDev: Update font after restore
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index 0ffa0e50..2c6f0dac 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         = 22.11.0
+PROJECT_NUMBER         = 22.12.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/Doxyfile b/qt5/src/Doxyfile
index 0022b1d5..0a4b33e3 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         = 22.11.0
+PROJECT_NUMBER         = 22.12.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/Doxyfile b/qt6/src/Doxyfile
index 12906b9c..6f5ee6b0 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         = 22.11.0
+PROJECT_NUMBER         = 22.12.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.