From 7e0685d2560727a6dd8aa94c3032444553d47104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 6 Feb 2018 00:15:38 +0100
Subject: [PATCH] libreoffice: update to 6.0.0.3

---
 srcpkgs/libreoffice/files/musl-os_utils_h.patch  | 16 ++++------------
 .../patches/0001-disable_i686_unit_test.patch    |  5 +++--
 srcpkgs/libreoffice/template                     | 16 +++++++++++-----
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/libreoffice/files/musl-os_utils_h.patch b/srcpkgs/libreoffice/files/musl-os_utils_h.patch
index 40572b8091d..78a74efa009 100644
--- a/srcpkgs/libreoffice/files/musl-os_utils_h.patch
+++ b/srcpkgs/libreoffice/files/musl-os_utils_h.patch
@@ -1,18 +1,10 @@
 --- src/common/os/os_utils.h	2016-04-14 16:07:29.000000000 +0200
-+++ src/common/os/os_utils.h	2017-10-08 22:15:46.091610818 +0200
-@@ -34,12 +34,13 @@
- #include "../common/StatusArg.h"
- #include "../common/classes/array.h"
- 
--#ifdef WIN_NT
- #include <sys/stat.h>
- 
-+#ifdef WIN_NT
++++ src/common/os/os_utils.h	2018-02-06 01:24:14.872345731 +0100
+@@ -40,6 +40,7 @@
  #define mode_t int
  #define DEFAULT_OPEN_MODE (_S_IREAD | _S_IWRITE)
--#else
-+#endif
-+#if !defined(DEFAULT_OPEN_MODE)
+ #else
++#include <sys/types.h>
  #define DEFAULT_OPEN_MODE (0666)
  #endif
  
diff --git a/srcpkgs/libreoffice/patches/0001-disable_i686_unit_test.patch b/srcpkgs/libreoffice/patches/0001-disable_i686_unit_test.patch
index abe600fe4e6..3f5c96bbb38 100644
--- a/srcpkgs/libreoffice/patches/0001-disable_i686_unit_test.patch
+++ b/srcpkgs/libreoffice/patches/0001-disable_i686_unit_test.patch
@@ -5,17 +5,18 @@ 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 @@
- #ifndef MACOSX /* Retina-reatled rounding rountrip error
                  * 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,6 +1125,7 @@
+@@ -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
  }
  
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index eae02cb1d72..f7caeb1298b 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,6 +1,6 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=5.4.4.2
+version=6.0.0.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-werror"
@@ -8,6 +8,7 @@ nocross=yes
 
 #
 # XXX: mit-krb5-devel nasm firebird3 hamcrest iwyu ogl-math
+# TODO: package libepubgen and libqxp; something is wrong with glm
 # Missing, required libraries are downloaded and built internally
 #
 hostmakedepends="automake libtool pkg-config bison flex gperf icu
@@ -53,10 +54,10 @@ distfiles="
  ${_ooopurl}/${_ooop_templates_md5hash}-OOOP-templates-pack-${_ooop_templates_version}.zip
 "
 checksum="
- 6826751b4cd7076e0c7adfe6eee025cde7253c502ba51ab7072aec6070557e03
- 42782cc8f965b8bd22f25d59044a3a8769573f491865fcb99676865d0746aa8a
- 280495861fc789868db62c4b19ef361eede9299a93003e0efd58499dcf862509
- 2be3a5867f720f7298aad3d67b5d11bab2253af5be970a30ca4c7b2d8de902c5
+ dc2171845ec19d5a0cece2c0052172011b2ec435cac80cb47637f2af94e19e3d
+ 98d48c683b54de88912643b18739c030bb81d7529c2611d622321c03bf0665d2
+ 9f4750a5dc087c1b700dc200ffe614932e4f854c185084207b79f5a8e2968442
+ 8afeb5cbb608e451a9b1acaef87601323faf403b490bd188edb5ddeedd60587e
  cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c
  c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159
  1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d
@@ -125,9 +126,11 @@ pre_configure() {
 	sed -i external/firebird/UnpackedTarball_firebird.mk \
 		-e's;\(.*external/firebird\)/libc++.patch\(.*\)$;\1/libc++.patch\2\n\1/musl-os_utils_h.patch\2;'
 
+
 	case "$XBPS_TARGET_MACHINE" in
 		i686*)	# Don't run broken tests
 			sed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk
+			sed -i "/CPPUNIT_TEST(testTdf111798);/d" sd/qa/unit/export-tests-ooxml2.cxx
 			make_build_args="build-nocheck"
 			;;
 	esac
@@ -190,6 +193,9 @@ do_configure() {
 	configure_args+=" --without-system-jfreereport"
 	configure_args+=" --without-system-apache-commons"
 	configure_args+=" --without-system-beanshell"
+	configure_args+=" --without-system-libepubgen"
+	configure_args+=" --without-system-libqxp"
+	configure_args+=" --without-system-glm"
 	configure_args+=" --with-myspell-dicts"
 	configure_args+=" --with-system-icu-for-build=yes"
 	configure_args+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen"