Re: Configure with --enable-lto on Debian Bullseye 64bit, tailored as per Franlin's attempt
It seems not matter what libgraphite2 packages installed in the system,
since it uses internal ones.
Could you please use
make > log.make.debugrun.txt 2>&1
To include the stderr messages into the log and paste the log on txtbin
again?
Thanks, Franklin
Alex 於 2023/6/21 13:46 寫道:
My graphite libraries are libgraphite2-dev, libgraphite2-3. Debian
packages
graphite2-minimal-1.3.14.tgz is a tarball in external/tarballs
Is there some sort of interaction maybe?
How to control/restrict use of graphite?
Alex Tao
Tao Submarines and Systems
Chios, Aegean Sea
Wednesday, June 21, 2023 8:39 AM +03:00 from Alex
:
I am installing on hardware, not in a VM/docker
Debian bullseye, 64bit
5.10 kernel
git checkout -f
( I hadn’t before!)
.
/autogen.sh --with-distro=LibreOfficeLinux --disable-online-update
--disable-breakpad > log.autogen.txt
https://txtbin.net/7dzdi078nf
./configure --enable-lto --with-package-format=deb --enable-epm
--enable-release-build --enable-dbgutil --srcdir=/home/user/a
--enable-option-checking=fatal --with-help=html >
log.configure-help=html-lang=el.enable-lto
https://txtbin.net/btud3qfffp
make > log.make.debugrun.txt
https://txtbin.net/qaw2ueuddr
After half an hour it fails
…
/home/user/a/workdir/CustomTarget/i18npool/localedata/localedata_ar_EG.cxx:2463:51:
note: code may be misoptimized unless ‘-fno-strict-aliasing’ is used
/tmp/libvcllo.so.m57uSi.ltrans17.ltrans.o::_ZZN12_GLOBAL__N_110direct_runEbPKPvPKhPiRPPN9graphite24SlotEhRNS6_2vm7Machine8status_tEPNS6_7SlotMapEE12opcode_table.lto_priv.0:
error: undefined reference to '.L2106'
Franklin uses an internal libgraphite
I am not sure, yet, what I have
Apparently (unwanted) language/l10n locale data is ‘misoptimized’
interacting with graphite
Alex Tao
Tao Submarines and Systems
Chios, Aegean Sea
Wednesday, June 21, 2023 7:07 AM +03:00 from Alex
:
I had a completely different error related to him, but I
didn’t pass the autogen --with-distro=LibreOfficeLinux
command, I need to also pass--disable-online-update
--disable-breakpad
Alex Tao
Tao Submarines and Systems
Chios, Aegean Sea
Tuesday, June 20, 2023 8:06 PM +03:00 from Alex
:
Hi all
Trying to replicate Franklin’s build process, source from
the latest bundle, updated.
./configure --enable-lto --with-package-format=deb
--enable-epm --enable-release-build --enable-dbgutil
--srcdir=/home/user/a --enable-option-checking=fatal
--with-help=html > log.configure-help=html-lang=el.enable-lto
I wanted to use the below config options, note language,
no rpm packaging, but I am using above for now
./configure --enable-lto --with-package-format=deb rpm
--enable-release-build --enable-dbgutil
--srcdir=/home/user/a/external/tarballs
--enable-option-checking=fatal --with-help=html
--with-lang=el > log.configure-help=html-lang=el.enable-lto
===
./configure --enable-lto --with-package-format=deb
--enable-epm --enable-release-build --enable-dbgutil
--srcdir=/home/user/a --enable-option-checking=fatal
--with-help=html > log.configure-help=html-lang=el.enable-lto
https://txtbin.net/6ktghfjwr2
In a couple of hours I will try make, and see what happens
No indication of any errors though
--
Alex
--
Alex
--
Franklin Weng
Member, Certification Committee
The Document Foundation, Kurfürstendamm 188, 10707 Berlin, DE
Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts
Legal details:https://www.documentfoundation.org/imprint
OpenPGP_signature
Description: OpenPGP digital signature
Building failed with --enable-lto on Debian, but succeeded on Ubuntu/Rocky Linux
Hi, I was trying to build latest LibreOffice core on Debian Bullseye and failed, while the other one could build successfully on Rocky Linux 8. So I tried to dig a bit deeper to find out why. Then I found that if I enable link-time optimization while running autogen.sh, it would fail : https://pastebin.com/Pt0zfEF2 Start from line 27641, while linking something with libharfbuzz.a, some symbols in libgraphite2.a were missing. libgraphite2.a was there, but all the makefiles didn't include them. If I use --disable-lto or simply comment out or remove the --enable-lto when running autogen.sh, it would succeed, but I'm still not sure if it linked libgraphite2 or not. https://pastebin.com/1FdeMsXr Then I tried to build it on Ubuntu Jammy. It succeeded even with --enable-lto. Well, problem solved since I could build it, but I'm still curious why it would fail only on Debian. I run all the compiling works in "pure" environment created by docker. The Dockerfiles for Debian and Ubuntu are simple like this: |FROM debian:bullseye || ||### Install system || ||COPY sources.list /etc/apt/sources.list || ||RUN mkdir /opt/git || ||RUN apt update || ||RUN apt install -y --no-install-recommends vim vim-runtime \ || || bash \ || || docker.io \ || || locales locales-all \ || || libkrb5-dev \ || || curl \ || || ssh \ || || git || ||RUN locale-gen zh_TW.UTF-8 || ||RUN locale-gen en_US.UTF-8 || ||RUN apt build-dep -y libreoffice| Any clue or possible reason why I would only fail on Debian with lto enabled? Or why it would not link with libgraphite.a which was indeed presented under workdir/LinkTarget/StaticLibrary/libgraphite.a? Thanks, Franklin -- Franklin Weng Member, Certification Committee The Document Foundation, Kurfürstendamm 188, 10707 Berlin, DE Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details:https://www.documentfoundation.org/imprint OpenPGP_signature Description: OpenPGP digital signature
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - filter/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 12b216ba8d9ca66924a2ed74c5e21b063f1ef6a3 Author: Franklin Weng AuthorDate: Wed May 10 14:18:45 2023 +0800 Commit: Michael Stahl CommitDate: Fri Jun 9 10:39:59 2023 +0200 tdf#155182 : fix test of $minLabelWidth which is always true Change-Id: I74e6e101ba16de1100e71ed950116bceb6862829 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151601 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 7f5e2fc7c1ae7c0c2bec76809e11365b255601d5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152759 Tested-by: Michael Stahl diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index da397ac9c24d..9706c1df0615 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -2025,7 +2025,7 @@ - +
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - filter/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e66251c6a30e2ab6bd8052c07ff3f69bbe85ca54 Author: Franklin Weng AuthorDate: Wed May 10 14:18:45 2023 +0800 Commit: Michael Stahl CommitDate: Thu Jun 8 19:20:56 2023 +0200 tdf#155182 : fix test of $minLabelWidth which is always true Change-Id: I74e6e101ba16de1100e71ed950116bceb6862829 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151601 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 7f5e2fc7c1ae7c0c2bec76809e11365b255601d5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152760 diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 6ad03e260d8c..0aa44114efa0 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -2038,7 +2038,7 @@ - +
[Libreoffice-commits] core.git: filter/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7f5e2fc7c1ae7c0c2bec76809e11365b255601d5 Author: Franklin Weng AuthorDate: Wed May 10 14:18:45 2023 +0800 Commit: Michael Stahl CommitDate: Thu Jun 8 17:27:33 2023 +0200 tdf#155182 : fix test of $minLabelWidth which is always true Change-Id: I74e6e101ba16de1100e71ed950116bceb6862829 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151601 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index da397ac9c24d..9706c1df0615 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -2025,7 +2025,7 @@ - +
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - filter/source
filter/source/xslt/odf2xhtml/export/common/table/table.xsl |4 ++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 19 ++--- 2 files changed, 20 insertions(+), 3 deletions(-) New commits: commit c910a1320c7247c111d4f7e2a61540fc646938ff Author: Franklin Weng AuthorDate: Wed Mar 22 12:33:38 2023 +0800 Commit: Adolfo Jayme Barrientos CommitDate: Tue May 9 18:26:48 2023 +0200 tdf#153839 : Further handling for adding newlines before and after some tags as described in comment 7 Change-Id: I6e2a6559a888d259c6d1cc848fad7d39a1ab653b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149280 Reviewed-by: Stéphane Guillou Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas (cherry picked from commit ce4272c25426f0084e53735e80870b9339239078) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150729 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table.xsl b/filter/source/xslt/odf2xhtml/export/common/table/table.xsl index cfc1ebbc525b..d55948cab5b9 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table/table.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table/table.xsl @@ -63,6 +63,7 @@ + @@ -71,6 +72,7 @@ + @@ -110,10 +112,12 @@ + + diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 6f64b5a83d82..6ad03e260d8c 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -254,7 +254,9 @@ + Next 'div' was a 'draw:text-box'. + @@ -379,10 +381,14 @@ + Next 'div' was a 'text:p'. + + Next 'div' was a 'draw:page'. + @@ -840,7 +846,9 @@ + Next 'div' added for floating. + display:inline; position:relative; left: @@ -1031,7 +1039,9 @@ + Next 'div' is emulating the top height of a draw:frame. +
[Libreoffice-commits] core.git: filter/source
filter/source/xslt/odf2xhtml/export/common/table/table.xsl |4 ++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 19 ++--- 2 files changed, 20 insertions(+), 3 deletions(-) New commits: commit ce4272c25426f0084e53735e80870b9339239078 Author: Franklin Weng AuthorDate: Wed Mar 22 12:33:38 2023 +0800 Commit: Ilmari Lauhakangas CommitDate: Fri Apr 21 11:35:16 2023 +0200 tdf#153839 : Further handling for adding newlines before and after some tags as described in comment 7 Change-Id: I6e2a6559a888d259c6d1cc848fad7d39a1ab653b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149280 Reviewed-by: Stéphane Guillou Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table.xsl b/filter/source/xslt/odf2xhtml/export/common/table/table.xsl index cfc1ebbc525b..d55948cab5b9 100644 --- a/filter/source/xslt/odf2xhtml/export/common/table/table.xsl +++ b/filter/source/xslt/odf2xhtml/export/common/table/table.xsl @@ -63,6 +63,7 @@ + @@ -71,6 +72,7 @@ + @@ -110,10 +112,12 @@ + + diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index ca7a6906b82c..fca8d9a763b7 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -248,7 +248,9 @@ + Next 'div' was a 'draw:text-box'. + @@ -372,10 +374,14 @@ + Next 'div' was a 'text:p'. + + Next 'div' was a 'draw:page'. + @@ -829,7 +835,9 @@ + Next 'div' added for floating. + display:inline; position:relative; left: @@ -1020,7 +1028,9 @@ + Next 'div' is emulating the top height of a draw:frame. +
Origin/master build fail
Hi, Since yesterday when I built from origin/master it always halted with the following messages: [BIN] sc [MOD] sc [BIN] postprocess [GAL] backgrounds [GAL] sounds [MOD] postprocess Aborted (core dumped) terminate called after throwing an instance of 'com::sun::star::uno::RuntimeException' make[1]: *** [/opt/git/libreoffice.core/solenv/gbuild/Gallery.mk:57: /opt/git/libreoffice.core/workdir/Gallery/sounds.done] Error 1 make[1]: *** Waiting for unfinished jobs Aborted (core dumped) terminate called after throwing an instance of 'com::sun::star::uno::RuntimeException' make[1]: *** [/opt/git/libreoffice.core/solenv/gbuild/Gallery.mk:57: /opt/git/libreoffice.core/workdir/Gallery/backgrounds.done] Error 1 make: *** [Makefile:289: build] Error 2 If I checked out tag libreoffice-7.5.1.2 it could build successfully, so I think it should not be caused by my building environment. Does anyone experience the same problem? Thanks, Franklin -- Franklin Weng Member, Certification Committee The Document Foundation, Kurfürstendamm 188, 10707 Berlin, DE Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details:https://www.documentfoundation.org/imprint OpenPGP_signature Description: OpenPGP digital signature
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - filter/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 11 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl| 31 filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl |6 ++ 3 files changed, 48 insertions(+) New commits: commit 5ee2f4ee7838401afdae5eef5669881601fb4ee6 Author: Franklin Weng AuthorDate: Wed Mar 1 00:04:11 2023 +0800 Commit: Caolán McNamara CommitDate: Thu Mar 16 11:46:09 2023 + tdf#153839: add newline after certain tags Add newline after certain tags in head section and paragraphs, to make generated xhtml easier to read. Change-Id: I9562ef48d9dd1283110be4a45527616dce186681 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148026 Tested-by: Jenkins Reviewed-by: Miklos Vajna (cherry picked from commit d2e8705c9cc503afdaed366b1f71ed012b0c568f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148869 Reviewed-by: Caolán McNamara diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 430b834b3cca..ca7a6906b82c 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -50,9 +50,11 @@ + + @@ -178,6 +180,7 @@ + @@ -233,6 +236,7 @@ + @@ -472,10 +476,12 @@ + + @@ -547,6 +553,7 @@ + @@ -558,6 +565,7 @@ + @@ -565,6 +573,7 @@ + @@ -580,6 +589,7 @@ + @@ -1193,6 +1203,7 @@ + diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl index 2bd07d8d29e4..581b8b8d3421 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl @@ -55,12 +55,14 @@ + http://dublincore.org/documents/dcmi-terms/ CSS helper variable will be created... + CSS variable ready, header will be created... @@ -68,6 +70,7 @@ CSS header creation finished! + @@ -246,11 +249,13 @@ + + @@ -262,6 +267,7 @@ en-US + @@ -271,6 +277,7 @@ + @@ -280,13 +287,16 @@ , + + Content-Type application/xhtml+xml; charset=utf-8 + @@ -304,6 +314,7 @@ + @@ -315,6 +326,7 @@ + @@ -322,6 +334,7 @@ + @@ -329,18 +342,21 @@ + DCTERMS.source http://xml.openoffice.org/odf2xhtml + + @@ -348,12 +364,14 @@ + + @@ -361,6 +379,7 @@ + @@ -369,6 +388,7 @@ + @@ -380,6 +400,7 @@ + @@ -387,6 +408,7
[Libreoffice-commits] core.git: filter/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 11 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl| 31 filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl |6 ++ 3 files changed, 48 insertions(+) New commits: commit d2e8705c9cc503afdaed366b1f71ed012b0c568f Author: Franklin Weng AuthorDate: Wed Mar 1 00:04:11 2023 +0800 Commit: Miklos Vajna CommitDate: Thu Mar 9 07:43:14 2023 + tdf#153839: add newline after certain tags Add newline after certain tags in head section and paragraphs, to make generated xhtml easier to read. Change-Id: I9562ef48d9dd1283110be4a45527616dce186681 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148026 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 430b834b3cca..ca7a6906b82c 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -50,9 +50,11 @@ + + @@ -178,6 +180,7 @@ + @@ -233,6 +236,7 @@ + @@ -472,10 +476,12 @@ + + @@ -547,6 +553,7 @@ + @@ -558,6 +565,7 @@ + @@ -565,6 +573,7 @@ + @@ -580,6 +589,7 @@ + @@ -1193,6 +1203,7 @@ + diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl index 2bd07d8d29e4..581b8b8d3421 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl @@ -55,12 +55,14 @@ + http://dublincore.org/documents/dcmi-terms/ CSS helper variable will be created... + CSS variable ready, header will be created... @@ -68,6 +70,7 @@ CSS header creation finished! + @@ -246,11 +249,13 @@ + + @@ -262,6 +267,7 @@ en-US + @@ -271,6 +277,7 @@ + @@ -280,13 +287,16 @@ , + + Content-Type application/xhtml+xml; charset=utf-8 + @@ -304,6 +314,7 @@ + @@ -315,6 +326,7 @@ + @@ -322,6 +334,7 @@ + @@ -329,18 +342,21 @@ + DCTERMS.source http://xml.openoffice.org/odf2xhtml + + @@ -348,12 +364,14 @@ + + @@ -361,6 +379,7 @@ + @@ -369,6 +388,7 @@ + @@ -380,6 +400,7 @@ + @@ -387,6 +408,7 @@ + @@ -394,6 +416,7
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/dialogs/certificatechooser.cxx | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 648990692c8253e3843c4c5954940e8b893d5f3e
Author: Franklin Weng
AuthorDate: Sun Aug 18 21:30:05 2019 +0800
Commit: Katarina Behrens
CommitDate: Tue Aug 20 15:14:48 2019 +0200
tdf#116862 do not encrypt to self when encryption key is not set
When "always encrypt to self" is checked but no encryption key is set,
encrypting a file with GPG key would cause error. So check if
msPreferredKey is empty or not before comparing with sIssuer.
Change-Id: I4d95f0b436cb1fafad1d57d50330fd2080902b69
Reviewed-on: https://gerrit.libreoffice.org/77665
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx
b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 32c688f2a257..795e9bf3ae07 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -220,13 +220,15 @@ void CertificateChooser::ImplInitialize()
#if HAVE_FEATURE_GPGME
// only GPG has preferred keys
-if ( sIssuer == msPreferredKey )
-{
-if ( meAction == UserAction::Sign || meAction ==
UserAction::SelectSign )
-m_xCertLB->select(nRow);
-else if ( meAction == UserAction::Encrypt &&
- aUserOpts.GetEncryptToSelf() )
-mxEncryptToSelf = xCert;
+if ( !sIssuer.isEmpty() && !msPreferredKey.isEmpty() ) {
+if ( sIssuer == msPreferredKey )
+{
+if ( meAction == UserAction::Sign || meAction ==
UserAction::SelectSign )
+m_xCertLB->select(nRow);
+else if ( meAction == UserAction::Encrypt &&
+ aUserOpts.GetEncryptToSelf() )
+mxEncryptToSelf = xCert;
+}
}
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Master build unit test failed
Hi, I tried to build the master branch and failed in the unit test. ./autogen.sh --with-language="en-US zh-TW" --with-locales="zh_TW en_US" make -j4 The first time failed messages: https://pastebin.com/D04KuJuJ The second time failed messages: https://pastebin.com/tQHPxVk8 During these two times I built it with build-nocheck and succeeded. Would anyone please take a look at it? Thanks, Franklin -- Franklin Weng Member, Board of Director & Certification Committee The Document Foundation, Kurfürstendamm 188, 10707 Berlin, DE Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: https://www.documentfoundation.org/imprint signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sfx2/source
sfx2/source/appl/appserv.cxx |8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit c008e38e1069f33a20af63eedc4bc7e6ebf5278d
Author: Franklin Weng <frank...@goodhorse.idv.tw>
Date: Wed Feb 28 18:12:07 2018 +0800
tdf#115795 Solve wrong redirect behavior of "Get Online Help"
When under locale zh-TW, Help > Get Online Help would use only "zh"
as the parameter of LOLang and sent it to hub.libreoffice.org, which
would redirect to Simplified Chinese forum instead of zh_TW
ask.libreoffice.org forum. After discussing with Guilhem he
refactored the behavior of the Hub, use LOlocale instead of LOLang,
and keep LOLang for backward compatibility. The LibreOffice sent
LOlocale instead to avoid this problem happening again.
Change-Id: Ia9348cff88723210f693e65260bb987826a3f3ea
Reviewed-on: https://gerrit.libreoffice.org/50503
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/50519
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index d6424c2d06ef..e5f91e7983e6 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -508,14 +508,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
{
// Askbot has URL's normalized to languages, not locales
// Get language from locale: ll or lll or ll-CC or lll-CC
-sal_Int32 ix = utl::ConfigManager::getLocale().indexOf("-",0);
-OUString aLang;
-if (ix == -1)
-aLang = utl::ConfigManager::getLocale();
-else
-aLang = utl::ConfigManager::getLocale().copy(0,ix);
-OUString sURL("http://hub.libreoffice.org/forum/?LOlang=; + aLang);
+OUString sURL("https://hub.libreoffice.org/forum/?LOlocale=; +
utl::ConfigManager::getLocale());
sfx2::openUriExternally(sURL, false);
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sfx2/source
sfx2/source/appl/appserv.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5fefbde340ed3bb7591f2301282e986c1caf2ee9
Author: Franklin Weng <frank...@goodhorse.idv.tw>
Date: Wed Feb 28 18:12:07 2018 +0800
tdf#115795 Solve wrong redirect behavior of "Get Online Help"
When under locale zh-TW, Help > Get Online Help would use only "zh"
as the parameter of LOLang and sent it to hub.libreoffice.org, which
would redirect to Simplified Chinese forum instead of zh_TW
ask.libreoffice.org forum. After discussing with Guilhem he
refactored the behavior of the Hub, use LOlocale instead of LOLang,
and keep LOLang for backward compatibility. The LibreOffice sent
LOlocale instead to avoid this problem happening again.
Change-Id: Ia9348cff88723210f693e65260bb987826a3f3ea
Reviewed-on: https://gerrit.libreoffice.org/50503
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
(cherry picked from commit 7c1f11985c0b42981cf8600840fb87521ce5ad33)
Reviewed-on: https://gerrit.libreoffice.org/50511
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 1e2a2ec4984c..7ed64646e37f 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -499,8 +499,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
{
// Askbot has URL's normalized to languages, not locales
// Get language from locale: ll or lll or ll-CC or lll-CC
-OUString aLang =
LanguageTag(utl::ConfigManager::getLocale()).getLanguage();
-OUString sURL("https://hub.libreoffice.org/forum/?LOlang=; +
aLang);
+
+OUString sURL("https://hub.libreoffice.org/forum/?LOlocale=; +
utl::ConfigManager::getLocale());
sfx2::openUriExternally(sURL, false);
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/appserv.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7c1f11985c0b42981cf8600840fb87521ce5ad33
Author: Franklin Weng <frank...@goodhorse.idv.tw>
Date: Wed Feb 28 18:12:07 2018 +0800
tdf#115795 Solve wrong redirect behavior of "Get Online Help"
When under locale zh-TW, Help > Get Online Help would use only "zh"
as the parameter of LOLang and sent it to hub.libreoffice.org, which
would redirect to Simplified Chinese forum instead of zh_TW
ask.libreoffice.org forum. After discussing with Guilhem he
refactored the behavior of the Hub, use LOlocale instead of LOLang,
and keep LOLang for backward compatibility. The LibreOffice sent
LOlocale instead to avoid this problem happening again.
Change-Id: Ia9348cff88723210f693e65260bb987826a3f3ea
Reviewed-on: https://gerrit.libreoffice.org/50503
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index f8b08137a326..dc89048452e8 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -501,8 +501,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
{
// Askbot has URL's normalized to languages, not locales
// Get language from locale: ll or lll or ll-CC or lll-CC
-OUString aLang =
LanguageTag(utl::ConfigManager::getLocale()).getLanguage();
-OUString sURL("https://hub.libreoffice.org/forum/?LOlang=; +
aLang);
+
+OUString sURL("https://hub.libreoffice.org/forum/?LOlocale=; +
utl::ConfigManager::getLocale());
sfx2::openUriExternally(sURL, false);
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
