Compare commits
No commits in common. 'i9' and 'i9-24.2.2.1' have entirely different histories.
i9
...
i9-24.2.2.
@ -1,62 +0,0 @@
|
||||
From 439bf688a50143a57d18be3e8bf8eceea9f839ea Mon Sep 17 00:00:00 2001
|
||||
From: Israel Paredes <israel.paredes@ugd.gob.mx>
|
||||
Date: Tue, 20 Jun 2023 02:26:13 -0400
|
||||
Subject: [PATCH 01/18] Archivos de distro-config de brand Office
|
||||
|
||||
Change-Id: I290939038b4fedf7a03f3ce68250966766a57e2b
|
||||
---
|
||||
distro-configs/OfficeLinux.conf | 10 ++++++++++
|
||||
distro-configs/OfficeWin64.conf | 24 ++++++++++++++++++++++++
|
||||
2 files changed, 34 insertions(+)
|
||||
create mode 100644 distro-configs/OfficeLinux.conf
|
||||
create mode 100644 distro-configs/OfficeWin64.conf
|
||||
|
||||
diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf
|
||||
new file mode 100644
|
||||
index 000000000000..6cb4bd4dca66
|
||||
--- /dev/null
|
||||
+++ b/distro-configs/OfficeLinux.conf
|
||||
@@ -0,0 +1,10 @@
|
||||
+--with-parallelism
|
||||
+--with-branding=custom_images
|
||||
+--enable-release-build
|
||||
+--enable-epm
|
||||
+--with-package-format=deb
|
||||
+--with-product-name=Office
|
||||
+--with-vendor=INFOTEC
|
||||
+--with-vendor=INFOTEC
|
||||
+--with-package-version=7.5.0.0
|
||||
+--disable-community-flavor
|
||||
diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf
|
||||
new file mode 100644
|
||||
index 000000000000..01ad659c2af3
|
||||
--- /dev/null
|
||||
+++ b/distro-configs/OfficeWin64.conf
|
||||
@@ -0,0 +1,24 @@
|
||||
+--with-ant-home=/cygdrive/c/sources/apache-ant-1.9.5
|
||||
+--with-visual-studio=2022
|
||||
+--with-jdk-home=C:\Program Files\Microsoft\jdk-11.0.12.7-hotspot
|
||||
+--host=x86_64-pc-cygwin
|
||||
+--without-junit
|
||||
+--without-helppack-integration
|
||||
+--enable-extension-integration
|
||||
+--enable-scripting-beanshell
|
||||
+--enable-scripting-javascript
|
||||
+--enable-ext-wiki-publisher
|
||||
+--enable-ext-nlpsolver
|
||||
+--with-myspell-dicts
|
||||
+--with-package-format=msi
|
||||
+--enable-mergelibs
|
||||
+--enable-lto
|
||||
+--enable-odk
|
||||
+--without-ucrt-dir
|
||||
+--enable-release-build
|
||||
+--with-lang=es
|
||||
+--with-branding=custom_images
|
||||
+--with-product-name=Office
|
||||
+--with-vendor=INFOTEC
|
||||
+--with-package-version=7.5.0.0
|
||||
+--disable-community-flavor
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 1e4bed0bedcb90425ca1cb6be74153c68c1b40bc Tue Mar 29 00:00:00 2022
|
||||
From: <saraico@ugd.gob.mx>
|
||||
Date: Tue Mar 29 00:00:00 2022
|
||||
Subject: [PATCH] compatibility with gpgme-1.13.1
|
||||
|
||||
Change-Id: 1e4bed0bedcb90425ca1cb6be74153c68c1b40bc
|
||||
---
|
||||
xmlsecurity/source/gpg/CertificateImpl.cxx | 5 +----
|
||||
1 file changed, 1 additions(+), 4 deletions(-)
|
||||
|
||||
diff -uri a/xmlsecurity/source/gpg/CertificateImpl.cxx b/xmlsecurity/source/gpg/CertificateImpl.cxx
|
||||
index 0000000..e28482c 100644
|
||||
--- a/xmlsecurity/source/gpg/CertificateImpl.cxx 2022-02-28 12:19:33.000000000 -0600
|
||||
+++ b/xmlsecurity/source/gpg/CertificateImpl.cxx 2022-03-29 15:07:40.000000000 -0600
|
||||
@@ -215,9 +215,7 @@
|
||||
ctx->setArmor(false); // caller will base64-encode anyway
|
||||
GpgME::Error err = ctx->exportPublicKeys(
|
||||
key.primaryFingerprint(),
|
||||
- data_out,
|
||||
- officecfg::Office::Common::Security::OpenPGP::MinimalKeyExport::get()
|
||||
- ? GpgME::Context::ExportMinimal : 0
|
||||
+ data_out
|
||||
);
|
||||
|
||||
if (err)
|
||||
@ -1,94 +0,0 @@
|
||||
From a4f6d63477b5a953b38859e2e3ad781f929b8584 Mon Sep 17 00:00:00 2001
|
||||
From: Israel Paredes <israel.paredes@ugd.gob.mx>
|
||||
Date: Tue, 20 Jun 2023 02:29:16 -0400
|
||||
Subject: [PATCH 02/18] Modificacion al build y borrado UPDATEURL
|
||||
|
||||
Change-Id: I10a2d0a01ceb02d5d7f5267dcb97eb25ce6600d7
|
||||
---
|
||||
instsetoo_native/util/openoffice.lst.in | 73 +++++++++++++++++++++++++
|
||||
1 file changed, 73 insertions(+)
|
||||
|
||||
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
|
||||
index b5da0bfb6697..454670cb1e15 100644
|
||||
--- a/instsetoo_native/util/openoffice.lst.in
|
||||
+++ b/instsetoo_native/util/openoffice.lst.in
|
||||
@@ -193,3 +193,76 @@ LibreOfficeDev_SDK
|
||||
include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath}
|
||||
}
|
||||
}
|
||||
+
|
||||
+
|
||||
+Office
|
||||
+{
|
||||
+ Settings
|
||||
+ {
|
||||
+ variables
|
||||
+ {
|
||||
+ PRODUCTNAME Office
|
||||
+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
+ POSTVERSIONEXTENSION
|
||||
+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
|
||||
+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
+ USERDIRPRODUCTVERSION 4
|
||||
+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
+ PCPFILENAME libreoffice.pcp
|
||||
+ UPDATEURL
|
||||
+ ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
|
||||
+ ADDSYSTEMINTEGRATION 1
|
||||
+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
+ PACKAGEREVISION {buildid}
|
||||
+ LICENSENAME LGPL
|
||||
+ ROOTMODULEGID gid_Module_Root
|
||||
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
|
||||
+ SPELLCHECKERFILE spellchecker_selection.txt
|
||||
+ CHANGETARGETDIR 1
|
||||
+ PATCHCODEFILE ooo_patchcodes.txt
|
||||
+ }
|
||||
+ active 1
|
||||
+ compression 5
|
||||
+ script setup_osl
|
||||
+ downloadname Office_{productversion}_{os}_install_{languages}
|
||||
+ langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages}
|
||||
+ helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages}
|
||||
+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath}
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+Office_SDK
|
||||
+{
|
||||
+ Settings
|
||||
+ {
|
||||
+ downloadname LibreOffice-SDK_{packageversion}_{os}_install_{languages}
|
||||
+ variables
|
||||
+ {
|
||||
+ PRODUCTNAME Office
|
||||
+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
+ POSTVERSIONEXTENSION SDK
|
||||
+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@.SDK
|
||||
+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
+ PACKAGEREVISION {buildid}
|
||||
+ PACK_INSTALLED 1
|
||||
+ DMG_VOLUMEEXTENSION SDK
|
||||
+ DATABASENAME office40sdk
|
||||
+ NO_README_IN_ROOTDIR 1
|
||||
+ LICENSENAME LGPL
|
||||
+ IGNOREDIRECTORYLAYER 1
|
||||
+ NOVERSIONINDIRNAME 0
|
||||
+ NOSPACEINDIRECTORYNAME 1
|
||||
+ NOSHORTDIRECTORYNAMES 1
|
||||
+ CHANGETARGETDIR 1
|
||||
+ DONTUSESTARTMENUFOLDER 1
|
||||
+ }
|
||||
+ active 1
|
||||
+ compression 5
|
||||
+ script sdkoo
|
||||
+ include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath}
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
--
|
||||
2.39.2
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,171 +0,0 @@
|
||||
From 4c459d3e41a3c4d08e03fc72db95480ed8783797 Mon Sep 17 00:00:00 2001
|
||||
From: Israel Paredes <israel.paredes@ugd.gob.mx>
|
||||
Date: Thu, 20 Jul 2023 08:28:06 -0600
|
||||
Subject: [PATCH 04/18] Fuentes monserrat y gmx
|
||||
|
||||
Change-Id: I73186714bc4809d0b3d48ceb94e933a78db2d623
|
||||
---
|
||||
Makefile.fetch | 4 ++
|
||||
Repository.mk | 1 +
|
||||
external/more_fonts/ExternalPackage_gmx.mk | 49 +++++++++++++++++++++
|
||||
external/more_fonts/Module_more_fonts.mk | 2 +
|
||||
external/more_fonts/UnpackedTarball_gmx.mk | 14 ++++++
|
||||
fonts/gmx-fonts.tar.xz | Bin 0 -> 1172924 bytes
|
||||
solenv/flatpak-manifest.in | 7 +++
|
||||
7 files changed, 77 insertions(+)
|
||||
create mode 100644 external/more_fonts/ExternalPackage_gmx.mk
|
||||
create mode 100644 external/more_fonts/UnpackedTarball_gmx.mk
|
||||
create mode 100644 fonts/gmx-fonts.tar.xz
|
||||
|
||||
diff --git a/Makefile.fetch b/Makefile.fetch
|
||||
index b96cb573c2bf..99f9bd3bca18 100644
|
||||
--- a/Makefile.fetch
|
||||
+++ b/Makefile.fetch
|
||||
@@ -124,6 +124,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
|
||||
$(call fetch_Optional,EXPAT,EXPAT_TARBALL) \
|
||||
$(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \
|
||||
$(call fetch_Optional,FONTCONFIG,FONTCONFIG_TARBALL) \
|
||||
+ $(call fetch_Optional,FONTGMXCONFIG,FONTGMXCONFIG_TARBALL) \
|
||||
$(call fetch_Optional,FREEHAND,FREEHAND_TARBALL) \
|
||||
$(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \
|
||||
FROZEN_TARBALL \
|
||||
@@ -241,6 +242,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
|
||||
$(call fetch_Optional,ODFVALIDATOR,ODFVALIDATOR_JAR) \
|
||||
$(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \
|
||||
,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
|
||||
+ $(foreach item, \
|
||||
+ $(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \
|
||||
+ ,$(call fetch__Download_item,https://repos.libreoffice.gob.mx/src,$(item)))
|
||||
@mkdir -p $(dir $@) && touch $@
|
||||
@mkdir -p $(dir $@)/Executable
|
||||
|
||||
diff --git a/Repository.mk b/Repository.mk
|
||||
index 3e2e29098e66..c04fb9cd4108 100644
|
||||
--- a/Repository.mk
|
||||
+++ b/Repository.mk
|
||||
@@ -1044,6 +1044,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
|
||||
$(call gb_Helper_optional,MORE_FONTS,\
|
||||
fonts_alef \
|
||||
fonts_amiri \
|
||||
+ fonts_gmx \
|
||||
fonts_caladea \
|
||||
fonts_carlito \
|
||||
$(if $(MPL_SUBSET),,fonts_culmus) \
|
||||
diff --git a/external/more_fonts/ExternalPackage_gmx.mk b/external/more_fonts/ExternalPackage_gmx.mk
|
||||
new file mode 100644
|
||||
index 000000000000..ccc1b03c5db2
|
||||
--- /dev/null
|
||||
+++ b/external/more_fonts/ExternalPackage_gmx.mk
|
||||
@@ -0,0 +1,49 @@
|
||||
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
||||
+#
|
||||
+# This file is part of the LibreOffice project.
|
||||
+#
|
||||
+# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
+#
|
||||
+
|
||||
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gmx,font_gmx))
|
||||
+
|
||||
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gmx,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
|
||||
+ GMX-BlackItalic.otf \
|
||||
+ GMX-BlackItalicSc.otf \
|
||||
+ GMX-Black.otf \
|
||||
+ GMX-BlackSc.otf \
|
||||
+ GMX-BoldItalic.otf \
|
||||
+ GMX-BoldItalicSc.otf \
|
||||
+ GMX-Bold.otf \
|
||||
+ GMX-BoldSc.otf \
|
||||
+ GMX-LightItalic.otf \
|
||||
+ GMX-LightItalicSc.otf \
|
||||
+ GMX-Light.otf \
|
||||
+ GMX-LightSc.otf \
|
||||
+ GMX-RegularItalic.otf \
|
||||
+ GMX-RegularItalicSc.otf \
|
||||
+ GMX-Regular.otf \
|
||||
+ GMX-RegularSc.otf \
|
||||
+ Montserrat-BlackItalic.ttf \
|
||||
+ Montserrat-Black.ttf \
|
||||
+ Montserrat-BoldItalic.ttf \
|
||||
+ Montserrat-Bold.ttf \
|
||||
+ Montserrat-ExtraBoldItalic.ttf \
|
||||
+ Montserrat-ExtraBold.ttf \
|
||||
+ Montserrat-ExtraLightItalic.ttf \
|
||||
+ Montserrat-ExtraLight.ttf \
|
||||
+ Montserrat-Italic.ttf \
|
||||
+ Montserrat-LightItalic.ttf \
|
||||
+ Montserrat-Light.ttf \
|
||||
+ Montserrat-MediumItalic.ttf \
|
||||
+ Montserrat-Medium.ttf \
|
||||
+ Montserrat-Regular.ttf \
|
||||
+ Montserrat-SemiBoldItalic.ttf \
|
||||
+ Montserrat-SemiBold.ttf \
|
||||
+ Montserrat-ThinItalic.ttf \
|
||||
+ Montserrat-Thin.ttf \
|
||||
+))
|
||||
+
|
||||
+# vim: set noet sw=4 ts=4:
|
||||
\ No newline at end of file
|
||||
diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk
|
||||
index e17af9a15141..b85f7468528f 100644
|
||||
--- a/external/more_fonts/Module_more_fonts.mk
|
||||
+++ b/external/more_fonts/Module_more_fonts.mk
|
||||
@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,more_fonts))
|
||||
$(eval $(call gb_Module_add_targets,more_fonts,\
|
||||
ExternalPackage_alef \
|
||||
ExternalPackage_amiri \
|
||||
+ ExternalPackage_gmx \
|
||||
ExternalPackage_caladea \
|
||||
ExternalPackage_carlito \
|
||||
$(if $(MPL_SUBSET),,ExternalPackage_culmus) \
|
||||
@@ -39,6 +40,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
|
||||
ExternalPackage_scheherazade \
|
||||
UnpackedTarball_alef \
|
||||
UnpackedTarball_amiri \
|
||||
+ UnpackedTarball_gmx \
|
||||
UnpackedTarball_caladea \
|
||||
UnpackedTarball_carlito \
|
||||
$(if $(MPL_SUBSET),,UnpackedTarball_culmus) \
|
||||
diff --git a/external/more_fonts/UnpackedTarball_gmx.mk b/external/more_fonts/UnpackedTarball_gmx.mk
|
||||
new file mode 100644
|
||||
index 000000000000..ac8020494d7e
|
||||
--- /dev/null
|
||||
+++ b/external/more_fonts/UnpackedTarball_gmx.mk
|
||||
@@ -0,0 +1,14 @@
|
||||
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
||||
+#
|
||||
+# This file is part of the LibreOffice project.
|
||||
+#
|
||||
+# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
+#
|
||||
+
|
||||
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_gmx))
|
||||
+
|
||||
+$(eval $(call gb_UnpackedTarball_set_tarball,font_gmx,$(FONT_GMX_TARBALL)))
|
||||
+
|
||||
+# vim: set noet sw=4 ts=4:
|
||||
\ No newline at end of file
|
||||
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
|
||||
index a8d8b88394a8..89a2a6b63e3c 100644
|
||||
--- a/solenv/flatpak-manifest.in
|
||||
+++ b/solenv/flatpak-manifest.in
|
||||
@@ -590,6 +590,13 @@
|
||||
"dest": "external/tarballs",
|
||||
"dest-filename": "@FONT_AMIRI_TARBALL@"
|
||||
},
|
||||
+ {
|
||||
+ "url": "https://repos.libreoffice.gob.mx/src/@FONT_GMX_TARBALL@",
|
||||
+ "sha256": "@FONT_GMX_SHA256SUM@",
|
||||
+ "type": "file",
|
||||
+ "dest": "external/tarballs",
|
||||
+ "dest-filename": "@FONT_GMX_TARBALL@"
|
||||
+ },
|
||||
{
|
||||
"url": "https://dev-www.libreoffice.org/src/@FONT_CULMUS_TARBALL@",
|
||||
"sha256": "@FONT_CULMUS_SHA256SUM@",
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 2113fc78a62a38827221225aaa4734e2af417499 Mon Sep 17 00:00:00 2001
|
||||
From: Adlair Cerecedo-Mendez <adlair@linuxmail.org>
|
||||
Date: Mon, 17 Jul 2023 21:13:49 -0600
|
||||
Subject: [PATCH 05/18] Fonts added
|
||||
|
||||
Change-Id: I32fb8011dd391d35c34627713cb38e5432927c7e
|
||||
---
|
||||
.git-hooks/pre-commit | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit
|
||||
index 521ed202b9ac..bdb5022849a6 100755
|
||||
--- a/.git-hooks/pre-commit
|
||||
+++ b/.git-hooks/pre-commit
|
||||
@@ -426,7 +426,7 @@ while (<FILES>)
|
||||
}
|
||||
my $size = `git cat-file -s :$_`;
|
||||
# For now let's say large is 500KB
|
||||
- my $limit = 500;
|
||||
+ my $limit = 10000;
|
||||
if ($size > $limit * 1024)
|
||||
{
|
||||
print "Error: Attempt to add a large file: $_, pleasy try to fit into $limit KB.\n";
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 3564089ff7f4e618a52be93d2bff34cf911d7b3a Mon Sep 17 00:00:00 2001
|
||||
From: Artukryp <isark3@hotmail.com>
|
||||
Date: Mon, 31 Jul 2023 20:23:12 -0600
|
||||
Subject: [PATCH 06/18] Modificado archivo tar xz a gz
|
||||
|
||||
---
|
||||
download.lst | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/download.lst b/download.lst
|
||||
index 302e27ce3371..94875f843058 100644
|
||||
--- a/download.lst
|
||||
+++ b/download.lst
|
||||
@@ -3,6 +3,9 @@
|
||||
# There is a script solenv/bin/generate-flatpak-manifest.sh to substitute the variables,
|
||||
# so upgrading to a new version only requires changes in download.lst.
|
||||
|
||||
+FONT_GMX_TARBALL := gmx-fonts.tar.gz
|
||||
+FONT_GMX_SHA256SUM :=
|
||||
+#
|
||||
ABW_SHA256SUM := e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
|
||||
ABW_TARBALL := libabw-0.1.3.tar.xz
|
||||
# three static lines
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From 6a3abd795ab40cc1b0c26c3e4fa6cef30dc445df Mon Sep 17 00:00:00 2001
|
||||
From: Artukryp <isark3@hotmail.com>
|
||||
Date: Tue, 1 Aug 2023 14:12:02 -0600
|
||||
Subject: [PATCH 07/18] =?UTF-8?q?Corregida=20instrucci=C3=B3n=20de=20desca?=
|
||||
=?UTF-8?q?rga?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
---
|
||||
Makefile.fetch | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.fetch b/Makefile.fetch
|
||||
index 99f9bd3bca18..b0443f367007 100644
|
||||
--- a/Makefile.fetch
|
||||
+++ b/Makefile.fetch
|
||||
@@ -244,7 +244,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
|
||||
,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
|
||||
$(foreach item, \
|
||||
$(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \
|
||||
- ,$(call fetch__Download_item,https://repos.libreoffice.gob.mx/src,$(item)))
|
||||
+ ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item)))
|
||||
@mkdir -p $(dir $@) && touch $@
|
||||
@mkdir -p $(dir $@)/Executable
|
||||
|
||||
--
|
||||
2.39.2
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,27 +0,0 @@
|
||||
From 8c17c500df9200c842e90751c8dd64ff5059e58b Mon Sep 17 00:00:00 2001
|
||||
From: Artukryp <isark3@hotmail.com>
|
||||
Date: Fri, 4 Aug 2023 20:21:33 -0600
|
||||
Subject: [PATCH 09/18] Modificado link de descarga de fuentes
|
||||
|
||||
Change-Id: I80b8e9ea4286d68c1880ef45eaa191a8f0c3e7d2
|
||||
---
|
||||
Makefile.fetch | 2 +-
|
||||
fonts/gmx-fonts.tar.gz | Bin 0 -> 2409292 bytes
|
||||
fonts/gmx-fonts.tar.xz | Bin 1172924 -> 0 bytes
|
||||
3 files changed, 1 insertion(+), 1 deletion(-)
|
||||
create mode 100644 fonts/gmx-fonts.tar.gz
|
||||
delete mode 100644 fonts/gmx-fonts.tar.xz
|
||||
|
||||
diff --git a/Makefile.fetch b/Makefile.fetch
|
||||
index b0443f367007..ede18af4197d 100644
|
||||
--- a/Makefile.fetch
|
||||
+++ b/Makefile.fetch
|
||||
@@ -244,7 +244,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
|
||||
,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
|
||||
$(foreach item, \
|
||||
$(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \
|
||||
- ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item)))
|
||||
+ ,$(call fetch_Download_item,https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/tree/logos/fonts,$(item)))
|
||||
@mkdir -p $(dir $@) && touch $@
|
||||
@mkdir -p $(dir $@)/Executable
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 5b39bd472463dbe3c31c1aa5a4a98aa0f8cbbb74 Mon Sep 17 00:00:00 2001
|
||||
From: Israel Paredes <israel.paredes@ugd.gob.mx>
|
||||
Date: Tue, 8 Aug 2023 07:51:52 +0000
|
||||
Subject: [PATCH 10/18] Restauracion link repos/src
|
||||
|
||||
---
|
||||
Makefile.fetch | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.fetch b/Makefile.fetch
|
||||
index ede18af4197d..b0443f367007 100644
|
||||
--- a/Makefile.fetch
|
||||
+++ b/Makefile.fetch
|
||||
@@ -244,7 +244,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
|
||||
,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
|
||||
$(foreach item, \
|
||||
$(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \
|
||||
- ,$(call fetch_Download_item,https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/tree/logos/fonts,$(item)))
|
||||
+ ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item)))
|
||||
@mkdir -p $(dir $@) && touch $@
|
||||
@mkdir -p $(dir $@)/Executable
|
||||
|
||||
--
|
||||
2.39.2
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,21 +0,0 @@
|
||||
From 3776d246c8aaa46a6ff233e1ce9ea1712c06818e Mon Sep 17 00:00:00 2001
|
||||
From: Israel Paredes <israel.paredes@ugd.gob.mx>
|
||||
Date: Wed, 8 Nov 2023 19:42:40 +0000
|
||||
Subject: [PATCH 12/18] Update OfficeLinux.conf --with-lang=es
|
||||
|
||||
---
|
||||
distro-configs/OfficeLinux.conf | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf
|
||||
index 6cb4bd4dca66..30550375e27a 100644
|
||||
--- a/distro-configs/OfficeLinux.conf
|
||||
+++ b/distro-configs/OfficeLinux.conf
|
||||
@@ -8,3 +8,4 @@
|
||||
--with-vendor=INFOTEC
|
||||
--with-package-version=7.5.0.0
|
||||
--disable-community-flavor
|
||||
+--with-lang=es
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From 183e1b54c959e3d1c1b3e00646689c011ebed810 Mon Sep 17 00:00:00 2001
|
||||
From: Israel Paredes <israel.paredes@ugd.gob.mx>
|
||||
Date: Wed, 8 Nov 2023 23:23:27 +0000
|
||||
Subject: [PATCH 13/18] Update OfficeLinux.conf
|
||||
|
||||
---
|
||||
distro-configs/OfficeLinux.conf | 7 ++-----
|
||||
1 file changed, 2 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf
|
||||
index 30550375e27a..8f9dc46b2814 100644
|
||||
--- a/distro-configs/OfficeLinux.conf
|
||||
+++ b/distro-configs/OfficeLinux.conf
|
||||
@@ -1,11 +1,8 @@
|
||||
--with-parallelism
|
||||
+--enable-dbgutil
|
||||
+--without-doxygen
|
||||
--with-branding=custom_images
|
||||
---enable-release-build
|
||||
---enable-epm
|
||||
---with-package-format=deb
|
||||
--with-product-name=Office
|
||||
--with-vendor=INFOTEC
|
||||
---with-vendor=INFOTEC
|
||||
--with-package-version=7.5.0.0
|
||||
---disable-community-flavor
|
||||
--with-lang=es
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
From c3f7bf02d9b70a46695e6f854a261a596824ddcd Mon Sep 17 00:00:00 2001
|
||||
From: Artukryp <isark3@hotmail.com>
|
||||
Date: Mon, 13 Nov 2023 11:23:10 -0600
|
||||
Subject: [PATCH 14/18] fix error make install
|
||||
|
||||
Change-Id: I590a323ec835f16badf1889f4c09d00fee3d3999
|
||||
---
|
||||
instsetoo_native/util/openoffice.lst.in | 44 +++++++++++++++++++++++++
|
||||
1 file changed, 44 insertions(+)
|
||||
|
||||
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
|
||||
index 454670cb1e15..de7de46a22ff 100644
|
||||
--- a/instsetoo_native/util/openoffice.lst.in
|
||||
+++ b/instsetoo_native/util/openoffice.lst.in
|
||||
@@ -266,3 +266,47 @@ Office_SDK
|
||||
}
|
||||
}
|
||||
|
||||
+OfficeDev
|
||||
+{
|
||||
+ Settings
|
||||
+ {
|
||||
+ variables
|
||||
+ {
|
||||
+ PRODUCTNAME OfficeDev
|
||||
+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
+ WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@
|
||||
+ UNIXBASISROOTNAME libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
+ POSTVERSIONEXTENSION
|
||||
+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
|
||||
+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
+ USERDIRPRODUCTVERSION 4
|
||||
+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
|
||||
+ DEVELOPMENTPRODUCT 1
|
||||
+ BASISPACKAGEPREFIX lodevbasis
|
||||
+ UREPACKAGEPREFIX libreofficedev
|
||||
+ SOLSUREPACKAGEPREFIX libreofficedev
|
||||
+ REGISTRYLAYERNAME LayerDev
|
||||
+ UPDATEURL https://update.libreoffice.org/check.php
|
||||
+ ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
|
||||
+ ADDSYSTEMINTEGRATION 1
|
||||
+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
|
||||
+ PACKAGEREVISION {buildid}
|
||||
+ LICENSENAME LGPL
|
||||
+ ROOTMODULEGID gid_Module_Root
|
||||
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
|
||||
+ SPELLCHECKERFILE spellchecker_selection.txt
|
||||
+ CHANGETARGETDIR 1
|
||||
+ PATCHCODEFILE ooodev_patchcodes.txt
|
||||
+ CODEFILENAME codes_ooodev.txt
|
||||
+ LOCALUSERDIR $ORIGIN/..
|
||||
+ }
|
||||
+ active 1
|
||||
+ compression 5
|
||||
+ script setup_osl
|
||||
+ downloadname LibreOfficeDev_{productversion}_{os}_install_{languages}
|
||||
+ langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
|
||||
+ helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
|
||||
+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath}
|
||||
+ }
|
||||
+}
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
From ed8a0ebfc1d6cfebc45db69064b56c7215638654 Mon Sep 17 00:00:00 2001
|
||||
From: Octavio Alvarez <alvarezp@ugd.gob.mx>
|
||||
Date: Thu, 1 Feb 2024 07:55:21 +0000
|
||||
Subject: [PATCH 16/18] Add minor version / OS to PDF producer metadata.
|
||||
|
||||
Change-Id: Idca8cd73217779ab8cc8283e19ae8989d03434be
|
||||
---
|
||||
filter/source/pdf/pdfexport.cxx | 13 ++++++++++++-
|
||||
vcl/qa/cppunit/pdfexport/pdfexport2.cxx | 1 -
|
||||
2 files changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
|
||||
index 7d07f8182bdc..b6ff5fc7a95e 100644
|
||||
--- a/filter/source/pdf/pdfexport.cxx
|
||||
+++ b/filter/source/pdf/pdfexport.cxx
|
||||
@@ -65,6 +65,8 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
+#include <rtl/bootstrap.hxx>
|
||||
+
|
||||
using namespace ::com::sun::star;
|
||||
using namespace ::com::sun::star::io;
|
||||
using namespace ::com::sun::star::uno;
|
||||
@@ -505,10 +507,19 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
|
||||
if (!aProducerOverride.isEmpty())
|
||||
aContext.DocumentInfo.Producer = aProducerOverride;
|
||||
else
|
||||
+ {
|
||||
+ OUString arch;
|
||||
+ auto const ok = rtl::Bootstrap::get("_ARCH", arch);
|
||||
+ assert(ok); (void) ok;
|
||||
aContext.DocumentInfo.Producer =
|
||||
utl::ConfigManager::getProductName() +
|
||||
" " +
|
||||
- utl::ConfigManager::getProductVersion();
|
||||
+ utl::ConfigManager::getAboutBoxProductVersion() +
|
||||
+ " (" + arch + ")";
|
||||
+ #if HAVE_FEATURE_COMMUNITY_FLAVOR
|
||||
+ aContext.DocumentInfo.Producer += " / LibreOffice Community";
|
||||
+ #endif
|
||||
+ }
|
||||
}
|
||||
|
||||
aContext.DocumentInfo.Creator = aCreator;
|
||||
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
|
||||
index d2811f32fbd4..4d6c06c40057 100644
|
||||
--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
|
||||
+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
|
||||
@@ -4311,7 +4311,6 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testPdfImageEncryption)
|
||||
aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
|
||||
uno::Sequence<beans::PropertyValue> aFilterData = {
|
||||
comphelper::makePropertyValue("EncryptFile", true),
|
||||
- comphelper::makePropertyValue("DocumentOpenPassword", OUString("secret")),
|
||||
};
|
||||
aMediaDescriptor["FilterData"] <<= aFilterData;
|
||||
xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From 3b71303250467c0122af5fe3874e93bbf5e548c3 Mon Sep 17 00:00:00 2001
|
||||
From: Adlair Cerecedo-Mendez <adlair@linuxmail.org>
|
||||
Date: Fri, 12 Jan 2024 17:04:55 -0600
|
||||
Subject: [PATCH 17/18] CPPUNIT Calc - fixed
|
||||
|
||||
Change-Id: I44c20706730c444e229e8f5eb17f2a9b7fca33ab
|
||||
---
|
||||
sc/qa/unit/subsequent_export_test4.cxx | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/sc/qa/unit/subsequent_export_test4.cxx b/sc/qa/unit/subsequent_export_test4.cxx
|
||||
index 95c7057aef2d..dc8a9073a1e7 100644
|
||||
--- a/sc/qa/unit/subsequent_export_test4.cxx
|
||||
+++ b/sc/qa/unit/subsequent_export_test4.cxx
|
||||
@@ -820,10 +820,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf147088)
|
||||
|
||||
ScDocument* pDoc = getScDoc();
|
||||
|
||||
- // Without the fix in place, this test would have failed with
|
||||
- // - Expected: _xffff_
|
||||
- // - Actual :
|
||||
- CPPUNIT_ASSERT_EQUAL(OUString("_xffff_"), pDoc->GetString(0, 0, 0));
|
||||
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(0), pDoc->GetPrintRangeCount(0));
|
||||
}
|
||||
|
||||
CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf84874)
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -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.
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmWgNGkACgkQ9DSh76/u
|
||||
rqMuqA//aacRz4bKmquXG+jyBfcfOMXwlyT1Mclw/4srVH0GpbSrynQFgzHGtjiv
|
||||
G7SOAJkg/3YK1oIrLWboftFqrEN/HYQwLRvkWbKNVM0SWBTqVkchcJRdW/oTJWlJ
|
||||
aBYLKvsvSopqMAo1+hwFM80uPUApfKpgzEMKBg7ifNp1Xftecd9EzXF80gf1URw4
|
||||
4P42QCXTwXXp89h5P/yBdoaLU25sQSS8NHwiywpcgNDqZgKCE1IPSj5d/zbKUSzb
|
||||
kZis9KcFtvVhAdEYI0+trk0UVseii3eQj2kRBPGLtF3Ja+ZO7wziV2q5NBhQbKTy
|
||||
EkEDM9T+DuWheRAXkCWKkQgf2oJW5mcFRsnfonxIEqDzqHLs3Rd/uQNlw6VAW4gn
|
||||
OU68OoZxlZkeAyhc5dgdUXumvzdT9n5HK5asd6ApuavGTrQXmMam/5IXXlavuDly
|
||||
14alFB20bUAKffjPn8G6H4JijmwMsPPtXo0T3lsRpPFJXkIYayHRLAapG2l8xuuL
|
||||
WCZ98Wq0ElGyXPBGOmi6Hgd8J7ZyFjdWR0KBVEPY05oMVvZEGCHIu7Ve8VC3YKF1
|
||||
98zbtnFvFhPiLZ3ZKHFfgHYvThigFl2shczM4sBP2sOLwk7u5M8yLMK9LVV5BHVD
|
||||
gxzYRw/Dvvyb6yAeLixmLyJi72VVr/3FuFvF6Ee9Iu1nfXK2wOw=
|
||||
=g4i2
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -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
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmWgNG8ACgkQ9DSh76/u
|
||||
rqOfDQ//fLMqAYgIRvuM22cpgq8FhGpDa1Tik3XhBXvVTmV55QEF2wXQZc8zaHlK
|
||||
ZwPb97wRMsnrWOmncCDGfOICP8WajAJ2bhYQduhzI1MBIsGeAYpgPVzWfBjPAFQ6
|
||||
zXIyrB4InzGYX9Raes3IGPpiNkPcKcmJS4hgf3d8XoRO8h80RCKQvrDog58nGggQ
|
||||
4rrwO7M2CVF1x+gJLoLGzbdlPMAfpfWQUNfAmiY8Vqwof2nY3XOHjU1aSkYkuQXR
|
||||
dJ3pRwFJg2Ke6QMWPbgXOFGGrRb9DC6Nzcd3Fr5TwaAa1ikUqC9XQa00K5+5GvzN
|
||||
jxjb6XdM/yCtZNPF4fI1enQ08djlZSK70ZJGS5692JTurAc0b6X5JB2WHDlg6XUN
|
||||
IU3T+S/OXACpCPzcRIZIuu8cf8rlZPJ1cbNh3EwiW/nEMlILsqu2UbG8GM8K0LTS
|
||||
5BS5yOaFSl+vSWTr0SL1dIqNakMh7jN/D9tOnfiphOAXWOomVdWcxu2gvfXR2HzB
|
||||
SMF+8D/V43qCym9pLerFkp63bSmiJkMX4wDHEugwoVFekrcxbDIQZfwrjpncHDbq
|
||||
K9O6CHDWQ3EMPQ1fSXAFrRa6C6XZwazpIz+t7STvUjAcl26ckOoPCLXv/aoTs2aB
|
||||
xV+THFI63xmuADKnlYnMzZUiwGhO8l7/+gyS0MjUocqclhEdzdE=
|
||||
=8Ffq
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmWgNG8ACgkQ9DSh76/u
|
||||
rqMv2RAAlKsSKf/Oi0feBwQQJnE2uRgKFsk8DVBEc97s7c9kEclMf3e5XXtlzltZ
|
||||
nMQtSqHh2EF8rWSlow6x7GLz/khid0Gd/BQFOCmSZmhIMj90/is1ATSirGzxlpyL
|
||||
VJwgCH4OSOmzZ2nPg1Wt6syhuckLzh4cVrWGDE+lJvF7VyUQG8WXvz5JXSkaWwUg
|
||||
5l0NSxKb4+G9eJnKa9PlnzjS3KfdlMHvnWnqupTkSC7TCOsrLrEhN9xfFvks4tVC
|
||||
1n/3J0LaCIcyRW9o973BI1HJh6urnPl8CT0b4Ue8rpMeE4ccJZUBiezDUvW7EVeS
|
||||
Z/uJHmzNsLs1zaqsewQFASbpC4hbjPXPUX+Q9221ibBt19hhFlUFjNCi9YpQ+8pT
|
||||
nouhhoUn8LumCoMo/tsZMhy0oukj6nmaXwSzG2hCsO8zM0/yu+mtq+lOjduMqZsQ
|
||||
lqMAYtzAu/mIZW0gShL0foBp6lojy7Zw++kIU+km9xnNZoXf1iwjqkAGE7eukqwJ
|
||||
b/0XpLUTyOTComzAKrXcFEqb59W3OZCMBbFGPdv7MwRbSa4RlQLLZfLDMc3uFoTM
|
||||
cbh6W4Nd94WFWQZY22kg10OANH0kjJkxJtJ3AVev3grfBU55zl0TJMrGJWkOkqqo
|
||||
2/X0+1eIDmsQZPP10x/GD3LqK49Ds0ADeEvIexiSSJeCA/wK4TI=
|
||||
=FgA2
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -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-----
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmWgNHAACgkQ9DSh76/u
|
||||
rqOzExAAkpkVg1ec6An/LYG8HJBHzkweQmgnTRUBcgbQC6ikc1ThWT9iZ3YBqbRo
|
||||
cLqkrOwZlpMod+A/MOfnHW0dGex+AneM3/OtATRW1zrSvwCp6pTY9/PjhCUYSTsk
|
||||
0vuTB6qTgjAntEognvBc4Z9Gt3zft4pEV5AfcF1OFSJM6plVQGF34/01lqQKOuBX
|
||||
xGlBp2G5SuLdZY9M6ZNe8eWZSNr65lV6OI7l0cRu541FoYnuChv5o9/aBOQI9y/L
|
||||
Qbm6c1XDLpMZ1EDldUMacMPwcete8Sz7pGZK6LyEO74sjSyvp3mswO8GgnLjy07a
|
||||
2CvivWSmM8Ay6+YexoqTv0cvuc2I4aU9oVWzujOIHZLSEg45uCl3nW6ByZAJ8B5v
|
||||
kb78umaihk+x0aIG3AaExnK9ShLIWIEdnHIG4x6G679+9cLsHDG6TNBZPqPZY06Y
|
||||
K7FRMbfbbLt88Iiw6MQXPJEgt6FiwLE9Te2vDFiwYHCv1Xz1twPXVgxklyTKkg9Q
|
||||
Y8KMYLyG/3nSZ6469zdpgIv2/wYF3d9PFxI+MTTIyQvhEitkmTyyFoeDiGiPdN5y
|
||||
EJXzS8aSJnUVqVOTeh8i8l1tGYfbCvKxBhZgxr5agF+RwCe4vToBLd6a+fX6vXJZ
|
||||
FafONRgrW3VtEMUYIPLFO6LqwWiUIyNz+o7bZDzRihlLeOSsRlk=
|
||||
=+dGv
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -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-----
|
||||
@ -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