LibreOffice: bump version

app-office/libreoffice/libreoffice-7.1.0.1.recipe

@@ -21,10 +21,10 @@ REVISION="1"
 
 SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz"
 SOURCE_DIR="core-libreoffice-$portVersion"
-CHECKSUM_SHA256="a466c53b2d71b482309f88c7b28c1313694c2a9381cb4d03a8584838a219c9d5"
+CHECKSUM_SHA256="bb7d7a724f20bf16ba45c6394914ce2d4c3d120a0440bbd82549d3148e16aa93"
 
 SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/libreoffice-$portVersion.tar.gz"
-CHECKSUM_SHA256_2="e4c71ac114869d625c75871f697b5431321cf795083a4a97d3a36ab90d35c05f"
+CHECKSUM_SHA256_2="215d1aa81151316c942d8f496526f48cd1dc41919666009d4533ff2ab4fecc11"
 SOURCE_DIR_2="translations-libreoffice-$portVersion"
 SOURCE_FILENAME_2="translations-libreoffice-$portVersion.tar.gz"
 
@@ -45,10 +45,8 @@ ADDITIONAL_FILES="
 	"
 
 POST_INSTALL_SCRIPTS="$relativePostInstallDir/create_buildid.sh"
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-	SECONDARY_ARCHITECTURES="!x86"
-fi
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="!x86"
 
 boostMinimumVersion=1.69.0
 libreofficeLanguages="af ar be bg bn br brx bs ca ca-valencia cs cy da de dsb el en-GB en-ZA eo es et eu fa fi fr fy ga gd gl he hi hr hu id is it ja ka kk kmr-Latn ko lb lt lv mk mn nb ne nl nn pl pt pt-BR ro ru sa-IN sd sk sl sq sr sr-Latn sv szl tg th tr tt ug uk uz vi zh-CN zh-TW"
@@ -64,6 +62,7 @@ REQUIRES="
 	lib:libboost_filesystem$secondaryArchSuffix
 	lib:libboost_iostreams$secondaryArchSuffix
 	lib:libboost_locale$secondaryArchSuffix
+	lib:libBox2D$secondaryArchSuffix
 	lib:libcairo$secondaryArchSuffix
 	lib:libcdr_0.1$secondaryArchSuffix
 	lib:libclucene_core$secondaryArchSuffix
@@ -112,7 +111,7 @@ REQUIRES="
 	lib:libnssutil3$secondaryArchSuffix
 	lib:libnumbertext_1.0$secondaryArchSuffix
 	lib:libodfgen_0.1$secondaryArchSuffix
-	lib:liborcus_0.15$secondaryArchSuffix
+	lib:liborcus_0.16$secondaryArchSuffix
 	lib:libpagemaker_0.0$secondaryArchSuffix
 	lib:libplc4$secondaryArchSuffix
 	lib:libplds4$secondaryArchSuffix
@@ -173,6 +172,7 @@ BUILD_REQUIRES="
 	devel:libboost_filesystem$secondaryArchSuffix >= $boostMinimumVersion
 	devel:libboost_iostreams$secondaryArchSuffix >= $boostMinimumVersion
 	devel:libboost_locale$secondaryArchSuffix >= $boostMinimumVersion
+	devel:libBox2D$secondaryArchSuffix
 	devel:libcairo$secondaryArchSuffix
 	devel:libcdr_0.1$secondaryArchSuffix
 	devel:libclucene_contribs_lib$secondaryArchSuffix
@@ -214,7 +214,7 @@ BUILD_REQUIRES="
 	devel:libnss3$secondaryArchSuffix
 	devel:libnumbertext_1.0$secondaryArchSuffix
 	devel:libodfgen_0.1$secondaryArchSuffix
-	devel:liborcus_0.15$secondaryArchSuffix
+	devel:liborcus_0.16$secondaryArchSuffix
 	devel:libpagemaker_0.0$secondaryArchSuffix
 	devel:libpoppler$secondaryArchSuffix
 	devel:libqrcodegen$secondaryArchSuffix

app-office/libreoffice/patches/libreoffice-7.1.0.1.patchset

@@ -1,14 +1,14 @@
-From 9748817ff819b25ecb8eced69237e5b278721508 Mon Sep 17 00:00:00 2001
+From ee874677eaa71820bf956457cf784a6a565e3aa9 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 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 e98d636..f154f7c 100644
+index 253242b..6b55799 100644
 --- a/vcl/source/app/IconThemeSelector.cxx
 +++ b/vcl/source/app/IconThemeSelector.cxx
-@@ -58,6 +58,9 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
+@@ -56,6 +56,9 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
  #ifdef _WIN32
      (void)desktopEnvironment;
      return "colibre";
@@ -22,63 +22,63 @@ index e98d636..f154f7c 100644
 2.28.0
 
 
-From 91225858d2661f8da5ac565cc2c1f0327466b116 Mon Sep 17 00:00:00 2001
+From 514e76265d070f605635eae7f1177ab7a7c24370 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Fri, 7 Aug 2020 12:14:40 +0300
 Subject: Show used vcl backend in About window on Haiku
 
 
 diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
-index faf2d6f..684a925 100644
+index f91375e..7c7b20d 100644
 --- a/vcl/source/app/svapp.cxx
 +++ b/vcl/source/app/svapp.cxx
-@@ -1191,7 +1191,7 @@ OUString Application::GetHWOSConfInfo(const int bSelection, const bool bLocalize
+@@ -1178,7 +1178,7 @@ OUString Application::GetHWOSConfInfo(const int bSelection, const bool bLocalize
  #endif
-             appendDetails("", Localize(SV_APP_DEFAULT, bLocalize));
+             appendDetails(u"", Localize(SV_APP_DEFAULT, bLocalize));
  
--#if (defined LINUX || defined _WIN32 || defined MACOSX)
-+#if (defined LINUX || defined _WIN32 || defined MACOSX || defined __HAIKU__)
-         appendDetails("; ", SV_APP_VCLBACKEND + GetToolkitName());
+-#if (defined LINUX || defined _WIN32 || defined MACOSX || defined __FreeBSD__)
++#if (defined LINUX || defined _WIN32 || defined MACOSX || defined __FreeBSD__  || defined __HAIKU__)
+         appendDetails(u"; ", SV_APP_VCLBACKEND + GetToolkitName());
  #endif
      }
 -- 
 2.28.0
 
 
-From 50ad745ee8cfc2049b0bd8f919c2b7ab2a598a5e Mon Sep 17 00:00:00 2001
+From d092099634c878d9cb1f43b7ac02a5469e242a1f Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 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 b661163..329265a 100644
+index 0093f64..3b5e402 100644
 --- a/vcl/unx/generic/app/geninst.cxx
 +++ b/vcl/unx/generic/app/geninst.cxx
-@@ -70,6 +70,8 @@ OUString SalGenericInstance::getOSVersion()
-         }
-         fclose( pVersion );
+@@ -89,6 +89,8 @@ OUString SalGenericInstance::getOSVersion()
      }
+     return OUString::createFromAscii( stName.sysname ) + " " +
+         aKernelVer.copy( 0, nIndex );
 +#elif defined(__HAIKU__)
 +	aKernelVer = "Haiku";
- #endif
+ #else
      return aKernelVer;
- }
+ #endif
 -- 
 2.28.0
 
 
-From fd9509c486889dc97f658b68d40009d6438e784d Mon Sep 17 00:00:00 2001
+From a50bf602c65013295a39e3f62cd16a225be5b84c Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 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 58c5ef4..93f7f7b 100644
+index bbd614a..d0e97ad 100644
 --- a/shell/source/unix/exec/shellexec.cxx
 +++ b/shell/source/unix/exec/shellexec.cxx
-@@ -180,6 +180,9 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
+@@ -170,6 +170,9 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
              aBuffer.append(" -R");
          }
          aBuffer.append(" --");
@@ -92,14 +92,14 @@ index 58c5ef4..93f7f7b 100644
 2.28.0
 
 
-From 83e4857c2e719b9d01755a584577804595243045 Mon Sep 17 00:00:00 2001
+From fa591ab690036fd7319c46a3fa45f14025fa7613 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 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 6abfb75..69b8d0e 100644
+index 7ef9d0b..45e28ba 100644
 --- a/solenv/gbuild/platform/unxgcc.mk
 +++ b/solenv/gbuild/platform/unxgcc.mk
 @@ -45,9 +45,9 @@ gb_CFLAGS := \
@@ -119,17 +119,17 @@ index 6abfb75..69b8d0e 100644
 2.28.0
 
 
-From f89aee806e71b4161b00fdb310ddc316267788ed Mon Sep 17 00:00:00 2001
+From ef314c710980ab68109ca80e1f0bd97958998492 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 28ef758..6f63c2e 100644
+index 508fe61..bc612a7 100644
 --- a/include/o3tl/sorted_vector.hxx
 +++ b/include/o3tl/sorted_vector.hxx
-@@ -92,6 +92,17 @@ public:
+@@ -94,6 +94,17 @@ public:
          return 0;
      }
  
@@ -148,7 +148,7 @@ index 28ef758..6f63c2e 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 a4c57ca..bbe89ce 100644
+index c9fd303..b2d15ef 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
@@ -164,14 +164,14 @@ index a4c57ca..bbe89ce 100644
 2.28.0
 
 
-From aaa099840c8ff36085f228c4d654d74d82f9c841 Mon Sep 17 00:00:00 2001
+From c8a5436bde765898615dec46b63e7e1771531efc 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 b2ed3f5..384dfb9 100644
+index 291e255..3a26883 100644
 --- a/svl/Library_svl.mk
 +++ b/svl/Library_svl.mk
 @@ -96,6 +96,12 @@ $(eval $(call gb_Library_use_system_win32_libs,svl,\
@@ -208,14 +208,14 @@ index bd2cb6a..9d6a90c 100644
 2.28.0
 
 
-From 34cbded565aae3b4ae2799eca45679b22d6dcb96 Mon Sep 17 00:00:00 2001
+From c5bb7e4cfcbf4f23cecee6ac4282936c492db5ad Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Fri, 7 Aug 2020 12:37:45 +0300
 Subject: Cast to boolean
 
 
 diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
-index c1fbb53..4dddb21 100644
+index 8807927..c570173 100644
 --- a/vcl/source/filter/jpeg/jpegc.cxx
 +++ b/vcl/source/filter/jpeg/jpegc.cxx
 @@ -172,13 +172,13 @@ static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputS
@@ -235,7 +235,7 @@ index c1fbb53..4dddb21 100644
  
      jpeg_calc_output_dimensions(&rContext.cinfo);
  
-@@ -365,7 +365,7 @@ bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream,
+@@ -372,7 +372,7 @@ bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream,
      }
  
      jpeg_set_defaults( &cinfo );
@@ -244,7 +244,7 @@ index c1fbb53..4dddb21 100644
  
      if (o3tl::convertsToAtMost(rPPI.getX(), 65535) && o3tl::convertsToAtMost(rPPI.getY(), 65535))
      {
-@@ -397,7 +397,7 @@ bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream,
+@@ -404,7 +404,7 @@ bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream,
          cinfo.comp_info[0].v_samp_factor = 2;
      }
  
@@ -253,7 +253,7 @@ index c1fbb53..4dddb21 100644
  
      for( nY = 0; nY < nHeight; nY++ )
      {
-@@ -432,10 +432,10 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle)
+@@ -439,10 +439,10 @@ void Transform(void* pInputStream, void* pOutputStream, Degree10 nAngle)
      jvirt_barray_ptr* aSourceCoefArrays      = nullptr;
      jvirt_barray_ptr* aDestinationCoefArrays = nullptr;
  
@@ -268,7 +268,7 @@ index c1fbb53..4dddb21 100644
  
      // Angle to transform option
      // 90 Clockwise = 270 Counterclockwise
-@@ -464,7 +464,7 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle)
+@@ -471,7 +471,7 @@ void Transform(void* pInputStream, void* pOutputStream, Degree10 nAngle)
      aDestinationInfo.err->error_exit     = errorExit;
      aDestinationInfo.err->output_message = outputMessage;
  
@@ -277,7 +277,7 @@ index c1fbb53..4dddb21 100644
  
      JpegDecompressOwner aDecompressOwner;
      JpegCompressOwner aCompressOwner;
-@@ -490,7 +490,7 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle)
+@@ -497,7 +497,7 @@ void Transform(void* pInputStream, void* pOutputStream, Degree10 nAngle)
      jpeg_svstream_src (&aSourceInfo, pInputStream);
  
      jcopy_markers_setup(&aSourceInfo, aCopyOption);
@@ -286,7 +286,7 @@ index c1fbb53..4dddb21 100644
      jtransform_request_workspace(&aSourceInfo, &aTransformOption);
  
      aSourceCoefArrays = jpeg_read_coefficients(&aSourceInfo);
-@@ -500,7 +500,7 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle)
+@@ -507,7 +507,7 @@ void Transform(void* pInputStream, void* pOutputStream, Degree10 nAngle)
      jpeg_svstream_dest (&aDestinationInfo, pOutputStream);
  
      // Compute optimal Huffman coding tables instead of precomputed tables
@@ -299,7 +299,7 @@ index c1fbb53..4dddb21 100644
 2.28.0
 
 
-From b81ec6d5c19132723d4cc48c58892f6e83dd0ea7 Mon Sep 17 00:00:00 2001
+From 60d14097ac288a4b99bd1c4f439ad022be6593a6 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Fri, 7 Aug 2020 12:47:56 +0300
 Subject: Revert fstack-protector check removal in
@@ -307,10 +307,10 @@ Subject: Revert fstack-protector check removal in
 
 
 diff --git a/config_host.mk.in b/config_host.mk.in
-index dc3da7e..3a8a222 100644
+index 42f4511..ee29da2 100644
 --- a/config_host.mk.in
 +++ b/config_host.mk.in
-@@ -270,6 +270,7 @@ export HAMCREST_JAR=@HAMCREST_JAR@
+@@ -264,6 +264,7 @@ export HAMCREST_JAR=@HAMCREST_JAR@
  export HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED=@HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED@
  export HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR=@HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR@
  export HAVE_GCC_AVX=@HAVE_GCC_AVX@
@@ -319,10 +319,10 @@ index dc3da7e..3a8a222 100644
  export HAVE_GCC_FNO_ENFORCE_EH_SPECS=@HAVE_GCC_FNO_ENFORCE_EH_SPECS@
  export HAVE_GCC_FNO_SIZED_DEALLOCATION=@HAVE_GCC_FNO_SIZED_DEALLOCATION@
 diff --git a/configure.ac b/configure.ac
-index 5a14369..5044e61 100644
+index 05ebfbb..4fc0564 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -6298,6 +6298,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
+@@ -6843,6 +6843,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
          AC_MSG_RESULT([no])
      fi
  
@@ -340,7 +340,7 @@ index 5a14369..5044e61 100644
      AC_MSG_CHECKING([whether $CC_BASE supports atomic functions])
      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
      int v = 0;
-@@ -6449,6 +6460,7 @@ AC_LANG_POP([C++])
+@@ -6980,6 +6991,7 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
  fi
  
  AC_SUBST(HAVE_GCC_AVX)
@@ -349,10 +349,10 @@ index 5a14369..5044e61 100644
  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 1707a74..901f0e6 100644
+index 047f121..f91a298 100644
 --- a/solenv/gbuild/platform/com_GCC_defs.mk
 +++ b/solenv/gbuild/platform/com_GCC_defs.mk
-@@ -67,7 +67,6 @@ gb_CFLAGS_COMMON := \
+@@ -63,7 +63,6 @@ gb_CFLAGS_COMMON := \
  	-fmessage-length=0 \
  	-fno-common \
  	-pipe \
@@ -360,7 +360,7 @@ index 1707a74..901f0e6 100644
  	$(if $(gb_COLOR),-fdiagnostics-color=always) \
  
  gb_CXXFLAGS_COMMON := \
-@@ -84,7 +83,6 @@ gb_CXXFLAGS_COMMON := \
+@@ -80,7 +79,6 @@ gb_CXXFLAGS_COMMON := \
  	-fmessage-length=0 \
  	-fno-common \
  	-pipe \
@@ -368,7 +368,7 @@ index 1707a74..901f0e6 100644
  	$(if $(gb_COLOR),-fdiagnostics-color=always) \
  
  ifeq ($(HAVE_WDEPRECATED_COPY_DTOR),TRUE)
-@@ -143,7 +141,11 @@ endif
+@@ -139,7 +137,11 @@ endif
  gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden
  gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX)
  
@@ -384,146 +384,45 @@ index 1707a74..901f0e6 100644
 2.28.0
 
 
-From 287897fc23816f84635c2b95329713c2e8d64cd1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Mon, 20 Jul 2020 09:52:27 +0100
-Subject: fix some warnings with --with-tls=openssl
+From 53a6e2ca942b368f892b77bf65a263994f30384a Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sat, 19 Dec 2020 22:59:07 +1000
+Subject: Extend getOSVersion for Haiku
 
 
-diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
-index ff11ebb..77b6f8c 100644
---- a/oox/source/crypto/CryptTools.cxx
-+++ b/oox/source/crypto/CryptTools.cxx
-@@ -27,16 +27,46 @@
- namespace oox::crypto {
+diff --git a/vcl/unx/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx
+index 3b5e402..04042bd 100644
+--- a/vcl/unx/generic/app/geninst.cxx
++++ b/vcl/unx/generic/app/geninst.cxx
+@@ -26,6 +26,11 @@
+ #  include <sys/utsname.h>
+ #endif
  
- #if USE_TLS_OPENSSL
-+
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+
-+static HMAC_CTX *HMAC_CTX_new(void)
-+{
-+   HMAC_CTX *pContext = new HMAC_CTX;
-+   HMAC_CTX_init(pContext);
-+   return pContext;
-+}
-+
-+static void HMAC_CTX_free(HMAC_CTX *pContext)
-+{
-+    HMAC_CTX_cleanup(pContext);
-+    delete pContext;
-+}
++#if defined(__HAIKU__)
++#  include <sys/utsname.h>
++#  include <private/libroot/system_revision.h>
 +#endif
 +
-+namespace
-+{
-+    struct cipher_delete
-+    {
-+        void operator()(EVP_CIPHER_CTX* p) { EVP_CIPHER_CTX_free(p); }
-+    };
+ #include <config_features.h>
+ #if HAVE_FEATURE_OPENGL
+ #include <vcl/opengl/OpenGLContext.hxx>
+@@ -90,7 +95,15 @@ OUString SalGenericInstance::getOSVersion()
+     return OUString::createFromAscii( stName.sysname ) + " " +
+         aKernelVer.copy( 0, nIndex );
+ #elif defined(__HAIKU__)
+-	aKernelVer = "Haiku";
++    struct utsname stName;
++    if ( uname( &stName ) != 0 )
++        return aKernelVer;
 +
-+    struct hmac_delete
-+    {
-+        void operator()(HMAC_CTX* p) { HMAC_CTX_free(p); }
-+    };
-+}
++	const char *haikuRevision = __get_haiku_revision();
++	if (haikuRevision[0] != '\0')
++		return OUString::createFromAscii( stName.sysname ) + " " + OUString::createFromAscii(haikuRevision);
 +
- struct CryptoImpl
- {
--    std::unique_ptr<EVP_CIPHER_CTX> mpContext;
--    std::unique_ptr<HMAC_CTX> mpHmacContext;
-+    std::unique_ptr<EVP_CIPHER_CTX, cipher_delete> mpContext;
-+    std::unique_ptr<HMAC_CTX, hmac_delete> mpHmacContext;
- 
-     CryptoImpl() = default;
- 
-     void setupEncryptContext(std::vector<sal_uInt8>& key, std::vector<sal_uInt8>& iv, Crypto::CryptoType eType)
-     {
--        mpContext.reset(new EVP_CIPHER_CTX);
-+        mpContext.reset(EVP_CIPHER_CTX_new());
-         EVP_CIPHER_CTX_init(mpContext.get());
- 
-         const EVP_CIPHER* cipher = getCipher(eType);
-@@ -44,7 +74,7 @@ struct CryptoImpl
-             return;
- 
-         if (iv.empty())
--            EVP_EncryptInit_ex(mpContext.get(), cipher, nullptr, key.data(), 0);
-+            EVP_EncryptInit_ex(mpContext.get(), cipher, nullptr, key.data(), nullptr);
-         else
-             EVP_EncryptInit_ex(mpContext.get(), cipher, nullptr, key.data(), iv.data());
-         EVP_CIPHER_CTX_set_padding(mpContext.get(), 0);
-@@ -52,7 +82,7 @@ struct CryptoImpl
- 
-     void setupDecryptContext(std::vector<sal_uInt8>& key, std::vector<sal_uInt8>& iv, Crypto::CryptoType eType)
-     {
--        mpContext.reset(new EVP_CIPHER_CTX);
-+        mpContext.reset(EVP_CIPHER_CTX_new());
-         EVP_CIPHER_CTX_init(mpContext.get());
- 
-         const EVP_CIPHER* pCipher = getCipher(eType);
-@@ -64,7 +94,7 @@ struct CryptoImpl
-             key.resize(nMinKeySize, 0);
- 
-         if (iv.empty())
--            EVP_DecryptInit_ex(mpContext.get(), pCipher, nullptr, key.data(), 0);
-+            EVP_DecryptInit_ex(mpContext.get(), pCipher, nullptr, key.data(), nullptr);
-         else
-         {
-             const size_t nMinIVSize = EVP_CIPHER_iv_length(pCipher);
-@@ -78,8 +108,7 @@ struct CryptoImpl
- 
-     void setupCryptoHashContext(std::vector<sal_uInt8>& rKey, CryptoHashType eType)
-     {
--        mpHmacContext.reset(new HMAC_CTX);
--        HMAC_CTX_init(mpHmacContext.get());
-+        mpHmacContext.reset(HMAC_CTX_new());
-         const EVP_MD* aEvpMd;
-         switch (eType)
-         {
-@@ -90,18 +119,16 @@ struct CryptoImpl
-             case CryptoHashType::SHA512:
-                 aEvpMd = EVP_sha512(); break;
-         }
--        HMAC_Init(mpHmacContext.get(), rKey.data(), rKey.size(), aEvpMd);
-+        HMAC_Init_ex(mpHmacContext.get(), rKey.data(), rKey.size(), aEvpMd, nullptr);
-     }
- 
-     ~CryptoImpl()
-     {
-         if (mpContext)
-             EVP_CIPHER_CTX_cleanup(mpContext.get());
--        if (mpHmacContext)
--            HMAC_CTX_cleanup(mpHmacContext.get());
-     }
- 
--    const EVP_CIPHER* getCipher(Crypto::CryptoType type)
-+    static const EVP_CIPHER* getCipher(Crypto::CryptoType type)
-     {
-         switch(type)
-         {
--- 
-2.28.0
-
-
-From 68bae1356f5c0d9f7ad955ddb42932a8f4708fcf Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sun, 25 Oct 2020 18:51:26 +1000
-Subject: Fix build
-
-
-diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
-index 3066c4d..93c88d6 100644
---- a/vcl/source/filter/ipdf/pdfread.cxx
-+++ b/vcl/source/filter/ipdf/pdfread.cxx
-@@ -218,7 +218,6 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, std::vector<Bitmap>& rBi
-     (void)rBitmaps;
-     (void)nFirstPage;
-     (void)nPages;
--    (void)fResolutionDPI;
-     return 0;
- #endif // HAVE_FEATURE_PDFIUM
- }
++	return OUString::createFromAscii( stName.sysname );
+ #else
+     return aKernelVer;
+ #endif
 -- 
 2.28.0