LibreOffice: bump version

app-office/libreoffice/libreoffice-7.2.0.4.recipe

@@ -17,14 +17,14 @@ and Open Source office suite on the market:
 HOMEPAGE="https://www.libreoffice.org/"
 COPYRIGHT="2000-2021 LibreOffice contributors"
 LICENSE="MPL v2.0"
-REVISION="2"
+REVISION="1"
 
 SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz"
 SOURCE_DIR="core-libreoffice-$portVersion"
-CHECKSUM_SHA256="fbed0198938db99d0cdda31bbca09e7436ddefd7eb9c88b15a07705240f5cb9d"
+CHECKSUM_SHA256="e5deb8fd899e9018a4e21af04a2f34ed1e7a11e13563ef920a52e504d9de0f1b"
 
 SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/libreoffice-$portVersion.tar.gz"
-CHECKSUM_SHA256_2="fed6a61a451c01cf312cc9a2010532757550e9257f357b340a86d440044c2030"
+CHECKSUM_SHA256_2="8792199a3cbab8a9bde90a9ed6026db2631b4b0b6908e29529f356164d072a88"
 SOURCE_DIR_2="translations-libreoffice-$portVersion"
 SOURCE_FILENAME_2="translations-libreoffice-$portVersion.tar.gz"
 
@@ -124,6 +124,7 @@ REQUIRES="
 	lib:libqxp_0.0$secondaryArchSuffix
 	lib:libraptor2$secondaryArchSuffix
 	lib:librdf$secondaryArchSuffix
+	lib:libreadline$secondaryArchSuffix >= 7
 	lib:librevenge_0.0$secondaryArchSuffix
 	lib:librevenge_stream_0.0$secondaryArchSuffix
 	lib:libsmime3$secondaryArchSuffix
@@ -221,6 +222,7 @@ BUILD_REQUIRES="
 	devel:libqxp_0.0$secondaryArchSuffix
 	devel:libraptor2$secondaryArchSuffix
 	devel:librdf$secondaryArchSuffix
+	devel:libreadline$secondaryArchSuffix >= 7
 	devel:librevenge_0.0$secondaryArchSuffix
 	devel:libsane$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
@@ -298,6 +300,7 @@ BUILD()
 		--disable-postgresql-sdbc \
 		--disable-fetch-external \
 		--disable-dependency-tracking \
+		--disable-zxing \
 		\
 		--with-fonts=no \
 		--with-vendor="HaikuPorts" \
@@ -305,6 +308,7 @@ BUILD()
 		--with-tls="openssl" \
 		--with-boost-libdir=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir \
 		--with-system-ucpp \
+		--with-system-cairo \
 		\
 		--without-doxygen \
 		--without-helppack-integration \

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

