| 1 |
commit: e04ddc64562f2226e344ddb8fa4307340efb2b46 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 9 19:11:48 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 9 19:12:21 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e04ddc64 |
| 7 |
|
| 8 |
app-office/libreoffice: slight tweak to Poppler 22.04.0 patch |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/843311 |
| 11 |
Thanks-to: Stephan Hartmann <sultan <AT> gentoo.org> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
...3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch | 16 +++++++++++----- |
| 15 |
...fice-7.3.3.2.ebuild => libreoffice-7.3.3.2-r1.ebuild} | 2 +- |
| 16 |
2 files changed, 12 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch b/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch |
| 19 |
index f273d9565051..22de747e01e4 100644 |
| 20 |
--- a/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch |
| 21 |
+++ b/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch |
| 22 |
@@ -2,24 +2,30 @@ https://bugs.gentoo.org/843311 |
| 23 |
|
| 24 |
From: Sam James <sam@g.o> |
| 25 |
Date: Sun, 8 May 2022 21:22:49 +0000 |
| 26 |
-Subject: [PATCH 2/2] Add missing nSize set for Poppler 22.04.0 |
| 27 |
+Subject: [PATCH] Add missing nSize set for Poppler 22.04.0 |
| 28 |
|
| 29 |
Thanks-to: Stephan Hartmann <sultan@g.o> |
| 30 |
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
| 31 |
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |
| 32 |
-@@ -478,6 +478,7 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, const GfxState* st |
| 33 |
+@@ -478,6 +478,10 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, const GfxState* st |
| 34 |
char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); |
| 35 |
#else |
| 36 |
std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() ); |
| 37 |
-+ nSize = pBuf->size(); |
| 38 |
++ if( pBuf ) |
| 39 |
++ { |
| 40 |
++ nSize = pBuf->size(); |
| 41 |
++ } |
| 42 |
#endif |
| 43 |
if( pBuf ) |
| 44 |
{ |
| 45 |
-@@ -502,6 +503,7 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const |
| 46 |
+@@ -502,6 +506,10 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const |
| 47 |
char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); |
| 48 |
#else |
| 49 |
std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() ); |
| 50 |
-+ nSize = pBuf->size(); |
| 51 |
++ if( pBuf ) |
| 52 |
++ { |
| 53 |
++ nSize = pBuf->size(); |
| 54 |
++ } |
| 55 |
#endif |
| 56 |
if( !pBuf ) |
| 57 |
return; |
| 58 |
|
| 59 |
diff --git a/app-office/libreoffice/libreoffice-7.3.3.2.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2-r1.ebuild |
| 60 |
similarity index 99% |
| 61 |
rename from app-office/libreoffice/libreoffice-7.3.3.2.ebuild |
| 62 |
rename to app-office/libreoffice/libreoffice-7.3.3.2-r1.ebuild |
| 63 |
index f229dff9382b..129fac1b9644 100644 |
| 64 |
--- a/app-office/libreoffice/libreoffice-7.3.3.2.ebuild |
| 65 |
+++ b/app-office/libreoffice/libreoffice-7.3.3.2-r1.ebuild |
| 66 |
@@ -302,7 +302,7 @@ PATCHES=( |
| 67 |
# TODO: upstream |
| 68 |
"${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux |
| 69 |
"${FILESDIR}/${PN}-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch" # from FreeBSD |
| 70 |
- "${FILESDIR}/${PN}-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch" # fixup for FreeBSD patch |
| 71 |
+ #"${FILESDIR}/${PN}-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch" # fixup for FreeBSD patch |
| 72 |
) |
| 73 |
|
| 74 |
S="${WORKDIR}/${PN}-${MY_PV}" |
Archives