poppler: upgrade to release 23.03.0

* Upgrade poppler-data to 0.4.12
* Update poppler-config.patch.1

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148842
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 79e60bb93f69370f23010adb078b5a5de5a1e7b2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157251
(cherry picked from commit 8aa3645801c48f0db4a7fe4f126c4e4e7691cb08)

Change-Id: Ic2a3e8d4f801d52d1568210d0df064cacb51290f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157291
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>

5 files changed, 129 insertions, 32 deletions

diff --git a/download.lst b/download.lst
index d490f3cd6bf3..00523c9e32d6 100644
--- a/download.lst
+++ b/download.lst
@@ -475,8 +475,8 @@ LIBPNG_TARBALL := libpng-1.6.37.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0
-POPPLER_TARBALL := poppler-22.12.0.tar.xz
+POPPLER_SHA256SUM := b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4
+POPPLER_TARBALL := poppler-23.03.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/poppler/StaticLibrary_poppler.mk b/external/poppler/StaticLibrary_poppler.mk
index 1f1adba6ee34..4915c5e81fff 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -53,24 +53,26 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,poppler,\
 ))
 
 $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\
+	UnpackedTarball/poppler/goo/gbase64 \
+	UnpackedTarball/poppler/goo/gbasename \
 	UnpackedTarball/poppler/goo/gfile \
-	UnpackedTarball/poppler/goo/GooTimer \
+	UnpackedTarball/poppler/goo/glibc \
+	UnpackedTarball/poppler/goo/glibc_strtok_r \
+	UnpackedTarball/poppler/goo/grandom \
+	UnpackedTarball/poppler/goo/gstrtod \
 	UnpackedTarball/poppler/goo/GooString \
+	UnpackedTarball/poppler/goo/GooTimer \
+	UnpackedTarball/poppler/goo/ImgWriter \
+	UnpackedTarball/poppler/goo/JpegWriter \
 	UnpackedTarball/poppler/goo/NetPBMWriter \
 	UnpackedTarball/poppler/goo/PNGWriter \
 	UnpackedTarball/poppler/goo/TiffWriter \
-	UnpackedTarball/poppler/goo/JpegWriter \
-	UnpackedTarball/poppler/goo/ImgWriter \
-	UnpackedTarball/poppler/goo/gstrtod \
-	UnpackedTarball/poppler/goo/grandom \
-	UnpackedTarball/poppler/goo/glibc \
-	UnpackedTarball/poppler/goo/glibc_strtok_r \
 	UnpackedTarball/poppler/fofi/FoFiBase \
 	UnpackedTarball/poppler/fofi/FoFiEncodings \
+	UnpackedTarball/poppler/fofi/FoFiIdentifier \
 	UnpackedTarball/poppler/fofi/FoFiTrueType \
 	UnpackedTarball/poppler/fofi/FoFiType1 \
 	UnpackedTarball/poppler/fofi/FoFiType1C \
-	UnpackedTarball/poppler/fofi/FoFiIdentifier \
 	UnpackedTarball/poppler/poppler/Annot \
 	UnpackedTarball/poppler/poppler/AnnotStampImageHelper \
 	UnpackedTarball/poppler/poppler/Array \
@@ -80,6 +82,7 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\
 	UnpackedTarball/poppler/poppler/CertificateInfo \
 	UnpackedTarball/poppler/poppler/CharCodeToUnicode \
 	UnpackedTarball/poppler/poppler/CMap \
+	UnpackedTarball/poppler/poppler/DCTStream \
 	UnpackedTarball/poppler/poppler/DateInfo \
 	UnpackedTarball/poppler/poppler/Decrypt \
 	UnpackedTarball/poppler/poppler/Dict \
@@ -88,8 +91,8 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\
 	UnpackedTarball/poppler/poppler/FILECacheLoader \
 	UnpackedTarball/poppler/poppler/FileSpec \
 	UnpackedTarball/poppler/poppler/FontEncodingTables \