@@ -1,4 +1,4 @@
-From cbfe404153d3f6aafc6b70524809496eb219a7be Mon Sep 17 00:00:00 2001
+From 2318e8b866e748bb5808504a85f29e1faa2c5668 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
@@ -19,20 +19,20 @@ index 253242b..6b55799 100644
      OUString r;
      if ( desktopEnvironment.equalsIgnoreAsciiCase("plasma5") ||
 -- 
-2.30.0
+2.30.2
 
 
-From b75c6114f8bf696c8507fce763b86037983d7606 Mon Sep 17 00:00:00 2001
+From 4db9b4b3a0b7145f3bb8030e7f2e6c49628a58df 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 f91375e..7c7b20d 100644
+index 79d6dfa..6071ffe 100644
 --- a/vcl/source/app/svapp.cxx
 +++ b/vcl/source/app/svapp.cxx
-@@ -1178,7 +1178,7 @@ OUString Application::GetHWOSConfInfo(const int bSelection, const bool bLocalize
+@@ -1195,7 +1195,7 @@ OUString Application::GetHWOSConfInfo(const int bSelection, const bool bLocalize
  #endif
              appendDetails(u"", Localize(SV_APP_DEFAULT, bLocalize));
  
@@ -42,43 +42,63 @@ index f91375e..7c7b20d 100644
  #endif
      }
 -- 
-2.30.0
+2.30.2
 
 
-From 1f0fd72b91f8fb4bf2522a6c9bef1f7ecda1f98e Mon Sep 17 00:00:00 2001
+From 93354e746eaf3dc60528663dbc35b7cf047dce5c 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 0093f64..3b5e402 100644
+index 0093f64..04042bd 100644
 --- a/vcl/unx/generic/app/geninst.cxx
 +++ b/vcl/unx/generic/app/geninst.cxx
-@@ -89,6 +89,8 @@ OUString SalGenericInstance::getOSVersion()
+@@ -26,6 +26,11 @@
+ #  include <sys/utsname.h>
+ #endif
+ 
++#if defined(__HAIKU__)
++#  include <sys/utsname.h>
++#  include <private/libroot/system_revision.h>
++#endif
++
+ #include <config_features.h>
+ #if HAVE_FEATURE_OPENGL
+ #include <vcl/opengl/OpenGLContext.hxx>
+@@ -89,6 +94,16 @@ 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;
++
++	const char *haikuRevision = __get_haiku_revision();
++	if (haikuRevision[0] != '\0')
++		return OUString::createFromAscii( stName.sysname ) + " " + OUString::createFromAscii(haikuRevision);
++
++	return OUString::createFromAscii( stName.sysname );
  #else
      return aKernelVer;
  #endif
 -- 
-2.30.0
+2.30.2
 
 
-From e6dd932ffa51bc6339f793edf1f6ef167d3d937a Mon Sep 17 00:00:00 2001
+From a17a0ca9457b5c7dfe2ae600ea4df42d4820f402 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 bbd614a..d0e97ad 100644
+index 87b78fe..7588126 100644
 --- a/shell/source/unix/exec/shellexec.cxx
 +++ b/shell/source/unix/exec/shellexec.cxx
-@@ -170,6 +170,9 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
+@@ -171,6 +171,9 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
              aBuffer.append(" -R");
          }
          aBuffer.append(" --");
@@ -87,19 +107,19 @@ index bbd614a..d0e97ad 100644
 +		aBuffer.append("open");
  #else
          // Just use xdg-open on non-Mac
-         aBuffer.append("/usr/bin/xdg-open");
+         aBuffer.append("xdg-open");
 -- 
-2.30.0
+2.30.2
 
 
-From ee7f873fe37d664cf50647e669d88d97b6410749 Mon Sep 17 00:00:00 2001
+From b95ba255fe77f6d34484837287a0af8e95e785de 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 7ef9d0b..45e28ba 100644
+index 4a96547..49f872b 100644
 --- a/solenv/gbuild/platform/unxgcc.mk
 +++ b/solenv/gbuild/platform/unxgcc.mk
 @@ -45,9 +45,9 @@ gb_CFLAGS := \
@@ -116,66 +136,21 @@ index 7ef9d0b..45e28ba 100644
  gb_CXXFLAGS := \
  	$(gb_CXXFLAGS_COMMON) \
 -- 
-2.30.0
+2.30.2
 
 
-From 40483d26575c45d8223c801369b30651736439f1 Mon Sep 17 00:00:00 2001
+From 8296fb4df4ca1cf27b52ebb2133838b0cd65eb59 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 508fe61..bc612a7 100644
---- a/include/o3tl/sorted_vector.hxx
-+++ b/include/o3tl/sorted_vector.hxx
-@@ -94,6 +94,17 @@ public:
-         return 0;
-     }
- 
-+    size_type erase2( const Value& x )
-+    {
-+        std::pair<const_iterator, bool> const ret(Find_t()(m_vector.begin(), m_vector.end(), x));
-+        if (ret.second)
-+        {
-+            m_vector.erase(m_vector.begin() + (ret.first - m_vector.begin()));
-+            return 1;
-+        }
-+        return 0;
-+    }
-+
-     void erase( size_t index )
-     {
-         m_vector.erase(m_vector.begin() + index);
-diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
-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
-                     if(itr != rCondFormatData.end())
-                     {
-                         ScCondFormatIndexes aNewCondFormatData(rCondFormatData);
--                        aNewCondFormatData.erase(nIndex);
-+                        aNewCondFormatData.erase2(nIndex);
-                         ScCondFormatItem aItem( std::move(aNewCondFormatData) );
-                         pPatternAttr->GetItemSet().Put( aItem );
-                         SetPatternArea( nTempStartRow, nTempEndRow, std::move(pPatternAttr), true );
--- 
-2.30.0
-
-
-From 2b755798bf792169b3f0a4dbb023813575fdb473 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 291e255..3a26883 100644
+index 17d64fe..5693089 100644
 --- a/svl/Library_svl.mk
 +++ b/svl/Library_svl.mk
-@@ -96,6 +96,12 @@ $(eval $(call gb_Library_use_system_win32_libs,svl,\
+@@ -184,6 +184,12 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
-     shlwapi \
+     svl/source/uno/pathservice \
  ))
  
 +ifeq ($(OS),HAIKU)
@@ -185,15 +160,15 @@ index 291e255..3a26883 100644
 +endif
 +
  ifeq ($(OS),WNT)
- $(eval $(call gb_Library_add_defs,svl,\
+ $(eval $(call gb_Library_add_exception_objects,svl,\
-     -DSVL_CRYPTO_MSCRYPTO \
+     svl/source/svdde/ddecli \
 diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
-index bd2cb6a..9d6a90c 100644
+index 450e19b..568ff83 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,\
+@@ -124,6 +124,12 @@ endif
- 	-DXMLSEC_CRYPTO_NSS \
+ 
- ))
+ else # !$(OS),WNT
  
 +ifeq ($(OS),HAIKU)
 +$(eval $(call gb_Library_add_defs,xsec_xmlsec,\
@@ -205,10 +180,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.30.0
+2.30.2
 
 
-From a7fb869f41b89a14b1df2f6ec66fe7eed3321d4b Mon Sep 17 00:00:00 2001
+From ab45fd09d9d16fb1fdc03ea6033a752209830951 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
@@ -296,10 +271,89 @@ index 8807927..c570173 100644
      jcopy_markers_execute(&aSourceInfo, &aDestinationInfo, aCopyOption);
      jtransform_execute_transformation(&aSourceInfo, &aDestinationInfo, aSourceCoefArrays, &aTransformOption);
 -- 
-2.30.0
+2.30.2
 
 
-From b25ac7f1431d79e12500f2db02ea1866061f5e1e Mon Sep 17 00:00:00 2001
+From a01bcbe4b0f62ed9e192be507ac10c6c3ed3e1d0 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Mon, 8 Feb 2021 15:50:11 +1000
+Subject: Use dpi=100 for qt5 backend
+
+
+diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
+index a2730be..9be0a6e 100644
+--- a/vcl/qt5/Qt5Graphics_GDI.cxx
++++ b/vcl/qt5/Qt5Graphics_GDI.cxx
+@@ -747,6 +747,10 @@ void Qt5Graphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
+         rDPIX = rDPIY = sForceDPI.toInt32();
+         return;
+     }
++#ifdef __HAIKU__
++    rDPIX = rDPIY = 100;
++    return;
++#endif
+ 
+     if (!m_pFrame || !m_pFrame->GetQWidget()->window()->windowHandle())
+         return;
+-- 
+2.30.2
+
+
+From bb51c0fe7ffaa397e101a2636832d3ef9340ea6e Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Mon, 8 Feb 2021 15:52:13 +1000
+Subject: Disable hidpi for Haiku
+
+
+diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
+index bf8d529..e8dca9a 100644
+--- a/vcl/qt5/Qt5Instance.cxx
++++ b/vcl/qt5/Qt5Instance.cxx
+@@ -637,10 +637,11 @@ void Qt5Instance::MoveFakeCmdlineArgs(std::unique_ptr<char* []>& rFakeArgv,
+ 
+ std::unique_ptr<QApplication> Qt5Instance::CreateQApplication(int& nArgc, char** pArgv)
+ {
++#ifndef __HAIKU__
+     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+     // for scaled icons in the native menus
+     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+-
++#endif
+     FreeableCStr session_manager;
+     if (getenv("SESSION_MANAGER") != nullptr)
+     {
+-- 
+2.30.2
+
+
+From 1674ab119d6e2b02b08d9cad1ebefdb4c48b5f71 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Mon, 8 Feb 2021 21:47:12 +1000
+Subject: Don't use fontconfig
+
+
+diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx
+index b429485..0719575 100644
+--- a/vcl/qt5/Qt5Graphics_Text.cxx
++++ b/vcl/qt5/Qt5Graphics_Text.cxx
+@@ -111,10 +111,10 @@ void Qt5Graphics::GetDevFontList(PhysicalFontCollection* pPFC)
+         const OString& rFileName = rMgr.getFontFileSysPath(aInfo.m_nID);
+         rFontManager.AddFontFile(rFileName, nFaceNum, nVariantNum, aInfo.m_nID, aDFA);
+     }
+-
++#ifndef __HAIKU__
+     if (bUseFontconfig)
+         SalGenericInstance::RegisterFontSubstitutors(pPFC);
+-
++#endif
+     for (auto& family : aFDB.families())
+         for (auto& style : aFDB.styles(family))
+             pPFC->Add(Qt5FontFace::fromQFontDatabase(family, style));
+-- 
+2.30.2
+
+
+From 8cc8c6f41b1165c71d565215c7c56a5947f34707 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,11 +361,11 @@ Subject: Revert fstack-protector check removal in
 
 
 diff --git a/config_host.mk.in b/config_host.mk.in
-index 42f4511..ee29da2 100644
+index 8bce24c..783a2f0 100644
 --- a/config_host.mk.in
 +++ b/config_host.mk.in
-@@ -264,6 +264,7 @@ export HAMCREST_JAR=@HAMCREST_JAR@
+@@ -266,6 +266,7 @@ export HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED=@HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZE
- export HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED=@HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED@
+ export HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW=@HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW@
  export HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR=@HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR@
  export HAVE_GCC_AVX=@HAVE_GCC_AVX@
 +export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@
@@ -319,10 +373,10 @@ index 42f4511..ee29da2 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 7d3f75b..843e2d6 100644
+index b629d5a..828fa22 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -6856,6 +6856,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
+@@ -6993,6 +6993,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
          AC_MSG_RESULT([no])
      fi
  
@@ -340,7 +394,7 @@ index 7d3f75b..843e2d6 100644
      AC_MSG_CHECKING([whether $CC_BASE supports atomic functions])
      AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
      int v = 0;
-@@ -6993,6 +7004,7 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
+@@ -7130,6 +7141,7 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
  fi
  
  AC_SUBST(HAVE_GCC_AVX)
@@ -349,159 +403,36 @@ index 7d3f75b..843e2d6 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 047f121..f91a298 100644
+index 09ca90a..9248195 100644
 --- a/solenv/gbuild/platform/com_GCC_defs.mk
 +++ b/solenv/gbuild/platform/com_GCC_defs.mk
-@@ -63,7 +63,6 @@ gb_CFLAGS_COMMON := \
+@@ -62,7 +62,7 @@ gb_CFLAGS_COMMON := \
  	-fmessage-length=0 \
  	-fno-common \
  	-pipe \
--	-fstack-protector-strong \
+-	$(if $(filter EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong) \
++	$(if $(or $(filter EMSCRIPTEN,$(OS)),$(filter HAIKU,$(OS))),-fno-stack-protector,-fstack-protector-strong) \
  	$(if $(gb_COLOR),-fdiagnostics-color=always) \
  
  gb_CXXFLAGS_COMMON := \
-@@ -80,7 +79,6 @@ gb_CXXFLAGS_COMMON := \
+@@ -79,7 +79,7 @@ gb_CXXFLAGS_COMMON := \
  	-fmessage-length=0 \
  	-fno-common \
  	-pipe \
--	-fstack-protector-strong \
+-	$(if $(filter EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong) \
++	$(if $(or $(filter EMSCRIPTEN,$(OS)),$(filter HAIKU,$(OS))),-fno-stack-protector,-fstack-protector-strong) \
  	$(if $(gb_COLOR),-fdiagnostics-color=always) \
  
  ifeq ($(HAVE_WDEPRECATED_COPY_DTOR),TRUE)
-@@ -139,7 +137,11 @@ endif
+@@ -144,7 +144,7 @@ endif
  gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden
  gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX)
  
-+ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE)
+-gb_LinkTarget_LDFLAGS += $(if $(filter EMSCRIPTEN,$(OS)),-fno-stack-protector,-fstack-protector-strong)
-+gb_CFLAGS_COMMON += -fstack-protector-strong
++gb_LinkTarget_LDFLAGS += $(if $(or $(filter EMSCRIPTEN,$(OS)),$(filter HAIKU,$(OS))),-fno-stack-protector,-fstack-protector-strong)
-+gb_CXXFLAGS_COMMON += -fstack-protector-strong
- gb_LinkTarget_LDFLAGS += -fstack-protector-strong
-+endif
  
  ifneq ($(gb_ENABLE_PCH),)
  ifeq ($(COM_IS_CLANG),TRUE)
 -- 
-2.30.0
+2.30.2
-
-
-From e057edf6799a47a32550ee28777e7594b5a61785 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/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 defined(__HAIKU__)
-+#  include <sys/utsname.h>
-+#  include <private/libroot/system_revision.h>
-+#endif
-+
- #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;
-+
-+	const char *haikuRevision = __get_haiku_revision();
-+	if (haikuRevision[0] != '\0')
-+		return OUString::createFromAscii( stName.sysname ) + " " + OUString::createFromAscii(haikuRevision);
-+
-+	return OUString::createFromAscii( stName.sysname );
- #else
-     return aKernelVer;
- #endif
--- 
-2.30.0
-
-
-From 636716df4dcb03f876c3db2713c9296011416cbf Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Mon, 8 Feb 2021 15:50:11 +1000
-Subject: Use dpi=100 for qt5 backend
-
-
-diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
-index 559ff4b..a44c973 100644
---- a/vcl/qt5/Qt5Graphics_GDI.cxx
-+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
-@@ -676,6 +676,10 @@ void Qt5Graphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
-         rDPIX = rDPIY = sForceDPI.toInt32();
-         return;
-     }
-+#ifdef __HAIKU__
-+    rDPIX = rDPIY = 100;
-+    return;
-+#endif
- 
-     if (!m_pFrame || !m_pFrame->GetQWidget()->window()->windowHandle())
-         return;
--- 
-2.30.0
-
-
-From 84c8851c38de8f9fd00897fb5dbefc2c4d6ddcee Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Mon, 8 Feb 2021 15:52:13 +1000
-Subject: Disable hidpi for Haiku
-
-
-diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
-index ca1f914..1168da8 100644
---- a/vcl/qt5/Qt5Instance.cxx
-+++ b/vcl/qt5/Qt5Instance.cxx
-@@ -608,10 +608,11 @@ void Qt5Instance::MoveFakeCmdlineArgs(std::unique_ptr<char* []>& rFakeArgv,
- 
- std::unique_ptr<QApplication> Qt5Instance::CreateQApplication(int& nArgc, char** pArgv)
- {
-+#ifndef __HAIKU__
-     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-     // for scaled icons in the native menus
-     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
--
-+#endif
-     FreeableCStr session_manager;
-     if (getenv("SESSION_MANAGER") != nullptr)
-     {
--- 
-2.30.0
-
-
-From 3c4d19a2a24d668ed21d4538b181d3f87ce5413c Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Mon, 8 Feb 2021 21:47:12 +1000
-Subject: Don't use fontconfig
-
-
-diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx
-index 50bae31..ba0aafb 100644
---- a/vcl/qt5/Qt5Graphics_Text.cxx
-+++ b/vcl/qt5/Qt5Graphics_Text.cxx
-@@ -111,10 +111,10 @@ void Qt5Graphics::GetDevFontList(PhysicalFontCollection* pPFC)
-         const OString& rFileName = rMgr.getFontFileSysPath(aInfo.m_nID);
-         rFontManager.AddFontFile(rFileName, nFaceNum, nVariantNum, aInfo.m_nID, aDFA);
-     }
--
-+#ifndef __HAIKU__
-     if (bUseFontconfig)
-         SalGenericInstance::RegisterFontSubstitutors(pPFC);
--
-+#endif
-     for (auto& family : aFDB.families())
-         for (auto& style : aFDB.styles(family))
-             pPFC->Add(Qt5FontFace::fromQFontDatabase(family, style));
--- 
-2.30.0