Update to 6.0.1.1

* Fix build with GCC 6.4 (PostgreSQL part)

Changelog:
Bugs fixed compared to 6.0.0 RC3:
    deb#887593 add #include <abstractions/X> to oosplash apparmor profile [Vincas Dargis, Rene Engelhard]
    ofz#4728 bad-cast [Caolán McNamara]
    ofz#4753 bad-cast [Caolán McNamara]
    ofz#4767 bad-cast [Caolán McNamara]
    ofz#4817 bad-cast [Caolán McNamara]
    ofz#4848 bad-cast [Caolán McNamara]
    ofz#4872 bad-cast [Caolán McNamara]
    ofz#4971 bad-cast [Caolán McNamara]
    ofz#5007 bad-cast [Caolán McNamara]
    ofz#5235 bad-cast [Caolán McNamara]
    ofz#5254 bad-cast [Caolán McNamara]
    ofz#5435 sw: fix SwCache::Insert() stale pointers [Michael Stahl]
    ofz#5447 on plcf save force current Fkp to stick in cache [Caolán McNamara]
    ofz#5477 if the para is already oversize, nums would go negative [Caolán McNamara]
    ofz#5535 max decimal places for rtl_math_round is 20 [Caolán McNamara]
    ofz#5747 short->sal_Int32 like in StgDataStrm [Caolán McNamara]
    ofz#5909 bad-cast [Caolán McNamara]
    ofz#6064 bad-cast [Caolán McNamara]
    rhbz#1367846 Scrolling is way too fast in writer [Caolán McNamara]
    rhbz#1535541 mimetypes are .macroEnabled not .macroenabled [Caolán McNamara]
    rhbz#1541486 Base table creation dialog window title is shown in different languages [Stephan Bergmann]
    tdf#32935 CSV import dialog doesn't get focus if libreoffice is already running [Mike Kaganski]
    tdf#38915 Multiple soffice.bin soffice.exe [Mike Kaganski]
    tdf#49134 On opening a password-protected file, the LibreOffice dialog is not raised/given focus [Mike Kaganski]
    tdf#70425 EDITING: Embedded Firebird - Copying integer values from Calc to Base impossible [Tamas Bunth]
    tdf#75256 (Icon-Theme-Sifr) [META] Incomplete Sifr icon theme [Matthias Freund]
    tdf#88004 mimetypes are .macroEnabled not .macroenabled [Caolán McNamara]
    tdf#94225 Writer crashes on undo times N (steps in Comment 11 or Comment 38) [Fyodor Yemelyanenko]
    tdf#95024 Support for new Hungarian orthography [László Németh]
    tdf#103174 Very laggy scrolling with trackpad on hidpi screens [Caolán McNamara]
    tdf#103550 JIS function [Winfried Donkers]
    tdf#104016 FILEOPEN: RTF incorrect bullets indentation and spacing [Miklos Vajna]
    tdf#105226 AM/PM locale for it_IT incorrect [Winfried Donkers]
    tdf#106780 FILESAVE, ODF: attribute text:style-name is invalid in table:table-template [Abhishek Shrivastava]
    tdf#108473 Inserting into a Form Table Control Date/Time (Time) field gets stuck [Julien Nabet]
    tdf#109062 Scrolling with touchpad or scrollwheel is not working on Mac [Caolán McNamara]
    tdf#112292 Memory usage is steadily increasing every time when copying something to the clipboard even with 0 undo steps [Noel Grandin]
    tdf#113751 Borders for Merged Cells are Partially Shown [Armin Le Grand]
    tdf#114045 Undo after Clone Formatting changes formatting of entire table [Mark Hung]
    tdf#114173 FILESAVE XLSX Custom size of chart legend is not preserved when the file is saved as XLSX [Caolán McNamara]
    tdf#114182 FILESAVE XLSX Pie chart slice moved back by LibreOffice Calc [Markus Mohrhard]
    tdf#114217 DOCX with floating table having 100% width incorrectly imported [Mike Kaganski]
    tdf#114221 Calc corrupts password-protected XLS on save (Save as works) - newer MSO 2013 encryption saved as unencrypted file with encryption mode [Caolán McNamara]
    tdf#114306 fix unexpected page break in row-spanned table [Manfred Blume]
    tdf#114428 XHTML import: xml declaration results in plain text import into Writer [Miklos Vajna]
    tdf#114460 Some embedded PDFs not exported to pdf [Miklos Vajna]
    tdf#114466 Certain Document in Use dialog does not get focus [Mike Kaganski]
    tdf#114519 Sidebar Number Format drop down does not update cell contents on number format selection change [Jim Raykowski]
    tdf#114596 External forms for a database doesn't save data - closing form with dataloss [Michael Stahl]
    tdf#114625 Calc can not print right border of merged cells from LO 6.0 [Armin Le Grand]
    tdf#114677 Base Form titles incorrect [Szymon Kłos]
    tdf#114731 Firefox themes cannot be installed, it finds nothing [Julien Nabet]
    tdf#114815 Crash in: take_gil on paste from clipboard in Windows [Michael Stahl]
    tdf#114820 FILEOPEN XLSX VLOOKUP/HLOOKUP gives Error:504, with a reference to an external xlsx file cells [Bartosz Kosiorek]
    tdf#114824 Export to PDF and Printing: Borders of Merged Cells Flow to Page Footer [Armin Le Grand]
    tdf#114901 UI: TSCP Classification dialog: too much vertical white space and Part list too wide [Tomaž Vajngerl]
    tdf#114934 (borderline-regressions) [META] borderline regressions [Armin Le Grand]
    tdf#115013 Merge fields aren't substituted after saving/reopening DOC(X) with added mail merge fields, and running mail merge [Mike Kaganski]
    tdf#115044 Calc asks to update links, but already updated them [Vasily Melenchuk]
    tdf#115057 Color picker widget border missing when opened in dialog [Maxim Monastirsky]
    tdf#115065 Crash when dragging table with many rows to a table with less rows [Mike Kaganski]
    tdf#115080 Replace with Pattern Field misbehaves when editing a form's table control [Caolán McNamara]
    tdf#115088 Pasting multi-line text from external source behaves strangely [Tamás Zolnai]
    tdf#115090 Crashes when closing the document running the macro (itself) [Thorsten Behrens]
    tdf#115100 Assertion failed, if I set vertical align for gluepoint [Julien Nabet]
    tdf#115106 Screen corruption in Writer in FullScreen mode. (gtk2) [Caolán McNamara]
    tdf#115153 FILEOPEN: RTF: Incorrect vertical position of lines (follow-up) [Michael Stahl]
    tdf#115155 FILEOPEN: RTF: left indent is lost in second list [Miklos Vajna]
    tdf#115162 FILEOPEN XLSX SUMIFS, AVERAGEIFS, COUNTIFS, MAXIFS, MINIFS functions give Error:504, with reference to external xlsx files cells [Bartosz Kosiorek]
    tdf#115169 Calc: Rotated Cells not shown rotated when using Print/PDF/PrintPreview [Armin Le Grand]
    tdf#115208 Apparmor profile doesn't allow java execution [Olivier Tilloy]
    tdf#115221 PRINTING: CRASH immediately after choosing comment (+doc) printing in the print dialog [Noel Grandin]
    tdf#115269 LO Base Report Builder crashes on modifying Page Header Horizontal or Vertical alignment [Julien Nabet]
    tdf#115369 Icons for the cell's shadows positions are inverted [Caolán McNamara]
    tdf#115416 LibreOffice fails to build with IJG's libjpeg - error: ‘JCS_EXT_BGRA’ was not declared in this scope [Caolán McNamara]

