Merge remote-tracking branch 'origin/master' into master_github

CMakeLists.txt

@@ -40,7 +40,7 @@ if (ECM_FOUND)
 endif()
 
 set(POPPLER_MAJOR_VERSION "24")
-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}")
@@ -614,7 +614,7 @@ ADD_GPERF_FILE(TimesItalicWidths)
 ADD_GPERF_FILE(TimesRomanWidths)
 ADD_GPERF_FILE(ZapfDingbatsWidths)
 
-set(POPPLER_SOVERSION_NUMBER "137")
+set(POPPLER_SOVERSION_NUMBER "138")
 
 set(LINKER_SCRIPT "${CMAKE_BINARY_DIR}/libpoppler.map")
 configure_file(

NEWS

@@ -1,3 +1,18 @@
+Release 24.06.0:
+        core:
+         * Performance improvements in some files
+         * Fix some issues with files bigger than 2^31 bytes
+         * Remove all cairo include guards for cairo < 1.16
+         * Fix MSVC build
+         * Internal code improvements
+
+        qt6:
+         * Update Qt6 doc example
+         * Use the non deprecated version of QString::fromUcs4
+
+        glib:
+         * properly document return value from poppler_font_info_scan
+
 Release 24.05.0:
         core:
          * Fix signing not being totally correct in some kind of PDF files

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         = 24.05.0
+PROJECT_NUMBER         = 24.06.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.