diff options
11 files changed, 1093 insertions, 0 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest new file mode 100644 index 0000000..94b3073 --- /dev/null +++ b/app-office/libreoffice/Manifest @@ -0,0 +1,19 @@ +AUX fix-execinfo.patch 1454 BLAKE2B e5dcddad97a37fb6348159cb49b95d8b8bc552b15b86162a39a7b3b0f6211c7e569c5b4640454a3ad7f7c7f30d54e9f68130d05257105eb568912a9e083bc35f SHA512 7f1f64459b680e8c789d511ae957f6182774b6d1ac9412650f7609c272ecf9ee4a073b01d32e8fde30c3d96fbab05a60c8fb87da8d53356c671f5202995b1429 +AUX fix-includes.patch 1245 BLAKE2B 049fdc0510ce2148e10b44e48e50ce2d00966663f71938e2f2afa3575a6cc25cc70d3d7bb061cf5efab9dd4418a112f225a79912b3dceea8f957529eafac0939 SHA512 39cde8e50e61537db8b9f40889d806c0c7247cca43701a19ed26c4e5a40699749f89218deb2bee5fbdd6846320a9d2eb290ca1b3a2df9ecf6eb5755d2d04b84d +AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 BLAKE2B d95ded4f051c77aed22ce99f6273b73ec0893190622f55a3d6d3c3e3e53c59a2f3ce3f645b011c1afa02b727ee803898c65f8feff723955a2fe1a69de6d24480 SHA512 b5ff4c6d3771bcdde21613ad15459120ac1d759b1b3b422b5cba3ee23f7ddf88fde274956f2c91f0a6a37cb36a8d90d8f90bd865e6c2d3ff7c2100e2b469dbd8 +AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6 +AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418 +AUX libreoffice-6.0.3.2-disable-flaky-tests-1.patch 8928 BLAKE2B e5399e0e520dfe4ac5d0a02c3bf3372ccdc7725f073aabb74c36600a7cd09eb45a9e5d5486bf700ae374723206e3a421069b298137d14a9b05e17e70f2d9d3b4 SHA512 ca100dc389ed93a5eeed35f001d9e0f6f886782bfaa3dead3105b9bce91ca9e721354b55cd67fdb40c7d2d64966c530ebc6ba6a4e3c62b0e006759c7b64f1b29 +AUX libreoffice-6.0.3.2-testTdf108947.patch 638 BLAKE2B 38da9bf34a921d22002d45e650c738687706c77a67ac2748ee14efb48f47a328b1339712687b525a4f66a1ad0b36fc69c0613ef441067a206ea4df81754f4727 SHA512 a712fb653d86a74a96d568805ca48d183a7ec71f32ef34cfb98a4999cb7fead3f5cd11f5d8f8944041583d5221b0dbaeb3cdfc625a1958118e867569d0c56479 +AUX libreoffice-6.0.4.2-glm-0.9.9.patch 1017 BLAKE2B 7a85f652d6a9c01157da37a9bcc72261849f8f5b64816a8b55b149a44c50e684102a63f0d758b69ed2199259a3a934fa4c47f56ca65b66a82558a72dca991084 SHA512 aca8b606c5ef7c7333938d489faa24f86f454f22797d40ff735653ef57b70874cb4b9d22f32099a8cbc45b23c6943dc1d9dbdda9b6a08052c63ef2ac99a3f1a1 +AUX linux-musl.patch 2198 BLAKE2B 2eec2c03ad678170b121f23a12c5b33c502d0edc6ce4970ca5562b9108c1cf21b88908a1d8b628c2f2cc572bdea75ce12b78dd29c5ec1697713bddd646f3a18c SHA512 52da356200beb292a1abcdcd64caaec0d5da59eeeb2741869188ec36da2e03247b926be924078ae1bd7099022ac6d09339523838eba3b207465e8896d4e5068a +DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a +DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c +DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a +DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f +DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a +DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f +DIST libreoffice-6.0.4.2.tar.xz 204556512 BLAKE2B 2131fb0f810c81803f9905bc1f3f9bfa04615deceb8eb443644a35d6b4226f6876ffdbb8ef00c9ffe8e5a677877513b3c2adb40b3f87ddcdb46946c5bf3d6183 SHA512 004cef88c1a6d908a519b8813562d4dd623c899608026aa603dd86012a3d0b9a5d776c05e0e2d7541c691f4a9fc6c4d62c278fe88627872a1c6f841bddc2736e +DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f +DIST libreoffice-help-6.0.4.2.tar.xz 2972636 BLAKE2B 0528ad30fc754269a94a4b2a0c9eab26ecb707b1e9a230686a982a24215fbc91016813fecef687499ee4cfb49228febbfbaaaff7371053d130adefd705a1bb49 SHA512 ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651 +EBUILD libreoffice-6.0.4.2.ebuild 17004 BLAKE2B 35b72485938074d20738679fd3d1efce7a1c8b2fc11cb996157a21da099d4f22f813844c30c246feb66faeb813546fead6ca60155d07ad350712be3b97548bf2 SHA512 598b5b4925ab0fdf2fdb8d9edc446a3b4e4d7b591861ed5c4dda25f51ab950977c249f2539346b3825df7ee293e7568d67a48cf4350b983c2a2bed3e95c4d7e3 diff --git a/app-office/libreoffice/files/fix-execinfo.patch b/app-office/libreoffice/files/fix-execinfo.patch new file mode 100644 index 0000000..577debb --- /dev/null +++ b/app-office/libreoffice/files/fix-execinfo.patch @@ -0,0 +1,54 @@ +From 22e97095b30583eae81b55cd83e3ab8b944faaad Mon Sep 17 00:00:00 2001 +From: "Jory A. Pratt" <anarchy@gentoo.org> +Date: Mon, 11 Jun 2018 04:10:23 -0500 +Subject: [PATCH 2/3] execinfo header not needed on musl setup + +Signed-off-by: Jory A. Pratt <anarchy@gentoo.org> +--- + sal/osl/unx/backtrace.c | 2 +- + sal/osl/unx/backtrace.h | 2 +- + sal/osl/unx/signal.cxx | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c +index f70031d0b..141ea4e06 100644 +--- a/sal/osl/unx/backtrace.c ++++ b/sal/osl/unx/backtrace.c +@@ -282,7 +282,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) + } + } + +-#elif !defined LINUX ++#elif !defined(__GLIBC__) + + int backtrace( void **buffer, int max_frames ) + { +diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h +index 5fafc1c90..408c12c69 100644 +--- a/sal/osl/unx/backtrace.h ++++ b/sal/osl/unx/backtrace.h +@@ -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> + +diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx +index 9a528fec3..bf15f628f 100644 +--- a/sal/osl/unx/signal.cxx ++++ b/sal/osl/unx/signal.cxx +@@ -35,7 +35,7 @@ + + #endif /* MACOSX */ + +-#ifdef LINUX ++#if defined(LINUX) && defined(__GLIBC__) + #include <execinfo.h> + #include <link.h> + #define INCLUDE_BACKTRACE +-- +2.17.1 + diff --git a/app-office/libreoffice/files/fix-includes.patch b/app-office/libreoffice/files/fix-includes.patch new file mode 100644 index 0000000..917eba3 --- /dev/null +++ b/app-office/libreoffice/files/fix-includes.patch @@ -0,0 +1,40 @@ +From af25d1cb9c009d66a536e6bbd5f997c71e6592a7 Mon Sep 17 00:00:00 2001 +From: "Jory A. Pratt" <anarchy@gentoo.org> +Date: Mon, 11 Jun 2018 04:11:20 -0500 +Subject: [PATCH 3/3] fix includes for musl system + +Signed-off-by: Jory A. Pratt <anarchy@gentoo.org> +--- + sd/source/ui/remotecontrol/BluetoothServer.cxx | 2 +- + vcl/inc/headless/svpinst.hxx | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx +index 780224719..c938afe48 100644 +--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx ++++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx +@@ -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> +diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx +index ba8096032..bcb644b84 100644 +--- a/vcl/inc/headless/svpinst.hxx ++++ b/vcl/inc/headless/svpinst.hxx +@@ -31,7 +31,7 @@ + + #include <list> + +-#include <time.h> ++#include <sys/time.h> + + #define VIRTUAL_DESKTOP_WIDTH 1024 + #define VIRTUAL_DESKTOP_HEIGHT 768 +-- +2.17.1 + diff --git a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch new file mode 100644 index 0000000..d714ff2 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch @@ -0,0 +1,10 @@ +--- libreoffice-5.2.5.1.orig/desktop/unx/source/pagein.c 2017-01-11 16:54:33.000000000 -0800 ++++ libreoffice-5.2.5.1/desktop/unx/source/pagein.c 2017-02-03 10:22:51.697673613 -0800 +@@ -26,6 +26,7 @@ + #include <string.h> + #include <sys/stat.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + + /* do_pagein */ + static void do_pagein (const char * filename) diff --git a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch new file mode 100644 index 0000000..a6e732f --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch @@ -0,0 +1,11 @@ +--- a/shell/source/unix/misc/senddoc.sh 2017-06-15 15:44:22.000000000 +0200 ++++ b/shell/source/unix/misc/senddoc.sh 2017-06-25 01:00:08.525435930 +0200 +@@ -389,6 +389,8 @@ + elif [ -n "$DESKTOP_LAUNCH" ]; then + # http://lists.freedesktop.org/pipermail/xdg/2004-August/002873.html + MAILER=${DESKTOP_LAUNCH} ++ elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open5 ] ; then ++ MAILER=/usr/bin/kde-open5 + elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then + MAILER=/usr/bin/kde-open + elif [ -x /usr/bin/xdg-open ] ; then diff --git a/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch new file mode 100644 index 0000000..83b56d1 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch @@ -0,0 +1,42 @@ +--- a/desktop/scripts/soffice.sh ++++ a/desktop/scripts/soffice.sh +@@ -147,6 +147,9 @@ if echo "$checks" | grep -q "cc" ; then + exit 1; + fi + ++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} ++export PYTHONPATH ++ + case "$(uname -s)" in + NetBSD|OpenBSD|DragonFly) + # this is a temporary hack until we can live with the default search paths +--- a/pyuno/source/module/uno.py ++++ a/pyuno/source/module/uno.py +@@ -16,11 +16,16 @@ + # except in compliance with the License. You may obtain a copy of + # the License at http://www.apache.org/licenses/LICENSE-2.0 . + # ++import os + import pyuno + import sys + import traceback + import warnings + ++sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program') ++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: ++ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc" ++ + # since on Windows sal3.dll no longer calls WSAStartup + import socket + +--- a/pyuno/source/officehelper.py ++++ a/pyuno/source/officehelper.py +@@ -45,7 +45,7 @@ def bootstrap(): + if "UNO_PATH" in os.environ: + sOffice = os.environ["UNO_PATH"] + else: +- sOffice = "" # lets hope for the best ++ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program" + sOffice = os.path.join(sOffice, "soffice") + if platform.startswith("win"): + sOffice += ".exe" diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch new file mode 100644 index 0000000..03421c5 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch @@ -0,0 +1,216 @@ +Kindly borrowed from Debian. + +14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some + system dependent way) e.g. on the Win@6 tinderbox it always + crashes +14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of + the time + +diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk +index 25db0b6..14e507c 100644 +--- a/toolkit/Module_toolkit.mk ++++ b/toolkit/Module_toolkit.mk +@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\ + ifneq ($(OOO_JUNIT_JAR),) + $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\ + JunitTest_toolkit_complex \ +- JunitTest_toolkit_unoapi_1 \ +- JunitTest_toolkit_unoapi_2 \ +- JunitTest_toolkit_unoapi_3 \ +- JunitTest_toolkit_unoapi_4 \ + )) + endif ++# JunitTest_toolkit_unoapi_1 \ ++# JunitTest_toolkit_unoapi_2 \ ++# JunitTest_toolkit_unoapi_3 \ ++# JunitTest_toolkit_unoapi_4 \ + + # vim: set noet sw=4 ts=4: +diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce +index fa1684c..cc8e1a5 100644 +--- a/sc/qa/unoapi/sc_1.sce ++++ b/sc/qa/unoapi/sc_1.sce +@@ -24,10 +24,3 @@ + # i84554 -o sc.AccessibleEditableTextPara_PreviewNote + # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter + -o sc.AccessibleEditableTextPara_PreviewCell +--o sc.ScAccessibleCell +-# i91044 -o sc.ScAccessibleCsvCell +-# i91044 -o sc.ScAccessibleCsvGrid +-# i84641 -o sc.ScAccessibleCsvRuler +-# i88330 -o sc.ScAccessibleDocument +-# i91045 -o sc.ScAccessibleDocumentPagePreview +--o sc.ScAccessiblePageHeader +diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce +index dbfc3e1..d235c5d 100644 +--- a/sc/qa/unoapi/sc_2.sce ++++ b/sc/qa/unoapi/sc_2.sce +@@ -15,11 +15,6 @@ + # except in compliance with the License. You may obtain a copy of + # the License at http://www.apache.org/licenses/LICENSE-2.0 . + # +-# fdo#FOO -o sc.ScAccessiblePageHeaderArea +--o sc.ScAccessiblePreviewCell +--o sc.ScAccessiblePreviewHeaderCell +--o sc.ScAccessiblePreviewTable +-# fdo#45337 -o sc.ScAccessibleSpreadsheet + # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE + # -o sc.ScAnnotationObj + # -o sc.ScAnnotationShapeObj + +12:18 < _rene_> chris_wot: ping? +12:18 < chris_wot> heya +12:18 < chris_wot> you pinged? +12:19 < _rene_> chris_wot: any news on + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815292? +12:20 < _rene_> (of course the this-night-uploaded rc3 also failed) +12:21 < chris_wot> ah, sorry - I've looked at an EMF regression, but I've not + gotten any further on that one +12:22 < chris_wot> I honestly think that for this one just disable the test for + now +12:22 < chris_wot> I'll ping the ML + +This seems fixed when opening the original doc. + +diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +index 54eed4d..78019bd 100644 +--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ++++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +@@ -1128,30 +1128,30 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt") + + + +-DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt") +-{ +- xmlDocPtr pXmlDoc = parseExport("word/document.xml"); +- if (!pXmlDoc) +- return; +- // there should be no flipH and flipV attributes in this case +- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH"); +- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV"); +- // check rotation angle +- assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); +- // check the first few coordinates of the polygon +-#ifndef MACOSX /* Retina-related rounding roundtrip error +- * hard to smooth out due to the use of string compare +- * instead of number */ +-#if !defined(_WIN32) +- 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"); +- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171"); +- 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 +-} ++//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt") ++//{ ++// xmlDocPtr pXmlDoc = parseExport("word/document.xml"); ++// if (!pXmlDoc) ++// return; ++// // there should be no flipH and flipV attributes in this case ++// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH"); ++// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV"); ++// // check rotation angle ++// assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); ++// // check the first few coordinates of the polygon ++//#ifndef MACOSX /* Retina-related rounding roundtrip error ++// * hard to smooth out due to the use of string compare ++// * instead of number */ ++//#if !defined(_WIN32) ++// 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"); ++// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171"); ++// 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 ++//} + + + CPPUNIT_PLUGIN_IMPLEMENT(); +diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce +index 1c3925f..a16f001 100644 +--- a/svx/qa/unoapi/svx.sce ++++ b/svx/qa/unoapi/svx.sce +@@ -25,7 +25,7 @@ + #i111216 -o svx.AccessiblePresentationGraphicShape + #i111216 -o svx.AccessiblePresentationOLEShape + #i85539 -o svx.AccessiblePresentationShape +--o svx.AccessibleShape ++#-o svx.AccessibleShape + #i90294 -o svx.GraphicExporter + -o svx.SvxDrawPage + #i85501 -o svx.SvxGraphCtrlAccessibleContext + +19:26 <@x1sc0> _rene_, since that test is using exact dimensions, it seems it + fails on your side probably because the paragraph style is + different. 1. I will change the test to avoid the exact + dimensions. 2. meantime you can skip that test: +https://cgit.freedesktop.org/libreoffice/core/commit/?id=e05f16e6bf36efbaab16dd2ed1427a750ce7cafd +19:26 < IZBot> core - disable UI test that does exact comparison +19:27 < _rene_> mmh, ok, saw that but that was for a different test, so.. :) +19:27 -!- jacobo [~jaragunde@fanzine.igalia.com] has quit [Quit: Leaving.] +19:27 < _rene_> thanks, will do + +diff --git a/uitest/writer_tests/tdf79236.py b/uitest/writer_tests/tdf79236.py +index 8585e48d8c64..704f42c009a1 100644 +--- a/uitest/writer_tests/tdf79236.py ++++ b/uitest/writer_tests/tdf79236.py +@@ -8,8 +8,11 @@ from uitest.framework import UITestCase + import time + from uitest.uihelper.common import get_state_as_dict, type_text + ++import unittest ++ + class tdf79236(UITestCase): + ++ @unittest.skip("Currently broken") + def test_paragraph(self): + + self.ui_test.create_doc_in_start_center("writer") + +14:39 < ztamas> _rene_: chart2dump is used to fail because of font size differences, just use a bigger delta or disable it if it + fails for you. +14:40 <@sberg_> noelgrandin, no +14:40 < noelgrandin> sberg_, sure seems that way both in the debugger and in the resulting SAL_WARN output +14:42 < ztamas> _rene_: there were some work on making font rendering consistent on different platforms, but it's not finished + yet, I guess +diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk +index 3273055d5373..cb452139170c 100644 +--- a/chart2/Module_chart2.mk ++++ b/chart2/Module_chart2.mk +@@ -33,9 +33,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,chart2,\ + CppunitTest_chart2_export \ + CppunitTest_chart2_import \ + CppunitTest_chart2_trendcalculators \ +- CppunitTest_chart2_dump \ + CppunitTest_chart2_pivot_chart_test \ + )) ++# CppunitTest_chart2_dump \ + + ifeq ($(ENABLE_CHART_TESTS),TRUE) + ifeq ($(WITH_FONTS), TRUE) +diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +index 4d65beeb90c4..f3d71501c41a 100644 +--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx ++++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +@@ -1559,14 +1559,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx") + } + + +-DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") ++/*DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx") + { + // the position of the flying text frame should be off page + // 30624 below its anchor + OUString aTop = parseDump("//fly[1]/infos/bounds", "top"); + CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop ); + +-} ++}*/ + + DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx") + { diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch new file mode 100644 index 0000000..bd84b31 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch @@ -0,0 +1,13 @@ +diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx +index 457aedce0acb..4f02cf2b4040 100644 +--- a/sw/qa/extras/rtfimport/rtfimport.cxx ++++ b/sw/qa/extras/rtfimport/rtfimport.cxx +@@ -1352,7 +1352,7 @@ DECLARE_RTFIMPORT_TEST(testImportHeaderFooter, "tdf108055.rtf") + DECLARE_RTFIMPORT_TEST(testTdf108947, "tdf108947.rtf") + { + //Check page count +- CPPUNIT_ASSERT_EQUAL(2, getPages()); ++ CPPUNIT_ASSERT_EQUAL(1, getPages()); + + //Check if Headers/Footers contain what they should in this document + uno::Reference<text::XText> xHeaderTextRight = getProperty<uno::Reference<text::XText>>( diff --git a/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch b/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch new file mode 100644 index 0000000..1430fdf --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch @@ -0,0 +1,34 @@ +From 5f1bf6598b5725ad1e50ae9f7ec7524cc8a834fa Mon Sep 17 00:00:00 2001 +From: Louis Sautier <sautier.louis@gmail.com> +Date: Sun, 10 Jun 2018 12:25:18 +0200 +Subject: Fix build with GLM 0.9.9.0, tdf#118070 + +One of the test files was forgotten in 953c4add8fd76d88f49a81ae4c21a1fdcc007e57 + +Change-Id: I0315433c688ff7edb2ba599bbef203cac9de3022 +Reviewed-on: https://gerrit.libreoffice.org/55554 +Reviewed-by: Rene Engelhard <rene@debian.org> +Tested-by: Rene Engelhard <rene@debian.org> +--- + vcl/Executable_icontest.mk | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk +index ce16330..8c917b7 100644 +--- a/vcl/Executable_icontest.mk ++++ b/vcl/Executable_icontest.mk +@@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\ + )) + endif + ++ifeq ($(SYSTEM_GLM),TRUE) ++$(eval $(call gb_Executable_add_defs,icontest,\ ++ -DGLM_ENABLE_EXPERIMENTAL \ ++)) ++endif ++ + $(eval $(call gb_Executable_use_api,icontest,\ + offapi \ + udkapi \ +-- +cgit v1.1 diff --git a/app-office/libreoffice/files/linux-musl.patch b/app-office/libreoffice/files/linux-musl.patch new file mode 100644 index 0000000..baadb49 --- /dev/null +++ b/app-office/libreoffice/files/linux-musl.patch @@ -0,0 +1,75 @@ +From 6b74147fc8de0ada711175aa46876fc7d41b562f Mon Sep 17 00:00:00 2001 +From: +Date: Mon, 11 Jun 2018 04:08:38 -0500 +Subject: [PATCH] add support for linux-musl to configure and remove glibc + check + +--- + configure.ac | 23 ++++------------------- + 1 file changed, 4 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 848dc4ff3..666a9ee04 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -573,7 +573,7 @@ solaris*) + fi + ;; + +-linux-gnu*|k*bsd*-gnu*) ++linux-gnu*|linux-musl*|k*bsd*-gnu*) + test_gtk=yes + build_gstreamer_1_0=yes + build_gstreamer_0_10=yes +@@ -4012,7 +4012,7 @@ kfreebsd*) + esac + ;; + +-linux-gnu*) ++linux-gnu*|linux-musl*) + COM=GCC + USING_X11=TRUE + OS=LINUX +@@ -6957,7 +6957,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then + test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" + ;; + +- linux-gnu*) ++ linux-gnu*|linux-musl*) + JAVAINC="-I$JAVA_HOME/include" + JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" + test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" +@@ -9460,21 +9460,6 @@ if test "$with_system_libexttextcat" = "yes"; then + fi + AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) + +-dnl *************************************** +-dnl testing libc version for Linux... +-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) +- exec 6>&1 # output on again +- if test "$HAVE_LIBC"; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_ERROR([no, upgrade libc]) +- fi +-fi +- + dnl ========================================= + dnl Check for uuidgen + dnl ========================================= +@@ -12470,7 +12455,7 @@ else + + case "$host_os" in + +- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) ++ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) + if test "$ENABLE_JAVA" != ""; then + pathmunge "$JAVA_HOME/bin" "after" + fi +-- +2.17.1 + diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild new file mode 100644 index 0000000..cc4db43 --- /dev/null +++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild @@ -0,0 +1,579 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +PYTHON_REQ_USE="threads,xml" + +MY_PV="${PV/_alpha/.alpha}" +MY_PV="${MY_PV/_beta/.beta}" +# experimental ; release ; old +# Usually the tarballs are moved a lot so this should make everyone happy. +DEV_URI=" + https://dev-builds.libreoffice.org/pre-releases/src + https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/ + https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src +" +ADDONS_URI="https://dev-www.libreoffice.org/src/" + +BRANDING="${PN}-branding-gentoo-0.8.tar.xz" +PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz" + +[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3" +inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS} +unset SCM_ECLASS + +DESCRIPTION="A full office productivity suite" +HOMEPAGE="https://www.libreoffice.org" +SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" + +# Split modules following git/tarballs; Core MUST be first! +# Help is used for the image generator +# Only release has the tarballs +if [[ ${MY_PV} != *9999* ]]; then + for i in ${DEV_URI}; do + SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz" + SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz" + done + unset i +fi +unset DEV_URI + +# Really required addons +# These are bundles that can't be removed for now due to huge patchsets. +# If you want them gone, patches are welcome. +ADDONS_SRC=( + "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" + # no release for 8 years, should we package it? + "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" + # Does not build with 1.6 rhino at all + "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" + # requirement of rhino + "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" + # not packageable + "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" +) +SRC_URI+=" ${ADDONS_SRC[*]}" + +unset ADDONS_URI +unset ADDONS_SRC + +# Extensions that need extra work: +LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" + +IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive +gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc +$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + bluetooth? ( dbus ) + kde? ( gtk ) + libreoffice_extensions_nlpsolver? ( java ) + libreoffice_extensions_scripting-beanshell? ( java ) + libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) +" + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" +[[ ${MY_PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" + +COMMON_DEPEND="${PYTHON_DEPS} + app-arch/unzip + app-arch/zip + app-crypt/gpgme[cxx] + app-text/hunspell:= + >=app-text/libabw-0.1.0 + >=app-text/libebook-0.1 + app-text/libepubgen + >=app-text/libetonyek-0.1 + app-text/libexttextcat + app-text/liblangtag + >=app-text/libmspub-0.1.0 + >=app-text/libmwaw-0.3.1 + >=app-text/libodfgen-0.1.0 + app-text/libqxp + app-text/libstaroffice + app-text/libwpd:0.10[tools] + app-text/libwpg:0.3 + >=app-text/libwps-0.4 + app-text/mythes + >=dev-cpp/clucene-2.3.3.4-r2 + =dev-cpp/libcmis-0.5* + dev-db/unixODBC + dev-lang/perl + dev-libs/boost:=[nls] + dev-libs/expat + dev-libs/hyphen + dev-libs/icu:= + dev-libs/libassuan + dev-libs/libgpg-error + >=dev-libs/liborcus-0.13.3 + dev-libs/librevenge + dev-libs/nspr + dev-libs/nss + !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) + libressl? ( dev-libs/libressl ) + >=dev-libs/redland-1.0.16 + >=dev-libs/xmlsec-1.2.24[nss] + media-gfx/graphite2 + media-libs/fontconfig + media-libs/freetype:2 + >=media-libs/harfbuzz-0.9.42:=[graphite,icu] + media-libs/lcms:2 + >=media-libs/libcdr-0.1.0 + >=media-libs/libepoxy-1.3.1[X] + >=media-libs/libfreehand-0.1.0 + media-libs/libpagemaker + >=media-libs/libpng-1.4:0= + >=media-libs/libvisio-0.1.0 + media-libs/libzmf + net-libs/neon + net-misc/curl + net-nds/openldap + sci-mathematics/lpsolve + virtual/glu + virtual/jpeg:0 + virtual/opengl + x11-libs/cairo[X] + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + bluetooth? ( net-wireless/bluez ) + coinmp? ( sci-libs/coinor-mp ) + cups? ( net-print/cups ) + dbus? ( dev-libs/dbus-glib ) + eds? ( + dev-libs/glib:2 + gnome-base/dconf + gnome-extra/evolution-data-server + ) + firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + gtk? ( + dev-libs/glib:2 + dev-libs/gobject-introspection + gnome-base/dconf + media-libs/mesa[egl] + x11-libs/gtk+:3 + ) + gtk2? ( + x11-libs/gdk-pixbuf + >=x11-libs/gtk+-2.24:2 + ) + jemalloc? ( dev-libs/jemalloc ) + kde? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtx11extras:5 + dev-qt/qtwidgets:5 + kde-frameworks/kconfig:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kio:5 + kde-frameworks/kwindowsystem:5 + ) + libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) + libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) + mysql? ( dev-db/mysql-connector-c++ ) + pdfimport? ( app-text/poppler:=[cxx] ) + postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) +" + +RDEPEND="${COMMON_DEPEND} + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + !app-office/openoffice + media-fonts/dejavu + media-fonts/liberation-fonts + media-fonts/libertine + || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) + java? ( >=virtual/jre-1.6 ) + kde? ( kde-frameworks/breeze-icons:* ) + vlc? ( media-video/vlc ) +" + +if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then + PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" +else + # Translations are not reliable on live ebuilds + # rather force people to use english only. + PDEPEND="!app-office/libreoffice-l10n" +fi + +# FIXME: cppunit should be moved to test conditional +# after everything upstream is under gbuild +# as dmake execute tests right away +DEPEND="${COMMON_DEPEND} + !<sys-devel/make-3.82 + >=dev-libs/libatomic_ops-7.2d + >=dev-libs/libxml2-2.7.8 + dev-libs/libxslt + dev-perl/Archive-Zip + >=dev-util/cppunit-1.14.0 + >=dev-util/gperf-3 + dev-util/intltool + >=dev-util/mdds-1.2.3:1= + media-libs/glm + sys-devel/bison + sys-devel/flex + sys-devel/gettext + sys-devel/ucpp + sys-libs/zlib + virtual/pkgconfig + x11-base/xorg-proto + x11-libs/libXt + x11-libs/libXtst + java? ( + dev-java/ant-core + >=virtual/jdk-1.6 + ) + odk? ( >=app-doc/doxygen-1.8.4 ) + test? ( + app-crypt/gnupg + dev-util/cppunit + media-fonts/dejavu + ) +" + +PATCHES=( + # not upstreamable stuff + "${FILESDIR}/${PN}-5.4-system-pyuno.patch" + "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" + "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676 + # 6.1 branch + "${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178 + + # TODO: upstream + "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" + "${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600 + + # Musl Patches + "${FILESDIR}/linux-musl.patch" + "${FILESDIR}/fix-execinfo.patch" + "${FILESDIR}/fix-includes.patch" + + # gtk3-kde5 vcl plugin backported from master + "${WORKDIR}"/${PATCHSET/.tar.xz/} +) + +S="${WORKDIR}/${PN}-${MY_PV}" + +_check_reqs() { + CHECKREQS_MEMORY="512M" + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + CHECKREQS_DISK_BUILD="22G" + else + CHECKREQS_DISK_BUILD="6G" + fi +} + +pkg_pretend() { + use java || \ + ewarn "If you plan to use Base application you should enable java or you will get various crashes." + + if has_version "<app-office/libreoffice-5.3.0[firebird]"; then + ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so" + ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version." + ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" + fi + + if [[ ${MERGE_TYPE} != binary ]]; then + _check_reqs + check-reqs_pkg_pretend + fi +} + +pkg_setup() { + java-pkg-opt-2_pkg_setup + python-single-r1_pkg_setup + xdg_environment_reset + + if [[ ${MERGE_TYPE} != binary ]]; then + _check_reqs + check-reqs_pkg_setup + fi +} + +src_unpack() { + default + + if [[ ${MY_PV} = *9999* ]]; then + local base_uri branch mypv + base_uri="https://anongit.freedesktop.org/git" + branch="master" + mypv=${MY_PV/.9999} + [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" + git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" + git-r3_checkout "${base_uri}/${PN}/core" + + git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" + git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help + fi +} + +src_prepare() { + default + + # sandbox violations on many systems, we don't need it. Bug #646406 + sed -i \ + -e "/KF5_CONFIG/s/kf5-config/no/" \ + configure.ac || die "Failed to disable kf5-config" + + AT_M4DIR="m4" eautoreconf + # hack in the autogen.sh + touch autogen.lastrun + + # system pyuno mess + sed -i \ + -e "s:%eprefix%:${EPREFIX}:g" \ + -e "s:%libdir%:$(get_libdir):g" \ + pyuno/source/module/uno.py \ + pyuno/source/officehelper.py || die + # sed in the tests + sed -i \ + -e "s#all : build unitcheck#all : build#g" \ + solenv/gbuild/Module.mk || die + sed -i \ + -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ + -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ + Makefile.in || die + + sed -i \ + -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ + -e "s,\$INSTALLDIRNAME.sh,${PN}," \ + bin/distro-install-desktop-integration || die + + if use branding; then + # hack... + mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die + fi + + # Don't list pdfimport support in desktop when built with none, bug # 605464 + if ! use pdfimport; then + sed -i \ + -e ":MimeType: s:application/pdf;::" \ + -e ":Keywords: s:pdf;::" \ + sysui/desktop/menus/draw.desktop || die + fi +} + +src_configure() { + # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys + # Note: these are for Gentoo use ONLY. For your own distribution, please get + # your own set of keys. Feel free to contact chromium@gentoo.org for more info. + local google_default_client_id="329227923882.apps.googleusercontent.com" + local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" + + # optimization flags + export GMAKE_OPTIONS="${MAKEOPTS}" + # System python enablement: + export PYTHON_CFLAGS=$(python_get_CFLAGS) + export PYTHON_LIBS=$(python_get_LIBS) + + if use kde; then + export QT_SELECT=5 # bug 639620 needs proper fix though + export QT5DIR="$(qt5_get_bindir)/../" + export MOC5="$(qt5_get_bindir)/moc" + fi + + # system headers/libs/...: enforce using system packages + # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad + # --enable-cairo: ensure that cairo is always required + # --enable-*-link: link to the library rather than just dlopen on runtime + # --enable-release-build: build the libreoffice as release + # --disable-fetch-external: prevent dowloading during compile phase + # --enable-extension-integration: enable any extension integration support + # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs + # --disable-report-builder: too much java packages pulled in without pkgs + # --without-system-sane: just sane.h header that is used for scan in writer, + # not linked or anything else, worthless to depend on + # --disable-pdfium: not yet packaged + local myeconfargs=( + --with-system-dicts + --with-system-epoxy + --with-system-headers + --with-system-jars + --with-system-libs + --enable-cairo-canvas + --enable-largefile + --enable-mergelibs + --enable-neon + --enable-python=system + --enable-randr + --enable-release-build + --disable-breakpad + --disable-ccache + --disable-dependency-tracking + --disable-epm + --disable-fetch-external + --disable-gstreamer-0-10 + --disable-online-update + --disable-pdfium + --disable-report-builder + --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") + --with-build-version="Gentoo official package" + --enable-extension-integration + --with-external-dict-dir="${EPREFIX}/usr/share/myspell" + --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" + --with-external-thes-dir="${EPREFIX}/usr/share/myspell" + --with-external-tar="${DISTDIR}" + --with-lang="" + --with-parallelism=$(makeopts_jobs) + --with-system-ucpp + --with-vendor="Gentoo Foundation" + --with-x + --without-fonts + --without-myspell-dicts + --without-help + --with-helppack-integration + --with-system-gpgmepp + --without-system-sane + $(use_enable bluetooth sdremote-bluetooth) + $(use_enable coinmp) + $(use_enable cups) + $(use_enable dbus) + $(use_enable debug) + $(use_enable eds evolution2) + $(use_enable firebird firebird-sdbc) + $(use_enable gstreamer gstreamer-1-0) + $(use_enable gtk gtk3) + $(use_enable gtk2 gtk) + $(use_enable kde gtk3-kde5) + $(use_enable kde qt5) + $(use_enable mysql ext-mariadb-connector) + $(use_enable odk) + $(use_enable pdfimport) + $(use_enable postgres postgresql-sdbc) + $(use_enable vlc) + $(use_with coinmp system-coinmp) + $(use_with googledrive gdrive-client-id ${google_default_client_id}) + $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) + $(use_with java) + $(use_with mysql system-mysql-cppconn) + $(use_with odk doxygen) + ) + + if use eds || use gtk; then + myeconfargs+=( --enable-dconf --enable-gio ) + else + myeconfargs+=( --disable-dconf --disable-gio ) + fi + + # libreoffice extensions handling + for lo_xt in ${LO_EXTS}; do + if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then + myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) ) + else + myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) ) + fi + done + + if use java; then + # hsqldb: system one is too new + myeconfargs+=( + --without-junit + --without-system-hsqldb + --with-ant-home="${ANT_HOME}" + --with-jdk-home=$(java-config --jdk-home 2>/dev/null) + --with-jvm-path="${EPREFIX}/usr/lib/" + ) + + use libreoffice_extensions_scripting-beanshell && \ + myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) + + use libreoffice_extensions_scripting-javascript && \ + myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) ) + fi + + is-flagq "-flto*" && myeconfargs+=( --enable-lto ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + # more and more LO stuff tries to use OpenGL, including tests during build + # bug 501508, bug 540624, bug 545974 and probably more + addpredict /dev/dri + addpredict /dev/ati + addpredict /dev/nvidiactl + + # hack for offlinehelp, this needs fixing upstream at some point + # it is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + ( + grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die + source "${T}/config_host.mk" 2&> /dev/null + + local path="${WORKDIR}/helpcontent2/source/auxiliary/" + mkdir -p "${path}" || die + + echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\"" + perl "${S}/helpcontent2/helpers/create_ilst.pl" \ + -dir=helpcontent2/source/media/helpimg \ + > "${path}/helpimg.ilst" + [[ -s "${path}/helpimg.ilst" ]] || \ + ewarn "The help images list is empty, something is fishy, report a bug." + ) + + local target + use test && target="build" || target="build-nocheck" + + # this is not a proper make script + make ${target} || die +} + +src_test() { + make unitcheck || die + make slowcheck || die +} + +src_install() { + # This is not Makefile so no buildserver + make DESTDIR="${D}" distro-pack-install -o build -o check || die + + # bug 593514 + if use gtk; then + dosym libreoffice/program/liblibreofficekitgtk.so \ + /usr/$(get_libdir)/liblibreofficekitgtk.so + fi + + # bash completion aliases + bashcomp_alias \ + libreoffice \ + unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice + + if use branding; then + insinto /usr/$(get_libdir)/${PN}/program + newins "${WORKDIR}/branding-sofficerc" sofficerc + dodir /etc/env.d + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die + fi + + # Hack for offlinehelp, this needs fixing upstream at some point. + # It is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + insinto /usr/$(get_libdir)/libreoffice/help + doins xmlhelp/util/*.xsl + + pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} |