From d9305d7df146f7b493495f25899ec3c98d4ddac3 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 15 Nov 2022 01:37:05 -0500 Subject: [PATCH] import libreoffice-7.1.8.1-7.el9 --- ...81661-gtk-critical-gtk_tree_view_scr.patch | 51 +++++++++++++++++++ SPECS/libreoffice.spec | 6 ++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0001-Resolves-rhbz-2081661-gtk-critical-gtk_tree_view_scr.patch diff --git a/SOURCES/0001-Resolves-rhbz-2081661-gtk-critical-gtk_tree_view_scr.patch b/SOURCES/0001-Resolves-rhbz-2081661-gtk-critical-gtk_tree_view_scr.patch new file mode 100644 index 0000000..6a40195 --- /dev/null +++ b/SOURCES/0001-Resolves-rhbz-2081661-gtk-critical-gtk_tree_view_scr.patch @@ -0,0 +1,51 @@ +From 1dbfd248524789efa4a84dc94d56a229c19bc0b9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 4 May 2022 11:52:58 +0100 +Subject: [PATCH] Resolves: rhbz#2081661 gtk-critical + gtk_tree_view_scroll_to_cell assertion + +Change-Id: I4c7c4caed907072ef3a73ccfafabe882d618fa0e +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133730 +Tested-by: Jenkins +Reviewed-by: Adolfo Jayme Barrientos +(cherry picked from commit 816435e4c2d52615462670464c48689bebdf1e55) +--- + cui/source/customize/SvxMenuConfigPage.cxx | 2 +- + cui/source/customize/SvxToolbarConfigPage.cxx | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx +index 34cee1368d7a..bf7457193f5c 100644 +--- a/cui/source/customize/SvxMenuConfigPage.cxx ++++ b/cui/source/customize/SvxMenuConfigPage.cxx +@@ -136,7 +136,7 @@ void SvxMenuConfigPage::Init() + + ReloadTopLevelListBox(); + +- m_xTopLevelListBox->set_active(0); ++ m_xTopLevelListBox->set_active(m_xTopLevelListBox->get_count() ? 0 : -1); + SelectElement(); + + m_xCommandCategoryListBox->Init(comphelper::getProcessComponentContext(), m_xFrame, +diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx +index 99a85d82f96e..d2284428d8f1 100644 +--- a/cui/source/customize/SvxToolbarConfigPage.cxx ++++ b/cui/source/customize/SvxToolbarConfigPage.cxx +@@ -246,10 +246,12 @@ void SvxToolbarConfigPage::Init() + + ReloadTopLevelListBox(); + +- sal_Int32 nPos = 0; ++ sal_Int32 nCount = m_xTopLevelListBox->get_count(); ++ sal_Int32 nPos = nCount > 0 ? 0 : -1; ++ + if (!m_aURLToSelect.isEmpty()) + { +- for (sal_Int32 i = 0, nCount = m_xTopLevelListBox->get_count(); i < nCount; ++i) ++ for (sal_Int32 i = 0; i < nCount; ++i) + { + SvxConfigEntry* pData + = reinterpret_cast(m_xTopLevelListBox->get_id(i).toInt64()); +-- +2.35.1 + diff --git a/SPECS/libreoffice.spec b/SPECS/libreoffice.spec index 2c3c1e4..f50dacb 100644 --- a/SPECS/libreoffice.spec +++ b/SPECS/libreoffice.spec @@ -57,7 +57,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 6%{?libo_prerelease}%{?dist} +Release: 7%{?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/ @@ -273,6 +273,7 @@ Patch17: 0001-tdf-121546-sw-don-t-use-undo-array-s-m_pOutlineNodes.patch Patch18: 0001-annocheck-warning-about-missing-.note.gnu.property-s.patch Patch19: 0001-EditTextObjectImpl-copy-ctor-doesn-t-exactly-copy-Ed.patch Patch20: 0001-CVE-2021-25636.patch +Patch21: 0001-Resolves-rhbz-2081661-gtk-critical-gtk_tree_view_scr.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch @@ -2269,6 +2270,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Tue May 10 2022 Caolán McNamara - 1:7.1.8.1-7 +- Resolves: rhbz#2081661 fix gtk_tree_view_scroll_to_cell assert + * Tue Feb 22 2022 Caolán McNamara - 1:7.1.8.1-6 - Resolves: rhbz#2056412 merge in fedoa 34 changes