From 1392f6381c3d2142476bbb24a60b6e8f016070463d8636237bdec66e75999198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 9 Mar 2020 16:08:01 +0000 Subject: [PATCH] - Update to 6.4.2.1: * 6.4.2 RC1 release - Remove merged patch: * soffice.sh_Avoid-exporting-empty-LC_ALL.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=864 --- libreoffice-6.4.1.1.tar.xz | 3 - libreoffice-6.4.1.1.tar.xz.asc | 16 ----- libreoffice-6.4.2.1.tar.xz | 3 + libreoffice-6.4.2.1.tar.xz.asc | 16 +++++ libreoffice-help-6.4.1.1.tar.xz | 3 - libreoffice-help-6.4.1.1.tar.xz.asc | 16 ----- libreoffice-help-6.4.2.1.tar.xz | 3 + libreoffice-help-6.4.2.1.tar.xz.asc | 16 +++++ libreoffice-translations-6.4.1.1.tar.xz | 3 - libreoffice-translations-6.4.1.1.tar.xz.asc | 16 ----- libreoffice-translations-6.4.2.1.tar.xz | 3 + libreoffice-translations-6.4.2.1.tar.xz.asc | 16 +++++ libreoffice.changes | 8 +++ libreoffice.spec | 5 +- soffice.sh_Avoid-exporting-empty-LC_ALL.patch | 72 ------------------- 15 files changed, 66 insertions(+), 133 deletions(-) delete mode 100644 libreoffice-6.4.1.1.tar.xz delete mode 100644 libreoffice-6.4.1.1.tar.xz.asc create mode 100644 libreoffice-6.4.2.1.tar.xz create mode 100644 libreoffice-6.4.2.1.tar.xz.asc delete mode 100644 libreoffice-help-6.4.1.1.tar.xz delete mode 100644 libreoffice-help-6.4.1.1.tar.xz.asc create mode 100644 libreoffice-help-6.4.2.1.tar.xz create mode 100644 libreoffice-help-6.4.2.1.tar.xz.asc delete mode 100644 libreoffice-translations-6.4.1.1.tar.xz delete mode 100644 libreoffice-translations-6.4.1.1.tar.xz.asc create mode 100644 libreoffice-translations-6.4.2.1.tar.xz create mode 100644 libreoffice-translations-6.4.2.1.tar.xz.asc delete mode 100644 soffice.sh_Avoid-exporting-empty-LC_ALL.patch diff --git a/libreoffice-6.4.1.1.tar.xz b/libreoffice-6.4.1.1.tar.xz deleted file mode 100644 index f5bb0fe..0000000 --- a/libreoffice-6.4.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2ef3951a50b5519c4e3b3dd150c1d4272f9504e0b1e426819d1934fe3bcd80d -size 234382184 diff --git a/libreoffice-6.4.1.1.tar.xz.asc b/libreoffice-6.4.1.1.tar.xz.asc deleted file mode 100644 index 71fffc3..0000000 --- a/libreoffice-6.4.1.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl47AmEACgkQ9DSh76/u -rqOCahAAgzZPYDTNaXpTDVKb+/4CRi1BjLEbCkHDxdfP6KFAPAFpV5IzBZOj/y37 -QIV1ZJF/2pr6mfmKbwh068siLx+jvo6neFyV9G2sbHXVfxXLt3qz3hMAr2Cm91UV -wJhkFV+r2m2ZL4+dcj88gZbl4Ph04+u95QMxEcCf1qQWS0egoKwpOeE6Daj/BnYT -U8OR/rKoDZWNFAfrsL3x564twKQ8FvCoFFUi8HWSXKBh2tZB7HUNKilt3j94DTzm -7AzXcFz9AENwpeVcJ1cGZ/mKyr+C2ILwkUT5eF688onGmrvRh14ZjUR8+BqA0OwA -K9026Ah8koN9qedhH+tYCmnBiT2z2uRE5qqzf+cvxPsX1Qfa/B02Dey93Q1fivR/ -JKpshUZSzhwMpwMHkLZ2kryYB4D+rOGTuTq3huLToueJj3NehL8Jrdy2NALzVqmI -z7G3TOwfk9Nk5T2rF6k2gI+nhFScbEbfRA/5kyTWf1vuJk6UHA1MlHwDBNNvhT2Z -Z8cG9JUVYgSO6ncJ0iqnwyyMhA4L3MRgnzyirdsP1xoTMcMK3PlYHMeiCFo7dVmZ -7OoVd9xo7s3awKh/i+pyviSZZkUSGadGix0rW953MTiK0McvWHDiu+23W4540rEt -EqwakWTRmRoXqdxIPXNfvLvJanq9lDkIIhQ351n8X4KLqHiL7RQ= -=9ue1 ------END PGP SIGNATURE----- diff --git a/libreoffice-6.4.2.1.tar.xz b/libreoffice-6.4.2.1.tar.xz new file mode 100644 index 0000000..42e8104 --- /dev/null +++ b/libreoffice-6.4.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7525da6f968f2320ca26e8ccf688c18817a7898561027bd3a05bbb8f35979072 +size 234792276 diff --git a/libreoffice-6.4.2.1.tar.xz.asc b/libreoffice-6.4.2.1.tar.xz.asc new file mode 100644 index 0000000..6f50d38 --- /dev/null +++ b/libreoffice-6.4.2.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl5ZaaIACgkQ9DSh76/u +rqNwPw/9GJkS2tPt7Ecw/gmBak+u180r/vsZucBeDE6YSfLFbfMjXt6ZM9njt6wg +zNazFlv4gCKdz+u+AjOIn6oibueus4L/QtYL/u9COhGbcKVTv4F6mhcOxlA7SRj2 +EHNn8sDQRabiFbHCEvOIpF1UXCYkTLD9PijIfwr3l2ZVwLGLCIsiyjFUYHeLrvl4 +f8rCFo/x8fIGeWH7O/hf0iMqscc+YTVT0nzilHvN+OGwNrZ08U4JHqNlZvjrhn0G +0X95hhsXdNkCOUMxtn80MosZLVztLQQqahKcAxrKKDvn3epPvk5VZ/drXYXwZklr +lWOKx3wcbWhCcCeMf16TsrIiCmSAVZMTDqlZLaNOv64WeR5bWhvJQjEzza70rrxH +946Fg5XeFvtJPuhMCGk6ai6lmkSVUdE0uTOake2xDmlYzpwqG5hVYLBUEP73fXax +4M5/vPb44jDuwWgJXd/NSW9QgwgrJgBJtX0bnxhegWCv2jPP0jhTGvx6RhiTf6YI +IiP3Kw7Pz+u0S9z8OkQsQwcBjC6/fs1VQzDB9/tHqdGhNQq55whmsN+bvwmHv9Y7 +MbvktKDHcX87kQCqLe5EU34bMCU1xlBrUI9m15p9Rugv4gZisfGS+2smBRtOIKnk +rRGiJvW5t9jMGOiSWXx5ki5mp2h5KTGUbATsHTwZ8EnuGm5bMrU= +=0Dk2 +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-6.4.1.1.tar.xz b/libreoffice-help-6.4.1.1.tar.xz deleted file mode 100644 index dc832dd..0000000 --- a/libreoffice-help-6.4.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18670465a592db239d267bd7328f68a0e5b624ccac0d9ff1abe5e5ee5ba6d4c1 -size 88377536 diff --git a/libreoffice-help-6.4.1.1.tar.xz.asc b/libreoffice-help-6.4.1.1.tar.xz.asc deleted file mode 100644 index 984bfa3..0000000 --- a/libreoffice-help-6.4.1.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl47AmgACgkQ9DSh76/u -rqObkw//WyiQwbCp010k3qFKTyjfeIIP7B82Z7JjN8vATRy3yxloRoUxues66VA5 -brZb77VUgqSz5/gRgQQIXdSxt6sk4Vfqw6rRHfuYB6pDunqXYJMRz5nEmDoy718L -l32wzkWojWWXiEB/gW9dXnRH/twEncFWu0IGhctBpHen77OWZTyQdmgvdG9We14N -jdIeCoMksPsfkSUUYiZgBbBdWw/Abfr3ZLIcyE2IY9QBWQpctpsnzG1dNuXxWSSg -EpcU900gBVs6ZN87dI9vM8/QtajlBP2tyBQYUAYX2NwSlHDHI7ITUj2jcBEKBldB -uZPCi61yACpSjOTBelFJAZ1suirmatbqW+KFo1m7Az7Zo9oKwzn8hAifnLce5Rv5 -WCShzLo3bClJv6Ljt31Y04uW7mkwGltF0lLgz5EAn9uZ6jN2gHrl6qqWdg70sykV -CZZJmSrBHMdmIFMfWa+WWgHnydfLCSqzi2Wt3WjEr8LwXPMfUIWpxbECNnzUrEAl -Kbj/dNlvPG2fgNByt19qAcmJitxkI9UotlH7PdDgM4oUVvQqz68yu8bO3UBws3dV -vE9pEUjzq5DddW8bQRFEoxc46KZXhbTEBh9igOiijIPp8sbNzTxG2JbMPdP9h3Oo -QNSvy4zC9ySEirDDY11HLa/YVhScrMqzaswMNSmEYJCKVEpvx1w= -=Z/Ta ------END PGP SIGNATURE----- diff --git a/libreoffice-help-6.4.2.1.tar.xz b/libreoffice-help-6.4.2.1.tar.xz new file mode 100644 index 0000000..d0e2ba3 --- /dev/null +++ b/libreoffice-help-6.4.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:450f582b9e1d52455aa2acdd4a7ebd4458d6b5824db0f12a629fc170923f43ed +size 88381292 diff --git a/libreoffice-help-6.4.2.1.tar.xz.asc b/libreoffice-help-6.4.2.1.tar.xz.asc new file mode 100644 index 0000000..5b650cc --- /dev/null +++ b/libreoffice-help-6.4.2.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl5ZaaUACgkQ9DSh76/u +rqOxJBAAkfPoY76ntAk/IYIiNzlZPTITaDhTaWMtW+Dwro9wRu95XMx6XnoI7r5e +kCswLFtlgLmu1R11I13REUmM6qzdoW1d7CbA4vvIXh3VWF4ZTswl8TCJ3n7OaF2C +W2EZr2eVZRMK3DdhnCJfPLBMRu6Q9ghs4OGPThsanVBiSvJ5w0l/GymIiRY2kOTK +dxHhJEdUkT8zuWfZok21esPiUxyDA7IEvd7d6B2dKwK8lhhjFd8fmMBz5gnb0SLM +f8ZYLb8gzmHIbDULa9cHtDPEQsMiBKjeqy4vT17KfAFUYghzpzTFxU6oITqiS9YC +I1j6mZQ5Trv70GU1MD+krbELWaG7QheJFJ5YrQ9ApEAt3pe6lDc5pWvD0LSydpHU +hT81mB5m4U6BWx2O/j/sjaQlpt2ksVCEiZDemBZbpP9WI589F84nCbuweerJQ0iJ +5LDtHI5wMyR2L0nteh7ujmVuRTTmzivmTxwMWRIVV8gt2oV0Mw+sAyS3jCI4rs2d +S2/fsmCIkFfi5gS5DDXbONcwMJ1LZT+QCJpW+8hVajJG0PXNiqX65wtRQ9KABuaF +VcuXNouDoMc9alkvxR7wKrloeqPFcAzwP71+CAR/+XuzKoQF1FDD6uymt+5r6C4R +0zSC1OLqT0qkMl8TYgFmKayCRMGM7gPQreIGKgD0Wcczw1E9mjM= +=Gk7W +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-6.4.1.1.tar.xz b/libreoffice-translations-6.4.1.1.tar.xz deleted file mode 100644 index e411c74..0000000 --- a/libreoffice-translations-6.4.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9935790fd87ac1b5f488cfbf25125df305b788088df7bc4295f0f8dea9ccea28 -size 172043080 diff --git a/libreoffice-translations-6.4.1.1.tar.xz.asc b/libreoffice-translations-6.4.1.1.tar.xz.asc deleted file mode 100644 index ed6109c..0000000 --- a/libreoffice-translations-6.4.1.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl47AmkACgkQ9DSh76/u -rqPZQhAAkHCoMYQmqAPUXlroUf+eFQuS8SHnn11lAUyFHJZc8JohHb9/NyepWsV3 -ez6lY7p/XnWrGsSN1xpmxgjw1a9MSVzY8AL3iAnEj2dV1L22oA2hgPhpwv7tqYYd -KVT8z3ftwN2cZAb0beoZ4d8+LQxslRutsJA4R9z1exxx4TJoA0CI1JVZyYQvCknN -Nld0UN3yMXBORivyW/0lLXxoq35XABJZfrVqSB9YdgXXsJDi2TxBBNmd+kmTMSlK -hiaxQDAXI96mtmsERzV2cOkieKc6Oi9wrUfBTG0LRGKfa7S7ulFwtgXJlyu8Bk4w -0W6kJDO5k/pHKTtJkKBKmWC6B6xM6LvNWypMWxBbqZ6z0jvlsweCzB5SYQZvsZPn -Jc7WI0uBk+zDY6GVCuFQWBsvlT+MrzIg4Sf4jwl9TTlEeAS6R3uOs5xOBZ5iFbL5 -qhEMUBtafC9Uc++0Twyp1NzwpgyT4YhV9GOcbuYqrH9PPDPZY/ZOfCYyQTCtcVD7 -aHuM8+y670tY2gI0komHHYrwZUwBwnEe4z/Cjz2KTWVM2msS02IDSSqdzvxZL8Bh -m2gXuux90Wn58Ex5fyRIcct2CffpffchDBm3xUQXO2LZOrkucexcabOC2QRnghec -C5mZFsrJ0n4jolCWL8MAUI86BXPICuuTC1IVPsFIC8LcQwBGFy0= -=ICIL ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-6.4.2.1.tar.xz b/libreoffice-translations-6.4.2.1.tar.xz new file mode 100644 index 0000000..4041ea8 --- /dev/null +++ b/libreoffice-translations-6.4.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0abbda9085ae8306efda61ae06ad794824a76cdbc4fb3a532f28a3124130c8ba +size 172212772 diff --git a/libreoffice-translations-6.4.2.1.tar.xz.asc b/libreoffice-translations-6.4.2.1.tar.xz.asc new file mode 100644 index 0000000..7eed2fb --- /dev/null +++ b/libreoffice-translations-6.4.2.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl5ZaaYACgkQ9DSh76/u +rqMLvg//Uu1eAhdjNzcQoVPPjaCZr+zWHCG3fkN8Ik28KY1mciLS5oSF+lwKdlpE +ZE1tSpepHrP4+mnUU9/YKr4z733rbA+TGI+1ag+UpYef3xnPYSKCc70jzRSmsX9s +OULr8MlWaVC2IiuD7cz11QIplgkVo7x9Y3haVspQBU59SIPKe2Y2hHJt4412hlFH +mH1ZWOnDB05R278670xxbmaVAjQA86R+86i1jk9h/A/Iw+ubg6PJNnNZeAN64weV +FFTS4zOIPEJ8gsucxiQJxq/zlIFIYyULtitIA4McklY3qqzainbIb5pBFL88lYhI +cGfuN+WvaWCHyoF0BIi/kpVbTbiiMu1u3nqNR3atq9zD0WJl8X9NN7/bw685SKqB +KJsVgJuvwiZMwR2jADeVpGsqGZwwAvWU7dWUjTwbX93ROPHRsQw1hCWsSDroKpeu +liENVLuv4506w1UDOca84kLtDgAMDKZA/YVJm1BVQ4egkCfCHohRNHEwPbSW3vEp +pbHu0txw7JDGi6JoYj6ez+mLODEKYI1646ucxDgD6IjzO02495qjPpgu2eh5NA6U +3cJMYzGp/IVFpeMyQsfaKuydwvcjyM79iLR5EWPSBXOg7nq/dguHhkFJ78WSOXOp +9G2tZu+PRWazmpA+AW1sB/F7w6Aw7fWLTrjnJOhoiu01yRw2m2E= +=7s+D +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index 72f6e47..7cdb214 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Mar 9 15:56:40 UTC 2020 - Tomáš Chvátal + +- Update to 6.4.2.1: + * 6.4.2 RC1 release +- Remove merged patch: + * soffice.sh_Avoid-exporting-empty-LC_ALL.patch + ------------------------------------------------------------------- Wed Feb 19 11:46:11 UTC 2020 - Adam Majer diff --git a/libreoffice.spec b/libreoffice.spec index bd379f1..a2f3fb6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -50,7 +50,7 @@ %bcond_with system_gpgme %endif Name: libreoffice -Version: 6.4.1.1 +Version: 6.4.2.1 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -98,8 +98,6 @@ Patch1: scp2-user-config-suse.diff # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff -# PATCH-FIX-UPSTREAM soffice.sh_Avoid-exporting-empty-LC_ALL.patch -Patch5: soffice.sh_Avoid-exporting-empty-LC_ALL.patch Patch6: fix_old_boost_spirit_namespace.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff @@ -956,7 +954,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %endif # Leap 42/SLE-12 %patch2 %patch3 -%patch5 -p1 %patch6 -p1 %patch990 -p1 %patch991 -p1 diff --git a/soffice.sh_Avoid-exporting-empty-LC_ALL.patch b/soffice.sh_Avoid-exporting-empty-LC_ALL.patch deleted file mode 100644 index 969fe99..0000000 --- a/soffice.sh_Avoid-exporting-empty-LC_ALL.patch +++ /dev/null @@ -1,72 +0,0 @@ -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