Updates to 24.8.3.2

24.8.3.2
Arkady L. Shane 4 weeks ago
parent 9a73a36535
commit 6760a645c4
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

8
.gitignore vendored

@ -1,7 +1,7 @@
SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
SOURCES/Java-WebSocket-1.5.6.tar.gz
SOURCES/libreoffice-help-24.8.3.2.tar.xz
SOURCES/dtoa-20180411.tgz
SOURCES/libreoffice-24.2.3.2.tar.xz
SOURCES/libreoffice-help-24.2.3.2.tar.xz
SOURCES/Java-WebSocket-1.5.4.tar.gz
SOURCES/libreoffice-translations-24.2.3.2.tar.xz
SOURCES/libreoffice-translations-24.8.3.2.tar.xz
SOURCES/libreoffice-24.8.3.2.tar.xz
SOURCES/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip

@ -1,7 +1,7 @@
2d49e11b0b711970f494294dc3698f05eb294853 SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
ee561c270fa186bac51bb240d4ce2166f866795c SOURCES/Java-WebSocket-1.5.6.tar.gz
fe7c694c1156e412a3ecc2ef77ca670f56b6b470 SOURCES/libreoffice-help-24.8.3.2.tar.xz
083509db5ad9d1680830be9add727d58b54ca0d3 SOURCES/dtoa-20180411.tgz
2ff8bb024d5960043f34f6ae2bb9a1e6a7dad4c9 SOURCES/libreoffice-24.2.3.2.tar.xz
dfe031c1696e553924bb4e8980a45c498f456e68 SOURCES/libreoffice-help-24.2.3.2.tar.xz
67703956d32bd3c20baf8f1dd69efa579234381e SOURCES/Java-WebSocket-1.5.4.tar.gz
a7f881cbeb07cd63beb7ed3eea5d579a69b951ad SOURCES/libreoffice-translations-24.2.3.2.tar.xz
c8766c085e21cc92c47d7ef2371b8a4d3dc2933d SOURCES/libreoffice-translations-24.8.3.2.tar.xz
d4a6c4a735210ddfd0b723e926a8b3352705662f SOURCES/libreoffice-24.8.3.2.tar.xz
7168b0f40aa5c72267899601c116d2348d2f56ec SOURCES/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip

@ -1,39 +0,0 @@
From 0ce38092c32bbbd2dac1a322b98daff56d9b4ad2 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Sun, 12 May 2024 21:01:39 +0300
Subject: [PATCH] Cleanup vendor in aboutdialog
---
android/source/res/values/strings.xml | 2 +-
cui/inc/strings.hrc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/android/source/res/values/strings.xml b/android/source/res/values/strings.xml
index 5d280ca50..efb13ce3b 100644
--- a/android/source/res/values/strings.xml
+++ b/android/source/res/values/strings.xml
@@ -8,7 +8,7 @@
<string name="app_version">Version: %1$s&lt;br&gt;Build ID: &lt;a href=&quot;https://hub.libreoffice.org/git-core/%2$s&quot;&gt;%2$s&lt;/a&gt;</string>
<string name="app_description">LibreOffice Viewer is a document viewer based on LibreOffice.</string>
<string name="app_credits">https://www.libreoffice.org</string>
- <string name="app_vendor">This release was supplied by $VENDOR.</string>
+ <string name="app_vendor"> </string>
<string name="readonly_file">This file is read-only.</string>
<string name="about_license">Show License</string>
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 52c4a7e42..7ecef24a4 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -359,7 +359,7 @@
#define RID_CUISTR_CANNOTCONVERTURL_ERR NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a filesystem path.")
#define RID_CUISTR_ABOUT_COPYRIGHT NC_("aboutdialog|copyright", "Copyright © 20002024 LibreOffice contributors.")
-#define RID_CUISTR_ABOUT_VENDOR NC_("aboutdialog|vendor", "This release was supplied by %OOOVENDOR.")
+#define RID_CUISTR_ABOUT_VENDOR NC_("aboutdialog|vendor", " ")
#define RID_CUISTR_ABOUT_BASED_ON NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
#define RID_CUISTR_ABOUT_DERIVED NC_("aboutdialog|derived", "%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
#define RID_CUISTR_ABOUT_UILOCALE NC_("aboutdialog|uilocale", "UI: $LOCALE")
--
2.44.0

@ -1,25 +0,0 @@
From cde54a03b7f04007312c4381bd938563c4d43030 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Sun, 12 May 2024 21:08:26 +0300
Subject: [PATCH] Fix Vendor
---
translations/source/ru/sfx2/messages.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/translations/source/ru/sfx2/messages.po b/translations/source/ru/sfx2/messages.po
index c7150c113..b4aa5c950 100644
--- a/translations/source/ru/sfx2/messages.po
+++ b/translations/source/ru/sfx2/messages.po
@@ -3806,7 +3806,7 @@ msgstr ""
"\n"
"Copyright © 20002024 разработчики LibreOffice. Все права защищены.\n"
"\n"
-"Этот продукт был создан %OOOVENDOR на основе OpenOffice.org, Copyright 2000, 2011 Oracle и/или её аффилированные лица. %OOOVENDOR признателен всем участникам сообщества, подробности смотрите по адресу http://www.libreoffice.org/ ."
+"Этот продукт был создан The Document Foundation на основе OpenOffice.org, Copyright 2000, 2011 Oracle и/или её аффилированные лица. Подробности смотрите по адресу http://www.libreoffice.org/ ."
#. QuVoN
#: sfx2/uiconfig/ui/linefragment.ui:57
--
2.44.0

@ -1,58 +0,0 @@
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,10 @@
--- a/configure~ 2024-08-22 09:49:41.957960557 -0500
+++ b/configure 2024-08-23 10:31:14.357014789 -0500
@@ -7399,7 +7399,6 @@
# AC_PROG_CC sets CFLAGS to -g -O2 if not set, avoid that (and avoid -O2 during AC_PROG_CC,
# Clang 12.0.1 occasionally SEGVs on some of the test invocations during AC_PROG_CC with -O2):
save_CFLAGS=$CFLAGS
- CFLAGS=-g

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYv7GYACgkQ9DSh76/u
rqOv7RAArslpflkBbsrkaDZzFVMp07C0QzNUucGDlB5CFu1JnJnnZBqitmtweZXY
PqNCq8IykHqKY6+eDbvzfridC6cX/FHnQT4Hf45aAVwaXpDfJj8nYCDFnj2F/tfp
djU+b3Nti12xTtT3G9QbeywPnERInzDhVNruV7qulvhsWjlc1LLCzmYE5fuNoGqK
Lk0v7a16VMX6+72yy77h8v4lYSiSdwtmfR6gkdPM/i0yJNLAFtTYt9ZclOBWmiyU
dGSaDxVnZnaNnKneefQiX2tmlVyaYfbvcp5IbwyKO+/aFWxe1RaiOQ7KoTxHDWCT
k9cNbUh0e8rel8W/ORnqZrk4yZazVY99Bla1Sd8bnv5xpYRFAX2f4AMChC2ufoX+
rfkKQxl8fCvHAwYtGEjzuNyutPe6HsK9ZRlHAnqnWPvEimW9l8BXoYVcfp/jeB9w
ye4000kijk1ktIxa9v2/1dye5LDAiTu52L4UKRBRc/royUBC7SizHJ727sgeSiC/
7vC4h4dJ6Yu1LkZox+/S5/aRe+tUx5suOCLGonCZQYZMgpHj+bz5yVx4N9jK/gHP
Ym2V97MwKOemmQx+EALzYmhWOsduvKI5KLSLe+QAv0aw9iAX/BR4JNPy84dARRpw
/3vjCUickeUYyItqlpCps3wluD/ox7oiPXpKy2/D8Lcmr/uWFUo=
=U6p3
-----END PGP SIGNATURE-----

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmcuNnsACgkQ9DSh76/u
rqNh6xAAnEXxRZq9jBXhRODcGhpns8AhbxjNk6VIynImKrT/lgSVNToo2xIfY6Pb
boPNvqu4q1Pf/OTvycph3EcxHN0KEeKvh1EQsfHZ69wj+PNlQ2RnMfQ87mDosApD
+RPCmOwJAqyys4f9UAyp5SICRgxofOHEOCVnynxq/hnPJLLv82ie8y4k8ZCHiajC
0HtllYeHW9fm2NZEYrB2Gtyo1FeofpQaykgmWfy3hK4uGtFh0MlYo2zva4PxLoJV
CJvlCMDstdUhlG+RlvDgdigwP3zbQ3Fy0k2OVTkeltFWQCBlwvOoQHTCh3iLWKZl
ne3dxvyBFsBpwkv9CjXdZWQpxDZ97WKLgTJ9BAXUSQ0u/EK9RlsE0WtqyedjmtkB
6sOZpTkd6gZ2nIVIDuotRGV5QxgKBrym2w3ZTDjp9GP9BmiXv/XfeiwGMdZi0BPv
NB92f3fjzN1tcWsMlA4FbB5SddLDKh6oo7LdtLl8Fj9w+R5qAF8ZHBzepQacOS/1
l4YbRyHpYCWUSYqicLn76ImFRNkeEi3S7N3NZiHWkLs1lKascARVKR6Vl+u+XWo+
6HK2CpCE6nXGxtbXrTm6bGaeMKf7snpq0k1OD7P2/ruowjn0CszjYtMDXhY75D4R
Mogzy+6epHRAr9xycJI6I9Q0lFhd1lHr7kJScYVwNmYMMD1yYVc=
=EkMr
-----END PGP SIGNATURE-----

