[pkgsrc/trunk]: pkgsrc/misc/libreoffice Update to 6.0.4.2

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aca8cdc55ca0
branches:  trunk
changeset: 380063:aca8cdc55ca0
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Thu May 10 20:11:01 2018 +0000

description:
Update to 6.0.4.2

* Remove patches for latest poppler

Changelog:
Bugs fixed compared to 6.0.4 rc1:

    tdf#75539 DOC import filter mismatch of shape size [Justin Luth]
    tdf#113377 Crash in: OpenGLContext::AcquireFramebuffer(OpenGLTexture const &) [Miklos Vajna]
    tdf#116274 Cannot open an excel workbook, "maximum number of columns per sheet" - in 64bit Calc on Windows [Eike Rathke]
    tdf#116939 Problem opening excelfile in latest release - due to overflow [Eike Rathke]
    tdf#117129 Libre office Swriter crashes when opening Microsot word doc in 97-2003 doc format [Justin Luth]


Bugs fixed compared to 6.0.3 (rc2):

    bnc#778133 sw: handle cell background for BACKGROUND_PARA_OVER_DRAWINGS [Miklos Vajna]
    bnc#825305 RTF import: implement reverse deduplication for lists [Miklos Vajna]
    ofz#6999 check available data len [Caol?n McNamara]
    ofz#7043 already registered [Caol?n McNamara]
    ofz#7063 ensure lifecycle [Caol?n McNamara]
    ofz#7109 infinite regress [Caol?n McNamara]
    ofz#7110 ensure join is called on std::exceptions as well as uno::Exception [Caol?n McNamara]
    ofz#7121 NamedDBs::insert takes ownership of its argument [Eike Rathke]
    ofz#7165 set a recursion limit for svm in svm [Caol?n McNamara]
    ofz#7648 bad-cast [Caol?n McNamara]
    rhbz#1283420 message box fonts corrupted in libreoffice [Caol?n McNamara]
    rhbz#1392145 libreoffice close button appears on the right side in an RTL locale under Wayland [Caol?n McNamara]
    tdf#46637 EDITING: Get focus on partially visible cell [Caol?n McNamara]
    tdf#48300 UI: Window doesn't take focus when opening an already open document [Katarina Behrens]
    tdf#50057 EDITING: Replication of frames when record changes (redlining) is on [Michael Stahl]
    tdf#72196 FILTER: Implement ODF 1.2 HOST-USE-WILDCARDS [Eike Rathke]
    tdf#75256 (Icon-Theme-Sifr) [META] Incomplete Sifr icon theme [Matthias Freund]
    tdf#77919 FORMATTING: Bibliography, character styles are lost after update [Caol?n McNamara]
    tdf#84205 FILESAVE: Theme Colors inverted in drawings after PPTX roundtrip (black part turned to white) [Szymon K?os]
    tdf#90627 Saving presentation results in invalid PPTX file [Szymon K?os]
    tdf#91106 1st Hierarchical level in Styles and Formatting is not alphabetically sorted [Michael Stahl]
    tdf#100015 Unary and Binary Operators images missing [Caol?n McNamara]
    tdf#100619 DataPilot: Enhanced field popup window [Michael Stahl]
    tdf#100925 When overwriting a cell, new content is displayed on top of the old content until finishing the edit [Caol?n McNamara]
    tdf#104786 FILESAVE: PPTX: Corrupted File after RT (The element has invalid child element) [Szymon K?os]
    tdf#104789 FILESAVE: PPTX: Corrupted File after RT (The attribute 'val' is not declared) [Szymon K?os]
    tdf#104792 FILESAVE: PPTX: Corrupted File after RT (The element has incomplete child element) [Szymon K?os]
    tdf#106667 Hang when trying to open a dialog and the whole sheet is selected [Noel Grandin]
    tdf#106746 copy/pasting revisions copy deleted words [Aron Budea]
    tdf#107035 FILEOPEN Missing numbering in inserted caption when document is saved in DOCX format and reopened [Luke Deller]
    tdf#107267 During a sub-total calculation or sum, the data set is not computed well. [Eike Rathke]
    tdf#108482 Repeat of 2 heading rows do not work in case of vertical text orientation in 2nd row [Mike Kaganski]
    tdf#108572 Mail merge: embedded database isn't properly discarded when working with MS Office starting documents [Caol?n McNamara]
    tdf#108580 Cannot run LibreOffice, api-ms-win-crt-runtime-l1-1-0.dll is missing (for local solution see comment 7) [Mike Kaganski]
    tdf#112448 FILEOPEN, DOCX spurious blank line in text [Serge Krot]
    tdf#112997 Viewing: only a single of multiple animated gif is rendered [Noel Grandin]
    tdf#113182 FILEOPEN: DOCX: Textbox wrap differs in MSO and LO [Serge Krot]
    tdf#114139 FILESAVE XLSX Pie Charts with 3D look get a gray background when saved in Calc and opened in Excel 2013 [Bartosz Kosiorek]
    tdf#114168 FILEOPEN XLSX XLS Bar Chart minor axis spacing appears differently than the Microsoft Office minor axis spacing [Bartosz Kosiorek]
    tdf#114648 When creating any new document from LibreOffice OSX Dock icon, new document window doesn't get focus ( steps in comment 4 ) [Caol?n McNamara]
    tdf#114738 EMF+ rendering problems [Bartosz Kosiorek]
    tdf#114743 PRINT: angled text does not display [Tamas Bunth]
    tdf#115005 Regression LibO 6.0RC creates much larger files than 5.4 by including duplicate/redundant images [Serge Krot]
    tdf#115117 Incorrect PDF cmap entries for ligatures and broken text extraction [Khaled Hosny]
    tdf#115353 Status bar displays wrong characters upon load (OpenGL) [Tamas Bunth]
    tdf#115396 Font Carlito not recognized [David Tardon]
    tdf#115407 Impress loses transition sounds and sound instructions [Julien Nabet]
    tdf#115539 "Start Slideshow" does not hide notebookbar when in Outline and SlideSorter mode [Xisco Fauli]
    tdf#115683 When CSV file importing to calc, if LibreOffice already open, text import dialog box open behind a grey window. [Caol?n McNamara]
    tdf#115719 DOCX import: lack of Word 2013-style increased spacing for paragraph with anchored objects [Miklos Vajna]
    tdf#115806 The sidebar deck changes when after switch to print preview and back [Katarina Behrens]
    tdf#115853 Custom properties deleted [Julien Nabet]
    tdf#115923 Clicking the fill handle triggers automatic horizontal scrolling [Caol?n McNamara]
    tdf#116003 Crash when asking subtotals on 2 groups with pre-sort area checked [Eike Rathke]
    tdf#116138 Insert Special Character also inserts selected character in current cursor in Title numbering [Caol?n McNamara]
    tdf#116179 FILEOPEN Automatic font colour is very dark blue when imported from Writer created DOCX [Luke Deller]
    tdf#116238 Notebookbar stays visible during slide show when started from Slides pane [Xisco Fauli]
    tdf#116266 FILEOPEN: Impress 6.0.2 breaks links to svg-files [Serge Krot]
    tdf#116269 FILEOPEN: RTF: Writer sets a left indent when it should be 0 [Mikl
    tdf#116277 Extraneous blank window opened after File > New > Labels [Caol?n McNamara]
    tdf#116410 FILEOPEN DOCX: First paragraph has wrong top margin (space before) [Miklos Vajna]
    tdf#116429 Undoing after adding a shape only undoes "Change obT: Page border is invisible in specific DOCX (border color=auto) [Mike Kaganski]
    tdf#116474 Undo/redo: The redo of adding caption to an image isn't working: no image [Caol?n McNamara]
    tdf#116486 FILEOPEN: DOCX: paragraph position is wrong due to 489 deadlock in ucb TaskManager [Michael Meeks]
    tdf#116516 Proxy detection returns garbage in Windows [Mike Kaganski]
    tdf#116525 Shadow is rendered wrong for box around some characters [Noel Grandin]
    tdf#116536 FILEOPEN: Bullets are higher tha Text from Writer can not be imported in Calc as Formatted Text [RTF] when the first paragraph of the document has Break (Type-Page, Position-Before, 
With page Style-activated) [Caol?n McNamara]
    tdf#116544 EDITING: Inserting Photo Album that includeselds anchor document with wrong extension [Miklos Vajna]
    tdf#116563 GEN, KDE4: Find textbox can't get focus when find toolbar is undocked [Katarina Behrens]
    tdf#116581 disappear Noto fonts after install LibreOffice 6.0.3.1 on Windows 10 [Mike Kaganski]
    tdf#116692 UI: (Paragraph) Classification dialog does not show translation [Cor Nouws]
    tdf#116706 AGGREGATE COUNTA with hidden rows [Winfried Donkers]
    tdf#116772 Using LIKE in query assistant [Lionel Elie Mamane]
    tdf#116813 copy down does not scroll [Caol?n McNamara]
    tdf#116830 DOCX import: table cell background is behind background shapes [Miklos Vajna]
    tdf#116865 Sidebar not functional after opening new window (gtk2) [Caol?n McNamara]
    tdf#116890 Firebird: empty columns gone with prepared statement [Julien Nabet]
    tdf#116925 Automatic text color in textbox does not consider fill style of shape [Miklos Vajna]
    tdf#117033 Tooltips show the wrong symbol for MOD3 combinations [heiko tietze]

diffstat:

 misc/libreoffice/Makefile                                                             |   5 +-
 misc/libreoffice/distinfo                                                             |  36 ++++-----
 misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx |  33 ---------
 misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx |  15 ----
 4 files changed, 19 insertions(+), 70 deletions(-)

