libreoffice: update to 6.4.0.3
The i686 package will be built after x86_64* are done.
This commit is contained in:
Jürgen Buchmüller
parent
9abee0ff02
commit
0501cbc62a
6 changed files with 34 additions and 107 deletions
|
|
@ -1,23 +0,0 @@
|
|||
The rounding errors which seem to plague the MACOSX build also occur
|
||||
for the i686 architecture on Void Linux. Since the problem seems to
|
||||
be minor, also disable the failing test lines for __i386 being defined.
|
||||
|
||||
--- sw/qa/extras/ooxmlexport/ooxmlexport7.cxx 2016-06-14 22:05:10.000000000 +0200
|
||||
+++ sw/qa/extras/ooxmlexport/ooxmlexport7.cxx 2016-06-25 12:32:05.783516158 +0200
|
||||
@@ -1117,6 +1117,7 @@
|
||||
* hard to smooth out due to the use of string compare
|
||||
* instead of number */
|
||||
#if !defined(_WIN32)
|
||||
+#ifndef __i386 /* We see rounding errors happening on the i686 architecture as well */
|
||||
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
|
||||
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
|
||||
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
|
||||
@@ -1124,7 +1125,8 @@
|
||||
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
|
||||
assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
|
||||
#endif
|
||||
#endif
|
||||
+#endif
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -1,18 +1,17 @@
|
|||
Rip out libc version check.
|
||||
Our glibc is newer than 2.1.1
|
||||
The musl libc has an entirely unrelated version number
|
||||
and of course does not support gnu_get_libc_version()
|
||||
Source: @pullmoll
|
||||
Upstream: no
|
||||
Reason: This test fails for Musl libc and we know we have a working libc
|
||||
|
||||
--- configure.ac 2016-01-27 01:58:25.000000000 +0100
|
||||
+++ configure.ac 2016-02-23 19:21:58.906456302 +0100
|
||||
@@ -9676,21 +9676,6 @@
|
||||
fi
|
||||
AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA)
|
||||
--- configure.ac 2020-01-23 00:14:16.000000000 +0100
|
||||
+++ configure.ac 2020-01-30 00:23:00.859196125 +0100
|
||||
@@ -10233,18 +10233,10 @@
|
||||
AC_SUBST(LIBNUMBERTEXT_CFLAGS)
|
||||
|
||||
-dnl ***************************************
|
||||
dnl ***************************************
|
||||
-dnl testing libc version for Linux...
|
||||
-dnl ***************************************
|
||||
-if test "$_os" = "Linux"; then
|
||||
+dnl Always assume we have a working libc
|
||||
dnl ***************************************
|
||||
if test "$_os" = "Linux"; then
|
||||
- AC_MSG_CHECKING([whether libc is >= 2.1.1])
|
||||
- exec 6>/dev/null # no output
|
||||
- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC)
|
||||
|
|
@ -22,8 +21,7 @@ and of course does not support gnu_get_libc_version()
|
|||
- else
|
||||
- AC_MSG_ERROR([no, upgrade libc])
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
dnl =========================================
|
||||
dnl Check for the Windows SDK.
|
||||
+ HAVE_LIBC=yes; export HAVE_LIBC
|
||||
fi
|
||||
|
||||
dnl =========================================
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
--- sal/osl/unx/signal.cxx 2016-01-27 01:58:25.000000000 +0100
|
||||
+++ sal/osl/unx/signal.cxx 2016-02-23 19:33:44.618507179 +0100
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
#endif /* MACOSX */
|
||||
|
||||
-#ifdef LINUX
|
||||
+#if defined(LINUX) && defined(__GLIBC__)
|
||||
#include <execinfo.h>
|
||||
#include <link.h>
|
||||
#define INCLUDE_BACKTRACE
|
||||
--- sal/osl/unx/backtrace.h 2017-07-25 22:26:39.000000000 +0200
|
||||
+++ sal/osl/unx/backtrace.h 2017-08-04 17:53:35.182066906 +0200
|
||||
@@ -20,7 +20,7 @@
|
||||
#ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H
|
||||
#define INCLUDED_SAL_OSL_UNX_BACKTRACE_H
|
||||
|
||||
-#if defined (LINUX)
|
||||
+#if defined (LINUX) && defined (__GLIBC__)
|
||||
|
||||
#include <execinfo.h>
|
||||
|
||||
--- sal/osl/unx/backtrace.c 2017-07-25 22:26:39.000000000 +0200
|
||||
+++ sal/osl/unx/backtrace.c 2017-08-04 17:54:56.831219663 +0200
|
||||
@@ -282,7 +282,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
-#elif !defined LINUX
|
||||
+#elif !defined LINUX || !defined __GLIBC__
|
||||
|
||||
int backtrace( void **buffer, int max_frames )
|
||||
{
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
--- vcl/inc/headless/svpinst.hxx 2016-01-27 01:58:25.000000000 +0100
|
||||
+++ vcl/inc/headless/svpinst.hxx 2016-02-24 18:41:32.947510323 +0100
|
||||
@@ -32,6 +32,9 @@
|
||||
#include <list>
|
||||
|
||||
#include <time.h>
|
||||
+#if !defined(__GLIBC__)
|
||||
+#include <sys/time.h>
|
||||
+#endif
|
||||
|
||||
#define VIRTUAL_DESKTOP_WIDTH 1024
|
||||
#define VIRTUAL_DESKTOP_HEIGHT 768
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- sd/source/ui/remotecontrol/BluetoothServer.cxx 2016-01-27 01:58:25.000000000 +0100
|
||||
+++ sd/source/ui/remotecontrol/BluetoothServer.cxx 2016-02-25 15:06:53.971708191 +0100
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <dbus/dbus.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
- #include <sys/unistd.h>
|
||||
+ #include <unistd.h>
|
||||
#include <sys/socket.h>
|
||||
#include <bluetooth/bluetooth.h>
|
||||
#include <bluetooth/rfcomm.h>
|
||||
|
|
@ -1,7 +1,10 @@
|
|||
# Template file for 'libreoffice'
|
||||
pkgname=libreoffice
|
||||
version=6.3.4.2
|
||||
version=6.4.0.3
|
||||
revision=1
|
||||
# Do not build on x86_64 and i686 at the same time.
|
||||
# Remove archs= after the x86_64* packages are built.
|
||||
archs="x86_64*"
|
||||
build_style=meta
|
||||
make_build_args="build-nocheck"
|
||||
nocross=yes
|
||||
|
|
@ -23,7 +26,7 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
|
|||
libwps-devel lpsolve-devel mdds mythes-devel neon-devel nss-devel
|
||||
postgresql-libs-devel python3-devel qt5-devel redland-devel sane-devel
|
||||
telepathy-glib-devel unixodbc-devel vigra-devel vlc-devel libcppunit-devel
|
||||
xmlsec1-devel"
|
||||
qrcodegen-devel xmlsec1-devel"
|
||||
depends="libreoffice-common>=${version}_${revision}"
|
||||
depends+=" libreoffice-base>=${version}_${revision}"
|
||||
depends+=" libreoffice-calc>=${version}_${revision}"
|
||||
|
|
@ -70,7 +73,7 @@ distfiles="
|
|||
${_addurl}/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
|
||||
${_addurl}/libstaroffice-0.0.6.tar.xz
|
||||
${_addurl}/libzmf-0.0.2.tar.xz
|
||||
${_addurl}/pdfium-3794.tar.bz2
|
||||
${_addurl}/pdfium-3963.tar.bz2
|
||||
${_addurl}/poppler-0.82.0.tar.xz
|
||||
${_addurl}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
|
||||
${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
|
||||
|
|
@ -115,10 +118,10 @@ distfiles="
|
|||
${_addurl}/ReemKufi-0.7.zip
|
||||
${_addurl}/Scheherazade-2.100.zip
|
||||
"
|
||||
checksum="cb72559aa9774f2c13e8fa78391d8f30f3c6f02e3fd83b2311bd643a5cdde49c
|
||||
8c515b3de578c5c4b289627764cf15eea8e14c2d5729bf04cf432026dc653078
|
||||
8eac0f6a846c90ab06490c0fec144d108da7f88082175eea28b81a0e8942af06
|
||||
74a11926ba96ad2fa373a3231ad2e283d95e2ba4a1458c4c625686569f6f5fe9
|
||||
checksum="c531d99d42c830a0f51f36c5a5efa4f32007b41b43788e3cec082cea87422a27
|
||||
cdd6de659ae2b716b8c4f7969778fa6a2862aa963ae8537dd1d1a8666760d749
|
||||
ff5046cdcd5bb85b1343fc08dbf31288bf63271a2af0f1345abc44ebd813a710
|
||||
75bd4c133061cad553cf3150665787a757519e0f52434fc8d6a5b779957152d5
|
||||
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
|
||||
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
|
||||
983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
|
||||
|
|
@ -129,7 +132,7 @@ checksum="cb72559aa9774f2c13e8fa78391d8f30f3c6f02e3fd83b2311bd643a5cdde49c
|
|||
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
|
||||
6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4
|
||||
27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
|
||||
e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4
|
||||
80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895
|
||||
234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df
|
||||
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
|
||||
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
|
||||
|
|
@ -188,7 +191,7 @@ skip_extraction="
|
|||
Firebird-3.0.0.32483-0.tar.bz2
|
||||
libstaroffice-0.0.6.tar.xz
|
||||
libzmf-0.0.2.tar.xz
|
||||
pdfium-3794.tar.bz2
|
||||
pdfium-3963.tar.bz2
|
||||
poppler-0.82.0.tar.xz
|
||||
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
|
||||
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
|
||||
|
|
@ -248,6 +251,7 @@ case "$XBPS_TARGET_MACHINE" in
|
|||
;;
|
||||
*-musl) # use shipped clucene, because CLucene/analysis/cjk/CJKAnalyzer.h
|
||||
# is missing in the musl clucene-devel files
|
||||
makedepends+=" libexecinfo-devel"
|
||||
;;
|
||||
x86_64) build_options_default="java"
|
||||
makedepends+=" apache-ant openjdk11 "
|
||||
|
|
@ -430,6 +434,10 @@ do_configure() {
|
|||
-e "s|.1.gz|.1|g"
|
||||
chmod +x bin/unpack-sources
|
||||
|
||||
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
|
||||
vsed -i sal/Library_sal.mk -e "s;-ldl ;-lexecinfo &;"
|
||||
fi
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*) # Don't run broken tests
|
||||
sed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk
|
||||
|
|
@ -460,7 +468,7 @@ do_configure() {
|
|||
opts+=" --enable-python=system"
|
||||
opts+=" --enable-gtk3"
|
||||
opts+=" --enable-qt5"
|
||||
opts+=" --enable-kde5"
|
||||
opts+=" --enable-kf5"
|
||||
opts+=" --enable-vlc"
|
||||
opts+=" --disable-dependency-tracking"
|
||||
opts+=" --enable-release-build"
|
||||
|
|
@ -599,8 +607,8 @@ libreoffice-kde_package() {
|
|||
noverifyrdeps=yes
|
||||
pkg_install() {
|
||||
cat > ${wrksrc}/file-lists/kde5_list.txt <<-EOF
|
||||
/usr/lib/libreoffice/program/libkde5be1lo.so
|
||||
/usr/lib/libreoffice/program/libvclplug_kde5lo.so
|
||||
/usr/lib/libreoffice/program/libkf5be1lo.so
|
||||
/usr/lib/libreoffice/program/libvclplug_kf5lo.so
|
||||
/usr/lib/libreoffice/program/libvclplug_qt5lo.so
|
||||
EOF
|
||||
_split kde5
|
||||
|
|
|
|||
Loading…
Reference in a new issue