From 6cc498743eb9dc6f3f69ec9e96bac75f2527c3b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 9 Jun 2022 18:52:48 +0100 Subject: [PATCH] 7.3.4 release --- .gitignore | 12 +++--- ...text-test-fails-with-latest-harfbuzz.patch | 40 ------------------- libreoffice.spec | 8 ++-- sources | 12 +++--- 4 files changed, 17 insertions(+), 55 deletions(-) delete mode 100644 0001-vertical-text-test-fails-with-latest-harfbuzz.patch diff --git a/.gitignore b/.gitignore index 33def50..ae5fc9b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,9 @@ /libreoffice-multiliblauncher.sh /dtoa-20180411.tgz /libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz -/libreoffice-7.3.3.2.tar.xz -/libreoffice-7.3.3.2.tar.xz.asc -/libreoffice-help-7.3.3.2.tar.xz -/libreoffice-help-7.3.3.2.tar.xz.asc -/libreoffice-translations-7.3.3.2.tar.xz -/libreoffice-translations-7.3.3.2.tar.xz.asc +/libreoffice-7.3.4.2.tar.xz +/libreoffice-7.3.4.2.tar.xz.asc +/libreoffice-help-7.3.4.2.tar.xz +/libreoffice-help-7.3.4.2.tar.xz.asc +/libreoffice-translations-7.3.4.2.tar.xz +/libreoffice-translations-7.3.4.2.tar.xz.asc diff --git a/0001-vertical-text-test-fails-with-latest-harfbuzz.patch b/0001-vertical-text-test-fails-with-latest-harfbuzz.patch deleted file mode 100644 index a4c3539..0000000 --- a/0001-vertical-text-test-fails-with-latest-harfbuzz.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5ac0ad60b79a7e421defa04f846a57b46c3435b6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 5 May 2022 10:28:45 +0100 -Subject: [PATCH] vertical text test fails with latest harfbuzz - -with font "Droid Sans Japanese" which doesn't seem to be available in -ci, but is by default in the Fedora 37 build roots - -I suspect since: https://github.com/harfbuzz/harfbuzz/issues/537 - -Change-Id: I23d9415444668ce379765f32a96ed67f057ebfd7 ---- - vcl/qa/cppunit/text.cxx | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/vcl/qa/cppunit/text.cxx b/vcl/qa/cppunit/text.cxx -index 5ab706045606..899217347085 100644 ---- a/vcl/qa/cppunit/text.cxx -+++ b/vcl/qa/cppunit/text.cxx -@@ -315,7 +315,7 @@ void VclTextTest::testVerticalText() - exportDevice("vertical-text-36.png", device); - // Height of U+30E8 with font 36 size should be roughly 28 pixels, - // but since we don't know which font will be used, allow even more range. -- tools::Long height36 = getCharacterRightSideHeight(device, Point(99, 20)); -+ tools::Long height36 = getCharacterRightSideHeight(device, Point(99, 22)); - CPPUNIT_ASSERT_DOUBLES_EQUAL(tools::Long(28), height36, 6); - tools::Long width36 = getCharacterTopWidth(device, Point(65, 0)); - CPPUNIT_ASSERT_DOUBLES_EQUAL(tools::Long(25), width36, 6); -@@ -390,7 +390,7 @@ void VclTextTest::testVerticalText() - device->SetFont(font); - device->DrawText(Point(90, 10), text); - exportDevice("vertical-text-36-50pct.png", device); -- tools::Long height36pct50 = getCharacterRightSideHeight(device, Point(99, 15)); -+ tools::Long height36pct50 = getCharacterRightSideHeight(device, Point(99, 16)); - CPPUNIT_ASSERT_DOUBLES_EQUAL(height36 / 2, height36pct50, 2); - tools::Long width36pct50 = getCharacterTopWidth(device, Point(65, 0)); - CPPUNIT_ASSERT_DOUBLES_EQUAL(width36, width36pct50, 2); --- -2.35.1 - diff --git a/libreoffice.spec b/libreoffice.spec index 14e76d9..64f5ad2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 7.3.3 +%global libo_version 7.3.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. @@ -62,7 +62,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 2%{?libo_prerelease}%{?dist} +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/ @@ -254,7 +254,6 @@ Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch Patch4: 0001-workaround-x86-ICE-with-gcc-12.patch Patch5: 0001-s390x-canvas-test-fails.patch Patch6: 0001-tdf-144862-use-resolution-independent-positions-for-.patch -Patch7: 0001-vertical-text-test-fails-with-latest-harfbuzz.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch @@ -2184,6 +2183,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Thu Jun 09 2022 Caolán McNamara - 1:7.3.4.2-1 +- 7.3.4 release + * Wed May 04 2022 Thomas Rodgers - 1:7.3.3.2-2 - Rebuilt for Boost 1.78 diff --git a/sources b/sources index 722eeca..b167d46 100644 --- a/sources +++ b/sources @@ -5,9 +5,9 @@ SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens__ SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 SHA512 (libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz) = 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8 -SHA512 (libreoffice-7.3.3.2.tar.xz) = 242d5694b6d09c669992ea68223b62fb8e418e886f68c7e5d843272d55ad2de34e5207180b7a541fd97cbe678c2d12d5290ebd8b82d47c88f1607e6736413c96 -SHA512 (libreoffice-7.3.3.2.tar.xz.asc) = 0818462ae629313efb6c2a0fe074f9b88369f987077075814f4478bd2128c1b9595b0e2c6806920776cb6d0b4f6869338002746c1b9fe22060e4c89cb278f285 -SHA512 (libreoffice-help-7.3.3.2.tar.xz) = f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f -SHA512 (libreoffice-help-7.3.3.2.tar.xz.asc) = 7592c9bdd3feb7ddd86d8cd1e2cf8ec7dcee36cca5c3eecffcaa84a86180e217cb52c57c1086a6088dd4ca4d1eff1ac05395e46f2147b5c7beed7b1649a0a7e0 -SHA512 (libreoffice-translations-7.3.3.2.tar.xz) = 6197659420c6f452ec678dcf006835e58e34b2b0952572768af79f1e67d40ecccc9fc4a316bee7420e5db6f1eb6521237af583a492080f4084eb4cab1fefcf42 -SHA512 (libreoffice-translations-7.3.3.2.tar.xz.asc) = 6b9fb7f79fcd4e3ff9136d5b8ceeeea251d69c20771f9abe5c7c9887e8fe530ee3c06f0980b60356223f9eb79c77ef0c82cf0ae9b1e379da49594179b0c697e9 +SHA512 (libreoffice-7.3.4.2.tar.xz) = 10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0 +SHA512 (libreoffice-7.3.4.2.tar.xz.asc) = 0f94b062d3855af9f2300cda0c82ee2fd5d3f254ddeac1c998d026802a58ee44ce19ed46ddb3217d4a02c4bdfb4403d89568c78b6b451a8171ec34f1c281853f +SHA512 (libreoffice-help-7.3.4.2.tar.xz) = 68af32f017b46f7d3e664bc8cfc69de6939c33f26248273372cc7ba5a29299c79795cc13b92a921b8e2508045e0447319ad0c0cd3678929355db6ef8a79a8614 +SHA512 (libreoffice-help-7.3.4.2.tar.xz.asc) = 2b11191813e37585151ff009853a13870a83a5714b85c6fda6840b7b9e3b1cd947a081daa7226a77de3203ac7b9a0c5e48cb963be853b5d11528ae6c838f1180 +SHA512 (libreoffice-translations-7.3.4.2.tar.xz) = 6f030297cfac2dc2809ee882f04e254b26c1ab669bb6a05cbea029759856433f6df9d9cf66dc5f42923743809b043d0b69c19938b094137858a6c720c43174ad +SHA512 (libreoffice-translations-7.3.4.2.tar.xz.asc) = 92fa2bd44c52fefe4604d3f7cc768a510e39cd0539d835c5c3a6e2002fe2008eeaa5b7245c24388c09ec5d24ed7c061d04fbc7297357d0d7b9f418761146a7b8