haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

libreoffice: bumped to 7.3.7.2 (#8613)

Browse Source 
* Delete libreoffice-7.3.3.2.patchset

* Delete libreoffice-7.3.3.2.recipe

* libreoffice: bumped to 7.3.7.2

* libreoffice: bumped to 7.3.7.2
This commit is contained in:
kenmays
2023-05-08 05:38:06 -07:00
committed by GitHub
parent 84abc2850f
commit 7632d344d7
2 changed files with 61 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app-office/libreoffice/libreoffice-7.3.3.2.recipe → app-office/libreoffice/libreoffice-7.3.7.2.recipe
View File

@@ -15,16 +15,16 @@ and Open Source office suite on the market:
- Base (databases)
- Math (formula editing)"
HOMEPAGE="https://www.libreoffice.org/"
COPYRIGHT="2000-2022 LibreOffice contributors"
COPYRIGHT="2000-2023 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="508bee0d141f363eaac5cc6e0741fc4be2523333548c61980eeb80dbeb47e92d"
CHECKSUM_SHA256="fa47398c89ff3fba92a21e2f8c681413b0a5b419b0088db43241d5e8249b883b"
SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/libreoffice-$portVersion.tar.gz"
CHECKSUM_SHA256_2="66395e00a1f6fa996603b08e1a67b10352c23d10b7dfeece0754c434feadfa5b"
CHECKSUM_SHA256_2="f78ef6d348ee4c7f365f00419867b3f395e9525bfd71189f7c265c74b1307d1a"
SOURCE_DIR_2="translations-libreoffice-$portVersion"
SOURCE_FILENAME_2="translations-libreoffice-$portVersion.tar.gz"
@@ -51,7 +51,7 @@ POST_INSTALL_SCRIPTS="$relativePostInstallDir/create_buildid.sh"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="!x86"
boostMinimumVersion=1.69.0
boostMinimumVersion=1.70.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"
PROVIDES="
@@ -249,7 +249,7 @@ BUILD_PREREQUIRES="
cmd:patch
cmd:perl
cmd:pkg_config$secondaryArchSuffix
cmd:python3.7
cmd:python3.9
cmd:ucpp
cmd:which
cmd:xz
@@ -279,8 +279,6 @@ BUILD()
--enable-sal-log \
\
--disable-ccache \
--disable-firebird-sdbc \
--disable-postgresql-sdbc \
--disable-fetch-external \
--disable-dependency-tracking \
--disable-zxing \
@@ -289,15 +287,12 @@ BUILD()
--with-vendor="HaikuPorts" \
--with-system-libs \
--with-tls="openssl" \
--with-system-nss \
--with-boost-libdir=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir \
--with-system-ucpp \
--with-system-cairo \
\
--without-doxygen \
--without-system-cuckoo \
--without-helppack-integration \
--without-java \
--without-system-jars \
--with-lang="$libreofficeLanguages"
make $jobArgs build-nocheck

108
app-office/libreoffice/patches/libreoffice-7.3.3.2.patchset → app-office/libreoffice/patches/libreoffice-7.3.7.2.patchset
View File

@@ -1,11 +1,11 @@
From 545b9b2fc67913ced00ace53d5e8dbcd9e52d008 Mon Sep 17 00:00:00 2001
From 04a798df18355fb87edf035d42e5420e07c9c7d3 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 253242b..6b55799 100644
index 5abb7b2..478a781 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -56,6 +56,9 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
@@ -19,10 +19,10 @@ index 253242b..6b55799 100644
OUString r;
if ( desktopEnvironment.equalsIgnoreAsciiCase("plasma5") ||
--
2.30.2
2.37.3
From 45761a551b443b5914acf38621d52d79dadb234a Mon Sep 17 00:00:00 2001
From 57e7112c55054ab1ab9b482daa873f11c07f5913 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 66c030d..6ba2c53 100644
#endif
}
--
2.30.2
2.37.3
From a3d4b12471969cbdcd9b781f2303f4d98d6981c4 Mon Sep 17 00:00:00 2001
From bab5c7c19f76e34bc625110e4c6267de6ddb4633 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
@@ -85,10 +85,10 @@ index 0093f64..04042bd 100644
return aKernelVer;
#endif
--
2.30.2
2.37.3
From c9793d3936aec02b9a798d5ddb3fe89487106344 Mon Sep 17 00:00:00 2001
From a730a4ba26d3194a2664e5ad5772e84a87331297 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
@@ -109,10 +109,10 @@ index ddfb2e6..24ce539 100644
// Just use xdg-open on non-Mac
aBuffer.append("xdg-open");
--
2.30.2
2.37.3
From 9428ff3ea52169a10868ac660286ac41266fe006 Mon Sep 17 00:00:00 2001
From 6784899788feb85ff2a4b3ed87166d5f2d9a1048 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
@@ -136,20 +136,20 @@ index 0cec2ec..f7cc49d 100644
gb_CXXFLAGS := \
$(gb_CXXFLAGS_COMMON) \
--
2.30.2
2.37.3
From 93b7f9b46921ecf493badb56ce91069b11a1af68 Mon Sep 17 00:00:00 2001
From 1475d275cb3dacecf81accfda565ca7aee11aa88 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 4e388ca..21a3ef4 100644
index 6e79be4..3dfa25d 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -184,6 +184,12 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
@@ -183,6 +183,12 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
svl/source/uno/pathservice \
))
@@ -180,10 +180,10 @@ index 450e19b..568ff83 100644
$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
$(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \
--
2.30.2
2.37.3
From 979731d734363387abdb60aea01c16987d6f0f7d Mon Sep 17 00:00:00 2001
From 0805f660b0304e7a9b6edbdec358babf6d646ab7 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
@@ -271,20 +271,20 @@ index 8807927..c570173 100644
jcopy_markers_execute(&aSourceInfo, &aDestinationInfo, aCopyOption);
jtransform_execute_transformation(&aSourceInfo, &aDestinationInfo, aSourceCoefArrays, &aTransformOption);
--
2.30.2
2.37.3
From fd03c28a70c4ca0f97f1c6220ffef90cd214784c Mon Sep 17 00:00:00 2001
From 84c98e91fffb3ece96a1d30fb10c3f26ca7c691a 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/QtGraphics_GDI.cxx b/vcl/qt5/QtGraphics_GDI.cxx
index f87de50..ae98b42 100644
index 6849a3b..b457e81 100644
--- a/vcl/qt5/QtGraphics_GDI.cxx
+++ b/vcl/qt5/QtGraphics_GDI.cxx
@@ -745,6 +745,10 @@ void QtGraphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
@@ -711,6 +711,10 @@ void QtGraphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
rDPIX = rDPIY = sForceDPI.toInt32();
return;
}
@@ -296,10 +296,10 @@ index f87de50..ae98b42 100644
if (!m_pFrame)
return;
--
2.30.2
2.37.3
From 467bd4d0c1ba40b8a429d6f9b8ba5f6679f204fd Mon Sep 17 00:00:00 2001
From a5e842fbbedc068397b2e49cc1e94e3ba638bfae 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
@@ -319,10 +319,10 @@ index 2470014..dbbe3b6 100644
// is deprecated, they're always enabled
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
--
2.30.2
2.37.3
From c86db72eb53e86a8347a50de3a2eb7a081c5a8f8 Mon Sep 17 00:00:00 2001
From e354fc5ace0a3271fa12e73fe3470e2231e83953 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
@@ -346,10 +346,10 @@ index b509c2a..6668fb6 100644
for (auto& style : aFDB.styles(family))
pPFC->Add(QtFontFace::fromQFontDatabase(family, style));
--
2.30.2
2.37.3
From 6333a2858e9c4ec058a4890435006fc5535c6767 Mon Sep 17 00:00:00 2001
From 56edbe8cab1d4fd9d5c607d0c8365ccc855b7b2e 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
@@ -357,10 +357,10 @@ Subject: Revert fstack-protector check removal in
diff --git a/config_host.mk.in b/config_host.mk.in
index 02f6ec6..ac26d1d 100644
index df934f4..65056ea 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -276,6 +276,7 @@ export HAVE_CXX20_ATOMIC_REF=@HAVE_CXX20_ATOMIC_REF@
@@ -275,6 +275,7 @@ export HAVE_CXX20_ATOMIC_REF=@HAVE_CXX20_ATOMIC_REF@
export HAVE_DLLEXPORTINLINES=@HAVE_DLLEXPORTINLINES@
export HAVE_LO_CLANG_DLLEXPORTINLINES=@HAVE_LO_CLANG_DLLEXPORTINLINES@
export HAVE_GCC_AVX=@HAVE_GCC_AVX@
@@ -369,7 +369,7 @@ index 02f6ec6..ac26d1d 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 2a08a4b..d4d3d47 100644
index 5430110..e57f0ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1093,6 +1093,7 @@ haiku*)
@@ -380,7 +380,7 @@ index 2a08a4b..d4d3d47 100644
enable_odk=no
enable_coinmp=no
enable_pdfium=no
@@ -7100,6 +7101,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
@@ -7119,6 +7120,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
AC_MSG_RESULT([no])
fi
@@ -398,7 +398,7 @@ index 2a08a4b..d4d3d47 100644
AC_MSG_CHECKING([whether $CC_BASE supports atomic functions])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
int v = 0;
@@ -7237,6 +7249,7 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
@@ -7256,6 +7268,7 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
fi
AC_SUBST(HAVE_GCC_AVX)
@@ -406,7 +406,7 @@ index 2a08a4b..d4d3d47 100644
AC_SUBST(HAVE_GCC_BUILTIN_ATOMIC)
AC_SUBST(HAVE_GCC_STACK_CLASH_PROTECTION)
@@ -12957,16 +12970,16 @@ dnl ===================================================================
@@ -12993,16 +13006,16 @@ dnl ===================================================================
QT6_CFLAGS=""
QT6_LIBS=""
@@ -426,7 +426,7 @@ index 2a08a4b..d4d3d47 100644
fi
qt6_test_include="QtWidgets/qapplication.h"
@@ -12980,7 +12993,7 @@ then
@@ -13016,7 +13029,7 @@ then
if test -n "$QT6DIR"; then
AC_PATH_PROG(QMAKE6, [qmake], no, [$QT6DIR/bin])
else
@@ -435,7 +435,7 @@ index 2a08a4b..d4d3d47 100644
fi
if test "$QMAKE6" = "no"; then
AC_MSG_ERROR([Qmake not found. Please specify the root of your Qt6 installation by exporting QT6DIR before running "configure".])
@@ -13057,7 +13070,7 @@ then
@@ -13093,7 +13106,7 @@ then
dnl Check for Meta Object Compiler
@@ -476,20 +476,20 @@ index 589c9ee..0cf6a91 100644
ifneq ($(gb_ENABLE_PCH),)
ifeq ($(COM_IS_CLANG),TRUE)
--
2.30.2
2.37.3
From ec074e2ab5fd388c2aaf9e860c043036c81aa0a8 Mon Sep 17 00:00:00 2001
From 13c58262d4b09eb56eb39f7647664f066c9fa1ad Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 20 Aug 2021 23:33:13 +1000
Subject: Revert Qt::Popup window handling
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index f6f4b6c..d5df2a2 100644
index 6c5f3b7..05feec3 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -114,10 +114,7 @@ QtFrame::QtFrame(QtFrame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
@@ -117,10 +117,7 @@ QtFrame::QtFrame(QtFrame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
, m_bDefaultPos(true)
, m_bFullScreen(false)
, m_bFullScreenSpanAll(false)
@@ -500,7 +500,7 @@ index f6f4b6c..d5df2a2 100644
, m_nInputLanguage(LANGUAGE_DONTKNOW)
{
QtInstance* pInst = static_cast<QtInstance*>(GetSalData()->m_pInstance);
@@ -146,7 +143,7 @@ QtFrame::QtFrame(QtFrame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
@@ -149,7 +146,7 @@ QtFrame::QtFrame(QtFrame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
else if ((nStyle & SalFrameStyleFlags::FLOAT)
&& (nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION))
aWinFlags = Qt::Tool | Qt::FramelessWindowHint;
@@ -509,7 +509,7 @@ index f6f4b6c..d5df2a2 100644
aWinFlags = Qt::ToolTip;
// Can't use Qt::Popup, because it grabs the input focus and generates a focus-out event,
// instantly auto-closing the LO's editable ComboBox popup.
@@ -203,6 +200,7 @@ void QtFrame::screenChanged(QScreen*) { m_pQWidget->fakeResize(); }
@@ -206,6 +203,7 @@ void QtFrame::screenChanged(QScreen*) { m_pQWidget->fakeResize(); }
void QtFrame::FillSystemEnvData(SystemEnvData& rData, sal_IntPtr pWindow, QWidget* pWidget)
{
@@ -517,7 +517,7 @@ index f6f4b6c..d5df2a2 100644
if (QGuiApplication::platformName() == "wayland")
rData.platform = SystemEnvData::Platform::Wayland;
else if (QGuiApplication::platformName() == "xcb")
@@ -214,7 +212,7 @@ void QtFrame::FillSystemEnvData(SystemEnvData& rData, sal_IntPtr pWindow, QWidge
@@ -217,7 +215,7 @@ void QtFrame::FillSystemEnvData(SystemEnvData& rData, sal_IntPtr pWindow, QWidge
"Unsupported qt VCL platform: " << toOUString(QGuiApplication::platformName()));
std::abort();
}
@@ -527,7 +527,7 @@ index f6f4b6c..d5df2a2 100644
rData.aShellWindow = pWindow;
rData.pWidget = pWidget;
diff --git a/vcl/qt5/QtWidget.cxx b/vcl/qt5/QtWidget.cxx
index 663e9b5..ab5d6f8 100644
index 8c545fd..a7d5e89 100644
--- a/vcl/qt5/QtWidget.cxx
+++ b/vcl/qt5/QtWidget.cxx
@@ -187,13 +187,7 @@ void QtWidget::handleMouseButtonEvent(const QtFrame& rFrame, const QMouseEvent*
@@ -546,10 +546,10 @@ index 663e9b5..ab5d6f8 100644
void QtWidget::mouseReleaseEvent(QMouseEvent* pEvent) { handleMouseReleaseEvent(m_rFrame, pEvent); }
--
2.30.2
2.37.3
From 3e571b370d740b473215ed077f05843a64bec056 Mon Sep 17 00:00:00 2001
From f7138ae9f0712337a4eca5727b47ebe25814b6b5 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 4 May 2022 21:46:48 +1000
Subject: Use Noto Sans as default font
@@ -572,10 +572,10 @@ index ef94981..1747a8e 100644
if( !aUIFont.isEmpty() )
--
2.30.2
2.37.3
From b99b61518befc06bf39a55213bcbdf38e7cd3fe9 Mon Sep 17 00:00:00 2001
From dd049b9136fb5bec2195a76378656bbddb612891 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 4 May 2022 21:48:43 +1000
Subject: Style tune
@@ -595,10 +595,10 @@ index e6e3d82..9a05d5a 100644
boundingRect = contentRect;
retVal = true;
--
2.30.2
2.37.3
From ca1309b8dee8425d2fb7656a7237f626de9b07d4 Mon Sep 17 00:00:00 2001
From cd831b40068b77dd798bb80db87f7d43a94ac8f2 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 4 May 2022 21:49:34 +1000
Subject: Reorder vcl plugins for Haiku
@@ -623,10 +623,10 @@ index 7c2a91c..a3b2726 100644
};
--
2.30.2
2.37.3
From 7f4ae9583a7146d4eec32069323ab49ee14c3fbb Mon Sep 17 00:00:00 2001
From 7e5b719fe7823a94771d07f8bc1fe94ec964e951 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 4 May 2022 21:50:08 +1000
Subject: FIx build for Qt6
@@ -648,17 +648,17 @@ index 23a4fd9..f9c71e5 100644
LanguageType m_nInputLanguage;
--
2.30.2
2.37.3
From 719e9c2ab90079e26c5f1c7eead92b4b01193f10 Mon Sep 17 00:00:00 2001
From 56e125b0f82ad78fc9eb2ffed6e10655a6bb7377 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 6 May 2022 10:55:46 +1000
Subject: Use system font
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 0e64a42..02c03a4 100644
index 186013e..5c6cba4 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -25,6 +25,12 @@
@@ -703,5 +703,5 @@ index 0e64a42..02c03a4 100644
maHelpFont = aStdFont;
maMenuFont = aStdFont;
--
2.30.2
2.37.3