pool/libreoffice
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 956520 from LibreOffice:Factory

Browse Source 
- Add upstream change to fix KDE Frameworks detection (boo#1196017)
  * 0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch

- Update to 7.3.1.1
- Removed uneeded patches:
  * 0001-Missing-includes-for-libstdc-12.patch
  * bsc1183308.patch
  * fix-wayland-scaling-in-plasma.patch
  * pld-skia-patches.patch
  * skia-freetype2.11.patch

OBS-URL: https://build.opensuse.org/request/show/956520
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=246
This commit is contained in:
Dominique Leuenberger 2022-02-24 17:20:10 +00:00 committed by Git OBS Bridge
commit 551b3450e8
36 changed files with 182 additions and 1916 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

354
0001-Missing-includes-for-libstdc-12.patch
View File

@ -1,354 +0,0 @@
From 83af781196f819f15c519c5e0c60758323e0e633 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 9 Aug 2021 23:07:12 +0200
Subject: [PATCH] Missing includes for libstdc++ 12
(for std::unique_ptr, with recent libstdc++ 12 trunk)
Change-Id: I61b7823dd740ea7cdfe0d7403a50ac73b24d1c4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120229
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 43542cc07ee110abe25a1e176238fd6d921d593b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128447
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
---
chart2/source/view/inc/PlottingPositionHelper.hxx | 4 ++++
compilerplugins/clang/test/unusedfields.cxx | 1 +
connectivity/source/inc/java/tools.hxx | 4 ++++
extensions/source/propctrlr/handlerhelper.hxx | 1 +
filter/source/xsltdialog/xmlfilterjar.hxx | 1 +
forms/source/component/EventThread.hxx | 1 +
forms/source/xforms/propertysetbase.hxx | 1 +
fpicker/source/office/contentenumeration.hxx | 4 ++++
framework/inc/uielement/toolbarwrapper.hxx | 2 ++
include/oox/crypto/StrongEncryptionDataSpace.hxx | 4 ++++
include/sfx2/sidebar/SidebarPanelBase.hxx | 4 ++++
include/svtools/imageresourceaccess.hxx | 4 ++++
include/vcl/BitmapBuffer.hxx | 4 ++++
include/vcl/filter/PngImageReader.hxx | 4 ++++
shell/source/backends/kf5be/kf5backend.cxx | 2 ++
sot/source/unoolestorage/xolesimplestorage.hxx | 2 ++
starmath/inc/token.hxx | 1 +
.../textconversiondlgs/chinese_translation_unodialog.hxx | 4 ++++
sw/source/uibase/docvw/OverlayRanges.hxx | 1 +
sw/source/uibase/docvw/ShadowOverlayObject.hxx | 4 ++++
xmlsecurity/source/gpg/SecurityEnvironment.hxx | 3 +++
xmlsecurity/source/helper/ooxmlsecparser.hxx | 1 +
xmlsecurity/source/helper/xsecparser.hxx | 1 +
23 files changed, 58 insertions(+)
diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx
index 0962868b0f31..d687cb902453 100644
--- a/chart2/source/view/inc/PlottingPositionHelper.hxx
+++ b/chart2/source/view/inc/PlottingPositionHelper.hxx
@@ -18,6 +18,10 @@
*/
#pragma once
+#include <sal/config.h>
+
+#include <memory>
+
#include <chartview/ExplicitScaleValues.hxx>
#include <basegfx/range/b2drectangle.hxx>
diff --git a/compilerplugins/clang/test/unusedfields.cxx b/compilerplugins/clang/test/unusedfields.cxx
index 5305b4aec964..6ff9189eab27 100644
--- a/compilerplugins/clang/test/unusedfields.cxx
+++ b/compilerplugins/clang/test/unusedfields.cxx
@@ -14,6 +14,7 @@
// expected-no-diagnostics
#else
+#include <memory>
#include <vector>
#include <ostream>
#include <com/sun/star/uno/Any.hxx>
diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index bc9759fa9a88..44a35ecee3f9 100644
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/tools.hxx
@@ -19,6 +19,10 @@
#pragma once
+#include <sal/config.h>
+
+#include <memory>
+
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/Sequence.h>
diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx
index a53a24a9256f..1d32db9c0573 100644
--- a/extensions/source/propctrlr/handlerhelper.hxx
+++ b/extensions/source/propctrlr/handlerhelper.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/Optional.hpp>
+#include <memory>
#include <vector>
namespace weld { class Builder; class Widget; class Window; }
diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx
index 6f02e5f99de0..1d8e52fc3e18 100644
--- a/filter/source/xsltdialog/xmlfilterjar.hxx
+++ b/filter/source/xsltdialog/xmlfilterjar.hxx
@@ -22,6 +22,7 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
+#include <memory>
#include <vector>
class filter_info_impl;
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index be9e9696734e..20aff73113db 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -21,6 +21,7 @@
#include <sal/config.h>
+#include <memory>
#include <vector>
#include <com/sun/star/lang/XEventListener.hpp>
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index bb27f8460fea..969253a04d62 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <map>
+#include <memory>
namespace com::sun::star::uno {
class Any;
diff --git a/fpicker/source/office/contentenumeration.hxx b/fpicker/source/office/contentenumeration.hxx
index 9dcfae687883..bc2180c53c47 100644
--- a/fpicker/source/office/contentenumeration.hxx
+++ b/fpicker/source/office/contentenumeration.hxx
@@ -19,6 +19,10 @@
#pragma once
+#include <sal/config.h>
+
+#include <memory>
+
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <salhelper/thread.hxx>
#include <ucbhelper/content.hxx>
diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx
index 55142f98d500..da90455b21da 100644
--- a/framework/inc/uielement/toolbarwrapper.hxx
+++ b/framework/inc/uielement/toolbarwrapper.hxx
@@ -25,6 +25,8 @@
#include <com/sun/star/ui/XUIFunctionListener.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
+#include <memory>
+
namespace weld
{
class Builder;
diff --git a/include/oox/crypto/StrongEncryptionDataSpace.hxx b/include/oox/crypto/StrongEncryptionDataSpace.hxx
index 59be5c9832a0..cd7156515ab3 100644
--- a/include/oox/crypto/StrongEncryptionDataSpace.hxx
+++ b/include/oox/crypto/StrongEncryptionDataSpace.hxx
@@ -11,6 +11,10 @@
#ifndef INCLUDED_OOX_CRYPTO_STRONGENCRYPTINDATASPACE_HXX
#define INCLUDED_OOX_CRYPTO_STRONGENCRYPTINDATASPACE_HXX
+#include <sal/config.h>
+
+#include <memory>
+
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/packages/XPackageEncryption.hpp>
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 971e286ca74f..8164244e796a 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -18,6 +18,10 @@
*/
#pragma once
+#include <sal/config.h>
+
+#include <memory>
+
#include <sfx2/dllapi.h>
#include <cppuhelper/compbase.hxx>
diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx
index d7e8a5629b11..ccb5b6b69bce 100644
--- a/include/svtools/imageresourceaccess.hxx
+++ b/include/svtools/imageresourceaccess.hxx
@@ -19,6 +19,10 @@
#pragma once
+#include <sal/config.h>
+
+#include <memory>
+
#include <config_options.h>
#include <svtools/svtdllapi.h>
diff --git a/include/vcl/BitmapBuffer.hxx b/include/vcl/BitmapBuffer.hxx
index 79f202cdfa2d..7468cb987f95 100644
--- a/include/vcl/BitmapBuffer.hxx
+++ b/include/vcl/BitmapBuffer.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_VCL_BITMAPBUFFER_HXX
#define INCLUDED_VCL_BITMAPBUFFER_HXX
+#include <sal/config.h>
+
+#include <memory>
+
#include <vcl/dllapi.h>
#include <vcl/BitmapPalette.hxx>
#include <vcl/ColorMask.hxx>
diff --git a/include/vcl/filter/PngImageReader.hxx b/include/vcl/filter/PngImageReader.hxx
index 2615fd961bd4..bbb5b7c8d672 100644
--- a/include/vcl/filter/PngImageReader.hxx
+++ b/include/vcl/filter/PngImageReader.hxx
@@ -11,6 +11,10 @@
#ifndef INCLUDED_VCL_FILTER_PNGIMAGEREADER_HXX
#define INCLUDED_VCL_FILTER_PNGIMAGEREADER_HXX
+#include <sal/config.h>
+
+#include <memory>
+
#include <vcl/dllapi.h>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/shell/source/backends/kf5be/kf5backend.cxx b/shell/source/backends/kf5be/kf5backend.cxx
index 47c829dc5f9b..e448c124d88a 100644
--- a/shell/source/backends/kf5be/kf5backend.cxx
+++ b/shell/source/backends/kf5be/kf5backend.cxx
@@ -19,6 +19,8 @@
#include <sal/config.h>
+#include <memory>
+
#include <QtWidgets/QApplication>
#include <boost/noncopyable.hpp>
diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx
index ef0214ba61c3..2ec9f715d873 100644
--- a/sot/source/unoolestorage/xolesimplestorage.hxx
+++ b/sot/source/unoolestorage/xolesimplestorage.hxx
@@ -22,6 +22,8 @@
#include <sal/config.h>
+#include <memory>
+
#include <com/sun/star/embed/XOLESimpleStorage.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase.hxx>
diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index e38b3e5afb5a..808195dca9d3 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -35,6 +35,7 @@
// std imports
#include <cassert>
+#include <memory>
#include <vector>
#include <stack>
#include <tuple>
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
index 8d2e29f1317a..dbfae4d74697 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
@@ -19,6 +19,10 @@
#pragma once
+#include <sal/config.h>
+
+#include <memory>
+
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx
index e086b8462ea2..829f0c4001dc 100644
--- a/sw/source/uibase/docvw/OverlayRanges.hxx
+++ b/sw/source/uibase/docvw/OverlayRanges.hxx
@@ -22,6 +22,7 @@
#include <svx/sdr/overlay/overlayobject.hxx>
#include <basegfx/range/b2drange.hxx>
+#include <memory>
#include <vector>
class SwView;
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
index df8e27009f5e..cd612f7ce50e 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
@@ -19,6 +19,10 @@
#pragma once
+#include <sal/config.h>
+
+#include <memory>
+
#include <svx/sdr/overlay/overlayobject.hxx>
class SwView;
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.hxx b/xmlsecurity/source/gpg/SecurityEnvironment.hxx
index 83b4f38b41c8..262578682274 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.hxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.hxx
@@ -10,6 +10,9 @@
#pragma once
#include <sal/config.h>
+
+#include <memory>
+
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/xmlsecurity/source/helper/ooxmlsecparser.hxx b/xmlsecurity/source/helper/ooxmlsecparser.hxx
index 4f11302ff765..9193d7b7e180 100644
--- a/xmlsecurity/source/helper/ooxmlsecparser.hxx
+++ b/xmlsecurity/source/helper/ooxmlsecparser.hxx
@@ -16,6 +16,7 @@
#include <xmloff/namespacemap.hxx>
+#include <memory>
#include <stack>
class XSecController;
diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx
index 86f6154ddc93..0e0ee8291f65 100644
--- a/xmlsecurity/source/helper/xsecparser.hxx
+++ b/xmlsecurity/source/helper/xsecparser.hxx
@@ -26,6 +26,7 @@
#include <xmloff/namespacemap.hxx>
+#include <memory>
#include <stack>
class XMLSignatureHelper;
--
2.35.1

57
0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch Normal file
View File

@ -0,0 +1,57 @@
From 5fd5e42bf28a7910321c6b6d76257e7386839fbc Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Wed, 16 Feb 2022 13:38:47 +0100
Subject: [PATCH] configure.ac: Update kf5 include/lib check to work with KF5
>= 5.91
The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons'
subdirectory in kcoreaddons commit
commit d971ba9bb27a3e8f18a116692fdf98c1729ac244
Author: Ahmad Samir <a.samirh78@gmail.com>
Date: Sat Jan 15 14:14:13 2022 +0200
Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/
Instead of /usr/include/KF5/kcoreaddons_version.h.
For more details see:
https://invent.kde.org/frameworks/kservice/-/merge_requests/79
GIT_SILENT
Adapt the KF5 check to check for the 'KFileWidget' header and
the 'libKF5KIOFileWidgets.so' library instead.
This is more exact anyway, since we require KIOFileWidgets,
and the previous check didn't ensure that.
(So in case only KF5CoreAddons but not KIOFileWidgets was installed,
configure would previously pass, but the build fail.)
[1] https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244
Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6acb3107cea3..4e84f9a33980 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13017,8 +13017,8 @@ then
kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
fi
- kf5_test_include="KF5/kcoreaddons_version.h"
- kf5_test_library="libKF5CoreAddons.so"
+ kf5_test_include="KF5/KIOFileWidgets/KFileWidget"
+ kf5_test_library="libKF5KIOFileWidgets.so"
kf5_libdirs="$qt5_libdir $kf5_libdirs"
dnl kf5 KDE4 support compatibility installed
--
2.35.1

3
boost_1_75_0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b
size 19322176

3
boost_1_77_0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b334d6c6d7af5a0687280788cd84444398b8e0b472cd88e52bbc3c3ef11d98e
size 17548708

1325
bsc1183308.patch
View File

File diff suppressed because it is too large Load Diff

79
fix-wayland-scaling-in-plasma.patch
View File

@ -1,79 +0,0 @@
From dc0016bc8d7e6c4456f4442c7ccf287bfc0c2e9b Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Thu, 18 Nov 2021 21:15:10 +0100
Subject: [PATCH] tdf#137924 qt (>=5.14): Use proper DPI without requiring
window handle
For Qt >= 5.14, don't require a window handle to retrieve
the screen and then the associated DPI value from that one,
but directly use 'QWidget::screen' (introduced in QT 5.14)
to retrieve the screen.
Previously, no DPI values would be set in case there was
no window handle.
This makes UI scaling work without having to manually set
'SAL_FORCEDPI' on Wayland.
While various UI elements (like e.g. the "Help" -> "About LibreOffice"
still look quite broken with the qt5 and kf5 VCL plugins
in a Plasma Wayland session (at least on my Debian testing with
Qt 5.15.2 and Plasma 5.23), they look OK
when using the qt6 VCL plugin with a custom build of qtbase
and qtwayland from Qt's "dev" git branches.
Change-Id: I5feae46ed86a8b7d3cf92d4a973f7a0f9a9f95de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125507
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
vcl/qt5/QtGraphics_GDI.cxx | 9 ++++++++-
vcl/qt5/QtSvpGraphics.cxx | 9 ++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/QtGraphics_GDI.cxx
index 0f9faa022d0b5..f87de50827dfc 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -746,10 +746,17 @@ void QtGraphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
return;
}
- if (!m_pFrame || !m_pFrame->GetQWidget()->window()->windowHandle())
+ if (!m_pFrame)
+ return;
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ QScreen* pScreen = m_pFrame->GetQWidget()->screen();
+#else
+ if (!m_pFrame->GetQWidget()->window()->windowHandle())
return;
QScreen* pScreen = m_pFrame->GetQWidget()->window()->windowHandle()->screen();
+#endif
rDPIX = pScreen->logicalDotsPerInchX() * pScreen->devicePixelRatio() + 0.5;
rDPIY = pScreen->logicalDotsPerInchY() * pScreen->devicePixelRatio() + 0.5;
}
diff --git a/vcl/qt5/Qt5SvpGraphics.cxx b/vcl/qt5/QtSvpGraphics.cxx
index b6018a95e2997..3632c8990706c 100644
--- a/vcl/qt5/Qt5SvpGraphics.cxx
+++ b/vcl/qt5/Qt5SvpGraphics.cxx
@@ -102,10 +102,17 @@ void QtSvpGraphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
return;
}
- if (!m_pFrame || !m_pFrame->GetQWidget()->window()->windowHandle())
+ if (!m_pFrame)
+ return;
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ QScreen* pScreen = m_pFrame->GetQWidget()->screen();
+#else
+ if (!m_pFrame->GetQWidget()->window()->windowHandle())
return;
QScreen* pScreen = m_pFrame->GetQWidget()->window()->windowHandle()->screen();
+#endif
rDPIX = pScreen->logicalDotsPerInchX() * pScreen->devicePixelRatio() + 0.5;
rDPIY = pScreen->logicalDotsPerInchY() * pScreen->devicePixelRatio() + 0.5;
}

3
gpgme-1.13.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46
size 1759616

3
gpgme-1.16.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0
size 1718913

3
icu4c-69_1-data.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf
size 16865417

3
icu4c-69_1-src.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
size 24814903

3
icu4c-70_1-data.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c72723ddba3300ffb231d6b09e2a728ea6e89de10ed5927f74bacbd77042336e
size 18770261

3
icu4c-70_1-src.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5
size 25449582

3
libassuan-2.5.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702
size 572348

3
libassuan-2.5.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
size 572263

3
libgpg-error-1.37.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763
size 937282

3
libgpg-error-1.43.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf
size 999006

3
libreoffice-7.2.5.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:20fd51ecce5906b32a1a33817c7f6c7917558e67a93072826c41bfef0115493c
size 252956132

16
libreoffice-7.2.5.1.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmG44Z8ACgkQ9DSh76/u
rqNLvA//agFf6ZTkJfe5yd+sVaUB9lmSDpYrPLOsB0WkYIAHQclbCWdmupfc6U3L
Msg02srrxxnECXkNnseWhjLYdPlnZwmaw3m5tpjh0UlMHue4gkdO3Rdv8GRc7+mR
GgcD1/OJms0KEW/KoUNQ/3pEMXkN8YWtMgKGASZOz6uKC0WjhXUMcHyiInefU8nt
veVyLV1iYJMzPFROeoN4ejWRi2DUozmIdMzrkig9yzZMB8gL89yfsDe/mFp5mpia
TSjNzLro2bwJGZyKHEd6eFLC8gvzWcCwNV6yDSWy4lIPnlPEubYl5MDU+tmZhwtP
tJAtjfL31Vj4XlLcZy+NudY83e5+XpCjultuz6pjy0NBkIa16dphtWCvQmbKYhR5
9DX555oYesmQRIwGu1krxgKXXfneiqNEjnxX7kF3yRG56kOIqEaEwoyJVRgBVCWc
fhZVY+jbRsn06QwelHncjBSW9wnBQFyNgTJ93hQwaf/VJCgzNXauKjl5CE79/l+t
m4Oy4J4ldoPLOkUC4QAaroYwXsp3/9OP8cCaT5iHH2XSp6XV1MSI+AJ5B3j9/g6X
N+AO57uJ123fHJVqNvXj5PhYitSna7o6zrXq65sFGlzfgoJAPHIhkx0hxo1znaqo
qV7A9jqeKUkFbNpMh62mteY1BhZJISRCzbXgpktouuY1rJ5mwLU=
=Z/OR
-----END PGP SIGNATURE-----

3
libreoffice-7.3.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:db554117cd690d48a2e69cb6190603981c9ba5e70d4bbe162f0ae31b397f1443
size 255263512

16
libreoffice-7.3.1.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIGT40ACgkQ9DSh76/u
rqOpmA/+NV5aSLZw4naApHPyClF0ujVBKTFKprLtpeu+1mg32Z9+/9kW6FYr0Oev
iUxTCmzvzvhgWhmuZ6F25ibnHfmmn2zOjMy+SRV1B6fEqDnFJc3V/JYdBb+oLuSt
la31Uy8Qbt8mcSiO6pM9aox+g34DlRTXnf/JnHKY06mOMqggHeACzqjYncpspsOt
fmZhOcIMrkpxccchEel4AQxbLveJf7omFrCS1H4SEWapIog5I1hyC9S3iqQWgdtp
x4p3NEDqV+npjsbIjI4qUaQCpgQIBDClP4ivK1ESpWCoF4IvcrzgPXdFnc1H0c6d
kxD3vXd0TIX/mDOoWpz7AQM/HgHtLVkDHwEBZI9mdi8kLh8k9dNEA2hgiR8vfubb
fl2KMlQJxWqYEdoKpDEEMjMSp48fAyoz8b5CXuOBoowRJkFVYvtDanB5NXevMvws
h5bQGqk2RmYjI+20HNlgSbHZLIfqviiwECZdAK6TiVsU/UkNREwlgV0Aqb1OHOXf
rcI4OLW3IwKUV7t8e8XStJIoZidzDOMcqO569yuiWqY9WQSAZT6nz1pY7+1fpYJm
lismZ6vaBAVLriUr//k9S80gYsscKkbjqnLz6jFL7VCJgVSNC5LCVMJXpeJvnNz3
UG1MIsNF/QbBf2dBgCr3f9Fqxpbr0tUHI8sg1PFZ4k5UE7gtJ60=
=N8ct
-----END PGP SIGNATURE-----

3
libreoffice-help-7.2.5.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:16d00f492518a73de8f9936b58b59b2d60265945bc5d1f2cb53324592ca80a4a
size 112081364

16
libreoffice-help-7.2.5.1.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmG44asACgkQ9DSh76/u
rqMlsg//dMMdlqmtuWjOW1j3dk9nXuFrBulhGUmTwGZNnl/oWraCNpc3ynPOEtBR
EOFTyTKl6mIzg/MqM9K+4CFmSdkPQ2tgXq7eMYSAPdwUF8vf8K1S2oHpRkkUOPPp
hk+qhW7/pa/A/cEzG+dr5jrtx+lKachhIJep0JcqB6ACtmtg5Xj59M0Q7qJfCJQI
JymekgfD763ED5/OSA1Cx9gyg87UbJuvcqxJj38Tr+9qxYf0+sxb9t6FtS0aWZ2Y
ftnpKYNWZkf0E8et3PXtlXDtSo8tk8OTRghlqHvTZZgWvl+1fUfSA/qzqilPITgf
6fZiP12mrJ6R1fMd7uziot/WyZU84xzYnK5t5KEP7vno/6PK22z6XIhHbFWsVyQH
KTxHFoy4zZgiS8njFdSiExyPRtlLSSwtGy/YW18rws6tRmpbTBP0UWuWf/LyUZyP
B44qmE+/zWE5O810e0m+P9JQvD1W6JLbWdB7GEs+yso74tNmaITxvNYhLla1QW3c
rsnHWrKoVsRH4L5c0ijwfa4ug9xT8aYcIovegRd9mXhc25WcOYRhiFaI7R7Pv7cy
MRCdw1Fl+NSYo5mkAyCTuLi03cL1+xm6o7Le7olnPbGRSD7D8M7vj8nhoH24oIzU
/vy8hUjbDJEKhhikOky/0WagFsNGeItqOwi3fhT19dkWQmdYpyM=
=oL9w
-----END PGP SIGNATURE-----

3
libreoffice-help-7.3.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a67efaabaddd57377af18e0e86aedb397b27ca83b09263a6bdc3264f9a8cb302
size 112208076

16
libreoffice-help-7.3.1.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIGT5IACgkQ9DSh76/u
rqMjBQ/9HeJmIMCGcvoC0ql4kIge9hul3bwJtwfSzSX54Cz+SvVLtEiXGiA+Hs6X
A50mbGeQeuFByhNzxuw40bJz8gIE+Bu3I9MG0wTHLDCbO4/yzw0xnUz4DJIVTG+U
V2t+g9rewilWi55JUkfAGLeUA3SefbUSLKB2zwk9WXb2EMSabdO7+bb5hp+k0tP0
R23I2hfc15OTtancSrNW5GRI1PI3IBk7RsFffKaqnRJqfKDBiYsT6OpdQYCzR+5p
4NqXTPcYxiWyRXdYl5KNdozln3GMJTirKE5kx3FPiTldEMc1JtFdngUY8UwMDfhb
XYykj0dtOY1UfLpv8GRJ0SbjemKcCTqIOSxmCudoDFkXub77RN2khPyF0ZuMB4ry
eD9N+lyfa4S4BCG+2oSR3DcNnMBGUfvZP+EG4kHLOcfjdCV38HKcgzkJ0HXTgPLx
CQmbvPKjpoc/d8M7uSd6G8YRh/SOB53zaGz0UU/aBh2gt1wGLJ1LXBxzEOtDdtkb
7lLbDDjefCD6brAkinPxK17UXgiEZIcItY7fFIQVGO391tWAJuLTJtEIsPIznkkm
PzGn+9w7qvq/PKZxhtcwCHDyEV6bVtdaVu/xekjXYiWmGCRj6ZCCuUjIKxEiD3ep
2PhWX0bERc0IVMsooD3ce+TkOBY+OsbG9Ztr40kaPPpJ0BBiSrs=
=lYoZ
-----END PGP SIGNATURE-----

3
libreoffice-translations-7.2.5.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:989ee335ebc8d30a2bfc302aa4e9e47fd2cff83acfaf3f0d3caf8fc931923908
size 192789608

16
libreoffice-translations-7.2.5.1.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmG44awACgkQ9DSh76/u
rqOjVw/9HtOad+Rfqe3BdwlPmnVES9LQQg6HCi4VF9t57EvRr0y/+LijBnzjuZe1
A+MoycvX9d4X8EM0yw3/00WOMGFE0FsJ/mXL+PeLzS0gDSu1xD5ajNGHjG25wtxp
A9WrUTuVDUqojzsgANlb3YI5tY5BSowfTuQfO+AS7lXv2ykUn+ope0jAwLlj6eRm
NxmLwMFClpJYjXYo6rMXKG1/aG/dfOTOZApVsPk3mEPdM1sVA6stJcfi55KcD9ez
J3+oibnnQoXh/0sFH1aZ9FWaaiOlyfMki5CPl+lOGZWXNEryY0uS5n2OQ4D/yc65
d9qkb2MV2QYoWh8yE0fkeO/MrdCAFcmuFrEjegSs+DntCXzq8p7QuqDBmn1b7QQv
NHLQg5GUqgRpJcBSBV6a8qcR/0g8w4jbGGqGP2tqzNhCHdW5dwELwNryY9VUfibQ
JCTV6pXLAU2QZY33Rkc+oFWVoIWNZH6g72AR9rUUlHglpE+/kgcG/sqErICBvILM
7VXEjb4qU/kD2drc5gIIp8wSVSVuWHuSJ9mNcXh6ySp9bfG7xvOKP1soFBzM1vJ7
D/BhPFjrlLT8rNPT7v37oDjbx1SxZ5PkxGgtGSUC0q9SLuoCgPQHnP+oDEjIof+n
qX7y0aIJaw9+cILfCKwTYISVfquoUWUOV8nVo8C2gXQaIB8RBFA=
=uFbB
-----END PGP SIGNATURE-----

3
libreoffice-translations-7.3.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b0a10b73eb0e7e3781eae61d18edf8d9f279700d86ccc0963e6dffff09668ae
size 196019764

16
libreoffice-translations-7.3.1.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIGT5QACgkQ9DSh76/u
rqPG/g//dkKs6bhQlEQ8T7pU7xN+vif99akisTOJ3qlCuo0ky+lOw8M3lFzMKxnH
/ZbwgOCpO3vLt5mCzhv0TGpXVHCaiFF14aYIV8wFK2UPqvsUTgPf5V6PwncIn7/z
uw1m0NGEdjtNlIjlm6O/5DCaPSOWPn/dbe4I+aiMSNfOhf9KunViRf/kKjkreUQY
Rt0OFiAAqm5f64SloO0q/Ecmr8zbav8I57e/9LoiqPb+pC/GdjWgQpRxUwXXabLy
m8MbiNknnIXNZaFogrN3KDJ3+Sf+1dSpFPAOwfUi+5FNhZJvIYOyl+Kx0led+tXk
CS6E+LnzAyzsUMqaF8fImj+r4A7Q+nsCCiG/G5hsyFNgufyhVP3I8eQ83tq6z1DM
DtZUnOsh0Yi/hqTcUDKbgHLimo79c+38BqDl+Ed+OL0FUWWCxFLEvWazrkYcjAqQ
+SPdPEaHfIfks3D7NbztJpCbQx2ig0i/8KXIt1qSh5BvoejpyUwqlhFtCfDuGqAW
CswCKWTWp/yseRz2DfD2ibOw76FM9oxmg79nnBZqtG4ojFB1tvwJltGd5NzAKrsk
pgmpRHvD1Kq9hbAOIBtW+39gNwtHvklbbzx3EjkAflM1SsKDQepymGP/GHdNKxTq
81tmszm/ZFGGuLj4LrklzygfjcqxTb3xrSVnBAlqf89Gym80UkI=
=zr9T
-----END PGP SIGNATURE-----