-	UnpackedTarball/poppler/poppler/Form \
 	UnpackedTarball/poppler/poppler/FontInfo \
+	UnpackedTarball/poppler/poppler/Form \
 	UnpackedTarball/poppler/poppler/Function \
 	UnpackedTarball/poppler/poppler/Gfx \
 	UnpackedTarball/poppler/poppler/GfxFont \
@@ -101,43 +104,42 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\
 	UnpackedTarball/poppler/poppler/JBIG2Stream \
 	UnpackedTarball/poppler/poppler/JSInfo \
 	UnpackedTarball/poppler/poppler/Lexer \
-	UnpackedTarball/poppler/poppler/Link \
 	UnpackedTarball/poppler/poppler/Linearization \
+	UnpackedTarball/poppler/poppler/Link \
 	UnpackedTarball/poppler/poppler/LocalPDFDocBuilder \
 	UnpackedTarball/poppler/poppler/MarkedContentOutputDev \
+	UnpackedTarball/poppler/poppler/Movie \
 	UnpackedTarball/poppler/poppler/NameToCharCode \
 	UnpackedTarball/poppler/poppler/Object \
 	UnpackedTarball/poppler/poppler/OptionalContent \
 	UnpackedTarball/poppler/poppler/Outline \
 	UnpackedTarball/poppler/poppler/OutputDev \
 	UnpackedTarball/poppler/poppler/Page \
+	UnpackedTarball/poppler/poppler/PageLabelInfo \
 	UnpackedTarball/poppler/poppler/PageTransition \
 	UnpackedTarball/poppler/poppler/Parser \
 	UnpackedTarball/poppler/poppler/PDFDoc \
 	UnpackedTarball/poppler/poppler/PDFDocBuilder \
 	UnpackedTarball/poppler/poppler/PDFDocEncoding \
 	UnpackedTarball/poppler/poppler/PDFDocFactory \
-	UnpackedTarball/poppler/poppler/ProfileData \
 	UnpackedTarball/poppler/poppler/PreScanOutputDev \
+	UnpackedTarball/poppler/poppler/ProfileData \
+	UnpackedTarball/poppler/poppler/PSOutputDev \
 	UnpackedTarball/poppler/poppler/PSTokenizer \
+	UnpackedTarball/poppler/poppler/Rendition \
+	UnpackedTarball/poppler/poppler/SecurityHandler \
 	UnpackedTarball/poppler/poppler/SignatureInfo \
+	UnpackedTarball/poppler/poppler/Sound \
 	UnpackedTarball/poppler/poppler/Stream \
-	UnpackedTarball/poppler/poppler/StructTreeRoot \
 	UnpackedTarball/poppler/poppler/StructElement \
+	UnpackedTarball/poppler/poppler/StructTreeRoot \
+	UnpackedTarball/poppler/poppler/TextOutputDev \
+	UnpackedTarball/poppler/poppler/UTF \
 	UnpackedTarball/poppler/poppler/UnicodeMap \
 	UnpackedTarball/poppler/poppler/UnicodeMapFuncs \
 	UnpackedTarball/poppler/poppler/UnicodeTypeTable \
-	UnpackedTarball/poppler/poppler/UTF \
-	UnpackedTarball/poppler/poppler/XRef \
-	UnpackedTarball/poppler/poppler/PSOutputDev \
-	UnpackedTarball/poppler/poppler/TextOutputDev \
-	UnpackedTarball/poppler/poppler/PageLabelInfo \
-	UnpackedTarball/poppler/poppler/SecurityHandler \
-	UnpackedTarball/poppler/poppler/Sound \
 	UnpackedTarball/poppler/poppler/ViewerPreferences \
-	UnpackedTarball/poppler/poppler/Movie \
-	UnpackedTarball/poppler/poppler/Rendition \
-	UnpackedTarball/poppler/poppler/DCTStream \
+	UnpackedTarball/poppler/poppler/XRef \
 	UnpackedTarball/poppler/splash/SplashBitmap \
 ))
 
diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk
index 0ac3c8aa69c4..aded0978fad9 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -12,9 +12,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,poppler))
 $(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler))
 
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
-	external/poppler/poppler-config.patch.1 \
 	external/poppler/disable-freetype.patch.1 \
 	external/poppler/gcc7-EntityInfo.patch.1 \
+	external/poppler/gcc7-GfxFont.patch.1 \
+	external/poppler/poppler-config.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/poppler/gcc7-GfxFont.patch.1 b/external/poppler/gcc7-GfxFont.patch.1
new file mode 100644
index 000000000000..a240b1b8bad2
--- /dev/null
+++ b/external/poppler/gcc7-GfxFont.patch.1
@@ -0,0 +1,94 @@
+Revert of upstream: https://gitlab.freedesktop.org/poppler/poppler/-/commit/d5ea5a24124badf2b32a7d08dd2c06a4a40f93fb
+
+gcc 7.5.0 says:
+
+workdir/UnpackedTarball/poppler/poppler/GfxFont.cc: In member function ‘std::optional<GfxFontLoc> GfxFont::locateFont(XRef*, PSOutputDev*)’:
+/home/taichi/libo-core/workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:660:24: error: could not convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional<GfxFontLoc>’
+                 return fontLoc;
+                        ^~~~~~~
+workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:671:16: error: could not convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional<GfxFontLoc>’
+         return fontLoc;
+                ^~~~~~~
+workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:680:16: error: could not convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional<GfxFontLoc>’
+         return fontLoc;
+                ^~~~~~~
+libo-core/workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:711:24: error: could not convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional<GfxFontLoc>’
+                 return fontLoc;
+                        ^~~~~~~
+workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:723:20: error: could not convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional<GfxFontLoc>’
+             return fontLoc;
+                    ^~~~~~~
+workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:752:20: error: could not convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional<GfxFontLoc>’
+             return fontLoc;
+                    ^~~~~~~
+workdir/UnpackedTarball/poppler/poppler/GfxFont.cc: In static member function ‘static std::optional<GfxFontLoc> GfxFont::getExternalFont(GooString*, bool)’:
+workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:814:12: error: could not convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional<GfxFontLoc>’
+     return fontLoc;
+
+diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
+index cc2ce038..b0d0d610 100644
+--- a/poppler/GfxFont.cc
++++ b/poppler/GfxFont.cc
+@@ -657,7 +657,7 @@ std::optional<GfxFontLoc> GfxFont::locateFont(XRef *xref, PSOutputDev *ps)
+                 fontLoc.locType = gfxFontLocEmbedded;
+                 fontLoc.fontType = type;
+                 fontLoc.embFontID = embFontID;
+-                return fontLoc;
++                return std::move(fontLoc); // std::move only required to please g++-7
+             }
+         }
+     }
+@@ -668,7 +668,7 @@ std::optional<GfxFontLoc> GfxFont::locateFont(XRef *xref, PSOutputDev *ps)
+         fontLoc.locType = gfxFontLocResident;
+         fontLoc.fontType = fontType1;
+         fontLoc.path = *name;
+-        return fontLoc;
++        return std::move(fontLoc); // std::move only required to please g++-7
+     }
+ 
+     //----- PS resident Base-14 font
+@@ -677,7 +677,7 @@ std::optional<GfxFontLoc> GfxFont::locateFont(XRef *xref, PSOutputDev *ps)
+         fontLoc.locType = gfxFontLocResident;
+         fontLoc.fontType = fontType1;
+         fontLoc.path = ((Gfx8BitFont *)this)->base14->base14Name;
+-        return fontLoc;
++        return std::move(fontLoc); // std::move only required to please g++-7
+     }
+ 
+     //----- external font file (fontFile, fontDir)
+@@ -708,7 +708,7 @@ std::optional<GfxFontLoc> GfxFont::locateFont(XRef *xref, PSOutputDev *ps)
+                 fontLoc.fontType = fontCIDType2;
+                 fontLoc.setPath(path);
+                 fontLoc.fontNum = fontNum;
+-                return fontLoc;
++                return std::move(fontLoc); // std::move only required to please g++-7
+             }
+         } else {
+             GfxFontLoc fontLoc;
+@@ -720,7 +720,7 @@ std::optional<GfxFontLoc> GfxFont::locateFont(XRef *xref, PSOutputDev *ps)
+                 fontLoc.fontType = fontType1;
+                 fontLoc.fontNum = fontNum;
+             }
+-            return fontLoc;
++            return std::move(fontLoc); // std::move only required to please g++-7
+         }
+         delete path;
+     }
+@@ -749,7 +749,7 @@ std::optional<GfxFontLoc> GfxFont::locateFont(XRef *xref, PSOutputDev *ps)
+             fontLoc.fontType = fontType1;
+             fontLoc.path = substName;
+             fontLoc.substIdx = substIdx;
+-            return fontLoc;
++            return std::move(fontLoc); // std::move only required to please g++-7
+         } else {
+             path = globalParams->findFontFile(substName);
+             if (path) {
+@@ -811,7 +811,7 @@ std::optional<GfxFontLoc> GfxFont::getExternalFont(GooString *path, bool cid)
+     fontLoc.locType = gfxFontLocExternal;
+     fontLoc.fontType = fontType;
+     fontLoc.setPath(path);
+-    return fontLoc;
++    return std::move(fontLoc); // std::move only required to please g++-7
+ }
+ 
+ std::optional<std::vector<unsigned char>> GfxFont::readEmbFontFile(XRef *xref)
diff --git a/external/poppler/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1
index 1e61b533d31b..503cf1c0ae46 100644
--- a/external/poppler/poppler-config.patch.1
+++ b/external/poppler/poppler-config.patch.1
@@ -173,7 +173,7 @@ index 0fbd336a..451213f8 100644
 +#define PACKAGE_NAME "poppler"
 +
 +/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "poppler 22.12.0"
++#define PACKAGE_STRING "poppler 23.03.0"
 +
 +/* Define to the one symbol short name of this package. */
 +#define PACKAGE_TARNAME "poppler"
@@ -182,7 +182,7 @@ index 0fbd336a..451213f8 100644
 +#define PACKAGE_URL ""
 +
 +/* Define to the version of this package. */
-+#define PACKAGE_VERSION "22.12.0"
++#define PACKAGE_VERSION "23.03.0"
 +
 +/* Poppler data dir */
 +#define POPPLER_DATADIR "/usr/local/share/poppler"
@@ -200,7 +200,7 @@ index 0fbd336a..451213f8 100644
 +/* #undef USE_FLOAT */
 +
 +/* Version number of package */
-+#define VERSION "22.12.0"
++#define VERSION "23.03.0"
 +
 +#if defined(__APPLE__)
 +#elif defined (_WIN32)
@@ -281,7 +281,7 @@ index 0fbd336a..451213f8 100644
 +
 +/* Defines the poppler version. */
 +#ifndef POPPLER_VERSION
-+#define POPPLER_VERSION "22.12.0"
++#define POPPLER_VERSION "23.03.0"
 +#endif
 +
 +/* Use single precision arithmetic in the Splash backend */
@@ -433,9 +433,9 @@ index 0fbd336a..451213f8 100644
 +
 +#include "poppler-global.h"
 +
-+#define POPPLER_VERSION "22.12.0"
-+#define POPPLER_VERSION_MAJOR 22
-+#define POPPLER_VERSION_MINOR 12
++#define POPPLER_VERSION "23.03.0"
++#define POPPLER_VERSION_MAJOR 23
++#define POPPLER_VERSION_MINOR 03
 +#define POPPLER_VERSION_MICRO 0
 +
 +namespace poppler