poppler: upgrade to release 23.03.0
* Upgrade poppler-data to 0.4.12 * Update poppler-config.patch.1 Change-Id: Ic2a3e8d4f801d52d1568210d0df064cacb51290f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148842 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
This commit is contained in:
Taichi Haradaguchi
Michael Stahl
parent
87f52dbf4f
commit
79e60bb93f
6 changed files with 145 additions and 48 deletions
|
|
@ -453,10 +453,10 @@ LIBTIFF_TARBALL := tiff-4.5.0rc3.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_DATA_SHA256SUM := 2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c
|
||||
POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
|
||||
POPPLER_SHA256SUM := b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4
|
||||
POPPLER_TARBALL := poppler-23.03.0.tar.xz
|
||||
POPPLER_DATA_SHA256SUM := c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74
|
||||
POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
|
||||
# three static lines
|
||||
# so that git cherry-pick
|
||||
# will not run into conflicts
|
||||
|
|
|
|||
24
external/poppler/ExternalPackage_poppler_data.mk
vendored
24
external/poppler/ExternalPackage_poppler_data.mk
vendored
|
|
@ -100,6 +100,7 @@ poppler_cmap-files = \
|
|||
cMap/Adobe-GB1/GB-EUC-H \
|
||||
cMap/Adobe-GB1/GB-EUC-V \
|
||||
cMap/Adobe-GB1/GB-H \
|
||||
cMap/Adobe-GB1/GB-V \
|
||||
cMap/Adobe-GB1/GBK2K-H \
|
||||
cMap/Adobe-GB1/GBK2K-V \
|
||||
cMap/Adobe-GB1/GBK-EUC-H \
|
||||
|
|
@ -114,10 +115,9 @@ poppler_cmap-files = \
|
|||
cMap/Adobe-GB1/GBT-EUC-H \
|
||||
cMap/Adobe-GB1/GBT-EUC-V \
|
||||
cMap/Adobe-GB1/GBT-H \
|
||||
cMap/Adobe-GB1/GBT-V \
|
||||
cMap/Adobe-GB1/GBTpc-EUC-H \
|
||||
cMap/Adobe-GB1/GBTpc-EUC-V \
|
||||
cMap/Adobe-GB1/GBT-V \
|
||||
cMap/Adobe-GB1/GB-V \
|
||||
cMap/Adobe-GB1/UCS2-GBK-EUC \
|
||||
cMap/Adobe-GB1/UCS2-GBpc-EUC \
|
||||
cMap/Adobe-GB1/UniGB-UCS2-H \
|
||||
|
|
@ -131,17 +131,17 @@ poppler_cmap-files = \
|
|||
cMap/Adobe-Japan1/78-EUC-H \
|
||||
cMap/Adobe-Japan1/78-EUC-V \
|
||||
cMap/Adobe-Japan1/78-H \
|
||||
cMap/Adobe-Japan1/78ms-RKSJ-H \
|
||||
cMap/Adobe-Japan1/78ms-RKSJ-V \
|
||||
cMap/Adobe-Japan1/78-RKSJ-H \
|
||||
cMap/Adobe-Japan1/78-RKSJ-V \
|
||||
cMap/Adobe-Japan1/78-V \
|
||||
cMap/Adobe-Japan1/78ms-RKSJ-H \
|
||||
cMap/Adobe-Japan1/78ms-RKSJ-V \
|
||||
cMap/Adobe-Japan1/83pv-RKSJ-H \
|
||||
cMap/Adobe-Japan1/90msp-RKSJ-H \
|
||||
cMap/Adobe-Japan1/90msp-RKSJ-V \
|
||||
cMap/Adobe-Japan1/90ms-RKSJ-H \
|
||||
cMap/Adobe-Japan1/90ms-RKSJ-UCS2 \
|
||||
cMap/Adobe-Japan1/90ms-RKSJ-V \
|
||||
cMap/Adobe-Japan1/90msp-RKSJ-H \
|
||||
cMap/Adobe-Japan1/90msp-RKSJ-V \
|
||||
cMap/Adobe-Japan1/90pv-RKSJ-H \
|
||||
cMap/Adobe-Japan1/90pv-RKSJ-UCS2 \
|
||||
cMap/Adobe-Japan1/90pv-RKSJ-UCS2C \
|
||||
|
|
@ -201,9 +201,6 @@ poppler_cmap-files = \
|
|||
cMap/Adobe-Japan1/UniJIS2004-UTF32-V \
|
||||
cMap/Adobe-Japan1/UniJIS2004-UTF8-H \
|
||||
cMap/Adobe-Japan1/UniJIS2004-UTF8-V \
|
||||
cMap/Adobe-Japan1/UniJISPro-UCS2-HW-V \
|
||||
cMap/Adobe-Japan1/UniJISPro-UCS2-V \
|
||||
cMap/Adobe-Japan1/UniJISPro-UTF8-V \
|
||||
cMap/Adobe-Japan1/UniJIS-UCS2-H \
|
||||
cMap/Adobe-Japan1/UniJIS-UCS2-HW-H \
|
||||
cMap/Adobe-Japan1/UniJIS-UCS2-HW-V \
|
||||
|
|
@ -214,10 +211,13 @@ poppler_cmap-files = \
|
|||
cMap/Adobe-Japan1/UniJIS-UTF32-V \
|
||||
cMap/Adobe-Japan1/UniJIS-UTF8-H \
|
||||
cMap/Adobe-Japan1/UniJIS-UTF8-V \
|
||||
cMap/Adobe-Japan1/UniJISX02132004-UTF32-H \
|
||||
cMap/Adobe-Japan1/UniJISX02132004-UTF32-V \
|
||||
cMap/Adobe-Japan1/UniJISPro-UCS2-HW-V \
|
||||
cMap/Adobe-Japan1/UniJISPro-UCS2-V \
|
||||
cMap/Adobe-Japan1/UniJISPro-UTF8-V \
|
||||
cMap/Adobe-Japan1/UniJISX0213-UTF32-H \
|
||||
cMap/Adobe-Japan1/UniJISX0213-UTF32-V \
|
||||
cMap/Adobe-Japan1/UniJISX02132004-UTF32-H \
|
||||
cMap/Adobe-Japan1/UniJISX02132004-UTF32-V \
|
||||
cMap/Adobe-Japan1/V \
|
||||
cMap/Adobe-Japan1/WP-Symbol \
|
||||
cMap/Adobe-Japan2/Adobe-Japan2-0 \
|
||||
|
|
@ -235,6 +235,7 @@ poppler_cmap-files = \
|
|||
cMap/Adobe-Korea1/KSC-H \
|
||||
cMap/Adobe-Korea1/KSC-Johab-H \
|
||||
cMap/Adobe-Korea1/KSC-Johab-V \
|
||||
cMap/Adobe-Korea1/KSC-V \
|
||||
cMap/Adobe-Korea1/KSCms-UHC-H \
|
||||
cMap/Adobe-Korea1/KSCms-UHC-HW-H \
|
||||
cMap/Adobe-Korea1/KSCms-UHC-HW-V \
|
||||
|
|
@ -244,7 +245,6 @@ poppler_cmap-files = \
|
|||
cMap/Adobe-Korea1/KSCpc-EUC-UCS2 \
|
||||
cMap/Adobe-Korea1/KSCpc-EUC-UCS2C \
|
||||
cMap/Adobe-Korea1/KSCpc-EUC-V \
|
||||
cMap/Adobe-Korea1/KSC-V \
|
||||
cMap/Adobe-Korea1/UCS2-KSCms-UHC \
|
||||
cMap/Adobe-Korea1/UCS2-KSCpc-EUC \
|
||||
cMap/Adobe-Korea1/UniKS-UCS2-H \
|
||||
|
|
|
|||
46
external/poppler/StaticLibrary_poppler.mk
vendored
46
external/poppler/StaticLibrary_poppler.mk
vendored
|
|
@ -55,24 +55,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 \
|
||||
|
|
@ -82,6 +84,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 \
|
||||
|
|
@ -90,8 +93,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 \
|
||||
|
|
@ -103,43 +106,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 \
|
||||
))
|
||||
|
||||
|
|
|
|||
7
external/poppler/UnpackedTarball_poppler.mk
vendored
7
external/poppler/UnpackedTarball_poppler.mk
vendored
|
|
@ -14,11 +14,12 @@ $(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler
|
|||
$(eval $(call gb_UnpackedTarball_set_patchlevel,poppler,0))
|
||||
|
||||
$(eval $(call gb_UnpackedTarball_add_patches,poppler,\
|
||||
external/poppler/poppler-config.patch.1 \
|
||||
external/poppler/pch.patch.0 \
|
||||
external/poppler/char_traits.patch \
|
||||
external/poppler/disable-freetype.patch.1 \
|
||||
external/poppler/gcc7-EntityInfo.patch.1 \
|
||||
external/poppler/char_traits.patch \
|
||||
external/poppler/gcc7-GfxFont.patch.1 \
|
||||
external/poppler/poppler-config.patch.1 \
|
||||
external/poppler/pch.patch.0 \
|
||||
))
|
||||
|
||||
ifneq ($(filter -fsanitize=%,$(CC)),)
|
||||
|
|
|
|||
94
external/poppler/gcc7-GfxFont.patch.1
vendored
Normal file
94
external/poppler/gcc7-GfxFont.patch.1
vendored
Normal file
|
|
@ -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)
|
||||
14
external/poppler/poppler-config.patch.1
vendored
14
external/poppler/poppler-config.patch.1
vendored
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue