summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-10-29 09:37:55 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2020-10-29 11:40:01 +0100
commit2c31a3aa736f52ba28567b41c80d71069654334f (patch)
tree789f6ddde29315a7b6d0d892effec24f5f80c592 /app-office/libreoffice/files
parentapp-office/libreoffice: Drop 6.4 stable branch (diff)
downloadgentoo-2c31a3aa736f52ba28567b41c80d71069654334f.tar.gz
gentoo-2c31a3aa736f52ba28567b41c80d71069654334f.tar.bz2
gentoo-2c31a3aa736f52ba28567b41c80d71069654334f.zip
app-office/libreoffice: Add 7.0 stable branch
Bug: https://bugs.gentoo.org/739134 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office/libreoffice/files')
-rw-r--r--app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch b/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch
new file mode 100644
index 000000000000..0361cd4c4839
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-non-pdfium-build.patch
@@ -0,0 +1,29 @@
+From 5f3f17a9c64e33fb787a79dc94d902147da77d71 Mon Sep 17 00:00:00 2001
+From: Noel Grandin <noelgrandin@gmail.com>
+Date: Sat, 19 Sep 2020 20:38:29 +0200
+Subject: fix non-pdfium build
+
+Change-Id: Ic1e30a412927748ba58a21cf2ee922cd1a490aa4
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103040
+Tested-by: Jenkins
+Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
+---
+ vcl/source/filter/ipdf/pdfread.cxx | 2 +-
+ xmlsecurity/source/pdfio/pdfdocument.cxx | 12 +++++++-----
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
+index 39c2933be8d5..a9b079a75bc3 100644
+--- a/vcl/source/filter/ipdf/pdfread.cxx
++++ b/vcl/source/filter/ipdf/pdfread.cxx
+@@ -220,7 +220,7 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, std::vector<Bitmap>& rBi
+ (void)rBitmaps;
+ (void)nFirstPage;
+ (void)nPages;
+- (void)fResolutionDPI;
++ (void)pSizeHint;
+ return 0;
+ #endif // HAVE_FEATURE_PDFIUM
+ }
+--
+cgit v1.2.1