libreoffice: update to 5.3.3.2
This commit is contained in:
Jürgen Buchmüller
parent
ae30b0e262
commit
700b682a54
|
|
@ -0,0 +1,12 @@
|
|||
--- src/common/os/os_utils.h 2016-09-27 10:03:58.000000000 +0200
|
||||
+++ src/common/os/os_utils.h 2017-02-04 03:05:37.357148694 +0100
|
||||
@@ -29,6 +29,9 @@
|
||||
#define INCLUDE_OS_FILE_UTILS_H
|
||||
|
||||
#include <stdio.h>
|
||||
+#if !defined(__GLIBC__)
|
||||
+#include <fcntl.h>
|
||||
+#endif
|
||||
|
||||
#include "../common/classes/fb_string.h"
|
||||
#include "../common/StatusArg.h"
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
Minimal exceprt from upstream fix only to unbreak build
|
||||
|
||||
https://cgit.freedesktop.org/libreoffice/core/commit/?id=3e42714c76b1347babfdea0564009d8d82a83af4
|
||||
|
||||
--- i18npool/source/breakiterator/breakiterator_unicode.cxx.orig 2016-05-04 21:28:24 UTC
|
||||
+++ i18npool/source/breakiterator/breakiterator_unicode.cxx
|
||||
@@ -64,10 +64,13 @@ BreakIterator_Unicode::~BreakIterator_Un
|
||||
class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
|
||||
{
|
||||
public:
|
||||
+#if (U_ICU_VERSION_MAJOR_NUM < 58)
|
||||
+ // RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
|
||||
inline void publicSetBreakType(int32_t type)
|
||||
{
|
||||
setBreakType(type);
|
||||
};
|
||||
+#endif
|
||||
OOoRuleBasedBreakIterator(UDataMemory* image,
|
||||
UErrorCode &status)
|
||||
: RuleBasedBreakIterator(image, status)
|
||||
@@ -143,12 +146,21 @@ void SAL_CALL BreakIterator_Unicode::loa
|
||||
}
|
||||
}
|
||||
if (rbi) {
|
||||
+#if (U_ICU_VERSION_MAJOR_NUM < 58)
|
||||
+ // ICU 58 made RuleBasedBreakIterator::setBreakType() private
|
||||
+ // instead of protected, so the old workaround of
|
||||
+ // https://ssl.icu-project.org/trac/ticket/5498
|
||||
+ // doesn't work anymore. However, they also claim to have fixed
|
||||
+ // the cause that an initial fBreakType==-1 would lead to an
|
||||
+ // endless loop under some circumstances.
|
||||
+ // Let's see ...
|
||||
switch (rBreakType) {
|
||||
case LOAD_CHARACTER_BREAKITERATOR: rbi->publicSetBreakType(UBRK_CHARACTER); break;
|
||||
case LOAD_WORD_BREAKITERATOR: rbi->publicSetBreakType(UBRK_WORD); break;
|
||||
case LOAD_SENTENCE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_SENTENCE); break;
|
||||
case LOAD_LINE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_LINE); break;
|
||||
}
|
||||
+#endif
|
||||
icuBI->aBreakIterator = rbi;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
# Template file for 'libreoffice'
|
||||
pkgname=libreoffice
|
||||
version=5.2.5.1
|
||||
revision=7
|
||||
version=5.3.3.2
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-werror"
|
||||
nopie=yes
|
||||
nocross=yes
|
||||
|
||||
#
|
||||
# XXX: mit-krb5-devel nasm openjdk hamcrest iwyu ogl-math
|
||||
# XXX: mit-krb5-devel nasm firebird3 hamcrest iwyu ogl-math
|
||||
# Missing, required libraries are downloaded and built internally
|
||||
#
|
||||
hostmakedepends="automake libtool pkg-config bison flex gperf icu
|
||||
|
|
@ -19,9 +19,9 @@ makedepends="apr-devel boost-devel cups-devel libcurl-devel
|
|||
libatomic_ops-devel lcms2-devel librsvg-devel libxml2-devel libxslt-devel
|
||||
MesaLib-devel nss-devel python3-devel libressl-devel libgcrypt-devel
|
||||
libgpg-error-devel poppler-cpp-devel postgresql-libs-devel redland-devel
|
||||
liborcus11-devel lpsolve-devel unixodbc-devel libXt-devel neon-devel
|
||||
liborcus-devel lpsolve-devel unixodbc-devel libXt-devel neon-devel
|
||||
avahi-libs-devel hunspell-devel hyphen-devel libabw-devel libcdr-devel CoinMP-devel
|
||||
libcmis-devel libcppunit-devel libe-book-devel libfbclient-devel libfreehand-devel
|
||||
libcmis-devel libcppunit-devel libe-book-devel libfreehand-devel
|
||||
libexttextcat-devel liblangtag-devel libldap-devel libmspub-devel libmwaw-devel
|
||||
glew-devel glyphy-devel gst-plugins-base1-devel libodfgen-devel libpagemaker-devel
|
||||
librevenge-devel libvisio-devel libetonyek-devel libwpd-devel libwpg-devel
|
||||
|
|
@ -58,10 +58,10 @@ distfiles="
|
|||
${_ooopurl}/${_ooop_templates_md5hash}-OOOP-templates-pack-${_ooop_templates_version}.zip
|
||||
"
|
||||
checksum="
|
||||
9756a322a497aa83d096fa0ac5541622d9a8f5038ce9c0ded48199566ab0d300
|
||||
a892f933b7da5dda3e4c5d399096cde77d75c4beb8bdf6ea64442ab6890dc357
|
||||
11199cca59748dc9cade4f5cbb0478f600d3c54114b09819eac54338dbbd49b4
|
||||
abf6e962aa2042bab4f2e6c3ba9eddbda64a56aa3251bde3b227cfffed926353
|
||||
9632956926d9d5c9049ce5b81c2673f298ae73b873d53cce8cfaea8ee243619a
|
||||
06c604794a33de125d08e3abf68a6326720304e4a9e8b5e82aad5c99eed88a21
|
||||
f9b4fef5f449cdbbcb5796908d0536576585c511173bfccf2ca049b5dcbb0dc7
|
||||
7f2d8da74b744bf7749602207b41c92225527ac34a2170601dd4fb9065bba6af
|
||||
cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c
|
||||
c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159
|
||||
1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d
|
||||
|
|
@ -123,6 +123,11 @@ pre_configure() {
|
|||
-i bin/distro-install-desktop-integration
|
||||
sed -e "/distro-install-file-lists/d" -i Makefile.in
|
||||
chmod +x bin/unpack-sources
|
||||
mkdir -p external/firebird
|
||||
# Add musl patch
|
||||
cp ${FILESDIR}/musl-fcntl_h.patch external/firebird/
|
||||
sed -i external/firebird/UnpackedTarball_firebird.mk \
|
||||
-e's;\(.*external/firebird\)/libc++.patch\(.*\)$;\1/libc++.patch\2\n\1/musl-fcntl_h.patch\2;'
|
||||
}
|
||||
|
||||
do_configure() {
|
||||
|
|
@ -227,7 +232,8 @@ do_configure() {
|
|||
configure_args+=" --with-system-openssl"
|
||||
configure_args+=" --with-system-neon"
|
||||
configure_args+=" --with-system-postgresql"
|
||||
configure_args+=" --with-system-firebird"
|
||||
# Firebird-3.0.1 does not work with libreoffice
|
||||
# configure_args+=" --with-system-firebird"
|
||||
configure_args+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"
|
||||
configure_args+=" --with-parallelism=${XBPS_MAKEJOBS}"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue