diff --git a/libreoffice.changes b/libreoffice.changes index bf5e932..bec4622 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Feb 12 11:03:39 UTC 2020 - Marina Latini + +- Fix autocorrect names for Italian + In Italian there are also other locales that should be included + in this list like fur_IT lld_IT sc_IT and vec_IT + +------------------------------------------------------------------- +Sun Feb 9 04:51:53 UTC 2020 - Thomas Williams + +- Remove unneeded (and counterintuitive) mysql/mariadb dep from core + RPMs. Move it instead to the -base package, where it's really used. + +------------------------------------------------------------------- +Thu Feb 6 09:55:01 UTC 2020 - Wolfgang Bauer + +- Add soffice.sh_Avoid-exporting-empty-LC_ALL.patch to fix broken + handling of non-ASCII characters in the KDE filedialog + (boo#1161816) + ------------------------------------------------------------------- Thu Jan 30 10:24:05 UTC 2020 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index 4daed0b..9964bf7 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -100,6 +100,8 @@ Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff # PATCH-FIX-UPSTREAM lo-Fix-build-with-poppler-0.83.patch Patch4: lo-Fix-build-with-poppler-0.83.patch +# PATCH-FIX-UPSTREAM soffice.sh_Avoid-exporting-empty-LC_ALL.patch +Patch5: soffice.sh_Avoid-exporting-empty-LC_ALL.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep @@ -956,6 +958,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch2 %patch3 %patch4 -p1 +%patch5 -p1 %patch990 -p1 %patch991 -p1 @@ -1247,7 +1250,7 @@ done %make_autocorr_aliases -l de de-DE de-AT de-BE de-CH de-LI de-LU %make_autocorr_aliases -l es es-ES es-AR es-BO es-CL es-CO es-CR es-CU es-DO es-EC es-GT es-HN es-MX es-NI es-PA es-PE es-PR es-PY es-SV es-US es-UY es-VE %make_autocorr_aliases -l fr fr-FR fr-BE fr-CA fr-CH fr-LU fr-MC -%make_autocorr_aliases -l it it-IT it-CH +%make_autocorr_aliases -l it it-IT it-CH fur_IT lld_IT sc_IT vec_IT %make_autocorr_aliases -l nl-NL nl-AW %make_autocorr_aliases -l sv-SE sv-FI pushd %{buildroot}%{_libdir}/%{name}/share/autocorr @@ -1353,6 +1356,11 @@ export DESTDIR=%{buildroot} export SRCDIR="./" ./solenv/bin/install-gdb-printers -a %{_datadir}/gdb/auto-load%{_libdir}/%{name} -c -i %{_libdir}/%{name} -p %{_datadir}/libreoffice/gdb +# Why would the mysql lib which is only USED by base not be IN THE BASE PACKAGE?!? +grep -v "%{_libdir}/libreoffice/program/libmysqlclo.so" file-lists/common_list.txt > tmplist +mv tmplist file-lists/common_list.txt +echo "%{_libdir}/libreoffice/program/libmysqlclo.so" >> file-lists/base_list.txt + # We have ton of duped files so run over it %fdupes %{buildroot}%{_prefix} diff --git a/soffice.sh_Avoid-exporting-empty-LC_ALL.patch b/soffice.sh_Avoid-exporting-empty-LC_ALL.patch new file mode 100644 index 0000000..969fe99 --- /dev/null +++ b/soffice.sh_Avoid-exporting-empty-LC_ALL.patch @@ -0,0 +1,72 @@ +From f5b7139b8eb1296e28d0983f35c3cec11d215298 Mon Sep 17 00:00:00 2001 +From: Michael Weghorn +Date: Wed, 05 Feb 2020 09:40:56 +0100 +Subject: [PATCH] tdf#130080 soffice.sh: Avoid exporting empty LC_ALL + +The previous way of doing + + LO_SAVE_LC_ALL="$LC_ALL" + LC_ALL=C + export LC_ALL + # ... (call some tools,...) + LC_ALL="$LO_SAVE_LC_ALL" + +resulted in the LC_ALL environment variable explicity being +set to an empty string in case it was not set at all previously. + +For some reason, an LC_ALL explicitly set to an empty string +(other than an unset LC_ALL) makes the system ICU on various +Linux distributions assume an "US-ASCII" encoding, even if the +locale is otherwise configured to be a UTF-8 one. +Since the corresponding detection from ICU is used in the +KF5/Qt stack, that resulted in the Plasma-native file picker +assuming an ASCII-encoding, and thus having problems with +files containing non-ASCII characters. + +To avoid this, don't export LC_ALL if unset or set to an +empty string. + +A big thanks to frinring on IRC #kde-devel for the analysis +of why the Plasma-native file picker is affected by LC_ALL being +set to an empty string! + +I could also reproduce that the following sample program run +with 'LC_ALL=' on KDE Neon Developer edition printed "US-ASCII" +when using the system ICU, while it printed "UTF-8" when using +a self-built ICU as of current master (commit +d6b88d49e3be7096baf3828776c2b482a8ed1780) instead, but did not +further investigate why: + + #include + #include + + int main() { + std::cout << ucnv_getDefaultName(); + } + +Change-Id: Idee88f200b6edecdb2633ed6e6fa70b370ffcf0c +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88003 +Reviewed-by: Michael Stahl +Tested-by: Jenkins +(cherry picked from commit 25649502e08a52087dea5e482d34a1d4150f0930) +--- + +diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh +index 026f7f0..415ea04 100755 +--- a/desktop/scripts/soffice.sh ++++ b/desktop/scripts/soffice.sh +@@ -169,8 +169,12 @@ + ;; + esac + +-# restore locale setting +-LC_ALL="$LO_SAVE_LC_ALL" ++# restore locale setting, avoiding to export empty LC_ALL, s. tdf#130080 ++if [ -n "$LO_SAVE_LC_ALL" ]; then ++ LC_ALL="$LO_SAVE_LC_ALL" ++else ++ unset LC_ALL ++fi + + # run soffice.bin directly when you want to get the backtrace + if [ -n "$GDBTRACECHECK" ] ; then