commit
475a4b6de0
GPG Key ID:
1EC08A25C9DB2503
@ -0,0 +1,7 @@
|
||||
SOURCES/libreoffice-translations-24.2.2.1.tar.xz
|
||||
SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
SOURCES/dtoa-20180411.tgz
|
||||
SOURCES/libreoffice-help-24.2.2.1.tar.xz
|
||||
SOURCES/libreoffice-24.2.2.1.tar.xz
|
||||
SOURCES/Java-WebSocket-1.5.4.tar.gz
|
||||
SOURCES/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
|
||||
@ -0,0 +1,7 @@
|
||||
53ebf758d5f22c6afe034cda75d687f415727452 SOURCES/libreoffice-translations-24.2.2.1.tar.xz
|
||||
2d49e11b0b711970f494294dc3698f05eb294853 SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
083509db5ad9d1680830be9add727d58b54ca0d3 SOURCES/dtoa-20180411.tgz
|
||||
fdb3ea32a1059613dd672473297bdebc490aa562 SOURCES/libreoffice-help-24.2.2.1.tar.xz
|
||||
5a9b9331ff85196ccf5176aa05002816c12e22a6 SOURCES/libreoffice-24.2.2.1.tar.xz
|
||||
67703956d32bd3c20baf8f1dd69efa579234381e SOURCES/Java-WebSocket-1.5.4.tar.gz
|
||||
7168b0f40aa5c72267899601c116d2348d2f56ec SOURCES/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
|
||||
@ -0,0 +1,26 @@
|
||||
From 87b90b6fbf010effd44ef0e2bd3d75b27562a82b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Mon, 27 Mar 2017 11:47:01 +0100
|
||||
Subject: [PATCH] Resolves: rhbz#1432468 disable opencl by default
|
||||
|
||||
Change-Id: Ie037fcabdd219f195425979dd721501fb5527573
|
||||
---
|
||||
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
|
||||
index 99b4104f6499..ef7ada84c2f3 100644
|
||||
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
|
||||
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
|
||||
@@ -5652,7 +5652,7 @@
|
||||
<desc>Determines whether OpenCL can be used, when available, to speed up
|
||||
some operations.</desc>
|
||||
</info>
|
||||
- <value>true</value>
|
||||
+ <value>false</value>
|
||||
</prop>
|
||||
<prop oor:name="OpenCLDenyList" oor:type="oor:string-list" oor:nillable="false">
|
||||
<!-- UIHints: Tools - Options General OpenCL -->
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -0,0 +1,58 @@
|
||||
From ffceb48dd576ababe346c9548b12ca18f31d3293 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Fri, 10 Mar 2023 11:41:45 +0000
|
||||
Subject: [PATCH] default to sifr for gnome light mode
|
||||
|
||||
https://pagure.io/fedora-workstation/issue/361
|
||||
|
||||
"Fedora Workstation currently uses the rather outdated-looking
|
||||
Elementary icon theme for LibreOffice, instead of the Sifr icon theme
|
||||
which was designed to fit in with GNOME's icons. The Sifr theme saw a
|
||||
nice update with LibreOffice 7.5, the version being shipped in Fedora
|
||||
Linux 38, which makes the icons fit better with the current GNOME design
|
||||
language."
|
||||
|
||||
Change-Id: Ic37bbe8e7ad754ab070ead06dc0b006c6ccf3adb
|
||||
---
|
||||
vcl/qa/cppunit/app/test_IconThemeSelector.cxx | 4 ++--
|
||||
vcl/source/app/IconThemeSelector.cxx | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
|
||||
index 72ee344b1437..8d1aea0c3889 100644
|
||||
--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
|
||||
+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
|
||||
@@ -85,7 +85,7 @@ IconThemeSelectorTest::ElementaryIsReturnedForGnomeDesktop()
|
||||
std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes();
|
||||
vcl::IconThemeSelector s;
|
||||
OUString r = s.SelectIconThemeForDesktopEnvironment(themes, "gnome");
|
||||
- CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is returned for gnome desktop", OUString("elementary"), r);
|
||||
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("'sifr' theme is returned for gnome desktop", OUString("sifr"), r);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -96,7 +96,7 @@ IconThemeSelectorTest::ThemeIsOverriddenByPreferredTheme()
|
||||
s.SetPreferredIconTheme(preferred, false);
|
||||
std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes();
|
||||
OUString selected = s.SelectIconThemeForDesktopEnvironment(themes, "gnome");
|
||||
- CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is overridden by breeze", preferred, selected);
|
||||
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("'sifr' theme is overridden by breeze", preferred, selected);
|
||||
}
|
||||
|
||||
void
|
||||
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
|
||||
index 6b8dfc0f42c7..ee30e577f3f5 100644
|
||||
--- a/vcl/source/app/IconThemeSelector.cxx
|
||||
+++ b/vcl/source/app/IconThemeSelector.cxx
|
||||
@@ -86,7 +86,7 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
|
||||
desktopEnvironment.equalsIgnoreAsciiCase("mate") ||
|
||||
desktopEnvironment.equalsIgnoreAsciiCase("unity") ) {
|
||||
if (!bPreferDarkIconTheme)
|
||||
- r = "elementary";
|
||||
+ r = "sifr";
|
||||
else
|
||||
r = "sifr_dark";
|
||||
} else
|
||||
--
|
||||
2.40.1
|
||||
|
||||
@ -0,0 +1,145 @@
|
||||
From 0b613b941c3ffbe432934269f8865bc1f9e59cde Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Tue, 27 Sep 2022 15:13:59 -0700
|
||||
Subject: [PATCH] disable libe-book support
|
||||
|
||||
---
|
||||
configure.ac | 3 ---
|
||||
external/Module_external.mk | 1 -
|
||||
filter/Configuration_filter.mk | 8 --------
|
||||
writerperfect/Library_wpftwriter.mk | 2 --
|
||||
writerperfect/qa/unit/WpftFilterFixture.hxx | 4 ----
|
||||
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 5 -----
|
||||
writerperfect/source/writer/wpftwriter.component | 6 ------
|
||||
7 files changed, 29 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 8babc85..e7733de 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -9606,9 +9606,6 @@ libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10])
|
||||
|
||||
libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
|
||||
|
||||
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
|
||||
-libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
|
||||
-
|
||||
libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
|
||||
|
||||
libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0])
|
||||
diff --git a/external/Module_external.mk b/external/Module_external.mk
|
||||
index 366fff2..bc987d1 100644
|
||||
--- a/external/Module_external.mk
|
||||
+++ b/external/Module_external.mk
|
||||
@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
|
||||
$(call gb_Helper_optional,CURL,curl) \
|
||||
$(call gb_Helper_optional,DRAGONBOX,dragonbox) \
|
||||
dtoa \
|
||||
- $(call gb_Helper_optional,EBOOK,libebook) \
|
||||
$(call gb_Helper_optional,EPM,epm) \
|
||||
$(call gb_Helper_optional,EPOXY,epoxy) \
|
||||
$(call gb_Helper_optional,EPUBGEN,libepubgen) \
|
||||
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
|
||||
index a58b839..526b447 100644
|
||||
--- a/filter/Configuration_filter.mk
|
||||
+++ b/filter/Configuration_filter.mk
|
||||
@@ -359,10 +359,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
|
||||
writer_OOXML_Template \
|
||||
writer_layout_dump_xml \
|
||||
writer_indexing_export_xml \
|
||||
- writer_BroadBand_eBook \
|
||||
- writer_FictionBook_2 \
|
||||
- writer_PalmDoc \
|
||||
- writer_Plucker_eBook \
|
||||
writer_ApplePages \
|
||||
MWAW_Text_Document \
|
||||
Palm_Text_Document \
|
||||
@@ -409,10 +405,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
|
||||
OOXML_Text_Template \
|
||||
writer_layout_dump \
|
||||
writer_indexing_export \
|
||||
- BroadBand_eBook \
|
||||
- FictionBook_2 \
|
||||
- PalmDoc \
|
||||
- Plucker_eBook \
|
||||
ApplePages \
|
||||
MWAW_Text_Document \
|
||||
Palm_Text_Document \
|
||||
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
|
||||
index 840a86f..70a8933 100644
|
||||
--- a/writerperfect/Library_wpftwriter.mk
|
||||
+++ b/writerperfect/Library_wpftwriter.mk
|
||||
@@ -64,7 +64,6 @@ endif
|
||||
$(eval $(call gb_Library_use_externals,wpftwriter,\
|
||||
abw \
|
||||
boost_headers \
|
||||
- ebook \
|
||||
$(if $(ENABLE_WASM_STRIP_SWEXPORTS),,etonyek) \
|
||||
icu_headers \
|
||||
icui18n \
|
||||
@@ -93,7 +92,6 @@ endif
|
||||
ifneq ($(ENABLE_WASM_STRIP_SWEXPORTS),TRUE)
|
||||
$(eval $(call gb_Library_add_exception_objects,wpftwriter,\
|
||||
writerperfect/source/writer/AbiWordImportFilter \
|
||||
- writerperfect/source/writer/EBookImportFilter \
|
||||
writerperfect/source/writer/MSWorksImportFilter \
|
||||
writerperfect/source/writer/MWAWImportFilter \
|
||||
writerperfect/source/writer/PagesImportFilter \
|
||||
diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx
|
||||
index 2fdd6a2..dbdd672 100644
|
||||
--- a/writerperfect/qa/unit/WpftFilterFixture.hxx
|
||||
+++ b/writerperfect/qa/unit/WpftFilterFixture.hxx
|
||||
@@ -25,10 +25,6 @@
|
||||
|| ((major) == (req_major) \
|
||||
&& ((minor) > (req_minor) || ((minor) == (req_minor) && ((micro) >= (req_micro)))))
|
||||
|
||||
-#define REQUIRE_EBOOK_VERSION(major, minor, micro) \
|
||||
- REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, \
|
||||
- micro)
|
||||
-
|
||||
#define REQUIRE_ETONYEK_VERSION(major, minor, micro) \
|
||||
REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, \
|
||||
minor, micro)
|
||||
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
|
||||
index 78d24dc..39924f9 100644
|
||||
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
|
||||
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
|
||||
@@ -30,9 +30,6 @@ WpftWriterFilterTest::WpftWriterFilterTest()
|
||||
|
||||
void WpftWriterFilterTest::test()
|
||||
{
|
||||
- const writerperfect::test::WpftOptionalMap_t aEBookOptional{
|
||||
- { "FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1) },
|
||||
- };
|
||||
const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
|
||||
{ "Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2) },
|
||||
{ "Pages_5.pages", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
|
||||
@@ -59,8 +56,6 @@ void WpftWriterFilterTest::test()
|
||||
|
||||
doTest("com.sun.star.comp.Writer.AbiWordImportFilter",
|
||||
u"/writerperfect/qa/unit/data/writer/libabw/");
|
||||
- doTest("org.libreoffice.comp.Writer.EBookImportFilter",
|
||||
- u"/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional);
|
||||
doTest("com.sun.star.comp.Writer.MSWorksImportFilter",
|
||||
u"/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional);
|
||||
doTest("com.sun.star.comp.Writer.MWAWImportFilter",
|
||||
diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component
|
||||
index 176d487..0c89217 100644
|
||||
--- a/writerperfect/source/writer/wpftwriter.component
|
||||
+++ b/writerperfect/source/writer/wpftwriter.component
|
||||
@@ -42,12 +42,6 @@
|
||||
<service name="com.sun.star.document.ImportFilter"/>
|
||||
<optional/>
|
||||
</implementation>
|
||||
- <implementation name="org.libreoffice.comp.Writer.EBookImportFilter"
|
||||
- constructor="org_libreoffice_comp_Writer_EBookImportFilter_get_implementation">
|
||||
- <service name="com.sun.star.document.ExtendedTypeDetection"/>
|
||||
- <service name="com.sun.star.document.ImportFilter"/>
|
||||
- <optional/>
|
||||
- </implementation>
|
||||
<implementation name="org.libreoffice.comp.Writer.PagesImportFilter"
|
||||
constructor="org_libreoffice_comp_Writer_PagesImportFilter_get_implementation">
|
||||
<service name="com.sun.star.document.ExtendedTypeDetection"/>
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From d6e2cdb0023e422546e3ece5bf9915f7c490ced8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Fri, 20 Mar 2020 14:24:05 +0000
|
||||
Subject: [PATCH] disble tip-of-the-day dialog by default
|
||||
|
||||
Change-Id: Ie7f0e3fe3dda12c2ec88c376d2b57419253ae5cf
|
||||
---
|
||||
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
|
||||
index e7c339e2e22e..9aa88ef1aa02 100644
|
||||
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
|
||||
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
|
||||
@@ -5570,7 +5570,7 @@
|
||||
<info>
|
||||
<desc>Determines whether the Tip-of-the-Day dialog is shown on startup.</desc>
|
||||
</info>
|
||||
- <value>true</value>
|
||||
+ <value>false</value>
|
||||
</prop>
|
||||
<prop oor:name="LastTipOfTheDayShown" oor:type="xs:int" oor:nillable="false">
|
||||
<info>
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
From a6f2cba43d79347b6975b3b8069b423c94a7dba6 Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
Date: Tue, 8 Nov 2016 11:50:06 +0100
|
||||
Subject: [PATCH] don't suppress crashes
|
||||
|
||||
An automatic restart after a crash makes the crash invisible to abrt.
|
||||
|
||||
Change-Id: I3854e619356049b144b08575879d289a3c12e4c9
|
||||
---
|
||||
desktop/source/app/app.cxx | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
|
||||
index c54aea9dd4f7..a613fe12cef2 100644
|
||||
--- a/desktop/source/app/app.cxx
|
||||
+++ b/desktop/source/app/app.cxx
|
||||
@@ -1165,8 +1165,6 @@
|
||||
if( bRestart )
|
||||
{
|
||||
RequestHandler::Disable();
|
||||
- if( pSignalHandler )
|
||||
- osl_removeSignalHandler( pSignalHandler );
|
||||
|
||||
restartOnMac(false);
|
||||
#if !ENABLE_WASM_STRIP_SPLASH
|
||||
@@ -1174,7 +1172,7 @@
|
||||
m_rSplashScreen->reset();
|
||||
#endif
|
||||
|
||||
- _exit( EXITHELPER_CRASH_WITH_RESTART );
|
||||
+ return;
|
||||
}
|
||||
else
|
||||
{
|
||||
--
|
||||
2.29.2
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,58 @@
|
||||
From 86abb6fd8a8f680f9fc5ff1db775845c9f4e254b Mon Sep 17 00:00:00 2001
|
||||
From: Michael Weghorn <m.weghorn@posteo.de>
|
||||
Date: Wed, 13 Mar 2024 12:27:12 +0100
|
||||
Subject: [PATCH] tdf#159915 qt: Force
|
||||
Qt::HighDpiScaleFactorRoundingPolicy::Round
|
||||
|
||||
For now, force `Qt::HighDpiScaleFactorRoundingPolicy::Round`
|
||||
for the HighDPI-scale factor rounding policy [1], which is the default
|
||||
for Qt 5, while Qt 6 defaults to `Qt::HighDpiScaleFactorRoundingPolicy::PassThrough`
|
||||
(see [2]), which resulted in broken rendering (e.g. "Help" -> "About"
|
||||
dialog not showing the whole content) when fractional display scaling like 150 %
|
||||
is configured in the KDE Plasma display settings (in contrast to manually setting the
|
||||
`QT_SCALE_FACTOR=1.5` env variable to apply scaling, which was working
|
||||
fine).
|
||||
|
||||
Quoting from [3]:
|
||||
|
||||
> The two principal options are whether fractional scale factors should be
|
||||
> rounded to an integer or not. Keeping the scale factor as-is will make
|
||||
> the user interface size match the OS setting exactly, but may cause
|
||||
> painting errors, for example with the Windows style.
|
||||
|
||||
Manually setting the env variable `QT_SCALE_FACTOR_ROUNDING_POLICY="Round"`
|
||||
has the same effect (and can be used with LO versions not yet
|
||||
containing this fix).
|
||||
|
||||
(There might be a way to adjust the way that scaling happens
|
||||
to make other policies work, but for now, just hard-code to
|
||||
the policy that is known to work.)
|
||||
|
||||
[1] https://doc.qt.io/qt-6/qt.html#HighDpiScaleFactorRoundingPolicy-enum
|
||||
[2] https://doc.qt.io/qt-6/highdpi.html#environment-variable-reference
|
||||
[3] https://doc.qt.io/qt-6/qguiapplication.html#setHighDpiScaleFactorRoundingPolicy
|
||||
|
||||
Change-Id: I8eb6911d4dd5faf00912b8f15a58e0bdace1995a
|
||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164768
|
||||
Tested-by: Jenkins
|
||||
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
||||
---
|
||||
vcl/qt5/QtInstance.cxx | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
|
||||
index 6b3bd0cc301ae..2801601115ecd 100644
|
||||
--- a/vcl/qt5/QtInstance.cxx
|
||||
+++ b/vcl/qt5/QtInstance.cxx
|
||||
@@ -740,6 +740,11 @@ std::unique_ptr<QApplication> QtInstance::CreateQApplication(int& nArgc, char**
|
||||
// for scaled icons in the native menus
|
||||
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
|
||||
#endif
|
||||
+ // force Qt::HighDpiScaleFactorRoundingPolicy::Round, which is the Qt 5 default
|
||||
+ // policy and prevents incorrect rendering with the Qt 6 default policy
|
||||
+ // Qt::HighDpiScaleFactorRoundingPolicy::PassThrough (tdf#159915)
|
||||
+ QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
|
||||
+ Qt::HighDpiScaleFactorRoundingPolicy::Round);
|
||||
|
||||
FreeableCStr session_manager;
|
||||
if (getenv("SESSION_MANAGER") != nullptr)
|
||||
Binary file not shown.
@ -0,0 +1,51 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
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
|
||||
=1iQB
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
@ -0,0 +1,16 @@
|
||||
diff -U 3 -dHrN a/sc/inc/arraysumfunctor.hxx b/sc/inc/arraysumfunctor.hxx
|
||||
--- a/sc/inc/arraysumfunctor.hxx 2023-09-22 21:07:01.000000000 +0200
|
||||
+++ b/sc/inc/arraysumfunctor.hxx 2023-10-01 09:13:03.523493665 +0200
|
||||
@@ -85,8 +85,12 @@
|
||||
inline KahanSum sumArray(const double* pArray, size_t nSize)
|
||||
{
|
||||
size_t i = 0;
|
||||
+#if 0
|
||||
const double* pCurrent = pArray;
|
||||
KahanSum fSum = executeFast(i, nSize, pCurrent);
|
||||
+#else
|
||||
+ KahanSum fSum = 0.0;
|
||||
+#endif
|
||||
|
||||
// sum rest of the array
|
||||
for (; i < nSize; ++i)
|
||||
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmXpp4IACgkQ9DSh76/u
|
||||
rqNySxAAoMRoCZyWx6+62LXKoJErPFJ6vEnKhf293UgK1jac7uyWZDItuzW60XhT
|
||||
UAnF1CGz7wgYV89fPkBLXRQSpKZEGSBOE7uOB3lUOoF7lLqH3NwyBBGDiF6Qf198
|
||||
XrQHpuVfTN9WuoTwOVmfnY5KbxRcsdetOoAKoNy1t7xmWToGwzkaaM2myqBvWJgM
|
||||
1NaTx9NrK+hghmNEwX380gtBjunvyebvvPWvB+c7Hth3RQS4yVgwdsleYh/7MTdU
|
||||
GLEqtVry+AahXj/X1Z2uUZhHctL4KDnQAPcy7PgzKBTmXHV5P3MfXFmUvCgHAta5
|
||||
rAIMUkW5FmW1TNrEbpZO0HzgxSCp7LFY69LWy0x7bKSZ/nm3X6e6t0+8ggWHvcI8
|
||||
MlKlKN+Lp8ErFAMME+4bWUvhJeGlw8lACFsCkZrZ0TrkpJ1sbPoRMM/2fLdZe3Xj
|
||||
Lh9QTPlgmdi3HdOun/atdEMxEMBZdaFbR9NVfizh9OsoDFakZUIUOZxZFvgZEyCR
|
||||
mogc2y+2HIYVt5gahHecPM/IbPL3BDngpvspgr833K/SwnpibEVq8YdY28mWreKu
|
||||
y0Q0J+k4vAUetBz3xteZte/pyQqNtvLew8RjP4aGtCW1eU7/rwbaP7t2w58nlBqf
|
||||
/r6fEnAfER9/rnc1IDlfZACq2cX3gvVSSq7HFbzynd5AO8tSIMc=
|
||||
=fQwu
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -0,0 +1,218 @@
|
||||
https://bugs.gentoo.org/917618
|
||||
https://bugs.documentfoundation.org/show_bug.cgi?id=158108
|
||||
|
||||
From bcd5d851ebe91fc22edd3ea92be4a674bd13acba Mon Sep 17 00:00:00 2001
|
||||
From: Alfred Wingate <parona@protonmail.com>
|
||||
Date: Mon, 20 Nov 2023 14:47:28 +0200
|
||||
Subject: [PATCH] Remove use of the now removed LBCMNoChain options
|
||||
|
||||
* This change removes its use and explicitly prevents chaining where
|
||||
the rule would have applied.
|
||||
|
||||
https://github.com/unicode-org/icu/commit/84e47620692be90950d090f2f4722494b020ad96
|
||||
https://github.com/unicode-org/icu/commit/9d9256f3b792100cda697c7bcf52bacfbc3bca87
|
||||
|
||||
Signed-off-by: Alfred Wingate <parona@protonmail.com>
|
||||
--- a/i18npool/source/breakiterator/data/line.txt
|
||||
+++ b/i18npool/source/breakiterator/data/line.txt
|
||||
@@ -14,7 +14,6 @@
|
||||
#
|
||||
|
||||
!!chain;
|
||||
-!!LBCMNoChain;
|
||||
|
||||
|
||||
!!lookAheadHardBreak;
|
||||
@@ -206,13 +205,13 @@ $CR $LF {100};
|
||||
#
|
||||
$LB4NonBreaks? $LB4Breaks {100}; # LB 5 do not break before hard breaks.
|
||||
$CAN_CM $CM* $LB4Breaks {100};
|
||||
-$CM+ $LB4Breaks {100};
|
||||
+^$CM+ $LB4Breaks {100};
|
||||
|
||||
# LB 7 x SP
|
||||
# x ZW
|
||||
$LB4NonBreaks [$SP $ZW];
|
||||
$CAN_CM $CM* [$SP $ZW];
|
||||
-$CM+ [$SP $ZW];
|
||||
+^$CM+ [$SP $ZW];
|
||||
|
||||
#
|
||||
# LB 8 Break after zero width space
|
||||
@@ -226,14 +225,14 @@ $LB8NonBreaks = [[$LB4NonBreaks] - [$ZW]];
|
||||
# See definition of $CAN_CM.
|
||||
|
||||
$CAN_CM $CM+; # Stick together any combining sequences that don't match other rules.
|
||||
-$CM+;
|
||||
+^$CM+;
|
||||
|
||||
#
|
||||
# LB 11 Do not break before or after WORD JOINER & related characters.
|
||||
#
|
||||
$CAN_CM $CM* $WJcm;
|
||||
$LB8NonBreaks $WJcm;
|
||||
-$CM+ $WJcm;
|
||||
+^$CM+ $WJcm;
|
||||
|
||||
$WJcm [^$CAN_CM];
|
||||
$WJcm $CAN_CM $CM*;
|
||||
@@ -243,7 +242,7 @@ $WJcm $CAN_CM $CM*;
|
||||
#
|
||||
# (!SP) x GL
|
||||
[$LB8NonBreaks-$SP] $CM* $GLcm;
|
||||
-$CM+ $GLcm;
|
||||
+^$CM+ $GLcm;
|
||||
|
||||
# GL x
|
||||
$GLcm ($LB8Breaks | $SP);
|
||||
@@ -260,19 +259,19 @@ $GLcm [$LB8NonBreaks-$SP] $CM*; # Don't let a combining mark go onto $CR, $B
|
||||
#
|
||||
$LB8NonBreaks $CL;
|
||||
$CAN_CM $CM* $CL;
|
||||
-$CM+ $CL; # by rule 10, stand-alone CM behaves as AL
|
||||
+^$CM+ $CL; # by rule 10, stand-alone CM behaves as AL
|
||||
|
||||
$LB8NonBreaks $EX;
|
||||
$CAN_CM $CM* $EX;
|
||||
-$CM+ $EX; # by rule 10, stand-alone CM behaves as AL
|
||||
+^$CM+ $EX; # by rule 10, stand-alone CM behaves as AL
|
||||
|
||||
$LB8NonBreaks $IS;
|
||||
$CAN_CM $CM* $IS;
|
||||
-$CM+ $IS; # by rule 10, stand-alone CM behaves as AL
|
||||
+^$CM+ $IS; # by rule 10, stand-alone CM behaves as AL
|
||||
|
||||
$LB8NonBreaks $SY;
|
||||
$CAN_CM $CM* $SY;
|
||||
-$CM+ $SY; # by rule 10, stand-alone CM behaves as AL
|
||||
+^$CM+ $SY; # by rule 10, stand-alone CM behaves as AL
|
||||
|
||||
|
||||
#
|
||||
@@ -302,7 +301,7 @@ $LB18Breaks = [$LB8Breaks $SP];
|
||||
# LB 19
|
||||
# x QU
|
||||
$LB18NonBreaks $CM* $QUcm;
|
||||
-$CM+ $QUcm;
|
||||
+^$CM+ $QUcm;
|
||||
|
||||
# QU x
|
||||
$QUcm .?;
|
||||
@@ -331,7 +330,7 @@ $HLcm ($HYcm | $BAcm) [^$CB]?;
|
||||
|
||||
# LB 22
|
||||
($ALcm | $HLcm) $INcm;
|
||||
-$CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL
|
||||
+^$CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL
|
||||
$IDcm $INcm;
|
||||
$INcm $INcm;
|
||||
$NUcm $INcm;
|
||||
@@ -341,7 +340,7 @@ $NUcm $INcm;
|
||||
$IDcm $POcm;
|
||||
$ALcm $NUcm; # includes $LB19
|
||||
$HLcm $NUcm;
|
||||
-$CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL
|
||||
+^$CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL
|
||||
$NUcm $ALcm;
|
||||
$NUcm $HLcm;
|
||||
|
||||
@@ -373,7 +372,7 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
|
||||
# LB 28 Do not break between alphabetics
|
||||
#
|
||||
($ALcm | $HLcm) ($ALcm | $HLcm);
|
||||
-$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL
|
||||
+^$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL
|
||||
|
||||
# LB 29
|
||||
$IScm ($ALcm | $NUcm);
|
||||
@@ -383,7 +382,7 @@ $IScm ($ALcm | $NUcm);
|
||||
# and opening or closing punctuation
|
||||
#
|
||||
($ALcm | $HLcm | $NUcm) $OPcm;
|
||||
-$CM+ $OPcm;
|
||||
+^$CM+ $OPcm;
|
||||
$CLcm ($ALcm | $HLcm | $NUcm);
|
||||
|
||||
#
|
||||
@@ -393,32 +392,32 @@ $CLcm ($ALcm | $HLcm | $NUcm);
|
||||
|
||||
!!reverse;
|
||||
|
||||
-$CM+ $ALPlus;
|
||||
-$CM+ $BA;
|
||||
-$CM+ $BB;
|
||||
-$CM+ $B2;
|
||||
-$CM+ $CL;
|
||||
-$CM+ $EX;
|
||||
-$CM+ $GL;
|
||||
-$CM+ $HL;
|
||||
-$CM+ $HY;
|
||||
-$CM+ $H2;
|
||||
-$CM+ $H3;
|
||||
-$CM+ $ID;
|
||||
-$CM+ $IN;
|
||||
-$CM+ $IS;
|
||||
-$CM+ $JL;
|
||||
-$CM+ $JV;
|
||||
-$CM+ $JT;
|
||||
-$CM+ $NS;
|
||||
-$CM+ $NU;
|
||||
-$CM+ $OP;
|
||||
-$CM+ $PO;
|
||||
-$CM+ $PR;
|
||||
-$CM+ $QU;
|
||||
-$CM+ $SY;
|
||||
-$CM+ $WJ;
|
||||
-$CM+;
|
||||
+^$CM+ $ALPlus;
|
||||
+^$CM+ $BA;
|
||||
+^$CM+ $BB;
|
||||
+^$CM+ $B2;
|
||||
+^$CM+ $CL;
|
||||
+^$CM+ $EX;
|
||||
+^$CM+ $GL;
|
||||
+^$CM+ $HL;
|
||||
+^$CM+ $HY;
|
||||
+^$CM+ $H2;
|
||||
+^$CM+ $H3;
|
||||
+^$CM+ $ID;
|
||||
+^$CM+ $IN;
|
||||
+^$CM+ $IS;
|
||||
+^$CM+ $JL;
|
||||
+^$CM+ $JV;
|
||||
+^$CM+ $JT;
|
||||
+^$CM+ $NS;
|
||||
+^$CM+ $NU;
|
||||
+^$CM+ $OP;
|
||||
+^$CM+ $PO;
|
||||
+^$CM+ $PR;
|
||||
+^$CM+ $QU;
|
||||
+^$CM+ $SY;
|
||||
+^$CM+ $WJ;
|
||||
+^$CM+;
|
||||
|
||||
|
||||
#
|
||||
@@ -468,7 +467,7 @@ $LF $CR;
|
||||
# X $CM needs to behave like X, where X is not $SP or controls.
|
||||
# $CM not covered by the above needs to behave like $AL
|
||||
# Stick together any combining sequences that don't match other rules.
|
||||
-$CM+ $CAN_CM;
|
||||
+^$CM+ $CAN_CM;
|
||||
|
||||
|
||||
# LB 11
|
||||
@@ -606,8 +605,8 @@ $CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP];
|
||||
!!safe_reverse;
|
||||
|
||||
# LB 7
|
||||
-$CM+ [^$CM $BK $CR $LF $NL $ZW $SP];
|
||||
-$CM+ $SP / .;
|
||||
+^$CM+ [^$CM $BK $CR $LF $NL $ZW $SP];
|
||||
+^$CM+ $SP / .;
|
||||
|
||||
# LB 9
|
||||
$SP+ $CM* $OP;
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
After Width: | Height: | Size: 4.7 KiB |
|
After Width: | Height: | Size: 4.3 KiB |
|
After Width: | Height: | Size: 4.3 KiB |
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmXpp4sACgkQ9DSh76/u
|
||||
rqOtnQ//YxE4MZVXLauoOfRxadz3PUyWpDqT+Ez2z4R9+YtmMclks+GfX7xwggb2
|
||||
a20KWmaDXiWL9CzJwJ89ovwoNAUdw/j+AhoSCQY4qNppv3Kkpn9SSUyDato6HJfm
|
||||
3xEjyVM2YlAdC7uPJHkC5YrutUs5ymzd8miDC0bdKDHgQsNiYU74SrbLU2t0ySoT
|
||||
WvKwpeg5XwMT7EUb8hyfovkOrcgJzVqGbSNEsqochAwwZ77uDrjskhrrp4lIm0iU
|
||||
QWEijCFJNPKr+4uaM8U3oJm02TYG9GGsi7l6eBc1Gicx3BSxyIqJgDThwdU8KWpb
|
||||
Hizk2mE3qAUWVyp/AL5RiLYdx1/CJTtBW1/eLzJAvFfdkZ1BZOn5rM498DfCtFdr
|
||||
PZo8nApMHPjUbdDiv5DiBSlpkBNyI2ZXZ5bBqK4suuVybg9FjYn56hoLPsesxECU
|
||||
VO77KTQVg2BoKETljLjcrDjYecxAoVurkNHNlKlzjCcjgf4r96ywkrYcRL2+6sRh
|
||||
SiamCiNtMNU2w+4nF58mG0w1HphRmUj6iKtTAB725qFcVSHxaFFyXeUySyphHqxy
|
||||
KjxBMJTfbr46EZHx0/3FjI6g5LfLMG/aaNHcpEu8SAsgqf0BA8yYp3ID2KY8U1x1
|
||||
j6Jiv5eTkkxAyB8hJB17zfY/KV1N/e+s7nZ4qKa/rqduYbr7L4s=
|
||||
=KgEh
|
||||
-----END PGP SIGNATURE-----
|
||||
|
After Width: | Height: | Size: 4.7 KiB |
|
After Width: | Height: | Size: 3.9 KiB |
|
After Width: | Height: | Size: 4.1 KiB |
@ -0,0 +1,16 @@
|
||||
#!/bin/sh
|
||||
OOO_ARCH=$(uname -m)
|
||||
case $OOO_ARCH in
|
||||
x86_64 | s390x | sparc64 | aarch64)
|
||||
OOO_LIB_DIR="/usr/lib64"
|
||||
SECONDARY_LIB_DIR="/usr/lib"
|
||||
;;
|
||||
* )
|
||||
OOO_LIB_DIR="/usr/lib"
|
||||
SECONDARY_LIB_DIR="/usr/lib64"
|
||||
;;
|
||||
esac
|
||||
if [ ! -x $OOO_LIB_DIR/BRAND/program/LAUNCHER ]; then
|
||||
OOO_LIB_DIR="$SECONDARY_LIB_DIR"
|
||||
fi
|
||||
exec $OOO_LIB_DIR/BRAND/program/LAUNCHER "$@"
|
||||
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmXpp4wACgkQ9DSh76/u
|
||||
rqN1iBAAtCtG7u/IXrWdmcd5d1tXIzr/6m/2Yx1tqtloYbxXuvBqNW4GKLFiF1QK
|
||||
Mxy/D0zMSirK+hVdp+OfztkYh9u0iL3PgRCnU/iCWy5bo13G1wPTtt1twXjBH+xE
|
||||
B/B78Hr30pyoVhaC4ilEco0Ev4B3dR+F+qyuPyzJ6OeVM9YHfw526zZLdksICwiu
|
||||
pzVuoPuuIK7k6goZBx4S+FmjCgutoxmBKvsZI41yjheNblC8mKocnOebFKjXPVOx
|
||||
rJiS0tnomdrXK9G6Rivk7/WypG28eOuroZTTg3s2ZcRNudnf2PMuBPgjousTnNTZ
|
||||
kmWwJPfs22wgoOwkY4/wnEgiIiuMQzvReTdlOyjC22JvwCPl3t1NmR/rXeVmufHY
|
||||
+mFLsRoC9q9+bYLvt/HcKRlykLxnPVXKrhHK1D0niX4qjUIJHTXBMbav7gNCCbYi
|
||||
qVXFC9oLws5mgG/jR7+JLLERzDiM/wfkflpVRvqvPP0MHaUq1cF8mfyepkcgFB4Y
|
||||
5iWoekrI+krf+gY7Zcpdgx2Mdrc39OBP0tDxZoexJ25OyCwlbEScTBsi57Te38Jx
|
||||
/vPPqA1AaUwz6SfumXRwaJac5chff5XoV6R98ApvQhqtG7UR0xPfq0G8an4+YLWU
|
||||
7ZV4TVFP1cZni0J2irq0CcZNPN9YwbXz3J3REwdI3wNeP7/bAdc=
|
||||
=hANw
|
||||
-----END PGP SIGNATURE-----
|
||||
|
After Width: | Height: | Size: 4.4 KiB |
@ -0,0 +1,19 @@
|
||||
diff -up libreoffice-7.6.0.3/testtools/source/bridgetest/bridgetest.cxx.orig libreoffice-7.6.0.3/testtools/source/bridgetest/bridgetest.cxx
|
||||
--- libreoffice-7.6.0.3/testtools/source/bridgetest/bridgetest.cxx.orig 2023-08-21 13:15:31.738062821 +0200
|
||||
+++ libreoffice-7.6.0.3/testtools/source/bridgetest/bridgetest.cxx 2023-08-21 13:15:56.607246816 +0200
|
||||
@@ -469,6 +469,7 @@ static bool performTest(
|
||||
equals(aData, aSV2ret) && equals(aData, aRet2),
|
||||
"getValues2 test");
|
||||
}
|
||||
+#if 0
|
||||
{
|
||||
TwoFloats aIn(1.1f, 2.2f);
|
||||
TwoFloats aOut = xLBT->echoTwoFloats(aIn);
|
||||
@@ -479,6 +480,7 @@ static bool performTest(
|
||||
FourFloats aOut = xLBT->echoFourFloats(aIn);
|
||||
bRet = check( memcmp(&aIn, &aOut, sizeof(FourFloats)) == 0, "four floats struct test" ) && bRet;
|
||||
}
|
||||
+#endif
|
||||
{
|
||||
MixedFloatAndInteger aIn(7.7f, 8);
|
||||
MixedFloatAndInteger aOut = xLBT->echoMixedFloatAndInteger(aIn);
|
||||
@ -0,0 +1,47 @@
|
||||
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
|
||||
index 05a03fe72c4d..44fc885a3dc0 100644
|
||||
--- a/pyuno/source/loader/pyuno_loader.cxx
|
||||
+++ b/pyuno/source/loader/pyuno_loader.cxx
|
||||
@@ -105,7 +105,7 @@ static PyRef getObjectFromLoaderModule( const char * func )
|
||||
return object;
|
||||
}
|
||||
|
||||
-static void setPythonHome ( const OUString & pythonHome )
|
||||
+static void setPythonHome ( const OUString & pythonHome, PyConfig * config )
|
||||
{
|
||||
OUString systemPythonHome;
|
||||
osl_getSystemPathFromFileURL( pythonHome.pData, &(systemPythonHome.pData) );
|
||||
@@ -129,9 +129,7 @@ static void setPythonHome ( const OUString & pythonHome )
|
||||
PyErr_SetString(PyExc_SystemError, "python home path is too long");
|
||||
return;
|
||||
}
|
||||
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
|
||||
- Py_SetPythonHome(wide); // deprecated since python 3.11
|
||||
-SAL_WNODEPRECATED_DECLARATIONS_POP
|
||||
+ config->home = wide;
|
||||
}
|
||||
|
||||
static void prependPythonPath( std::u16string_view pythonPathBootstrap )
|
||||
@@ -183,11 +181,13 @@ void pythonInit() {
|
||||
if ( Py_IsInitialized()) // may be inited by getComponentContext() already
|
||||
return;
|
||||
|
||||
+ PyConfig config;
|
||||
OUString pythonPath;
|
||||
OUString pythonHome;
|
||||
OUString path( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("pythonloader.uno" ));
|
||||
rtl::Bootstrap::expandMacros(path); //TODO: detect failure
|
||||
rtl::Bootstrap bootstrap(path);
|
||||
+ PyConfig_InitPythonConfig( &config );
|
||||
|
||||
// look for pythonhome
|
||||
bootstrap.getFrom( "PYUNO_LOADER_PYTHONHOME", pythonHome );
|
||||
@@ -196,7 +196,7 @@ void pythonInit() {
|
||||
// pythonhome+pythonpath must be set before Py_Initialize(), otherwise there appear warning on the console
|
||||
// sadly, there is no api for setting the pythonpath, we have to use the environment variable
|
||||
if( !pythonHome.isEmpty() )
|
||||
- setPythonHome( pythonHome );
|
||||
+ setPythonHome( pythonHome, &config );
|
||||
|
||||
if( !pythonPath.isEmpty() )
|
||||
prependPythonPath( pythonPath );
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue