[poppler] 3 commits - CMakeLists.txt cpp/Doxyfile .gitlab-ci.yml glib/poppler-page.cc NEWS qt5/src qt6/src

[GitLab Mirror]

 .gitlab-ci.yml       |    4 ++--
 CMakeLists.txt       |    2 +-
 NEWS                 |    4 ++++
 cpp/Doxyfile         |    2 +-
 glib/poppler-page.cc |    3 ++-
 qt5/src/Doxyfile     |    2 +-
 qt6/src/Doxyfile     |    2 +-
 7 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 9bcf967b5eadee7c36b32d1595c884c3130339a1
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Jun 15 00:37:54 2021 +0200

    CI: switch mingw CI to fedora 33
    
    fedora 34 is giving weird errors around libjpeg

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cffdd61b..ac1e7516 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,9 +70,9 @@ build_ubuntu_18_04:
     - cmake -G Ninja ..
     - ninja
 
-build_mingw64_fedora34:
+build_mingw64_fedora33:
   stage: build
-  image: fedora:34
+  image: fedora:33
   before_script:
     - dnf install -y 'dnf-command(builddep)'
     - dnf builddep -y mingw64-poppler
commit b782d4be006c184c49c6b46bec1d23dd28f1683a
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Jun 3 22:42:20 2021 +0200

    poppler 21.06.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7517f3c1..51676ec8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ 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}")
-set(POPPLER_MICRO_VERSION "0")
+set(POPPLER_MICRO_VERSION "1")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION_STRING}.${POPPLER_MICRO_VERSION}")
 
 set(CMAKE_CXX_STANDARD 14)
diff --git a/NEWS b/NEWS
index 69ae33ea..c1ad2472 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Release 21.06.1:
+        glib:
+         * fix poppler_rectangle_free() regression. Issue #1087
+
 Release 21.06.0:
         core:
          * Fix rendering of some extended latin1 characters in annotations. Issue #1070
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index 8aa1dc81..d6643bb5 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.06.0
+PROJECT_NUMBER         = 21.06.1
 
 # 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 02a75f37..85c9f6e5 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.06.0
+PROJECT_NUMBER         = 21.06.1
 
 # 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 1c709466..9140be6e 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.06.0
+PROJECT_NUMBER         = 21.06.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
commit b9314b06c7e458f26e7ca0d55b071f4eb1dced58
Author: Nelson Benítez León <nbenitezl at gmail.com>
Date:   Wed Jun 2 15:25:47 2021 +0100

    glib: fix poppler_rectangle_free() regression
    
    Regression from e3fed321f230a4a91df873e6d9a213ba8dad6694
    
    Fixes issue #1087

diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index 7536cfcb..e81c1e12 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -1663,7 +1663,8 @@ PopplerRectangle *poppler_rectangle_copy(PopplerRectangle *rectangle)
  */
 void poppler_rectangle_free(PopplerRectangle *rectangle)
 {
-    g_slice_free(PopplerRectangle, rectangle);
+    auto ext_rectangle = reinterpret_cast<PopplerRectangleExtended *>(rectangle);
+    g_slice_free(PopplerRectangleExtended, ext_rectangle);
 }
 
 /**