17
libreoffice.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu Feb 17 10:10:53 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Add upstream change to fix KDE Frameworks detection (boo#1196017)
* 0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch
-------------------------------------------------------------------
Fri Feb 14 10:22:01 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
- Update to 7.3.1.1
- Removed uneeded patches:
* 0001-Missing-includes-for-libstdc-12.patch
* bsc1183308.patch
* fix-wayland-scaling-in-plasma.patch
* pld-skia-patches.patch
* skia-freetype2.11.patch
-------------------------------------------------------------------
Sat Feb 5 15:29:22 UTC 2022 - Michael Gorse <mgorse@suse.com>

57
libreoffice.spec
View File

@ -46,7 +46,7 @@
%endif
%bcond_with firebird
Name: libreoffice
Version: 7.2.5.1
Version: 7.3.1.1
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -70,9 +70,9 @@ Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{nu
Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
# GPGME bundle list
Source1000: %{external_url}/gpgme-1.13.1.tar.bz2
Source1001: %{external_url}/libgpg-error-1.37.tar.bz2
Source1002: %{external_url}/libassuan-2.5.3.tar.bz2
Source1000: %{external_url}/gpgme-1.16.0.tar.bz2
Source1001: %{external_url}/libgpg-error-1.43.tar.bz2
Source1002: %{external_url}/libassuan-2.5.5.tar.bz2
# Internal bundled stuff we can't remove
# To build this we would pull cygwin; not worth it
Source2001: https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
@ -87,13 +87,11 @@ Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi
Source2006: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
Source2007: https://dev-www.libreoffice.org/extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
# PDFium is bundled everywhere
Source2008: %{external_url}/pdfium-4500.tar.bz2
Source2008: %{external_url}/pdfium-4699.tar.bz2
# Single C file with patches from LO
Source2009: %{external_url}/dtoa-20180411.tgz
# Skia is part of chromium and bundled everywhere as by google only way is monorepo way
Source2010: %{external_url}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
# Fix the build with freetype-2.11
Source2011: skia-freetype2.11.patch
Source2010: %{external_url}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
Source2012: %{external_url}/libcmis-0.5.2.tar.xz
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build
@ -104,14 +102,10 @@ Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-no-broken-help.diff
# PATCH-FIX-OPENSUSE boo#1186110 fix GCC 11 error
Patch6: gcc11-fix-error.patch
Patch7: pld-skia-patches.patch
# PATCH-FIX-UPSTREAM https://bugs.documentfoundation.org/show_bug.cgi?id=137924 Use proper DPI without requiring window handle
Patch8: fix-wayland-scaling-in-plasma.patch
Patch9: fix_math_desktop_file.patch
Patch10: fix_gtk_popover_on_3.20.patch
# LO-L3: bsc#1183308 Simple, seven page slide deck of 3.7MB takes looong to open, start presentation mode, or move back to slide 1
Patch11: bsc1183308.patch
Patch12: 0001-Missing-includes-for-libstdc-12.patch
# PATCH-FIX-UPSTREAM boo#1196017 Fix KDE Frameworks 5.91 detection
Patch11: 0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch
# Build with java 8
Patch101: 0001-Revert-java-9-changes.patch
# try to save space by using hardlinks
@ -127,7 +121,7 @@ BuildRequires: bison
BuildRequires: bsh2
BuildRequires: commons-logging
BuildRequires: cups-devel
BuildRequires: curl-devel
BuildRequires: curl-devel >= 7.68.0
# Needed for tests
BuildRequires: dejavu-fonts
BuildRequires: doxygen >= 1.8.4
@ -138,12 +132,14 @@ BuildRequires: fontforge
BuildRequires: glm-devel
# Needed for tests
BuildRequires: google-carlito-fonts
BuildRequires: abseil-cpp-devel
BuildRequires: gperf >= 3.1
BuildRequires: graphviz
BuildRequires: hyphen-devel
BuildRequires: junit4
BuildRequires: libbase
BuildRequires: libcppunit-devel >= 1.14.0
BuildRequires: libcuckoo-devel
BuildRequires: liberation-fonts
BuildRequires: libexif
BuildRequires: libfonts
@ -205,7 +201,8 @@ BuildRequires: pkgconfig(libmspub-0.1) >= 0.1
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.19
BuildRequires: pkgconfig(libnumbertext) >= 1.0.6
BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4
BuildRequires: pkgconfig(liborcus-0.16)
BuildRequires: pkgconfig(libopenjp2)
BuildRequires: pkgconfig(liborcus-0.17)
BuildRequires: pkgconfig(libpagemaker-0.0)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libpq)
@ -220,14 +217,13 @@ BuildRequires: pkgconfig(libwps-0.4) >= 0.4.11
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(libzmf-0.0)
BuildRequires: pkgconfig(mdds-1.5) >= 1.5.0
BuildRequires: pkgconfig(mdds-2.0)
BuildRequires: pkgconfig(mythes)
BuildRequires: pkgconfig(nspr) >= 4.8
BuildRequires: pkgconfig(nss) >= 3.9.3
BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(redland)
BuildRequires: pkgconfig(sane-backends)
BuildRequires: pkgconfig(serf-1) >= 1.3.9
BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.28
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xt)
@ -264,7 +260,7 @@ Obsoletes: %{name}-icon-theme-oxygen < %{version}
ExclusiveArch: aarch64 %{ix86} x86_64 ppc64le
%if 0%{?suse_version} < 1550
# Too old boost on the system
Source2020: %{external_url}/boost_1_75_0.tar.xz
Source2020: %{external_url}/boost_1_77_0.tar.xz
Source2023: %{external_url}/poppler-21.11.0.tar.xz
Source2024: %{external_url}/poppler-data-0.4.10.tar.gz
%else
@ -278,8 +274,8 @@ BuildRequires: pkgconfig(poppler-cpp)
%endif
%if 0%{?suse_version} < 1500
# Too old icu on the system
Source2021: %{external_url}/icu4c-69_1-src.tgz
Source2022: %{external_url}/icu4c-69_1-data.zip
Source2021: %{external_url}/icu4c-70_1-src.tgz
Source2022: %{external_url}/icu4c-70_1-data.zip
BuildRequires: gcc7
BuildRequires: gcc7-c++
BuildRequires: java-devel >= 1.8
@ -1011,22 +1007,15 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch2
%patch3
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch11 -p1
%if 0%{?suse_version} < 1500
%patch10 -p1
%patch11 -p1
%endif
%patch12 -p1
%if 0%{?suse_version} < 1500
%patch101 -p1
%endif
%patch990 -p1
%patch991 -p1
cp %{SOURCE2011} external/skia
# Disable some of the failing tests (some are random)
%if 0%{?suse_version} < 1330
sed -i -e '/CppunitTest_desktop_lib/d' desktop/Module_desktop.mk
@ -1042,6 +1031,8 @@ sed -i -e /CppunitTest_sw_uiwriter/d sw/Module_sw.mk
sed -i -e /CPPUNIT_TEST\(testODFEncryptedGPG\)/d xmlsecurity/qa/unit/signing/signing.cxx
# breaks on LTO https://bugs.documentfoundation.org/show_bug.cgi?id=126442
sed -i -e /CppunitTest_sw_apitests/d sw/Module_sw.mk
# -flto=thin is not supported by gcc
sed -i -e s/-flto=thin/-flto/ solenv/gbuild/platform/com_GCC_defs.mk
# Disable failing tests on ppc64le for now
%ifarch ppc64le
sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
@ -1145,7 +1136,7 @@ export NOCONFIGURE=yes
--without-fonts \
--without-myspell-dicts \
--with-jdk-home=$JAVA_HOME \
--with-webdav=serf \
--with-webdav=curl \
--with-beanshell-jar=%{_datadir}/java/bsh2/bsh.jar \
--with-ant-home=%{_datadir}/ant \
--with-external-dict-dir=%{_datadir}/hunspell \
@ -1585,11 +1576,17 @@ exit 0
%files -f file-lists/sdk_doc_list.txt sdk-doc
%files calc-extensions
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/share
%dir %{_libdir}/%{name}/share/extensions
%{_libdir}/%{name}/share/extensions/ConvertTextToNumber
%{_libdir}/%{name}/share/extensions/nlpsolver
%{_libdir}/%{name}/share/extensions/numbertext
%files writer-extensions
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/share
%dir %{_libdir}/%{name}/share/extensions
%{_libdir}/%{name}/share/extensions/wiki-publisher
%files icon-themes

3
pdfium-4500.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304
size 7275062

3
pdfium-4699.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789df500c563bf
size 8780890

10
pld-skia-patches.patch
View File

@ -1,10 +0,0 @@
--- libreoffice-7.2.0.3/external/skia/UnpackedTarball_skia.mk.orig 2021-08-10 19:27:48.000000000 +0200
+++ libreoffice-7.2.0.3/external/skia/UnpackedTarball_skia.mk 2021-08-12 18:09:22.813517161 +0200
@@ -39,6 +39,7 @@
fix-warnings.patch.1 \
disable-freetype-colrv1.1 \
windows-libraries-system32.patch.1 \
+ skia-freetype2.11.patch \
$(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))

37
skia-freetype2.11.patch
View File

@ -1,37 +0,0 @@
--- skia/src/ports/SkFontHost_FreeType_common.cpp.orig 2021-03-01 15:53:09.178606791 +0100
+++ skia/src/ports/SkFontHost_FreeType_common.cpp 2021-08-12 17:48:32.358901987 +0200
@@ -665,8 +665,13 @@
canvas->drawPaint(paint);
break;
}
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+ case FT_COLR_PAINTFORMAT_TRANSFORM: {
+ SkMatrix transform = ToSkMatrix(colrv1_paint.u.transform.affine);
+#else
case FT_COLR_PAINTFORMAT_TRANSFORMED: {
SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
+#endif
canvas->concat(transform);
break;
@@ -760,12 +765,20 @@
traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
FT_COLOR_NO_ROOT_TRANSFORM);
break;
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+ case FT_COLR_PAINTFORMAT_TRANSFORM:
+#else
case FT_COLR_PAINTFORMAT_TRANSFORMED:
+#endif
canvas->saveLayer(nullptr, nullptr);
// Traverse / draw operation will apply transform.
colrv1_draw_paint(canvas, palette, face, paint);
traverse_result =
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
+ colrv1_traverse_paint(canvas, palette, face, paint.u.transform.paint);
+#else
colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint);
+#endif
canvas->restore();
break;
case FT_COLR_PAINTFORMAT_ROTATE:

3
skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d
size 10630696

3
skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177
size 11826600