diffs (129 lines):

diff -r 3d28a108d9e2 -r aca8cdc55ca0 misc/libreoffice/Makefile
--- a/misc/libreoffice/Makefile Thu May 10 20:05:36 2018 +0000
+++ b/misc/libreoffice/Makefile Thu May 10 20:11:01 2018 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.154 2018/04/29 21:31:55 adam Exp $
+# $NetBSD: Makefile,v 1.155 2018/05/10 20:11:01 ryoon Exp $
 
-VERREL=                6.0.3
+VERREL=                6.0.4
 VERRC=         2
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
-PKGREVISION=   6
 CATEGORIES=    misc
 MASTER_SITES=  http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=  .tar.xz
diff -r 3d28a108d9e2 -r aca8cdc55ca0 misc/libreoffice/distinfo
--- a/misc/libreoffice/distinfo Thu May 10 20:05:36 2018 +0000
+++ b/misc/libreoffice/distinfo Thu May 10 20:11:01 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2018/04/30 04:46:16 ryoon Exp $
+$NetBSD: distinfo,v 1.56 2018/05/10 20:11:01 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -176,22 +176,22 @@
 RMD160 (libreoffice/libre-hebrew-1.0.tar.gz) = e44c35266105eb06023bd75d16f8f297c63e886d
 SHA512 (libreoffice/libre-hebrew-1.0.tar.gz) = 609c8ef29a1eab9b027ea04abf14949e9a204cf826fb0a792dadd8a83fc49ac9610a0b3a2bd4b8988e615688c63d0ec08a89436134980b2a9667e8966a75a795
 Size (libreoffice/libre-hebrew-1.0.tar.gz) = 531276 bytes
