diff --git a/app-office/libreoffice/libreoffice-6.3.3.2.recipe b/app-office/libreoffice/libreoffice-6.4.1.1.recipe similarity index 96% rename from app-office/libreoffice/libreoffice-6.3.3.2.recipe rename to app-office/libreoffice/libreoffice-6.4.1.1.recipe index 3c72e83a6..c672d6072 100644 --- a/app-office/libreoffice/libreoffice-6.3.3.2.recipe +++ b/app-office/libreoffice/libreoffice-6.4.1.1.recipe @@ -15,22 +15,21 @@ and Open Source office suite on the market: - Base (databases) - Math (formula editing)" HOMEPAGE="https://www.libreoffice.org/" -COPYRIGHT="2000-2019 LibreOffice contributors" +COPYRIGHT="2000-2020 LibreOffice contributors" LICENSE="MPL v2.0" REVISION="1" SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz" SOURCE_DIR="core-libreoffice-$portVersion" -CHECKSUM_SHA256="5773f66670c5f45523b5103e7de46fd27036c656537a751a8a5f301468ba970e" +CHECKSUM_SHA256="afd745af76e532dea26d7660f69c65e68978f33ea0398b9fddb41e4f5692c877" SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/libreoffice-$portVersion.tar.gz" -CHECKSUM_SHA256_2="d0cb9f61bd8a86092817533592531d9266cba8e905b4b30fb6ce7d831c07cbb0" +CHECKSUM_SHA256_2="b296d4ef0305b830843f4f433b022404b0bc809464367c05de1e35af8fced10e" SOURCE_DIR_2="translations-libreoffice-$portVersion" SOURCE_FILENAME_2="translations-libreoffice-$portVersion.tar.gz" PATCHES=" libreoffice-$portVersion.patchset - libreoffice_mdds-1.5.0.patchset " ADDITIONAL_FILES=" libreoffice.iom @@ -211,6 +210,7 @@ BUILD_REQUIRES=" devel:liborcus_0.15$secondaryArchSuffix devel:libpagemaker_0.0$secondaryArchSuffix devel:libpoppler$secondaryArchSuffix + devel:libqrcodegen$secondaryArchSuffix devel:libqxp_0.0$secondaryArchSuffix devel:libraptor2$secondaryArchSuffix devel:librdf$secondaryArchSuffix @@ -267,9 +267,6 @@ PATCH() BUILD() { - # TODO: enable commented out stuff when there is a "stable" release - # currently there are too many things in flux to waste space - # rename $sourceDir to something shorter, otherwise build fails with # execv: Argument too big /sources/core/sw/Library_sw.mk:20 cd .. ; mv core-libreoffice-$portVersion core @@ -284,7 +281,7 @@ BUILD() ./autogen.sh \ --with-distro=LibreOfficeHaiku \ - --enable-kde5 \ + --enable-kf5 \ --enable-qt5 \ --enable-release-build \ --enable-readonly-installset \ diff --git a/app-office/libreoffice/patches/libreoffice-6.3.3.2.patchset b/app-office/libreoffice/patches/libreoffice-6.4.1.1.patchset similarity index 71% rename from app-office/libreoffice/patches/libreoffice-6.3.3.2.patchset rename to app-office/libreoffice/patches/libreoffice-6.4.1.1.patchset index baa046653..76a782df5 100644 --- a/app-office/libreoffice/patches/libreoffice-6.3.3.2.patchset +++ b/app-office/libreoffice/patches/libreoffice-6.4.1.1.patchset @@ -1,37 +1,38 @@ -From 5f113b2ae2e6e84d39f93d24293ce80a508aa217 Mon Sep 17 00:00:00 2001 +From bdf798e420f02bcb9c601433a0d5d5efef0865b4 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov -Date: Wed, 24 Oct 2018 17:00:02 +0300 +Date: Sat, 15 Feb 2020 14:52:59 +0300 Subject: Make Elementary the default on Haiku diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx -index c4e60fd..81490ed 100644 +index 696d5ab..33971bc 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx -@@ -54,6 +54,8 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi +@@ -58,6 +58,9 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi #ifdef _WIN32 (void)desktopEnvironment; - return OUString("colibre"); + return "colibre"; +#elif defined(__HAIKU__) -+ return OUString("elementary"); ++ (void)desktopEnvironment; ++ return "elementary"; #else OUString r; - if ( desktopEnvironment.equalsIgnoreAsciiCase("kde5") || + if ( desktopEnvironment.equalsIgnoreAsciiCase("plasma5") || -- -2.21.0 +2.24.1 -From f7e3677000d2734ddecd3b281da949888f6671f4 Mon Sep 17 00:00:00 2001 +From bb86d253630f3b94c9f7143b6b7192ff605ff2ee Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 24 Oct 2018 17:01:09 +0300 Subject: Show used vcl backend on Haiku diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx -index d087a15..6613105 100644 +index c4c3be9..119380d 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx -@@ -1163,7 +1163,7 @@ OUString Application::GetHWOSConfInfo() +@@ -1155,7 +1155,7 @@ OUString Application::GetHWOSConfInfo() aDetails.append( VclResId(SV_APP_DEFAULT) ); aDetails.append( "; " ); @@ -41,20 +42,20 @@ index d087a15..6613105 100644 aDetails.append( GetToolkitName() ); aDetails.append( "; " ); -- -2.21.0 +2.24.1 -From 5bb186abfc2e6d561a78d17da02a39f1de8cc947 Mon Sep 17 00:00:00 2001 +From 8620060cdf42280c16a9271c516d94b2b1327eb5 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 24 Oct 2018 17:01:34 +0300 Subject: Identify Haiku in about window diff --git a/vcl/unx/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx -index dff6ff0..0901bdb 100644 +index b661163..329265a 100644 --- a/vcl/unx/generic/app/geninst.cxx +++ b/vcl/unx/generic/app/geninst.cxx -@@ -76,6 +76,8 @@ OUString SalGenericInstance::getOSVersion() +@@ -70,6 +70,8 @@ OUString SalGenericInstance::getOSVersion() } fclose( pVersion ); } @@ -64,10 +65,10 @@ index dff6ff0..0901bdb 100644 return aKernelVer; } -- -2.21.0 +2.24.1 -From f17d884a8ecc6a83fffcf7cc564de88506861d89 Mon Sep 17 00:00:00 2001 +From 605aa6b11f2f247fe3277fea9e92f1d445a9c43b Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 24 Oct 2018 17:02:04 +0300 Subject: Workaround a crash on quit. See Haiku #13159 @@ -101,23 +102,23 @@ index 643c42a..d4b47cb 100644 return ret; } -- -2.21.0 +2.24.1 -From 099c88f1676ae5ed00c70dd29de6a045b59529df Mon Sep 17 00:00:00 2001 +From 47b0273f5ef2443b153713eee163ea3b5a5c2bb1 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov -Date: Wed, 21 Nov 2018 13:39:14 +0300 +Date: Sat, 15 Feb 2020 15:04:53 +0300 Subject: Implement ShellExec on Haiku diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx -index 7355eae..3e8788d 100644 +index 3daea4a..d114d79 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx -@@ -173,6 +173,9 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar - // Results in "The file /.../foo:bar does not exits." (where "/..." is - // the CWD) on stderr and SystemShellExecuteException. - aBuffer.append("open --"); +@@ -180,6 +180,9 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar + aBuffer.append(" -R"); + } + aBuffer.append(" --"); + +#elif __HAIKU__ + aBuffer.append("open"); @@ -125,17 +126,17 @@ index 7355eae..3e8788d 100644 // Just use xdg-open on non-Mac aBuffer.append("/usr/bin/xdg-open"); -- -2.21.0 +2.24.1 -From d4fae787dc5055dd11f2bfb866bb4c6546d2ae1c Mon Sep 17 00:00:00 2001 +From fe6a9cd7144b182fde0e5119c86fed2dc1ec275f Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 20 Jul 2019 01:18:50 +0300 Subject: Comment out linking with pthread diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk -index 1d6b38c..6a50da3 100644 +index 8854aab..f0489a8 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -45,9 +45,9 @@ gb_CFLAGS := \ @@ -152,20 +153,20 @@ index 1d6b38c..6a50da3 100644 gb_CXXFLAGS := \ $(gb_CXXFLAGS_COMMON) \ -- -2.21.0 +2.24.1 -From 66176185412c45eb22d9307041988ec4e8c64a2b Mon Sep 17 00:00:00 2001 +From b3289a50fa549dc1266e3b1173c436cecd658cfc Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 11 Aug 2019 11:46:49 +1000 Subject: Workaround for ambiguous methods diff --git a/include/o3tl/sorted_vector.hxx b/include/o3tl/sorted_vector.hxx -index 35882ab..c5d0386 100644 +index 088f5a2..1288061 100644 --- a/include/o3tl/sorted_vector.hxx +++ b/include/o3tl/sorted_vector.hxx -@@ -80,6 +80,17 @@ public: +@@ -92,6 +92,17 @@ public: return 0; } @@ -184,7 +185,7 @@ index 35882ab..c5d0386 100644 { m_vector.erase(m_vector.begin() + index); diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx -index 9431c46..f48d8d9 100644 +index 8636d6b..0defdfc 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -375,7 +375,7 @@ void ScAttrArray::RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 n @@ -197,17 +198,17 @@ index 9431c46..f48d8d9 100644 pPatternAttr->GetItemSet().Put( aItem ); SetPatternArea( nTempStartRow, nTempEndRow, std::move(pPatternAttr), true ); -- -2.21.0 +2.24.1 -From 79a55ca412cc07bf6e9761c5a8ce23f4b6a2907f Mon Sep 17 00:00:00 2001 +From a97f516acd57bc2300676fdb97b141b37b0a584a Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 11 Aug 2019 11:47:40 +1000 Subject: Add XP_HAIKU defs for xmlsec diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk -index 64e2feb..f60f43b 100644 +index c49417d..ec75755 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -95,6 +95,12 @@ $(eval $(call gb_Library_use_system_win32_libs,svl,\ @@ -224,7 +225,7 @@ index 64e2feb..f60f43b 100644 $(eval $(call gb_Library_add_defs,svl,\ -DSVL_CRYPTO_MSCRYPTO \ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk -index f067e14..62fc24e 100644 +index bd2cb6a..9d6a90c 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -116,6 +116,12 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ @@ -241,28 +242,20 @@ index f067e14..62fc24e 100644 $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ $(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \ -- -2.21.0 +2.24.1 -From 3fd2780182e2b80d8ff41744a2e33d6113c9da94 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 11 Aug 2019 11:48:38 +1000 +From ffc0940ccf620127f264fe2307a5e3c0539b9c25 Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +Date: Sat, 15 Feb 2020 15:08:51 +0300 Subject: Cast to boolean diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx -index f6e18a5..4405871 100644 +index 8a57f55..4835901 100644 --- a/vcl/source/filter/jpeg/jpegc.cxx +++ b/vcl/source/filter/jpeg/jpegc.cxx -@@ -24,6 +24,7 @@ - #include - #include - #include -+//#include - #include - #include - -@@ -166,13 +167,13 @@ static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputS +@@ -163,13 +163,13 @@ static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputS rContext.aOwner.set(&rContext.cinfo); jpeg_svstream_src(&rContext.cinfo, pInputStream); SourceManagerStruct *source = reinterpret_cast(rContext.cinfo.src); @@ -279,7 +272,7 @@ index f6e18a5..4405871 100644 /* change scale for preview import */ long nPreviewWidth = previewSize.Width(); -@@ -207,8 +208,8 @@ static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputS +@@ -204,8 +204,8 @@ static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputS if (rContext.cinfo.scale_denom > 1) { rContext.cinfo.dct_method = JDCT_FASTEST; @@ -290,7 +283,7 @@ index f6e18a5..4405871 100644 } } -@@ -397,7 +398,7 @@ bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream, +@@ -394,7 +394,7 @@ bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream, } jpeg_set_defaults( &cinfo ); @@ -299,7 +292,7 @@ index f6e18a5..4405871 100644 cinfo.density_unit = 1; cinfo.X_density = rPPI.getX(); -@@ -422,7 +423,7 @@ bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream, +@@ -419,7 +419,7 @@ bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream, cinfo.comp_info[0].v_samp_factor = 2; } @@ -308,7 +301,7 @@ index f6e18a5..4405871 100644 for( nY = 0; nY < nHeight; nY++ ) { -@@ -457,10 +458,10 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle) +@@ -454,10 +454,10 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle) jvirt_barray_ptr* aSourceCoefArrays = nullptr; jvirt_barray_ptr* aDestinationCoefArrays = nullptr; @@ -323,7 +316,7 @@ index f6e18a5..4405871 100644 // Angle to transform option // 90 Clockwise = 270 Counterclockwise -@@ -489,7 +490,7 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle) +@@ -486,7 +486,7 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle) aDestinationInfo.err->error_exit = errorExit; aDestinationInfo.err->output_message = outputMessage; @@ -332,7 +325,7 @@ index f6e18a5..4405871 100644 JpegDecompressOwner aDecompressOwner; JpegCompressOwner aCompressOwner; -@@ -509,7 +510,7 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle) +@@ -506,7 +506,7 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle) jpeg_svstream_src (&aSourceInfo, pInputStream); jcopy_markers_setup(&aSourceInfo, aCopyOption); @@ -341,7 +334,7 @@ index f6e18a5..4405871 100644 jtransform_request_workspace(&aSourceInfo, &aTransformOption); aSourceCoefArrays = jpeg_read_coefficients(&aSourceInfo); -@@ -519,7 +520,7 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle) +@@ -516,7 +516,7 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle) jpeg_svstream_dest (&aDestinationInfo, pOutputStream); // Compute optimal Huffman coding tables instead of precomputed tables @@ -351,5 +344,59 @@ index f6e18a5..4405871 100644 jcopy_markers_execute(&aSourceInfo, &aDestinationInfo, aCopyOption); jtransform_execute_transformation(&aSourceInfo, &aDestinationInfo, aSourceCoefArrays, &aTransformOption); -- -2.21.0 +2.24.1 + + +From 6655aa52e139829e04b1dbd2cc94f44361926e3b Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +Date: Sat, 15 Feb 2020 17:45:08 +0300 +Subject: Revert fstack-protector check removal + + +diff --git a/config_host.mk.in b/config_host.mk.in +index e621a4e..baf620f 100644 +--- a/config_host.mk.in ++++ b/config_host.mk.in +@@ -244,6 +244,7 @@ export USING_X11=@USING_X11@ + export HAMCREST_JAR=@HAMCREST_JAR@ + export HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED=@HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED@ + export HAVE_GCC_AVX=@HAVE_GCC_AVX@ ++export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@ + export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@ + export HAVE_GCC_BUILTIN_FFS=@HAVE_GCC_BUILTIN_FFS@ + export HAVE_GCC_FNO_ENFORCE_EH_SPECS=@HAVE_GCC_FNO_ENFORCE_EH_SPECS@ +diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk +index 712a61d..2c3d5f1 100644 +--- a/solenv/gbuild/platform/com_GCC_defs.mk ++++ b/solenv/gbuild/platform/com_GCC_defs.mk +@@ -67,7 +67,6 @@ gb_CFLAGS_COMMON := \ + -fmessage-length=0 \ + -fno-common \ + -pipe \ +- -fstack-protector-strong \ + + gb_CXXFLAGS_COMMON := \ + -Wall \ +@@ -82,7 +81,6 @@ gb_CXXFLAGS_COMMON := \ + -fmessage-length=0 \ + -fno-common \ + -pipe \ +- -fstack-protector-strong \ + + gb_CXXFLAGS_DISABLE_WARNINGS = -w + +@@ -136,7 +134,11 @@ endif + gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden + gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX) + ++ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE) ++gb_CFLAGS_COMMON += -fstack-protector-strong ++gb_CXXFLAGS_COMMON += -fstack-protector-strong + gb_LinkTarget_LDFLAGS += -fstack-protector-strong ++endif + + ifneq ($(ENABLE_PCH),) + ifeq ($(COM_IS_CLANG),TRUE) +-- +2.24.1 diff --git a/app-office/libreoffice/patches/libreoffice_mdds-1.5.0.patchset b/app-office/libreoffice/patches/libreoffice_mdds-1.5.0.patchset deleted file mode 100644 index 0d9185d6f..000000000 --- a/app-office/libreoffice/patches/libreoffice_mdds-1.5.0.patchset +++ /dev/null @@ -1,425 +0,0 @@ -From cd0b924fe47f5bdb34a399ea54e224e2e8b7e9e0 Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida -Date: Sat, 2 Nov 2019 22:52:27 +1000 -Subject: Switch mdds to 1.5.0 and liborcus to 0.15.0. - - -diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk -index a75ca50..1c6c0c5 100644 ---- a/RepositoryExternal.mk -+++ b/RepositoryExternal.mk -@@ -3262,7 +3262,7 @@ $(call gb_LinkTarget_set_include,$(1),\ - ) - - $(call gb_LinkTarget_add_libs,$(1),\ -- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.14 \ -+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.15 \ - ) - - $(if $(SYSTEM_BOOST), \ -@@ -3281,7 +3281,7 @@ $(call gb_LinkTarget_set_include,$(1),\ - ) - - $(call gb_LinkTarget_add_libs,$(1),\ -- -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.14 \ -+ -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.15 \ - ) - - endef -diff --git a/configure.ac b/configure.ac -index e318a5b..e5f803f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9269,7 +9269,7 @@ AC_SUBST(SYSTEM_BOOST) - dnl =================================================================== - dnl Check for system mdds - dnl =================================================================== --libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.4 >= 1.4.1], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) -+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.5 >= 1.5.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) - - dnl =================================================================== - dnl Check for system glm -@@ -9575,7 +9575,7 @@ AC_SUBST(ENABLE_FUZZERS) - dnl =================================================================== - dnl Orcus - dnl =================================================================== --libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.14 >= 0.14.0]) -+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.15 >= 0.15.0]) - if test "$with_system_orcus" != "yes"; then - if test "$SYSTEM_BOOST" = "TRUE"; then - # =========================================================== -diff --git a/download.lst b/download.lst -index 19e6e9a..cbedee5 100644 ---- a/download.lst -+++ b/download.lst -@@ -168,8 +168,8 @@ export LXML_SHA256SUM := 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a - export LXML_TARBALL := lxml-4.1.1.tgz - export MARIADB_CONNECTOR_C_SHA256SUM := fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 - export MARIADB_CONNECTOR_C_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz --export MDDS_SHA256SUM := 25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81 --export MDDS_TARBALL := mdds-1.4.3.tar.bz2 -+export MDDS_SHA256SUM := 74cda018d5aa39a2f91652608efb066fd225f3597ce54733e6ab1e99e52606f7 -+export MDDS_TARBALL := mdds-1.5.0.tar.bz2 - export MDNSRESPONDER_SHA256SUM := e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0 - export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz - export MSPUB_SHA256SUM := ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba -@@ -194,8 +194,8 @@ export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89 - export OPENLDAP_TARBALL := openldap-2.4.45.tgz - export OPENSSL_SHA256SUM := 14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc - export OPENSSL_TARBALL := openssl-1.0.2t.tar.gz --export ORCUS_SHA256SUM := 3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f --export ORCUS_TARBALL := liborcus-0.14.1.tar.gz -+export ORCUS_SHA256SUM := 06ec7567896d76ca579efada794cc281a5d6b427195def01cbcfd79795e8a944 -+export ORCUS_TARBALL := liborcus-0.15.0.tar.gz - export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb - export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz - export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d -diff --git a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch b/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch -deleted file mode 100644 -index 3353857..0000000 ---- a/external/liborcus/0001-Prevent-unsigned-integer-underflow.patch -+++ /dev/null -@@ -1,27 +0,0 @@ --From 1967be013804f4f578b53659d7ef459b4c35de9f Mon Sep 17 00:00:00 2001 --From: Kohei Yoshida --Date: Wed, 7 Nov 2018 21:08:40 -0500 --Subject: [PATCH] Prevent unsigned integer underflow. -- --(cherry picked from commit 40bbce85048b77c545103af124f3d9831dd4a458) ----- -- src/parser/parser_base.cpp | 3 ++- -- 1 file changed, 2 insertions(+), 1 deletion(-) -- --diff --git a/src/parser/parser_base.cpp b/src/parser/parser_base.cpp --index 586d495f..9d426efb 100644 ----- a/src/parser/parser_base.cpp --+++ b/src/parser/parser_base.cpp --@@ -120,7 +120,8 @@ double parser_base::parse_double() -- -- size_t parser_base::remaining_size() const -- { --- return std::distance(mp_char, mp_end) - 1; --+ size_t n = std::distance(mp_char, mp_end); --+ return n ? (n - 1) : 0; -- } -- -- std::ptrdiff_t parser_base::offset() const ---- --2.17.1 -- -diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk -index ffa0b38..21dd1bf 100644 ---- a/external/liborcus/ExternalPackage_liborcus.mk -+++ b/external/liborcus/ExternalPackage_liborcus.mk -@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus)) - $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus)) - - ifeq ($(OS),MACOSX) --$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.0.dylib,src/liborcus/.libs/liborcus-0.14.0.dylib)) --$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.14.0.dylib,src/parser/.libs/liborcus-parser-0.14.0.dylib)) -+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.0.dylib,src/liborcus/.libs/liborcus-0.15.0.dylib)) -+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.15.0.dylib,src/parser/.libs/liborcus-parser-0.15.0.dylib)) - else ifeq ($(DISABLE_DYNLOADING),) --$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.14.so.0,src/liborcus/.libs/liborcus-0.14.so.0.0.0)) --$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.14.so.0,src/parser/.libs/liborcus-parser-0.14.so.0.0.0)) -+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.15.so.0,src/liborcus/.libs/liborcus-0.15.so.0.0.0)) -+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.15.so.0,src/parser/.libs/liborcus-parser-0.15.so.0.0.0)) - endif - - # vim: set noet sw=4 ts=4: -diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk -index 8cc1c03..0bd36c3 100644 ---- a/external/liborcus/ExternalProject_liborcus.mk -+++ b/external/liborcus/ExternalProject_liborcus.mk -@@ -122,8 +122,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : - $(MAKE) \ - $(if $(filter MACOSX,$(OS)),\ - && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ -- $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.14.0.dylib \ -- $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.14.0.dylib \ -+ $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.15.0.dylib \ -+ $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.15.0.dylib \ - ) \ - ) - -diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk -index 32367b8..d25d821 100644 ---- a/external/liborcus/Library_orcus-parser.mk -+++ b/external/liborcus/Library_orcus-parser.mk -@@ -13,6 +13,7 @@ $(eval $(call gb_Library_use_unpacked,orcus-parser,liborcus)) - - $(eval $(call gb_Library_use_externals,orcus-parser,\ - boost_headers \ -+ boost_filesystem \ - boost_system \ - mdds_headers \ - zlib \ -@@ -22,6 +23,7 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus-parser)) - - $(eval $(call gb_Library_set_include,orcus-parser,\ - -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \ -+ -I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \ - $$(INCLUDE) \ - )) - -diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk -index 2b20cdf..3793805 100644 ---- a/external/liborcus/Library_orcus.mk -+++ b/external/liborcus/Library_orcus.mk -@@ -24,6 +24,7 @@ $(eval $(call gb_Library_set_warnings_disabled,orcus)) - - $(eval $(call gb_Library_set_include,orcus,\ - -I$(call gb_UnpackedTarball_get_dir,liborcus)/include \ -+ -I$(call gb_UnpackedTarball_get_dir,liborcus)/src/include \ - $$(INCLUDE) \ - )) - -@@ -68,6 +69,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ - UnpackedTarball/liborcus/src/liborcus/info \ - UnpackedTarball/liborcus/src/liborcus/interface \ - UnpackedTarball/liborcus/src/liborcus/json_document_tree \ -+ UnpackedTarball/liborcus/src/liborcus/json_map_tree \ -+ UnpackedTarball/liborcus/src/liborcus/json_structure_mapper \ -+ UnpackedTarball/liborcus/src/liborcus/json_structure_tree \ - UnpackedTarball/liborcus/src/liborcus/json_util \ - UnpackedTarball/liborcus/src/liborcus/measurement \ - UnpackedTarball/liborcus/src/liborcus/odf_helper \ -@@ -92,12 +96,15 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\ - UnpackedTarball/liborcus/src/liborcus/orcus_gnumeric \ - UnpackedTarball/liborcus/src/liborcus/orcus_import_ods \ - UnpackedTarball/liborcus/src/liborcus/orcus_import_xlsx \ -+ UnpackedTarball/liborcus/src/liborcus/orcus_json \ - UnpackedTarball/liborcus/src/liborcus/orcus_ods \ - UnpackedTarball/liborcus/src/liborcus/orcus_xls_xml \ - UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \ - UnpackedTarball/liborcus/src/liborcus/orcus_xml \ -+ UnpackedTarball/liborcus/src/liborcus/orcus_xml_map_def \ - UnpackedTarball/liborcus/src/liborcus/session_context \ - UnpackedTarball/liborcus/src/liborcus/spreadsheet_iface_util \ -+ UnpackedTarball/liborcus/src/liborcus/spreadsheet_impl_types \ - UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \ - UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \ - UnpackedTarball/liborcus/src/liborcus/string_helper \ -diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk -index e1d810a..74fbbb2 100644 ---- a/external/liborcus/UnpackedTarball_liborcus.mk -+++ b/external/liborcus/UnpackedTarball_liborcus.mk -@@ -19,12 +19,9 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus)) - # "Remove unused - # VERSION file": - $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ -- external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \ - external/liborcus/rpath.patch.0 \ - external/liborcus/gcc9.patch.0 \ -- external/liborcus/version.patch.0 \ - external/liborcus/libtool.patch.0 \ -- external/liborcus/0001-Prevent-unsigned-integer-underflow.patch \ - )) - - ifeq ($(OS),WNT) -diff --git a/external/liborcus/version.patch.0 b/external/liborcus/version.patch.0 -deleted file mode 100644 -index 2c0b5ae..0000000 ---- a/external/liborcus/version.patch.0 -+++ /dev/null -@@ -1,11 +0,0 @@ ----- configure --+++ configure --@@ -21055,7 +21055,7 @@ -- -- fi -- ---ac_config_files="$ac_config_files Makefile liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in VERSION include/Makefile include/orcus/Makefile include/orcus/detail/Makefile include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile parser_handlers/Makefile benchmark/Makefile doc_example/Makefile" --+ac_config_files="$ac_config_files Makefile liborcus-$ORCUS_API_VERSION.pc:liborcus.pc.in liborcus-spreadsheet-model-$ORCUS_API_VERSION.pc:liborcus-spreadsheet-model.pc.in include/Makefile include/orcus/Makefile include/orcus/detail/Makefile include/orcus/mso/Makefile include/orcus/spreadsheet/Makefile src/Makefile src/liborcus/Makefile src/liborcus/constants.inl src/mso/Makefile src/parser/Makefile src/python/Makefile src/spreadsheet/Makefile parser_handlers/Makefile benchmark/Makefile doc_example/Makefile" -- -- cat >confcache <<\_ACEOF -- # This file is a shell script that caches the results of configure -diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx -index 407f039..382fb4d 100644 ---- a/sc/inc/mtvelements.hxx -+++ b/sc/inc/mtvelements.hxx -@@ -52,9 +52,9 @@ const mdds::mtv::element_t element_type_formula = mdds::mtv::element_type_user_s - const mdds::mtv::element_t element_type_cellnote = mdds::mtv::element_type_user_start + 5; - - /// Mapped standard element types (for convenience). --const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_numeric; -+const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_double; - const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty; --const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_ushort; -+const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_uint16; - - /// Custom element blocks. - -@@ -66,8 +66,8 @@ typedef mdds::mtv::noncopyable_managed_element_block formula_block; - - /// Mapped standard element blocks (for convenience). --typedef mdds::mtv::numeric_element_block numeric_block; --typedef mdds::mtv::ushort_element_block uint16_block; -+typedef mdds::mtv::double_element_block numeric_block; -+typedef mdds::mtv::uint16_element_block uint16_block; - - /// This needs to be in the same namespace as CellTextAttr. - MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr, CellTextAttr(), celltextattr_block) -diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx -index b635eca..d292134 100644 ---- a/sc/inc/orcusxml.hxx -+++ b/sc/inc/orcusxml.hxx -@@ -70,6 +70,7 @@ struct ScOrcusImportXMLParam - { - ScAddress maPos; - std::vector maFieldPaths; -+ std::vector maRowGroups; - }; - - typedef std::vector CellLinksType; -diff --git a/sc/qa/unit/dataproviders_test.cxx b/sc/qa/unit/dataproviders_test.cxx -index 1e9cf97..a9b6b11 100644 ---- a/sc/qa/unit/dataproviders_test.cxx -+++ b/sc/qa/unit/dataproviders_test.cxx -@@ -156,6 +156,7 @@ void ScDataProvidersTest::testXMLImport() - aRangeLink.maPos = ScAddress(0,0,0); - aRangeLink.maFieldPaths.push_back("/bookstore/book/title"); - aRangeLink.maFieldPaths.push_back("/bookstore/book/author"); -+ aRangeLink.maRowGroups.push_back("/bookstore/book"); - aParam.maRangeLinks.push_back(aRangeLink); - - createFileURL("test1.", "xml", aFileURL); -diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx -index 0291c84..9eaa14f 100644 ---- a/sc/source/core/tool/scmatrix.cxx -+++ b/sc/source/core/tool/scmatrix.cxx -@@ -1935,8 +1935,8 @@ public: - { - case mdds::mtm::element_numeric: - { -- numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data); -- numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data); -+ double_element_block::const_iterator it = double_element_block::begin(*node.data); -+ double_element_block::const_iterator itEnd = double_element_block::end(*node.data); - for (; it != itEnd; ++it, ++miPos) - *miPos = *it; - } -@@ -2012,8 +2012,8 @@ public: - { - case mdds::mtm::element_numeric: - { -- numeric_element_block::const_iterator it = numeric_element_block::begin(*node.data); -- numeric_element_block::const_iterator itEnd = numeric_element_block::end(*node.data); -+ double_element_block::const_iterator it = double_element_block::begin(*node.data); -+ double_element_block::const_iterator itEnd = double_element_block::end(*node.data); - for (; it != itEnd; ++it, ++miPos) - { - if (GetDoubleErrorValue(*miPos) == FormulaError::ElementNaN) -diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx -index 9d090b7..7c7c4f2 100644 ---- a/sc/source/filter/inc/orcusinterface.hxx -+++ b/sc/source/filter/inc/orcusinterface.hxx -@@ -332,6 +332,8 @@ public: - - virtual orcus::spreadsheet::range_size_t get_sheet_size() const override; - -+ virtual void fill_down_cells(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::row_t range_size) override; -+ - SCTAB getIndex() const { return mnTab; } - - const sc::SharedFormulaGroups& getSharedFormulaGroups() const; -diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx -index 833fb27..23f17a1 100644 ---- a/sc/source/filter/orcus/interface.cxx -+++ b/sc/source/filter/orcus/interface.cxx -@@ -61,8 +61,7 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t - case orcus::spreadsheet::formula_grammar_t::ods: - eGrammar = formula::FormulaGrammar::GRAM_ODFF; - break; -- case orcus::spreadsheet::formula_grammar_t::xlsx_2007: -- case orcus::spreadsheet::formula_grammar_t::xlsx_2010: -+ case orcus::spreadsheet::formula_grammar_t::xlsx: - eGrammar = formula::FormulaGrammar::GRAM_OOXML; - break; - case orcus::spreadsheet::formula_grammar_t::gnumeric: -@@ -1188,6 +1187,11 @@ orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const - return ret; - } - -+void ScOrcusSheet::fill_down_cells(os::row_t /*row*/, os::col_t /*col*/, os::row_t /*range_size*/) -+{ -+ // TODO : implement this. -+} -+ - const sc::SharedFormulaGroups& ScOrcusSheet::getSharedFormulaGroups() const - { - return maFormulaGroups; -diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx -index cdfb70d..8e9b0b1 100644 ---- a/sc/source/filter/orcus/orcusfiltersimpl.cxx -+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx -@@ -139,10 +139,10 @@ bool ScOrcusFiltersImpl::importODS_Styles(ScDocument& rDoc, OUString& aPath) con - - try - { -- std::string content = orcus::load_file_content(path); -+ orcus::file_content content(path); - ScOrcusFactory aFactory(rDoc); - ScOrcusStyles aStyles(aFactory); -- orcus::import_ods::read_styles(content.c_str(), content.size(), &aStyles); -+ orcus::import_ods::read_styles(content.data(), content.size(), &aStyles); - } - catch (const std::exception& e) - { -diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx -index 2548f5b..71c44bc 100644 ---- a/sc/source/filter/orcus/xmlcontext.cxx -+++ b/sc/source/filter/orcus/xmlcontext.cxx -@@ -269,10 +269,17 @@ void ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam) - - std::for_each(rLink.maFieldPaths.begin(), rLink.maFieldPaths.end(), InsertFieldPath(filter)); - -+ std::for_each(rLink.maRowGroups.begin(), rLink.maRowGroups.end(), -+ [&filter] (const OString& rRowGroup) -+ { -+ filter.set_range_row_group(rRowGroup.getStr()); -+ } -+ ); -+ - filter.commit_range(); - } - -- std::string content = orcus::load_file_content(path); -+ orcus::file_content content(path); - filter.read_stream(content.data(), content.size()); - - aFactory.finalize(); -diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx -index e243673..d9cd8b5 100644 ---- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx -+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx -@@ -536,6 +536,12 @@ void ScXMLSourceDlg::OkPressed() - // Go through all its child elements. - getFieldLinks(aRangeLink, aParam.maNamespaces, *mxLbTree, *rEntry); - -+ // Add the anchor node as a grouping node, which will be used as a -+ // row position increment point. -+ OUString aThisEntry = getXPath(*mxLbTree, *rEntry, aParam.maNamespaces); -+ aRangeLink.maRowGroups.push_back( -+ OUStringToOString(aThisEntry, RTL_TEXTENCODING_UTF8)); -+ - aParam.maRangeLinks.push_back(aRangeLink); - } - } -diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx -index 9ed7f43..2126474 100644 ---- a/svl/source/misc/gridprinter.cxx -+++ b/svl/source/misc/gridprinter.cxx -@@ -29,7 +29,7 @@ typedef mdds::mtv::default_element_block string_b - struct matrix_trait - { - typedef string_block string_element_block; -- typedef mdds::mtv::ushort_element_block integer_element_block; -+ typedef mdds::mtv::uint16_element_block integer_element_block; - - typedef mdds::mtv::custom_block_func1 element_block_func; - }; --- -2.23.0 -