4 files changed, 56 insertions, 33 deletions

diff --git a/misc/libreoffice/patches/patch-configure.ac b/misc/libreoffice/patches/patch-configure.ac
index 528a1aeedfa..1f4ec85ff35 100644
--- a/misc/libreoffice/patches/patch-configure.ac
+++ b/misc/libreoffice/patches/patch-configure.ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure.ac,v 1.9 2018/02/03 00:39:50 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.10 2018/02/13 13:03:07 ryoon Exp $
 
---- configure.ac.orig	2018-01-24 20:31:03.000000000 +0000
+--- configure.ac.orig	2018-02-08 14:35:19.000000000 +0000
 +++ configure.ac
 @@ -5852,14 +5852,14 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG
          ], [AC_MSG_RESULT([no])])
@@ -43,16 +43,16 @@ $NetBSD: patch-configure.ac,v 1.9 2018/02/03 00:39:50 ryoon Exp $
  
  if test "$COM" = "MSC"; then # override the above
      GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
-@@ -10120,7 +10120,7 @@ fi
- AC_SUBST(ENABLE_PDFIUM)
- 
+@@ -10122,7 +10122,7 @@ AC_SUBST(ENABLE_PDFIUM)
  SYSTEM_GPGMEPP=
--if test "$_os" = "Linux" -o "$_os" = "Darwin" \
-+if test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "NetBSD" \
+ if test "$enable_mpl_subset" = "yes" ; then
+    :
+-elif test "$_os" = "Linux" -o "$_os" = "Darwin" \
++elif test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "NetBSD" \
     -o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" \) \
     -o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = "x86" \) ; then
      dnl ===================================================================
-@@ -10132,7 +10132,7 @@ if test "$_os" = "Linux" -o "$_os" = "Da
+@@ -10134,7 +10134,7 @@ elif test "$_os" = "Linux" -o "$_os" = "
          SYSTEM_GPGMEPP=TRUE
  
          # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
@@ -61,7 +61,7 @@ $NetBSD: patch-configure.ac,v 1.9 2018/02/03 00:39:50 ryoon Exp $
              [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp development package])], [])
          # progress_callback is the only func with plain C linkage
          # checking for it also filters out older, KDE-dependent libgpgmepp versions
-@@ -11518,8 +11518,8 @@ EOF
+@@ -11520,8 +11520,8 @@ EOF
      dnl Checking for ant.jar
      if test "$ANT_HOME" != "NO_ANT_HOME"; then
          AC_MSG_CHECKING([Ant lib directory])
diff --git a/misc/libreoffice/patches/patch-external_postgresql_UnpackedTarball__postgresql.mk b/misc/libreoffice/patches/patch-external_postgresql_UnpackedTarball__postgresql.mk
new file mode 100644
index 00000000000..b5637947ced
--- /dev/null
+++ b/misc/libreoffice/patches/patch-external_postgresql_UnpackedTarball__postgresql.mk
@@ -0,0 +1,12 @@
+$NetBSD: patch-external_postgresql_UnpackedTarball__postgresql.mk,v 1.1 2018/02/13 13:03:07 ryoon Exp $
+
+--- external/postgresql/UnpackedTarball_postgresql.mk.orig	2018-02-08 14:35:19.000000000 +0000
++++ external/postgresql/UnpackedTarball_postgresql.mk
+@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_pat
+ 	external/postgresql/postgresql-libs-leak.patch \
+ 	external/postgresql/postgresql-9.2.1-autoreconf.patch \
+ 	external/postgresql/postgresql-9.2.1-libreoffice.patch \
++	external/postgresql/postgresql-9.2.1-openssl-1.1.patch \
+ ))
+ 
+ ifeq ($(SYSTEM_ZLIB),)
diff --git a/misc/libreoffice/patches/patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch b/misc/libreoffice/patches/patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch
new file mode 100644
index 00000000000..039f36f0f21
--- /dev/null
+++ b/misc/libreoffice/patches/patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch
@@ -0,0 +1,35 @@
+$NetBSD: patch-external_postgresql_postgresql-9.2.1-openssl-1.1.patch,v 1.1 2018/02/13 13:03:07 ryoon Exp $
+
+--- external/postgresql/postgresql-9.2.1-openssl-1.1.patch.orig	2018-02-12 23:06:25.715483454 +0000
++++ external/postgresql/postgresql-9.2.1-openssl-1.1.patch
+@@ -0,0 +1,30 @@
++--- misc/build/postgresql-9.2.1/configure.orig	2012-09-19 21:47:58.000000000 +0000
+++++ misc/build/postgresql-9.2.1/configure
++@@ -9106,11 +9144,11 @@ cat >>conftest.$ac_ext <<_ACEOF
++ #ifdef __cplusplus
++ extern "C"
++ #endif
++-char SSL_library_init ();
+++char SSL_CTX_new ();
++ int
++ main ()
++ {
++-return SSL_library_init ();
+++return SSL_CTX_new ();
++   ;
++   return 0;
++ }
++@@ -9275,11 +9313,11 @@ cat >>conftest.$ac_ext <<_ACEOF
++ #ifdef __cplusplus
++ extern "C"
++ #endif
++-char SSL_library_init ();
+++char SSL_CTX_new ();
++ int
++ main ()
++ {
++-return SSL_library_init ();
+++return SSL_CTX_new ();
++   ;
++   return 0;
++ }
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 88ac72c7339..00000000000
--- a/misc/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx,v 1.2 2018/02/03 00:39:50 ryoon Exp $
-
-* Fix build with poppler-0.62.0
-
---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig	2018-01-24 20:31:03.000000000 +0000
-+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -36,7 +36,7 @@
- // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
- //        because the internal poppler does not provide poppler-version.h and the macro always returns 0
- #if POPPLER_CHECK_VERSION(0, 21, 1)
--#include <UTF8.h>
-+#include <UnicodeMapFuncs.h>
- #elif POPPLER_CHECK_VERSION(0, 21, 0)
- #include "UTF.h"
- #else
-@@ -913,7 +913,7 @@ void PDFOutDev::drawChar(GfxState *state
-             );
- 
-     // silence spurious warning
--    (void)&mapUCS2;
-+    (void)&mapUTF16;
- 
-     char buf[9];
-     for( int i=0; i<uLen; ++i )