libreoffice: upgrade 7.0.2.2 -> 7.0.3.1
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -0,0 +1,41 @@
|
|||||||
|
From f95acefc6d069dd31bfbdd1e218e667b8d9efa70 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||||
|
Date: Sun, 8 Nov 2020 16:17:35 +0100
|
||||||
|
Subject: [PATCH] pdfread.cxx: fix incorrect parameter
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Fixes:
|
||||||
|
libreoffice-7.0.3.1/vcl/source/filter/ipdf/pdfread.cxx: In function ‘size_t vcl::RenderPDFBitmaps(const void*, int, std::vector<Bitmap>&, size_t, int, const basegfx::B2DTuple*)’:
|
||||||
|
libreoffice-7.0.3.1/vcl/source/filter/ipdf/pdfread.cxx:221:11: error: ‘fResolutionDPI’ was not declared in this scope
|
||||||
|
221 | (void)fResolutionDPI;
|
||||||
|
| ^~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Upstream fix [1] does not apply
|
||||||
|
|
||||||
|
[1] https://github.com/LibreOffice/core/commit/5f3f17a9c64e33fb787a79dc94d902147da77d71#diff-34bdeffbff65e730b3f48255d872d5d1c5b3936990d27448a452a769c3635e5c
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
|
||||||
|
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||||
|
---
|
||||||
|
vcl/source/filter/ipdf/pdfread.cxx | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
|
||||||
|
index 3066c4d..bf11578 100644
|
||||||
|
--- a/vcl/source/filter/ipdf/pdfread.cxx
|
||||||
|
+++ b/vcl/source/filter/ipdf/pdfread.cxx
|
||||||
|
@@ -218,7 +218,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
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
||||||
@@ -1,8 +1,5 @@
|
|||||||
PV = "7.0.2.2"
|
PV = "7.0.3.1"
|
||||||
DIRV = "7.0.2"
|
DIRV = "7.0.3"
|
||||||
|
|
||||||
SRC_URI += " \
|
SRC_URI += "http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz"
|
||||||
http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz \
|
SRC_URI[sha256sum] = "6566bce180c6b9561554de334b02344340a59f3bc0663d2c3c72addec444292d"
|
||||||
"
|
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "09fa559f2ef239151cb37bcca17a6f074a846693b88893c3e1fb612ecde74d97"
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ SRC_URI += " \
|
|||||||
file://0010-Support-install-to-find-bash-completion.in.patch \
|
file://0010-Support-install-to-find-bash-completion.in.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[translations.sha256sum] = "878f85188d48ec469eb82f0b50e33cf421d0c1efd8a64287cb097df6f355e826"
|
SRC_URI[translations.sha256sum] = "442a2a1931549edbdbc6ab8f9fbc6b8e7088fde4d5806cda82263080d3617168"
|
||||||
|
|
||||||
DEPENDS += " \
|
DEPENDS += " \
|
||||||
${BPN}-native \
|
${BPN}-native \
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ require libreoffice-version.inc
|
|||||||
SRC_URI += " \
|
SRC_URI += " \
|
||||||
git://github.com/dagwieers/unoconv.git;destsuffix=git/unoconv;name=unoconv \
|
git://github.com/dagwieers/unoconv.git;destsuffix=git/unoconv;name=unoconv \
|
||||||
file://0001-Workaround-boost-library-detection-failures.patch \
|
file://0001-Workaround-boost-library-detection-failures.patch \
|
||||||
|
file://0002-pdfread.cxx-fix-incorrect-parameter.patch \
|
||||||
"
|
"
|
||||||
SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"
|
SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user