@ -1,218 +0,0 @@
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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYv7G0ACgkQ9DSh76/u
rqPMrg//cIDB8DLaOEmdrUwNQmGGIaCvInUCoWL+J9dcBFLKa9eBBK6qVB41PC91
j1amlgWfUWor5P3W3bWSA33V6QTvqV3Ag2qlAf8hNVIpr0sWus4T/pOyQFHiRduT
6rSEvO/o5IBTfJAdspfG8tlipFwhpTJzCotL6c1DSE+C6jyedNa+SyMmcdpj1iJy
JIdZOI52vcxvmupr3cm0sE1FXvN4Kqt6sjlCQnIwOqa56bNgkzKUPGuEtjFYIeC3
nBFNhGlcZKCWYqH2bHNBFa8UvOFyGH2OBNBUXwyw34Rb9ebmJC6YVujPKRbxpU0r
7toWFiAmf7JcVKlDGE/YV9DdU7yDd1VEsSWLE42PaJ8ote9MrG897x+zMSgIjpqX
7Ud6BAVUmopko1nMhy2C/vCeI2z6JflTC52oaSrsUokBGZ8VUcF8MPLbrVFtxhzn
gb7ihsZt4XVY8n7pvqhK39NTLBzswfgqj9gqSi6dY38WQ7qiEduCkDIDcHZ+aCMX
okVIjnSAoshPZy3NtG2NLEv5kOAqx34qSFXkK4J2XvgEvCYS89F2odKo6Ct/NvHs
FTjCbjByKA1NYddBZd38GMppzbbT26pD2Qvlv3a54DgOkcMozLV8sLWKcLFerFOs
SqNAk7+1PcT/cmGUoLc99d3abInCMn4SpOgVNSypm08rM3uwlvY=
=Zeti
-----END PGP SIGNATURE-----

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmcuNn8ACgkQ9DSh76/u
rqMKYBAAybgaTLnNObh8cYO1dALaz08HeWXtFv5UuNT+E2VUaLM7bp6fQQ5lz9b0
lwzbDleWeZTJdlzVqFuMXDV9T3pCTbpP78jGR0c2KSETAJ3ya3a229WAABW4AE5w
hXalwgeESisG8YkhiLL7zPOrFAVcT5xiQbsPRCURr7Yf97TvqridOpsjCYafDGbS
bd9qbPUEOfpoQBAhD2mUeNav+lGWoYQHfDbftIdBA0Rel6HVb2ph5VSE2oBp1E2Z
PpjAhwYOf0LcFStKEWse/+RWDzUjyKV9K0ZjzScg+OZmuD3gcyIlj3VktInhmzFK
nTqazrjZROwv2qt4rpg+784J9wj2mgh8dcMykBHdYEFuQnFlbvZtAqfA/JULO7zm
8vHWGDnWg+5PwznyYjM0xeUFl3tennvtEejUjLLW48x5o9zG+t6KQp9fVTsLmchd
15pnLGbhPAIIcyCmNsYLyeLuhMFGiKe184yEOIeYtCbJkNvyx0Wto9mVKq8rok/3
DWmbKe0Kk/bHkwvPkoyk/boyTivQ3HNyDd8Qgsvo/hIlPYcRwJQ22mSIIRFdcrxw
60cXtmRnIEVfUWyfOi7pd+toPgjx3P0ZSJ7xBa5p+hOE6sXbt7nilGAC+kNAHWOR
DixDAUyAAE/lKVOVfrqMBoGT8ALcmiaVEI/6EGuYwxPqDZuZsic=
=ILLN
-----END PGP SIGNATURE-----

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYv7G0ACgkQ9DSh76/u
rqPuhhAAp+oFhBzaZhKHP0eDyjMi34jaqab/Cv3gWEX3Vb7s8ilLCYJZXlA5fO2u
Gx7VUOeHVR9GxgxmrnxHJ143ICpT//SrZjUeF6rz18PZgejZBtwkAxG40eA3poRZ
LB8Oa9Qx8uF8SxrWSDEY2+f5oTPCXkIeaL7G2rtQ9b5GotbjQOTa+UGqnqK/sc58
uis3TUlyCmzqZyq4t+ORyTjfVsydgDMCIn5e5yYUs3vKTL8FTX9KD82Dhv7Cv/TJ
7DzJjRt6ZmT+vH+Sol7pmsdKztc0KEzLIUF8VDsoXrE1mWlEXALBfF4Nk8CSIuXo
q3EKtb4PiXFyOPH2+VReaf/RN+Flmb9iFgepeHV0q9R+9iTodDUyxeT8gyYsnY6w
f587MZZiBEF49ttlhtcA7cdFo23WZR3PH69T6bdlNJ6W9wZuP2+P/Yc6WKYiAjyz
3uqsq16zviUzW2gKYRWZnL9flpIhLDQB442lQ4nov20j+Ws+dnkea8jX7U0JeGuF
wjvWoYOm8I7sLdS+p8FMcE3AcOuWtgrvumIOX3dnjDZYbeJGHrEdxp3X3U28qs7Z
AlbF7yAo2wn4XhLMM1JEDPlFp7vsULQ6YybnmGtos6OE6z0LmVWBt28hOjeLzD6W
IhG8F39c8ZH1/QUTDl1q/SFbI5H1vlVxemj4HObSySBoOU4pTQU=
=XaF0
-----END PGP SIGNATURE-----

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmcuNn8ACgkQ9DSh76/u
rqNdvQ//We5N9WJPuszsSv3nyeJdFiemdeLMdF3sRp3fG6hoQY1Qd4FW5ZS54WlN
Svge8fl0HNKmiyAx5JC/bdTdLGk3Et99D1mJNg/54mbNjDRWc0zy+Y5+bcFQc8vJ
XOM+LXrurbgw6kbi6+5g6fYfDE2y8TtMgC4+hcjW2Btixe6LAeIvbsMEpxPdke32
p6Wt/XWKrB2gzYH7dB0wMCwjOFVC+Lya49PwGRMUkPxXoS8+Pl656abgiC5uZSzR
Txsd0+dHq2lHtxChAD5zcBNVp1Fqmcy05KDFiLxtjMYrU+awc3YiT6/s6noYZ6vp
W6aontnLF4DoGBSIn0LbznNeAf1tjhrR3Okz78aeJ0Xb7Fb56WLkrpgerX/7RpIY
9g+/dcEihylbsdcchAxlmVk9Xnqraqr+7CHeCBfvQYF9JIalkhH+DPzR+AwSNH9B
kR5xvQF7T6xTldOGUpnSEjjownbzfTlUga0U5T9xAObD9oJuP+Hu3+YXTXe2ziVH
RNogSLhB2W7x5ao7hBeeXn6Z5IDZH4zmVqAAG1fF5z04GC8UddHf59drkIrybnlp
RZNVX2Q+ixve9xwXf8QniLK8MQ9jVb2zVWHartIxA8CyVcDaZVULhD0VMGqgTYzi
jK318KIM3RU/aGM6e+di1sytJjgZhu8Hx5h2oZM9vunoFn8AYJc=
=hKX0
-----END PGP SIGNATURE-----

@ -1,47 +0,0 @@
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…
Cancel
Save