diff --git a/.gitignore b/.gitignore index 8cb8e83..100a10a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,9 @@ /libreoffice-multiliblauncher.sh /dtoa-20180411.tgz /dragonbox-1.1.3.tar.gz -/libreoffice-7.4.5.1.tar.xz -/libreoffice-7.4.5.1.tar.xz.asc -/libreoffice-help-7.4.5.1.tar.xz -/libreoffice-help-7.4.5.1.tar.xz.asc -/libreoffice-translations-7.4.5.1.tar.xz -/libreoffice-translations-7.4.5.1.tar.xz.asc +/libreoffice-7.4.6.2.tar.xz +/libreoffice-7.4.6.2.tar.xz.asc +/libreoffice-help-7.4.6.2.tar.xz +/libreoffice-help-7.4.6.2.tar.xz.asc +/libreoffice-translations-7.4.6.2.tar.xz +/libreoffice-translations-7.4.6.2.tar.xz.asc diff --git a/0001-Related-tdf-151898-fix-gtk4-build-in-7-4.patch b/0001-Related-tdf-151898-fix-gtk4-build-in-7-4.patch deleted file mode 100644 index 42e1b74..0000000 --- a/0001-Related-tdf-151898-fix-gtk4-build-in-7-4.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 623ea5c4d2871aba2e3e5114ad7d58d6f910a2f3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 12 Jan 2023 20:55:27 +0000 -Subject: [PATCH] Related: tdf#151898 fix gtk4 build in 7-4 - -Change-Id: I71b59b7d2eac406817c79bf6911736ad4510771c ---- - vcl/unx/gtk3/gtkinst.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx -index 8ba640992b9a..b697b0b50a3c 100644 ---- a/vcl/unx/gtk3/gtkinst.cxx -+++ b/vcl/unx/gtk3/gtkinst.cxx -@@ -5114,7 +5114,7 @@ namespace - - void picture_set_from_xgraphic(GtkPicture* pPicture, const css::uno::Reference& rPicture) - { -- if (auto xTempFile = getImageFile(rPicture, false)) -+ if (auto xTempFile = getImageFile(rPicture)) - gtk_picture_set_filename(pPicture, OUStringToOString(xTempFile->GetFileName(), osl_getThreadTextEncoding()).getStr()); - else - gtk_picture_set_pixbuf(pPicture, nullptr); --- -2.39.0 - diff --git a/0001-rhbz-2162862-null-pFrame-during-teardown.patch b/0001-rhbz-2162862-null-pFrame-during-teardown.patch deleted file mode 100644 index 030d9e6..0000000 --- a/0001-rhbz-2162862-null-pFrame-during-teardown.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 403259fb4b24fe8427930b6c83f4c737f61950c1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Sat, 21 Jan 2023 16:20:29 +0000 -Subject: [PATCH] rhbz#2162862 null pFrame during teardown - -Change-Id: Iad2de93f0400b0ec49dae4c3d6979957784114f4 ---- - sw/source/core/access/accpara.cxx | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx -index aea0d2b3518f..8121d1c62389 100644 ---- a/sw/source/core/access/accpara.cxx -+++ b/sw/source/core/access/accpara.cxx -@@ -431,15 +431,18 @@ bool SwAccessibleParagraph::HasCursor() - void SwAccessibleParagraph::UpdatePortionData() - { - // obtain the text frame -- OSL_ENSURE( GetFrame() != nullptr, "The text frame has vanished!" ); -- OSL_ENSURE( GetFrame()->IsTextFrame(), "The text frame has mutated!" ); - const SwTextFrame* pFrame = static_cast( GetFrame() ); -- -- // build new portion data -- m_pPortionData.reset( new SwAccessiblePortionData( -- pFrame, GetMap()->GetShell()->GetViewOptions()) ); -- pFrame->VisitPortions( *m_pPortionData ); -- -+ OSL_ENSURE( pFrame != nullptr, "The text frame has vanished!" ); -+ if (!pFrame) -+ ClearPortionData(); -+ else -+ { -+ OSL_ENSURE( pFrame->IsTextFrame(), "The text frame has mutated!" ); -+ // build new portion data -+ m_pPortionData.reset( new SwAccessiblePortionData( -+ pFrame, GetMap()->GetShell()->GetViewOptions()) ); -+ pFrame->VisitPortions( *m_pPortionData ); -+ } - OSL_ENSURE( m_pPortionData != nullptr, "UpdatePortionData() failed" ); - } - --- -2.39.0 - diff --git a/libreoffice.spec b/libreoffice.spec index c4d91a0..aeb0ef8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 7.4.5 +%global libo_version 7.4.6 # 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. @@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 +Version: %{libo_version}.2 Release: 1%{?libo_prerelease}%{?dist} # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 @@ -263,10 +263,8 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch # backported Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch -Patch4: 0001-Related-tdf-151898-fix-gtk4-build-in-7-4.patch -Patch5: 0001-rhbz-2162658-backtrace-showing-endlessly-recursive-S.patch -Patch6: 0001-rhbz-2162862-null-pFrame-during-teardown.patch -Patch7: 0001-Related-rhbz-2136459-use-a-value-which-is-exactly-re.patch +Patch4: 0001-rhbz-2162658-backtrace-showing-endlessly-recursive-S.patch +Patch5: 0001-Related-rhbz-2136459-use-a-value-which-is-exactly-re.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch @@ -2270,6 +2268,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Thu Mar 09 2023 Caolán McNamara - 1:7.4.6.2-1 +- 7.4.6 release + * Thu Jan 26 2023 Caolán McNamara - 1:7.4.5.1-1 - 7.4.5 release diff --git a/sources b/sources index 4a8fc8b..cddbdb5 100644 --- a/sources +++ b/sources @@ -5,9 +5,9 @@ SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens__ SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (dragonbox-1.1.3.tar.gz) = 41ac356ebced3312c0f9ea0f07ff372337ab78af69071f63f63dc12bd2b0088d5d89aae3792276599dd0393bfdfd2b979946c43d36042e43105080bcdcbe089d SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 -SHA512 (libreoffice-7.4.5.1.tar.xz) = 1a3deebeeb0789c00997b0d88a197fd5708e8518938670271e5a90d754f11cee4e25ad46a3171fb7184de828a6ee9ceb37993832f001b10f8435416a2286e266 -SHA512 (libreoffice-7.4.5.1.tar.xz.asc) = 007c37ab428473f9ad8fd4e38065299e69b6230b59634c4e08d73aac84ff8f60d675e5afb8ca790350654f41cdbaa51e47ec2920c8b4528fbeccd9d5a7e96231 -SHA512 (libreoffice-help-7.4.5.1.tar.xz) = a725557ea4890ce0f424c2d985398e67056dde2a369be2d8282f042bd7ec2715f32e1134be020480717b4d469192c61ef0748fcfed067bcda04cd0e9317d87f7 -SHA512 (libreoffice-help-7.4.5.1.tar.xz.asc) = 92630b1f426c1e7fc4e984c10b6825e57420d0d35b3d68b6b0f325c082d4d40ac0289bc66571e2ac306db037f37cbd84e71c8eeba9f41e35212e8622e32e96e5 -SHA512 (libreoffice-translations-7.4.5.1.tar.xz) = f9b5397278d77f1531bd00ccf1f9021ad41856c16b35b7156d44296351520d2b9e234a2e0d758899def2c13d334bb1a9aa9b59845e4236ad88901cc04b126fc1 -SHA512 (libreoffice-translations-7.4.5.1.tar.xz.asc) = 1d6f7845b9f9ed16b06607a5aa993e9fc692d1711d40b02c4977bb940043d60263302f96e5e7d4df6c64f7003f745fcd778b9332827b5f33581af96cca959b0b +SHA512 (libreoffice-7.4.6.2.tar.xz) = c0b18d6c5bec1140d87fc24b539640280fea782ff1239e44368afeac63058ba38aae1b81e30d1ab17e84089918d7e698f0afd342e98208171faeff303ccd7fab +SHA512 (libreoffice-7.4.6.2.tar.xz.asc) = d7c1848d01e179be3af3e9ecc90b63a69c3b5ef95e6132e46e3ca482d7b84e55895c9ea68ac4324f2e70a81c646724771005ad699f60cb3da91f74cb83f83565 +SHA512 (libreoffice-help-7.4.6.2.tar.xz) = c158c0126aef3d0c6602ace5e57efdf2b9c35511424eb960ac52b7f8371eca02a604919f95dc3449f3cafc86db514c24e4deb5dbfde1ffb57170c5e82bc9d25b +SHA512 (libreoffice-help-7.4.6.2.tar.xz.asc) = 24a25d3166f2e7421059d4763f4f149f63cc8a1f9a2ffe2b3e581b2ed182932f0a9fbe2dd4ef5bd0f9d6a2c1a9b30e7649f1ae0dddebf38cc5016c0230ef6328 +SHA512 (libreoffice-translations-7.4.6.2.tar.xz) = 682d8ebdc9c61c693c654c97d427c884369d3f4b3167c35ee7687868495fae5adafb3401a6393a43b892b70fff0b71dfeb530e8cbe0d87cae593981c4d7e26a1 +SHA512 (libreoffice-translations-7.4.6.2.tar.xz.asc) = f1b2b973c8448950afc951755e02e143744c4ed999560016b5b027e4385a94a37650b0b5648afaca389fe944d25b0d64b83f10db3ffc0398f85818e853d00722