[arch-commits] Commit in libreoffice-fresh/trunk (PKGBUILD poppler-0.64.patch)
Andreas Radke
andyrtr at archlinux.org
Wed May 9 18:36:16 UTC 2018
Date: Wednesday, May 9, 2018 @ 18:36:15
Author: andyrtr
Revision: 323645
upgpkg: libreoffice-fresh 6.0.4-1
upstream update 6.0.4
Modified:
libreoffice-fresh/trunk/PKGBUILD
Deleted:
libreoffice-fresh/trunk/poppler-0.64.patch
--------------------+
PKGBUILD | 61 ++++++++++++++++++++++-------------------------
poppler-0.64.patch | 65 ---------------------------------------------------
2 files changed, 29 insertions(+), 97 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-09 18:24:08 UTC (rev 323644)
+++ PKGBUILD 2018-05-09 18:36:15 UTC (rev 323645)
@@ -11,9 +11,9 @@
pkgbase=libreoffice-fresh
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=6.0.3.2
-pkgver=6.0.3
-pkgrel=2
+_LOver=6.0.4.2
+pkgver=6.0.4
+pkgrel=1
arch=('x86_64')
license=('LGPL3')
url="http://www.libreoffice.org/"
@@ -33,31 +33,6 @@
'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode'
'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'
)
-sha256sums=('12b8a2f57d797ad51b7661e2302babfe73c0d23b52ddac9f4c7eb1b82472859b'
- 'SKIP'
- '06999eac776c4fcf7339732bf988d2b85b7193283d4be622f848706e278e4701'
- 'SKIP'
- '8aa651266b701b17e78aaca77db394bec3da07faf62546496484c63dd519a5b3'
- 'SKIP'
- '9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81'
- '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
- '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
- '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
- '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776'
- 'd6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab'
- 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
- '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
- '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
- '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
- '7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f'
- 'd0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a'
- 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
- 'aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf'
- 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
- 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
- '944064e8f8fa18beeb348468348d910d365d8a3e36ddb76076a368bd9bd6f894'
- '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4'
- 'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283')
_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
#_mirror="https://dev-builds.libreoffice.org/pre-releases/src"
@@ -80,7 +55,6 @@
${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar # for test suite
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
make-pyuno-work-with-system-wide-module-install.diff
- poppler-0.64.patch
libreoffice-fresh.sh libreoffice-fresh.csh)
noextract=(boost_1_65_1.tar.bz2
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -99,6 +73,30 @@
185d60944ea767075d27247c3162b3bc-unowinreg.dll
)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
+sha256sums=('9081fb132090e9fe1ed8896ba4085e6f7ceef145f3a76889caeaed6c032510f7'
+ 'SKIP'
+ 'cef0f0d54da925bb9a69725177ba8594683f5f7500f226bdeeaf344ecb5c41fc'
+ 'SKIP'
+ '865f78003114c9333d8df63ee64197b25f1894c5dd1038f563abb4c91a1c542e'
+ 'SKIP'
+ '9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81'
+ '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
+ '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
+ '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
+ '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776'
+ 'd6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab'
+ 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
+ '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
+ '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
+ '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
+ '7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f'
+ 'd0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a'
+ 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
+ 'aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf'
+ 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
+ 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
+ '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4'
+ 'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283')
prepare() {
@@ -116,6 +114,8 @@
sed -i "/CppunitTest_sw_uiwriter/d" sw/Module_sw.mk
sed -i "/CppunitTest_xmlsecurity_signing/d" xmlsecurity/Module_xmlsecurity.mk
sed -i "/CppunitTest_sc_subsequent_filters_test/d" sc/Module_sc.mk
+ sed -i "/CppunitTest_dbaccess_RowSetClones/d" dbaccess/Module_dbaccess.mk
+ sed -i "/CppunitTest_dbaccess_hsqldb/d" dbaccess/Module_dbaccess.mk
# unowinreg.dll must be a file not a symlink or the result will become a broken symlink
# /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -125,9 +125,6 @@
# fix not upstreamable pyuno paths - FS#54250
patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
- # fix build with poppler 0.64
- patch -Np1 -i ${srcdir}/poppler-0.64.patch
-
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
case "$i" in
Deleted: poppler-0.64.patch
===================================================================
--- poppler-0.64.patch 2018-05-09 18:24:08 UTC (rev 323644)
+++ poppler-0.64.patch 2018-05-09 18:36:15 UTC (rev 323645)
@@ -1,65 +0,0 @@
-From 42cebff14f7d486c20f04863681cc5ef4602f4eb Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene at debian.org>
-Date: Tue, 24 Apr 2018 15:56:23 +0200
-Subject: [PATCH] fix build with poppler 0.64
-
-GooString became const...
-
-Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5
----
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 ++++++++++
- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
- 2 files changed, 14 insertions(+)
-
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 48a735ba54a5..06e4faead383 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -432,6 +432,9 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state )
- FontAttributes aNewFont;
- int nSize = 0;
-
-+#if POPPLER_CHECK_VERSION(0, 64, 0)
-+ const
-+#endif
- GooString* pFamily = gfxFont->getName();
- if( pFamily )
- {
-@@ -728,6 +731,9 @@ void PDFOutDev::updateFont(GfxState *state)
- FontAttributes aFont;
- int nEmbedSize=0;
-
-+#if POPPLER_CHECK_VERSION(0, 64, 0)
-+ const
-+#endif
- Ref* pID = gfxFont->getID();
- // TODO(Q3): Portability problem
- long long fontID = static_cast<long long>(pID->gen) << 32 | static_cast<long long>(pID->num);
-@@ -918,7 +924,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y,
- printf( "\n" );
- }
-
-+#if POPPLER_CHECK_VERSION(0, 64, 0)
-+void PDFOutDev::drawString(GfxState*, const GooString* /*s*/)
-+#else
- void PDFOutDev::drawString(GfxState*, GooString* /*s*/)
-+#endif
- {
- // TODO(F3): NYI
- }
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index c3367aa6ddf2..7e65f085d288 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -224,7 +224,11 @@ namespace pdfi
- double dx, double dy,
- double originX, double originY,
- CharCode code, int nBytes, Unicode *u, int uLen) override;
-+#if POPPLER_CHECK_VERSION(0, 64, 0)
-+ virtual void drawString(GfxState *state, const GooString *s) override;
-+#else
- virtual void drawString(GfxState *state, GooString *s) override;
-+#endif
- virtual void endTextObject(GfxState *state) override;
-
- //----- image drawing
More information about the arch-commits
mailing list