mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
LibreOffice: bump version
This commit is contained in:
Gerasim Troeglazov
@@ -15,16 +15,16 @@ and Open Source office suite on the market:
|
||||
- Base (databases)
|
||||
- Math (formula editing)"
|
||||
HOMEPAGE="https://www.libreoffice.org/"
|
||||
COPYRIGHT="2000-2020 LibreOffice contributors"
|
||||
COPYRIGHT="2000-2021 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="bb7d7a724f20bf16ba45c6394914ce2d4c3d120a0440bbd82549d3148e16aa93"
|
||||
CHECKSUM_SHA256="fbed0198938db99d0cdda31bbca09e7436ddefd7eb9c88b15a07705240f5cb9d"
|
||||
|
||||
SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/libreoffice-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256_2="215d1aa81151316c942d8f496526f48cd1dc41919666009d4533ff2ab4fecc11"
|
||||
CHECKSUM_SHA256_2="fed6a61a451c01cf312cc9a2010532757550e9257f357b340a86d440044c2030"
|
||||
SOURCE_DIR_2="translations-libreoffice-$portVersion"
|
||||
SOURCE_FILENAME_2="translations-libreoffice-$portVersion.tar.gz"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From ee874677eaa71820bf956457cf784a6a565e3aa9 Mon Sep 17 00:00:00 2001
|
||||
From ca456b6dbb9b86208fcb1870cec0417a94dec63c 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,10 +19,10 @@ index 253242b..6b55799 100644
|
||||
OUString r;
|
||||
if ( desktopEnvironment.equalsIgnoreAsciiCase("plasma5") ||
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From 514e76265d070f605635eae7f1177ab7a7c24370 Mon Sep 17 00:00:00 2001
|
||||
From 5f8cc2ffee4320ded43b793e937fb9a4acbf5f28 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
|
||||
@@ -42,10 +42,10 @@ index f91375e..7c7b20d 100644
|
||||
#endif
|
||||
}
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From d092099634c878d9cb1f43b7ac02a5469e242a1f Mon Sep 17 00:00:00 2001
|
||||
From e4af6b75c5841ee30e00433597d6df0f92d8b7f9 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
|
||||
@@ -65,10 +65,10 @@ index 0093f64..3b5e402 100644
|
||||
return aKernelVer;
|
||||
#endif
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From a50bf602c65013295a39e3f62cd16a225be5b84c Mon Sep 17 00:00:00 2001
|
||||
From 7fb93050dc3a38523ff086c1091fb7d6b301027f 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
|
||||
@@ -89,10 +89,10 @@ index bbd614a..d0e97ad 100644
|
||||
// Just use xdg-open on non-Mac
|
||||
aBuffer.append("/usr/bin/xdg-open");
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From fa591ab690036fd7319c46a3fa45f14025fa7613 Mon Sep 17 00:00:00 2001
|
||||
From ba2270596c2fd7ad290dfef663f0b93982875010 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
|
||||
@@ -116,10 +116,10 @@ index 7ef9d0b..45e28ba 100644
|
||||
gb_CXXFLAGS := \
|
||||
$(gb_CXXFLAGS_COMMON) \
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From ef314c710980ab68109ca80e1f0bd97958998492 Mon Sep 17 00:00:00 2001
|
||||
From f955a52a008f72e757b47fdcd4cde6941a2f3b46 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
|
||||
@@ -161,10 +161,10 @@ index c9fd303..b2d15ef 100644
|
||||
pPatternAttr->GetItemSet().Put( aItem );
|
||||
SetPatternArea( nTempStartRow, nTempEndRow, std::move(pPatternAttr), true );
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From c8a5436bde765898615dec46b63e7e1771531efc Mon Sep 17 00:00:00 2001
|
||||
From 992bc6c5303da1bdc20d82ae9afd2466b761f47f 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
|
||||
@@ -205,10 +205,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.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From c5bb7e4cfcbf4f23cecee6ac4282936c492db5ad Mon Sep 17 00:00:00 2001
|
||||
From 3115feb75f4b259379d90c6cf84397ef695ed8be 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 +296,10 @@ index 8807927..c570173 100644
|
||||
jcopy_markers_execute(&aSourceInfo, &aDestinationInfo, aCopyOption);
|
||||
jtransform_execute_transformation(&aSourceInfo, &aDestinationInfo, aSourceCoefArrays, &aTransformOption);
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From 60d14097ac288a4b99bd1c4f439ad022be6593a6 Mon Sep 17 00:00:00 2001
|
||||
From cba531491650a671ce02840f3dcc7bd8b7b6b4e2 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
|
||||
@@ -319,10 +319,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 05ebfbb..4fc0564 100644
|
||||
index 7d3f75b..843e2d6 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -6843,6 +6843,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
|
||||
@@ -6856,6 +6856,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
@@ -340,7 +340,7 @@ index 05ebfbb..4fc0564 100644
|
||||
AC_MSG_CHECKING([whether $CC_BASE supports atomic functions])
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
|
||||
int v = 0;
|
||||
@@ -6980,6 +6991,7 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
|
||||
@@ -6993,6 +7004,7 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
|
||||
fi
|
||||
|
||||
AC_SUBST(HAVE_GCC_AVX)
|
||||
@@ -381,10 +381,10 @@ index 047f121..f91a298 100644
|
||||
ifneq ($(gb_ENABLE_PCH),)
|
||||
ifeq ($(COM_IS_CLANG),TRUE)
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From 53a6e2ca942b368f892b77bf65a263994f30384a Mon Sep 17 00:00:00 2001
|
||||
From 792a5611d1da8c0b03ee65d084910b9c58b6c873 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
|
||||
@@ -424,5 +424,81 @@ index 3b5e402..04042bd 100644
|
||||
return aKernelVer;
|
||||
#endif
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From 96c4ece2d02774f20d7107ca9afc69a06aff16a2 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 707c57b3846198f2e4d942b5ee274e0209e44e44 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 8 Feb 2021 15:51:28 +1000
|
||||
Subject: Don't use fontconfig
|
||||
|
||||
|
||||
diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx
|
||||
index 50bae31..4d771ab 100644
|
||||
--- a/vcl/qt5/Qt5Graphics_Text.cxx
|
||||
+++ b/vcl/qt5/Qt5Graphics_Text.cxx
|
||||
@@ -85,6 +85,9 @@ bool Qt5Graphics::GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities)
|
||||
void Qt5Graphics::GetDevFontList(PhysicalFontCollection* pPFC)
|
||||
{
|
||||
static const bool bUseFontconfig = (nullptr == getenv("SAL_VCL_QT5_NO_FONTCONFIG"));
|
||||
+#ifdef __HAIKU__
|
||||
+ bUseFontconfig = false;
|
||||
+#endif
|
||||
|
||||
if (pPFC->Count())
|
||||
return;
|
||||
--
|
||||
2.30.0
|
||||
|
||||
|
||||
From 85a5a6ee70e7ff61caf0d2e02030d24a8fae17a3 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
|
||||
|
||||
Reference in New Issue
Block a user