From 6fe1c8d7ea7598afc0d0c1694f3551a20beb6c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 6 Oct 2020 09:02:17 -0500 Subject: [PATCH] latest version --- .gitignore | 12 ++-- ...tmlexport-The-actual-PNG-data-does-n.patch | 50 ---------------- 0001-Pass-fno-lto-unconditionally.patch | 57 ------------------- ...sort-order-is-equivalent-keep-order-.patch | 43 -------------- libreoffice.spec | 18 +++--- sources | 12 ++-- 6 files changed, 21 insertions(+), 171 deletions(-) delete mode 100644 0001-CppunitTest_sw_htmlexport-The-actual-PNG-data-does-n.patch delete mode 100644 0001-Pass-fno-lto-unconditionally.patch delete mode 100644 0001-rhbz-1875377-if-sort-order-is-equivalent-keep-order-.patch diff --git a/.gitignore b/.gitignore index 1116b10..43e9b59 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,9 @@ /884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf /libreoffice-multiliblauncher.sh /dtoa-20180411.tgz -/libreoffice-7.0.1.2.tar.xz -/libreoffice-7.0.1.2.tar.xz.asc -/libreoffice-help-7.0.1.2.tar.xz -/libreoffice-help-7.0.1.2.tar.xz.asc -/libreoffice-translations-7.0.1.2.tar.xz -/libreoffice-translations-7.0.1.2.tar.xz.asc +/libreoffice-7.0.2.2.tar.xz +/libreoffice-7.0.2.2.tar.xz.asc +/libreoffice-help-7.0.2.2.tar.xz +/libreoffice-help-7.0.2.2.tar.xz.asc +/libreoffice-translations-7.0.2.2.tar.xz +/libreoffice-translations-7.0.2.2.tar.xz.asc diff --git a/0001-CppunitTest_sw_htmlexport-The-actual-PNG-data-does-n.patch b/0001-CppunitTest_sw_htmlexport-The-actual-PNG-data-does-n.patch deleted file mode 100644 index b9d25f7..0000000 --- a/0001-CppunitTest_sw_htmlexport-The-actual-PNG-data-does-n.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 824e092dbfefe2366f39e55a3efcc3d99dc1cbf7 Mon Sep 17 00:00:00 2001 -From: Jan Holesovsky -Date: Tue, 25 Aug 2020 15:16:21 +0200 -Subject: [PATCH] CppunitTest_sw_htmlexport: The actual PNG data does not - matter. - -The test was supposed to test whether the PNG data is embedded (or not), -not the actual content of the data. Turns out that a different zlib -affects the PNG content, so let's ignore that part, and only check that -the data is actually embedded. - -Change-Id: I603bd546d97abda7c47248db0a95349f4a48b4aa -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101329 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann ---- - sw/qa/extras/htmlexport/htmlexport.cxx | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx -index 36df600df185..d4d59103fffe 100644 ---- a/sw/qa/extras/htmlexport/htmlexport.cxx -+++ b/sw/qa/extras/htmlexport/htmlexport.cxx -@@ -357,6 +357,8 @@ DECLARE_HTMLEXPORT_TEST(testNormalImageExport, "textAndImage.docx") - CPPUNIT_ASSERT(pDoc); - - assertXPath(pDoc, "/html/body", 1); -+ -+ // the HTML export normally does not embed the images - OUString imgSrc = getXPath(pDoc, "/html/body/p/img", "src"); - CPPUNIT_ASSERT(imgSrc.endsWith(".png")); - } -@@ -367,7 +369,13 @@ DECLARE_HTMLEXPORT_TEST(testEmbedImagesEnabled, "textAndImage.docx") - CPPUNIT_ASSERT(pDoc); - - assertXPath(pDoc, "/html/body", 1); -- assertXPath(pDoc, "/html/body/p/img", "src", "data:image/png;base64,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"); -+ -+ // the HTML export normally does not embed the images, but here the test -+ // name triggers setting of the "EmbedImages" filter option, meaning the -+ // image will not be a separate PNG, but an embedded base64 encoded -+ // version of that -+ OUString imgSrc = getXPath(pDoc, "/html/body/p/img", "src"); -+ CPPUNIT_ASSERT(imgSrc.startsWith("data:image/png;base64,")); - } - - DECLARE_HTMLEXPORT_TEST(testXHTML, "hello.html") --- -2.28.0 - diff --git a/0001-Pass-fno-lto-unconditionally.patch b/0001-Pass-fno-lto-unconditionally.patch deleted file mode 100644 index 0ee44bd..0000000 --- a/0001-Pass-fno-lto-unconditionally.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7b0ab85b4042cb38221ca5c9794b70c87443181f Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Thu, 20 Aug 2020 14:54:31 +0200 -Subject: [PATCH] Pass -fno-lto unconditionally - -At least when building the libreoffice rpm on Fedora 33, the relevant -flto... -flags are passed in via the global CFLAGS/CXXFLAGS, and no --enable-lto -configure option is given. That caused this library to be built with LTO there, -which in turn caused at least aarch64 to fail the %check step with - -> ### unexpected exception content! failed -> ### unexpected exception content! failed -> ### unexpected exception content! failed -> exception test failed -> oneway exception test failed -> exception occurred: error: test failed! testtools/source/bridgetest/bridgetest.cxx:1176 -> -> > error: error: test failed! testtools/source/bridgetest/bridgetest.cxx:1176 -> > dying...make[1]: *** [testtools/CustomTarget_uno_test.mk:25: workdir/CustomTarget/testtools/uno_test.done] Error 1 -> make: *** [Makefile:166: CustomTarget_testtools/uno_test] Error 2 - -The easiest fix appears to pass -fno-lto unconditionally: For one, both GCC and -Clang appear to support it since before our baseline versions (GCC: baseline -7.0.0, presumably supported since "Merge lto branch into trunk" in -releases/gcc-4.5; Clang: baseline 5.0.2 (at least on Linux), presumably -supported since "Driver: Support -fno-lto" in -releases/3.0.x). For another, the other (few) places in the code that check -ENABLE_LTO appear not to be relevant at least for that Fedora 33 rpm build, so -there appears to be no incentive to make that build configure --enable-lto as an -alternative to this fix. - -Change-Id: I4735403660e57ef73b99d6a8cc5945c6d8e2af73 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101129 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann ---- - bridges/Library_cpp_uno.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk -index 5e78bcb676a6..0c6b255f52ad 100644 ---- a/bridges/Library_cpp_uno.mk -+++ b/bridges/Library_cpp_uno.mk -@@ -212,7 +212,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ - $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-I$(ANDROID_BINUTILS_PREBUILT_ROOT)/lib/gcc/arm-linux-androideabi/4.9.x/include) \ - -fno-omit-frame-pointer \ - -fno-strict-aliasing \ -- $(if $(filter TRUE,$(ENABLE_LTO)),-fno-lto) \ -+ -fno-lto \ - $(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \ - )) - --- -2.26.2 - diff --git a/0001-rhbz-1875377-if-sort-order-is-equivalent-keep-order-.patch b/0001-rhbz-1875377-if-sort-order-is-equivalent-keep-order-.patch deleted file mode 100644 index 956db3e..0000000 --- a/0001-rhbz-1875377-if-sort-order-is-equivalent-keep-order-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1104a217092f7a609166113c2e911589f62b647c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Fri, 4 Sep 2020 19:38:52 +0100 -Subject: [PATCH] rhbz#1875377 if sort order is equivalent keep order - fontconfig presents - -there are two fonts in fedora 32/33 for regular Cantarell - -/usr/share/fonts/cantarell/Cantarell-Regular.otf -and -/usr/share/fonts/cantarell/Cantarell-VF.otf - -where VF is the Variable Font version. The Cantarell-Regular -ones has a CFF table and export to pdf creates a font subset -that works perfectly fine. The VF one does not have a CFF -table and the fallback case doesn't work for pdf export. - -Both have the same version, use a stable sort to retain -their relative order that fontconfig presents so we use -the Cantarell-Regular version we would see if we didn't -sort by version at all. - -Change-Id: I750006b980810fc59e0a152d42ae17f29f46e3b3 ---- - vcl/unx/generic/fontmanager/fontconfig.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx -index dea4cd548949..a87c2c21094c 100644 ---- a/vcl/unx/generic/fontmanager/fontconfig.cxx -+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx -@@ -213,7 +213,7 @@ FcFontSet* FontCfgWrapper::getFontSet() - addFontSet( FcSetSystem ); - addFontSet( FcSetApplication ); - -- ::std::sort(m_pFontSet->fonts,m_pFontSet->fonts+m_pFontSet->nfont,SortFont()); -+ std::stable_sort(m_pFontSet->fonts,m_pFontSet->fonts+m_pFontSet->nfont,SortFont()); - } - - return m_pFontSet; --- -2.26.2 - diff --git a/libreoffice.spec b/libreoffice.spec index 2bb5065..167a5b3 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 7.0.1 +%global libo_version 7.0.2 # 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. @@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 7%{?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/ @@ -246,15 +246,12 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch # backported Patch3: 0001-fix-detecting-qrcodegen.patch -Patch4: 0001-Pass-fno-lto-unconditionally.patch -Patch5: 0001-rhbz-1870501-crash-on-reexport-of-odg.patch -Patch6: 0001-CppunitTest_sw_htmlexport-The-actual-PNG-data-does-n.patch -Patch7: 0001-rhbz-1875377-if-sort-order-is-equivalent-keep-order-.patch +Patch4: 0001-rhbz-1870501-crash-on-reexport-of-odg.patch %if 0%{?fedora} > 33 || 0%{?rhel} > 8 -Patch8: 0001-Upgrade-liborcus-to-0.16.0.patch +Patch5: 0001-Upgrade-liborcus-to-0.16.0.patch %endif -Patch9: 0001-rhbz-1882616-move-cursor-one-step-at-a-time-in-the-d.patch -Patch10: 0001-export-HYPERLINK-target-in-html-clipboard-export.patch +Patch6: 0001-rhbz-1882616-move-cursor-one-step-at-a-time-in-the-d.patch +Patch7: 0001-export-HYPERLINK-target-in-html-clipboard-export.patch %if 0%{?rhel} # not upstreamed @@ -2235,6 +2232,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Sat Oct 10 2020 Caolán McNamara - 1:7.0.2.2-1 +- latest version + * Tue Oct 06 2020 Rex Dieter - 1:7.0.1.2-7 - -kf5: enable Supplements: (%%name-core and plasma-workspace) diff --git a/sources b/sources index 8c9141c..6a1645a 100644 --- a/sources +++ b/sources @@ -7,9 +7,9 @@ SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838d SHA512 (884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = ce7e23e750f2c6f7ff2e590cc8941caa18eaae2727c9ca31313ab72ab19278055bd9393d38b0b5b685594e2f04ee15cb83b3bbb25d09665fe7383d7f26bf2ae8 SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 -SHA512 (libreoffice-7.0.1.2.tar.xz) = fa7d39446e131d0abd3d094b8fd793e1fed49d499f31093525fa2e3526f2408b9aaf433d83ba15c08b79742a3bb5bbf231c4c1442cd62d1db8cc7b9594cf6469 -SHA512 (libreoffice-7.0.1.2.tar.xz.asc) = 3f1213b7e0be508b923a4f5f1ffc487e53e9e3e2d3b179e4a781e0cb42c5d29cf9b356415e630b6fdf10a319389af1794993638c7016bd7468554fa91a1fad51 -SHA512 (libreoffice-help-7.0.1.2.tar.xz) = 1e84b440044d685b20886e098c3920cc56eb21b2d3d8b2b7fd94beb3368d0c36050a4832e8ab345eb9e01203a7e16e508b4c4ac61836ae774c31b579a5a17440 -SHA512 (libreoffice-help-7.0.1.2.tar.xz.asc) = 985e2caa75eaadc39362ccd084fdadbb90dc054a72226346324ea63c333fa61b2858c1e873b9442d55df527912b7afc51ff3518d07b90b7f160868cdbdb82d11 -SHA512 (libreoffice-translations-7.0.1.2.tar.xz) = d75d5e6c3873b5ffb6a79503ef42080be76b1c3ae978bf8da96de38f20e931650954bf9920947fe79633b747a325a7bb3cb641e6df9d4b2e050ded7bef3f91e6 -SHA512 (libreoffice-translations-7.0.1.2.tar.xz.asc) = b211588ebb5b3f8b48f7c19ee2595031c87329a1287e85079ec378e06cdc5681eec3f14859e0da32ff43fe1cfcbb978a8024dd9778684ef37e86fc39667e001f +SHA512 (libreoffice-7.0.2.2.tar.xz) = f0f54562f42ec9274e81a0fc898f90328053e02e8554b62a3cd2f0f79bce794528d1113102c3d5d9744fee712c869dba990e9466a1a31b3cfb716c12d7db6552 +SHA512 (libreoffice-7.0.2.2.tar.xz.asc) = ec7a2c9035d88138e6391d1d3dbfd631bde7724a404c07002fa6d1372dd81786266659ca48228b91f0f2bd54b857e99786e2924fbc80735bcfdac5bcecdce9b1 +SHA512 (libreoffice-help-7.0.2.2.tar.xz) = bd9e307eeb7a4f971a3f0aeaa2f372fc9b5b5c13fa08bb844e848d518f88425003a0608b362c4c9568e85c65eeedd817e0530816854be4ecb06dc1d7b2e06574 +SHA512 (libreoffice-help-7.0.2.2.tar.xz.asc) = 19898e230f78cb889a3c1842027af36644f993793fde76b6751ad45ba39f25d812ab5afae1477711c1993b26ffca8d1006db990e51a97701edb5f7b2e83a9bbb +SHA512 (libreoffice-translations-7.0.2.2.tar.xz) = 54d49a8c8bf3897dbfc706683993f8accc0921d11226bca5224c731f490bf1d35ee48484acb1bb60907c2417dec2867bf39ae6e5c23e851ca754dfa02c64f0ee +SHA512 (libreoffice-translations-7.0.2.2.tar.xz.asc) = 972d752e4e83678e5b1bd591c2a74a22f1d789cddeb75ec06bb49e7b7ea0e1f9b3e41131b9b9828eab4f50528548d7b9ad2fa169607d6bf013d725fe2ba643d1