archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-18 22:54:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/libreoffice-still to 5.4.6-1

Browse source
This commit is contained in:
Kevin Mihelich 2018-03-27 17:54:02 +00:00
parent 5c5cf3d653
commit e213fe4342
2 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
extra/libreoffice-still/PKGBUILD
View file

@ -19,8 +19,8 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
pkgbase=libreoffice-still
pkgname=('libreoffice-still-sdk' 'libreoffice-still')
_LOver=5.4.5.1
pkgver=5.4.5
_LOver=5.4.6.2
pkgver=5.4.6
pkgrel=1
arch=('x86_64')
license=('LGPL3')
@ -65,6 +65,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
${_additional_source_url2}/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar # for test suite
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
make-pyuno-work-with-system-wide-module-install.diff
poppler-0.62.patch
libreoffice-still.sh libreoffice-still.csh)
noextract=(boost_1_63_0.tar.bz2
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@ -86,11 +87,11 @@ noextract=(boost_1_63_0.tar.bz2
1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
185d60944ea767075d27247c3162b3bc-unowinreg.dll)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
sha256sums=('eb151d17d23d08d78acfb45d1f5b4830a565c99bf0f5f386ddcc41ffa481eb98'
sha256sums=('919caa5cde10bae8d16b8549664cbf8e410c3975653463976ee2be2004448d45'
'SKIP'
'd445cb0a1e8e228288a5f0173476694c8bb937a72db92420ea22018c05f0f193'
'acf7c5dfbc14e92793648b15774e633e291bfa82f47581cbad8f6d9d40136808'
'SKIP'
'a4e40763bf615a6a82d33078fa105602d2c85509cf566fbc9124d30687205d55'
'8c5e0c0465f4cbb2143d994c5bfebe53bc9bb91d3ba6095440144f6cec2ae899'
'SKIP'
'beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0'
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
@ -110,6 +111,7 @@ sha256sums=('eb151d17d23d08d78acfb45d1f5b4830a565c99bf0f5f386ddcc41ffa481eb98'
'a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34'
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
'344f88086b947d53550ef5492e4d61b1e1594067a34c6c4d8ae801ddd0a2fadb'
'76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4'
'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283')
@ -132,6 +134,9 @@ prepare() {
rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
# upstream fix to build with poppler 0.62 and later
patch -Np0 -i ${srcdir}/poppler-0.62.patch
# fix not upstreamable pyuno paths - FS#54250
patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff

29
extra/libreoffice-still/poppler-0.62.patch Normal file
View file

@ -0,0 +1,29 @@
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-01-30 18:22:07.000000000 +0100
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.new 2018-03-20 11:38:16.558290319 +0100
@@ -32,10 +32,12 @@
#pragma warning(push, 1)
#endif
-// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
+// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1, then renamed to UnicodeMapFuncs.h in 0.62.0
// FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
// because the internal poppler does not provide poppler-version.h and the macro always returns 0
-#if POPPLER_CHECK_VERSION(0, 21, 1)
+#if POPPLER_CHECK_VERSION(0, 62, 0)
+#include <UnicodeMapFuncs.h>
+#elif POPPLER_CHECK_VERSION(0, 21, 1)
#include "UTF8.h"
#elif POPPLER_CHECK_VERSION(0, 21, 0)
#include "UTF.h"
@@ -918,7 +920,11 @@
);
// silence spurious warning
+#if POPPLER_CHECK_VERSION(0, 62, 0)
+ (void)&mapUTF16;
+#else
(void)&mapUCS2;
+#endif
char buf[9];
for( int i=0; i<uLen; ++i )