diff --git a/app-office/libreoffice/libreoffice-6.4.1.1.recipe b/app-office/libreoffice/libreoffice-6.4.3.1.recipe similarity index 97% rename from app-office/libreoffice/libreoffice-6.4.1.1.recipe rename to app-office/libreoffice/libreoffice-6.4.3.1.recipe index 17106d6c1..6d4f99bf1 100644 --- a/app-office/libreoffice/libreoffice-6.4.1.1.recipe +++ b/app-office/libreoffice/libreoffice-6.4.3.1.recipe @@ -17,20 +17,17 @@ and Open Source office suite on the market: HOMEPAGE="https://www.libreoffice.org/" COPYRIGHT="2000-2020 LibreOffice contributors" LICENSE="MPL v2.0" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz" SOURCE_DIR="core-libreoffice-$portVersion" -CHECKSUM_SHA256="afd745af76e532dea26d7660f69c65e68978f33ea0398b9fddb41e4f5692c877" +CHECKSUM_SHA256="2ee684b73fcedf013b4a5353571d89e7725fa079e4dfc39aacc978cd31edd637" SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/libreoffice-$portVersion.tar.gz" -CHECKSUM_SHA256_2="b296d4ef0305b830843f4f433b022404b0bc809464367c05de1e35af8fced10e" +CHECKSUM_SHA256_2="075a794acb232cb01ddfd63e57e6e5ba311a99615e051f15be8354c0f21f163e" SOURCE_DIR_2="translations-libreoffice-$portVersion" SOURCE_FILENAME_2="translations-libreoffice-$portVersion.tar.gz" - -PATCHES=" - libreoffice-$portVersion.patchset - " +PATCHES="libreoffice-$portVersion.patchset" ADDITIONAL_FILES=" libreoffice.iom libreoffice.rdef.in @@ -121,7 +118,6 @@ REQUIRES=" lib:librevenge_0.0$secondaryArchSuffix lib:librevenge_stream_0.0$secondaryArchSuffix lib:libsmime3$secondaryArchSuffix - lib:libssl$secondaryArchSuffix lib:libssl3$secondaryArchSuffix lib:libstaroffice_0.0$secondaryArchSuffix lib:libuuid$secondaryArchSuffix @@ -216,7 +212,6 @@ BUILD_REQUIRES=" devel:librdf$secondaryArchSuffix devel:librevenge_0.0$secondaryArchSuffix devel:libsane$secondaryArchSuffix - devel:libssl$secondaryArchSuffix devel:libstaroffice_0.0$secondaryArchSuffix devel:libvisio_0.1$secondaryArchSuffix devel:libwpd_0.10$secondaryArchSuffix @@ -298,7 +293,6 @@ BUILD() --with-fonts=no \ --with-vendor="HaikuPorts" \ --with-system-libs \ - --with-tls="openssl" \ --with-boost-libdir=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir \ --with-system-ucpp \ \ diff --git a/app-office/libreoffice/patches/libreoffice-6.4.1.1.patchset b/app-office/libreoffice/patches/libreoffice-6.4.3.1.patchset similarity index 86% rename from app-office/libreoffice/patches/libreoffice-6.4.1.1.patchset rename to app-office/libreoffice/patches/libreoffice-6.4.3.1.patchset index 4e6710b03..d603ab976 100644 --- a/app-office/libreoffice/patches/libreoffice-6.4.1.1.patchset +++ b/app-office/libreoffice/patches/libreoffice-6.4.3.1.patchset @@ -1,11 +1,11 @@ -From bdf798e420f02bcb9c601433a0d5d5efef0865b4 Mon Sep 17 00:00:00 2001 +From c03536371bc767970d464a0bde4dc30970421e8e Mon Sep 17 00:00:00 2001 From: Sergei Reznikov 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 696d5ab..33971bc 100644 +index 225414f..a971e11 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx @@ -58,6 +58,9 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi @@ -19,10 +19,10 @@ index 696d5ab..33971bc 100644 OUString r; if ( desktopEnvironment.equalsIgnoreAsciiCase("plasma5") || -- -2.24.1 +2.26.0 -From bb86d253630f3b94c9f7143b6b7192ff605ff2ee Mon Sep 17 00:00:00 2001 +From 9b04dafc3824d3d433b42d3fe66ac1848d53d58f 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 @@ -42,10 +42,10 @@ index c4c3be9..119380d 100644 aDetails.append( GetToolkitName() ); aDetails.append( "; " ); -- -2.24.1 +2.26.0 -From 8620060cdf42280c16a9271c516d94b2b1327eb5 Mon Sep 17 00:00:00 2001 +From 1053d9e72ecc2d89410bc877c6b667b2048035b9 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 @@ -65,10 +65,10 @@ index b661163..329265a 100644 return aKernelVer; } -- -2.24.1 +2.26.0 -From 605aa6b11f2f247fe3277fea9e92f1d445a9c43b Mon Sep 17 00:00:00 2001 +From e63502e45d5c100a5bbd80269c9dc9f14d2c1b8b 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 @@ -102,10 +102,10 @@ index 643c42a..d4b47cb 100644 return ret; } -- -2.24.1 +2.26.0 -From 47b0273f5ef2443b153713eee163ea3b5a5c2bb1 Mon Sep 17 00:00:00 2001 +From e96b7cda0014ad783122c456a76cde523b5c8cc5 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 15 Feb 2020 15:04:53 +0300 Subject: Implement ShellExec on Haiku @@ -126,10 +126,10 @@ index 3daea4a..d114d79 100644 // Just use xdg-open on non-Mac aBuffer.append("/usr/bin/xdg-open"); -- -2.24.1 +2.26.0 -From fe6a9cd7144b182fde0e5119c86fed2dc1ec275f Mon Sep 17 00:00:00 2001 +From 5299c0b1c26ecce9ee151b89f85a710b5f710a1f 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 @@ -153,10 +153,10 @@ index 8854aab..f0489a8 100644 gb_CXXFLAGS := \ $(gb_CXXFLAGS_COMMON) \ -- -2.24.1 +2.26.0 -From b3289a50fa549dc1266e3b1173c436cecd658cfc Mon Sep 17 00:00:00 2001 +From 9d72216b26b85f0a5abbd8e29485b66364f202ef 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 @@ -198,10 +198,10 @@ index 8636d6b..0defdfc 100644 pPatternAttr->GetItemSet().Put( aItem ); SetPatternArea( nTempStartRow, nTempEndRow, std::move(pPatternAttr), true ); -- -2.24.1 +2.26.0 -From a97f516acd57bc2300676fdb97b141b37b0a584a Mon Sep 17 00:00:00 2001 +From 2c1bab9663a4338ef01868308d6cd5b601510e23 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 @@ -242,10 +242,10 @@ index bd2cb6a..9d6a90c 100644 $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ $(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \ -- -2.24.1 +2.26.0 -From ffc0940ccf620127f264fe2307a5e3c0539b9c25 Mon Sep 17 00:00:00 2001 +From 632ddc27944cfa8be5db73aa0d0be9b62970a487 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 15 Feb 2020 15:08:51 +0300 Subject: Cast to boolean @@ -344,89 +344,90 @@ index 8a57f55..4835901 100644 jcopy_markers_execute(&aSourceInfo, &aDestinationInfo, aCopyOption); jtransform_execute_transformation(&aSourceInfo, &aDestinationInfo, aSourceCoefArrays, &aTransformOption); -- -2.24.1 +2.26.0 -From 6655aa52e139829e04b1dbd2cc94f44361926e3b Mon Sep 17 00:00:00 2001 +From e116706a86fc12824929f9d769b72a89d08841f8 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 +Subject: Revert fstack-protector check removal in + 9db11a8ab648f4d04e59e6bb94cd640f64835447 diff --git a/config_host.mk.in b/config_host.mk.in -index 91ced61d3d94..cbfa19f0e7b4 100644 +index e47ca61..3c3eb35 100644 --- a/config_host.mk.in +++ b/config_host.mk.in -@@ -244,7 +244,6 @@ export USING_X11=@USING_X11@ +@@ -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_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/configure.ac b/configure.ac -index 0c8388fbc9a5..809ed94733a2 100644 +index c0a09f1..b3a1eec 100644 --- a/configure.ac +++ b/configure.ac -@@ -6167,17 +6167,6 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then +@@ -6203,6 +6203,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then AC_MSG_RESULT([no]) fi -- AC_MSG_CHECKING([whether $CC_BASE supports -fstack-protector-strong]) -- save_CFLAGS=$CFLAGS -- CFLAGS="$CFLAGS -O0 -Werror -fstack-protector-strong" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ char a[8]; a[7] = 0; ]])],[ HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[]) -- CFLAGS=$save_CFLAGS -- if test "$HAVE_GCC_STACK_PROTECTOR_STRONG" = "TRUE"; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- fi -- ++ AC_MSG_CHECKING([whether $CC_BASE supports -fstack-protector-strong]) ++ save_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS -O0 -Werror -fstack-protector-strong" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ char a[8]; a[7] = 0; ]])],[ HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[]) ++ CFLAGS=$save_CFLAGS ++ if test "$HAVE_GCC_STACK_PROTECTOR_STRONG" = "TRUE"; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ AC_MSG_CHECKING([whether $CC_BASE supports atomic functions]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ int v = 0; -@@ -6349,7 +6338,6 @@ AC_LANG_POP([C++]) +@@ -6374,6 +6385,7 @@ AC_LANG_POP([C++]) fi AC_SUBST(HAVE_GCC_AVX) --AC_SUBST(HAVE_GCC_STACK_PROTECTOR_STRONG) ++AC_SUBST(HAVE_GCC_STACK_PROTECTOR_STRONG) AC_SUBST(HAVE_GCC_BUILTIN_ATOMIC) AC_SUBST(HAVE_GCC_BUILTIN_FFS) - + AC_SUBST(HAVE_GCC_STACK_CLASH_PROTECTION) diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk -index 2c3d5f1a98f3..712a61df544f 100644 +index 712a61d..2c3d5f1 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk -@@ -67,6 +67,7 @@ gb_CFLAGS_COMMON := \ +@@ -67,7 +67,6 @@ gb_CFLAGS_COMMON := \ -fmessage-length=0 \ -fno-common \ -pipe \ -+ -fstack-protector-strong \ +- -fstack-protector-strong \ gb_CXXFLAGS_COMMON := \ -Wall \ -@@ -81,6 +82,7 @@ gb_CXXFLAGS_COMMON := \ +@@ -82,7 +81,6 @@ gb_CXXFLAGS_COMMON := \ -fmessage-length=0 \ -fno-common \ -pipe \ -+ -fstack-protector-strong \ +- -fstack-protector-strong \ gb_CXXFLAGS_DISABLE_WARNINGS = -w -@@ -134,11 +136,7 @@ endif +@@ -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 ++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 ++endif ifneq ($(ENABLE_PCH),) ifeq ($(COM_IS_CLANG),TRUE) -- -2.24.1 +2.26.0