-SHA1 (libreoffice/libreoffice-6.0.3.2.tar.xz) = ed5d957edda3cb3aa56b205678d3ee2c6036a142
-RMD160 (libreoffice/libreoffice-6.0.3.2.tar.xz) = 3de20e6a194f1c1ac655b1c3c77c72cc6dacb8bc
-SHA512 (libreoffice/libreoffice-6.0.3.2.tar.xz) = d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
-Size (libreoffice/libreoffice-6.0.3.2.tar.xz) = 203747760 bytes
-SHA1 (libreoffice/libreoffice-dictionaries-6.0.3.2.tar.xz) = 6f63f93fbd78bf35fa1498f520f7b608c71fbed0
-RMD160 (libreoffice/libreoffice-dictionaries-6.0.3.2.tar.xz) = c8d17d128ac1de90ae468e35ad6baa769fe66c9c
-SHA512 (libreoffice/libreoffice-dictionaries-6.0.3.2.tar.xz) = 40dfd899bc9a2dd34531334bffead18a7446a0b86bf31370993646cbcebe64cf17a1fe1477045092546bda4cc5e5ce856444dc3c2dbf5594b894641758d6c205
-Size (libreoffice/libreoffice-dictionaries-6.0.3.2.tar.xz) = 41657048 bytes
-SHA1 (libreoffice/libreoffice-help-6.0.3.2.tar.xz) = 37bd99cd66d00a0c6bd3e9536616f83f24cc98ed
-RMD160 (libreoffice/libreoffice-help-6.0.3.2.tar.xz) = 0b9a68d9a6af3b1795d74b7af1b89b9fe8dd354b
-SHA512 (libreoffice/libreoffice-help-6.0.3.2.tar.xz) = cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
-Size (libreoffice/libreoffice-help-6.0.3.2.tar.xz) = 2972952 bytes
-SHA1 (libreoffice/libreoffice-translations-6.0.3.2.tar.xz) = bf1a29ec8adc9457de0a6703f202919a4543a1f2
-RMD160 (libreoffice/libreoffice-translations-6.0.3.2.tar.xz) = 93dd690be56fc9b419b546ddf213f5f65f15ae75
-SHA512 (libreoffice/libreoffice-translations-6.0.3.2.tar.xz) = 96d6ebdb22192590a15478146d4a784de82985664a5d5fac791b53199f2680923a15ffdcf2d900b67b2bcd481c86113c09e887109eb27e2bc8d4a1134eac0eb0
-Size (libreoffice/libreoffice-translations-6.0.3.2.tar.xz) = 139138536 bytes
+SHA1 (libreoffice/libreoffice-6.0.4.2.tar.xz) = d6e2d9037bffb81333b0ebd11258ec8966a2ea52
+RMD160 (libreoffice/libreoffice-6.0.4.2.tar.xz) = 8eb8615c635387f05a0a90f097cbbcb86bcf4885
+SHA512 (libreoffice/libreoffice-6.0.4.2.tar.xz) = 004cef88c1a6d908a519b8813562d4dd623c899608026aa603dd86012a3d0b9a5d776c05e0e2d7541c691f4a9fc6c4d62c278fe88627872a1c6f841bddc2736e
+Size (libreoffice/libreoffice-6.0.4.2.tar.xz) = 204556512 bytes
+SHA1 (libreoffice/libreoffice-dictionaries-6.0.4.2.tar.xz) = 10998a5cf9dafe1addf17e0f9c01a30bb5a5ede4
+RMD160 (libreoffice/libreoffice-dictionaries-6.0.4.2.tar.xz) = 2722c1a86906f038b4a9bbe23e1dade385d76317
+SHA512 (libreoffice/libreoffice-dictionaries-6.0.4.2.tar.xz) = e7b371e08ce48d53e2b9b565dade6663be0199d07cbe49af176352ec79b23d83370c7cf121b9a545d576eb7230da7960226f1eebd394700fd931100956984502
+Size (libreoffice/libreoffice-dictionaries-6.0.4.2.tar.xz) = 41653868 bytes
+SHA1 (libreoffice/libreoffice-help-6.0.4.2.tar.xz) = ed25496cf1269afc046d5c446641d4b32e23b5e2
+RMD160 (libreoffice/libreoffice-help-6.0.4.2.tar.xz) = e23552cd9df13183c3983d737d3e8d2b7668fd28
+SHA512 (libreoffice/libreoffice-help-6.0.4.2.tar.xz) = ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651
+Size (libreoffice/libreoffice-help-6.0.4.2.tar.xz) = 2972636 bytes
+SHA1 (libreoffice/libreoffice-translations-6.0.4.2.tar.xz) = 15c933088d7584b5fe2c12d1cc5fa95e5a7afc71
+RMD160 (libreoffice/libreoffice-translations-6.0.4.2.tar.xz) = 319889a5bcdb3892cd0f2bbe07006f997684ff61
+SHA512 (libreoffice/libreoffice-translations-6.0.4.2.tar.xz) = 470e1d9d17dcbd4cebd2429d0c2711ee1730be32178684b3128471387708a24b6ee357ea261ac36f6b6a5d8acbcb4fa1ea5c216186705edcb2406bc5cb765124
+Size (libreoffice/libreoffice-translations-6.0.4.2.tar.xz) = 139214448 bytes
 SHA1 (libreoffice/noto-fonts-20171024.tar.gz) = e775f61b4ed544198e9497b27b3460623d5560ca
 RMD160 (libreoffice/noto-fonts-20171024.tar.gz) = 02f8d0e2615032daf36dc375d00a2b4575d858a3
 SHA512 (libreoffice/noto-fonts-20171024.tar.gz) = 3888c5f19d85f9ae25413a064a27f01b87e09ba07b40f721b20e563bad3289a5c435686744dc3b52980625a24f82fa0b4b38046b4db971afc50a0cb3a757c179
@@ -228,8 +228,6 @@
 SHA1 (patch-lotuswordpro_source_filter_localtime.cxx) = 8db23e81f54b5a71e331dfccb57cceb8aab92d2a
 SHA1 (patch-mysqlc_Library__mysqlc.mk) = b040cfdb25f41896c77df3acafd4c31dc41dd590
 SHA1 (patch-opencl_source_openclconfig.cxx) = 2178f73aa08148cfd54d9a8c79eb29bf535f2e6b
-SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx) = 6df205a34db526938eccaa3190d3f9ef4a62d76a
-SHA1 (patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx) = 2c25420332c28768973aa15dae8fa57fbcf118b3
 SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d
 SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 2db5f3e7daabb2a79181de5e136de019d5264b58
 SHA1 (patch-vcl_inc_scrptrun.h) = 52877f7f6c867e2baeed525c200ce7d75a97574a
diff -r 3d28a108d9e2 -r aca8cdc55ca0 misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
--- a/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx     Thu May 10 20:05:36 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx,v 1.4 2018/04/30 04:46:17 ryoon Exp $
-
-* Fix build with poppler 0.64.0
-
---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2018-03-29 15:04:09.000000000 +0000
-+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -446,7 +446,7 @@ int PDFOutDev::parseFont( long long nNew
-     FontAttributes aNewFont;
-     int nSize = 0;
- 
--    GooString* pFamily = gfxFont->getName();
-+    GooString* pFamily = const_cast<GooString*>(gfxFont->getName());
-     if( pFamily )
-     {
-         aNewFont.familyName.clear();
-@@ -742,7 +742,7 @@ void PDFOutDev::updateFont(GfxState *sta
-         FontAttributes aFont;
-         int nEmbedSize=0;
- 
--        Ref* pID = gfxFont->getID();
-+        Ref* pID = const_cast<Ref*>(gfxFont->getID());
-         // TODO(Q3): Portability problem
-         long long fontID = (long long)pID->gen << 32 | (long long)pID->num;
-         std::unordered_map< long long, FontAttributes >::const_iterator it =
-@@ -932,7 +932,7 @@ void PDFOutDev::drawChar(GfxState *state
-     printf( "\n" );
- }
- 
--void PDFOutDev::drawString(GfxState*, GooString* /*s*/)
-+void PDFOutDev::drawString(GfxState*, const GooString* /*s*/)
- {
-     // TODO(F3): NYI
- }
diff -r 3d28a108d9e2 -r aca8cdc55ca0 misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx
--- a/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx     Thu May 10 20:05:36 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx,v 1.1 2018/04/30 04:46:17 ryoon Exp $
-
-* Fix build with poppler 0.64.0
-
---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig 2018-03-29 15:04:09.000000000 +0000
-+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -223,7 +223,7 @@ namespace pdfi
-                               double dx, double dy,
-                               double originX, double originY,
-                               CharCode code, int nBytes, Unicode *u, int uLen) override;
--        virtual void drawString(GfxState *state, GooString *s) override;
-+        virtual void drawString(GfxState *state, const GooString *s) override;
-         virtual void endTextObject(GfxState *state) override;
- 
-         //----- image drawing