From 12157c9e42ffd89b3e0de205a1ecf500cd78d992 Mon Sep 17 00:00:00 2001 From: Taichi Haradaguchi <20001722@ymail.ne.jp> Date: Mon, 2 Oct 2023 20:31:31 +0900 Subject: Drop some patches for old GCC There are no longer needed after 6ef2d358ac053ce0f6de9cf0f8f25e8bae66d441 "Adapt Clang and GCC minimum version checks" Change-Id: I2978571ff4a175f876f590dadd4931f53fd0f26b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157490 Tested-by: Jenkins Reviewed-by: Michael Stahl --- external/poppler/UnpackedTarball_poppler.mk | 2 - external/poppler/gcc7-EntityInfo.patch.1 | 55 ----------------- external/poppler/gcc7-GfxFont.patch.1 | 94 ----------------------------- 3 files changed, 151 deletions(-) delete mode 100644 external/poppler/gcc7-EntityInfo.patch.1 delete mode 100644 external/poppler/gcc7-GfxFont.patch.1 diff --git a/external/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk index 73265d8ec65b..c6ddbf9785d3 100644 --- a/external/poppler/UnpackedTarball_poppler.mk +++ b/external/poppler/UnpackedTarball_poppler.mk @@ -17,8 +17,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\ external/poppler/char_traits.patch \ external/poppler/disable-freetype.patch.1 \ external/poppler/disable-nss-and-gpgmepp.patch.1 \ - external/poppler/gcc7-EntityInfo.patch.1 \ - external/poppler/gcc7-GfxFont.patch.1 \ external/poppler/poppler-config.patch.1 \ external/poppler/pch.patch.0 \ )) diff --git a/external/poppler/gcc7-EntityInfo.patch.1 b/external/poppler/gcc7-EntityInfo.patch.1 deleted file mode 100644 index 1dd7c83ad475..000000000000 --- a/external/poppler/gcc7-EntityInfo.patch.1 +++ /dev/null @@ -1,55 +0,0 @@ -gcc 7.3.1 says: - -workdir/UnpackedTarball/poppler/poppler/CertificateInfo.cc:42:34: error: function ‘X509CertificateInfo::EntityInfo& X509CertificateInfo::EntityInfo::operator=(X509CertificateInfo::EntityInfo&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’ - -workdir/UnpackedTarball/poppler/poppler/CertificateInfo.cc: In member function ‘void X509CertificateInfo::setPublicKeyInfo(X509CertificateInfo::PublicKeyInfo&&)’: -workdir/UnpackedTarball/poppler/poppler/CertificateInfo.cc:106:39: error: use of deleted function ‘X509CertificateInfo::PublicKeyInfo& X509CertificateInfo::PublicKeyInfo::operator=(X509CertificateInfo::PublicKeyInfo&&)’ - public_key_info = std::move(pkInfo); - ^ -In file included from workdir/UnpackedTarball/poppler/poppler/CertificateInfo.cc:15:0: -workdir/UnpackedTarball/poppler/poppler/CertificateInfo.h:58:24: note: ‘X509CertificateInfo::PublicKeyInfo& X509CertificateInfo::PublicKeyInfo::operator=(X509CertificateInfo::PublicKeyInfo&&) noexcept’ is implicitly deleted because its exception-specification does not match the implicit exception-specification ‘’ - PublicKeyInfo &operator=(PublicKeyInfo &&) noexcept = default; - ^~~~~~~~ - ---- poppler/poppler/CertificateInfo.h.orig 2023-06-05 19:29:14.000000000 +0900 -+++ poppler/poppler/CertificateInfo.h 2023-06-19 18:10:55.760031700 +0900 -@@ -55,7 +55,7 @@ - PublicKeyInfo() = default; - - PublicKeyInfo(PublicKeyInfo &&) noexcept = default; -- PublicKeyInfo &operator=(PublicKeyInfo &&) noexcept = default; -+ PublicKeyInfo &operator=(PublicKeyInfo &&) /*noexcept*/ = default; - - PublicKeyInfo(const PublicKeyInfo &) = delete; - PublicKeyInfo &operator=(const PublicKeyInfo &) = delete; -@@ -71,7 +71,7 @@ - ~EntityInfo() = default; - - EntityInfo(EntityInfo &&) noexcept = default; -- EntityInfo &operator=(EntityInfo &&) noexcept = default; -+ EntityInfo &operator=(EntityInfo &&) /*noexcept*/ = default; - - EntityInfo(const EntityInfo &) = delete; - EntityInfo &operator=(const EntityInfo &) = delete; ---- poppler/poppler/GfxFont.cc.orig 2022-09-14 20:24:32.569607333 +0200 -+++ poppler/poppler/GfxFont.cc 2022-09-14 20:24:52.323596186 +0200 -@@ -180,7 +180,7 @@ - - GfxFontLoc::GfxFontLoc(GfxFontLoc &&other) noexcept = default; - --GfxFontLoc &GfxFontLoc::operator=(GfxFontLoc &&other) noexcept = default; -+GfxFontLoc &GfxFontLoc::operator=(GfxFontLoc &&other) /*noexcept*/ = default; - - void GfxFontLoc::setPath(GooString *pathA) - { ---- poppler/poppler/GfxFont.h.orig 2022-09-14 20:24:30.784608340 +0200 -+++ poppler/poppler/GfxFont.h 2022-09-14 20:25:08.850586861 +0200 -@@ -124,7 +124,7 @@ - GfxFontLoc(const GfxFontLoc &) = delete; - GfxFontLoc(GfxFontLoc &&) noexcept; - GfxFontLoc &operator=(const GfxFontLoc &) = delete; -- GfxFontLoc &operator=(GfxFontLoc &&other) noexcept; -+ GfxFontLoc &operator=(GfxFontLoc &&other) /*noexcept*/; - - // Set the 'path' string from a GooString on the heap. - // Ownership of the object is taken. diff --git a/external/poppler/gcc7-GfxFont.patch.1 b/external/poppler/gcc7-GfxFont.patch.1 deleted file mode 100644 index a240b1b8bad2..000000000000 --- a/external/poppler/gcc7-GfxFont.patch.1 +++ /dev/null @@ -1,94 +0,0 @@ -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 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’ - return fontLoc; - ^~~~~~~ -workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:671:16: error: could not convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional’ - return fontLoc; - ^~~~~~~ -workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:680:16: error: could not convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional’ - return fontLoc; - ^~~~~~~ -libo-core/workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:711:24: error: could not convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional’ - return fontLoc; - ^~~~~~~ -workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:723:20: error: could not convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional’ - return fontLoc; - ^~~~~~~ -workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:752:20: error: could not convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional’ - return fontLoc; - ^~~~~~~ -workdir/UnpackedTarball/poppler/poppler/GfxFont.cc: In static member function ‘static std::optional GfxFont::getExternalFont(GooString*, bool)’: -workdir/UnpackedTarball/poppler/poppler/GfxFont.cc:814:12: error: could not convert ‘fontLoc’ from ‘GfxFontLoc’ to ‘std::optional’ - 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 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 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 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 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 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 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 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> GfxFont::readEmbFontFile(XRef *xref) -- cgit