diff --git a/.gitignore b/.gitignore index 7a42993..47c5a99 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,9 @@ /17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip /185d60944ea767075d27247c3162b3bc-unowinreg.dll /libreoffice-multiliblauncher.sh -/libreoffice-6.1.2.1.tar.xz -/libreoffice-6.1.2.1.tar.xz.asc -/libreoffice-help-6.1.2.1.tar.xz -/libreoffice-help-6.1.2.1.tar.xz.asc -/libreoffice-translations-6.1.2.1.tar.xz -/libreoffice-translations-6.1.2.1.tar.xz.asc +/libreoffice-6.1.4.2.tar.xz +/libreoffice-6.1.4.2.tar.xz.asc +/libreoffice-help-6.1.4.2.tar.xz +/libreoffice-help-6.1.4.2.tar.xz.asc +/libreoffice-translations-6.1.4.2.tar.xz +/libreoffice-translations-6.1.4.2.tar.xz.asc diff --git a/0001-tdf-121855-like-osx-case-don-t-search-near-infinite-.patch b/0001-tdf-121855-like-osx-case-don-t-search-near-infinite-.patch new file mode 100644 index 0000000..55a379b --- /dev/null +++ b/0001-tdf-121855-like-osx-case-don-t-search-near-infinite-.patch @@ -0,0 +1,73 @@ +From 08755c7f3c285576ba29fe8dd875b18d0792de39 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 4 Dec 2018 13:01:14 +0000 +Subject: [PATCH] tdf#121855 like osx case don't search near-infinite calc grid + for focus +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Change-Id: Ie6bccd2781fbbdc5f4d5dc2eb6903191aafe8265 +Reviewed-on: https://gerrit.libreoffice.org/64520 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara +Tested-by: Caolán McNamara +(cherry picked from commit cd0c794a6cfaf9c008682596d2cdae6aa57c8bbf) +--- + vcl/osx/a11ywrapper.mm | 2 +- + vcl/unx/gtk/gtksalframe.cxx | 7 +++++++ + vcl/unx/gtk3/gtk3gtkframe.cxx | 7 +++++++ + 3 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm +index 67e155e81e53..b35a1d22745d 100644 +--- a/vcl/osx/a11ywrapper.mm ++++ b/vcl/osx/a11ywrapper.mm +@@ -992,7 +992,7 @@ Reference < XAccessibleContext > hitTestRunner ( css::awt::Point point, + bool bSafeToIterate = true; + sal_Int32 nCount = rxAccessibleContext -> getAccessibleChildCount(); + +- if ( nCount < 0 || nCount > SAL_MAX_UINT16 /* slow enough for anyone */ ) ++ if (nCount < 0 || nCount > SAL_MAX_UINT16 /* slow enough for anyone */) + bSafeToIterate = false; + else { // manages descendants is an horror from the a11y standards guys. + Reference< XAccessibleStateSet > xStateSet; +diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx +index 16e716b16daa..56cb33520443 100644 +--- a/vcl/unx/gtk/gtksalframe.cxx ++++ b/vcl/unx/gtk/gtksalframe.cxx +@@ -3666,6 +3666,13 @@ uno::Reference + } + } + ++ bool bSafeToIterate = true; ++ sal_Int32 nCount = xContext->getAccessibleChildCount(); ++ if (nCount < 0 || nCount > SAL_MAX_UINT16 /* slow enough for anyone */) ++ bSafeToIterate = false; ++ if (!bSafeToIterate) ++ return uno::Reference< accessibility::XAccessibleEditableText >(); ++ + for (sal_Int32 i = 0; i < xContext->getAccessibleChildCount(); ++i) + { + uno::Reference< accessibility::XAccessible > xChild = xContext->getAccessibleChild(i); +diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx +index 71ab50efc813..95e616473608 100644 +--- a/vcl/unx/gtk3/gtk3gtkframe.cxx ++++ b/vcl/unx/gtk3/gtk3gtkframe.cxx +@@ -4213,6 +4213,13 @@ uno::Reference + } + } + ++ bool bSafeToIterate = true; ++ sal_Int32 nCount = xContext->getAccessibleChildCount(); ++ if (nCount < 0 || nCount > SAL_MAX_UINT16 /* slow enough for anyone */) ++ bSafeToIterate = false; ++ if (!bSafeToIterate) ++ return uno::Reference< accessibility::XAccessibleEditableText >(); ++ + for (sal_Int32 i = 0; i < xContext->getAccessibleChildCount(); ++i) + { + uno::Reference< accessibility::XAccessible > xChild = xContext->getAccessibleChild(i); +-- +2.19.2 + diff --git a/libreoffice.spec b/libreoffice.spec index 43dca0f..777281f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -3,7 +3,7 @@ %global _python_bytecompile_extra 1 # download path contains version without the last (fourth) digit -%global libo_version 6.1.2 +%global libo_version 6.1.4 # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. @@ -53,8 +53,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 -Release: 8%{?libo_prerelease}%{?dist} +Version: %{libo_version}.2 +Release: 1%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -238,6 +238,7 @@ Patch1: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch Patch2: 0001-Update-mdds-to-1.4.1.patch Patch3: 0001-Update-orcus-to-0.14.0.patch Patch4: 0001-tdf-120764-Toolbar-popups-sometimes-not-showing-unde.patch +Patch5: 0001-tdf-121855-like-osx-case-don-t-search-near-infinite-.patch %if 0%{?rhel} # not upstreamed @@ -2170,6 +2171,11 @@ done %{_includedir}/LibreOfficeKit %changelog +* Mon Jan 07 2019 Caolán McNamara - 1:6.1.4.2-1 +- latest version +- Resolves: rhbz#1662616 crash in macro dialog editor +- Resolves: rhbz#1662512 a11y freeze in calc + * Tue Dec 04 2018 Caolán McNamara - 1:6.1.2.1-8 - Resolves: rhbz#1639174 desire to block en-help install diff --git a/sources b/sources index 26de85f..bdc98bc 100644 --- a/sources +++ b/sources @@ -5,9 +5,9 @@ SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6f SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd -SHA512 (libreoffice-6.1.2.1.tar.xz) = b7c7839da8251fd0f01794381d77a5abd4d092f21589df046402a1d332d782608aa00ab29ad60c9a34f27f11576d70c5a678e87a0f53c5b4065ae59fe77a0367 -SHA512 (libreoffice-6.1.2.1.tar.xz.asc) = c69280e41801a58f41a6ba221813346690891de1d50d1aa24fdfd0cfc029960428b0f8e323916513252262d19c726dc931a4f1dd769ac97baa299bf4e44cb45f -SHA512 (libreoffice-help-6.1.2.1.tar.xz) = 6cabaed79d0405e4e35af3e3689561e0d447bbf98b081b6a40fd52c37bda7b0886d4df4ea1c2deaa7db56c26933b5697ae4ef796f6e763a58b7ee729debcca6e -SHA512 (libreoffice-help-6.1.2.1.tar.xz.asc) = 54113c35636c78c9c64defc672da889b620dd230ee2e4f528c2a9087ba6468fb9e04fd4213e5467f3b94dcddac56e6daf8524a55d9a23c99d5d73641af75de3b -SHA512 (libreoffice-translations-6.1.2.1.tar.xz) = 26ea250c4cfe77929b1b95026da0874f34dd161550ba78a1db99350f4234d6b5b1a8e3e0553f248151aa7344fea1ef1a1589751381a4a5ecc7ff5dc0cb3e1e59 -SHA512 (libreoffice-translations-6.1.2.1.tar.xz.asc) = 13080d06ca7cddf5c7cc79861b5508a7214112aabc3f3c594f679a21fcb0ba5896753130507e2101811bd5a3ca968d2c1480207494e4934fc566c147fb05b36d +SHA512 (libreoffice-6.1.4.2.tar.xz) = ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c +SHA512 (libreoffice-6.1.4.2.tar.xz.asc) = 4e1c45211ea654cb12ce2a4accd4c49e8f7fef5e2f99e018fd69514566cd1117432c8f868e0d5c32dd570935d23a9709cfdafaa67c1b47837def28bc80d10ae7 +SHA512 (libreoffice-help-6.1.4.2.tar.xz) = e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab +SHA512 (libreoffice-help-6.1.4.2.tar.xz.asc) = 8817ef14327998cd8b32bfe6f404388aa6a5da693fa2f5805c5ec251ddff4fc825c900ea14bc2c5663702891686ef28074d07699802cef82731d0ae7f2b39c4a +SHA512 (libreoffice-translations-6.1.4.2.tar.xz) = 6a07c4fd1388c2b84905ea16fe9a512301519a1579fbd3c8097cea6a9c6ff6109a659bf6d2e61cb7abff3a72b80dfa0388576e94fdd5a6280e1e10ea3bbf31aa +SHA512 (libreoffice-translations-6.1.4.2.tar.xz.asc) = ed4c972ac3585d4695b0aa9276c65f9f94194578de7baf09ed82a50c7fd296afccd50fb5706e5caf3d2d81d999ca6023eb44404096107a6bfbc6e32d94254502