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]

2 files changed, 0 insertions, 48 deletions

diff --git a/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx b/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
deleted file mode 100644
index fa0cd728edc..00000000000
--- a/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
+++ /dev/null
@@ -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 --git a/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx b/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx
deleted file mode 100644
index e7e12b2a06e..00000000000
--- a/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx
+++ /dev/null
@@ -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