diff --git a/.gitignore b/.gitignore index ae8cbb3..7da73e4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,10 @@ /185d60944ea767075d27247c3162b3bc-unowinreg.dll /884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf /libreoffice-multiliblauncher.sh -/libreoffice-6.4.5.2.tar.xz -/libreoffice-6.4.5.2.tar.xz.asc -/libreoffice-help-6.4.5.2.tar.xz -/libreoffice-help-6.4.5.2.tar.xz.asc -/libreoffice-translations-6.4.5.2.tar.xz -/libreoffice-translations-6.4.5.2.tar.xz.asc +/libreoffice-7.0.0.3.tar.xz +/libreoffice-7.0.0.3.tar.xz.asc +/libreoffice-help-7.0.0.3.tar.xz +/libreoffice-help-7.0.0.3.tar.xz.asc +/libreoffice-translations-7.0.0.3.tar.xz +/libreoffice-translations-7.0.0.3.tar.xz.asc +/dtoa-20180411.tgz diff --git a/0001-fix-detecting-qrcodegen.patch b/0001-fix-detecting-qrcodegen.patch index 03578df..3abccba 100644 --- a/0001-fix-detecting-qrcodegen.patch +++ b/0001-fix-detecting-qrcodegen.patch @@ -1,4 +1,4 @@ -From 5875af20a84ccf4a8a0fd22989d3bb520b8320ab Mon Sep 17 00:00:00 2001 +From a332f53a202d90e99d5159f53f59381bb5f8e4c8 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 30 Jan 2020 11:19:20 +0000 Subject: [PATCH] fix detecting qrcodegen @@ -10,10 +10,10 @@ Change-Id: Ib945b57420083489273cefc5655eb50932b5a3f8 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 1e4724a..6d6f4ce 100644 +index 7e1ca6d..a6eeec6 100644 --- a/configure.ac +++ b/configure.ac -@@ -10034,7 +10034,7 @@ if test "$with_system_qrcodegen" = "yes"; then +@@ -10235,7 +10235,7 @@ if test "$with_system_qrcodegen" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_QRCODEGEN=TRUE AC_LANG_PUSH([C++]) @@ -23,11 +23,11 @@ index 1e4724a..6d6f4ce 100644 AC_CHECK_LIB([qrcodegencpp], [main], [:], [ AC_MSG_ERROR(qrcodegen C++ library not found.) ], []) diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx -index d936219..e0fc4fc 100644 +index 85ed930..0850db5 100644 --- a/cui/source/dialogs/QrCodeGenDialog.cxx +++ b/cui/source/dialogs/QrCodeGenDialog.cxx -@@ -17,7 +17,7 @@ - #include +@@ -18,7 +18,7 @@ + #include #if defined(SYSTEM_QRCODEGEN) -#include @@ -36,5 +36,5 @@ index d936219..e0fc4fc 100644 #include #endif -- -2.24.1 +2.26.2 diff --git a/0001-replace-boost-bimap-in-sdext-pdfimport.patch b/0001-replace-boost-bimap-in-sdext-pdfimport.patch deleted file mode 100644 index 479101c..0000000 --- a/0001-replace-boost-bimap-in-sdext-pdfimport.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 193b49763a03d63ba79db50c1fa0563ec0d6b0c3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 29 Jan 2020 12:44:52 +0000 -Subject: [PATCH] replace boost::bimap in sdext pdfimport - -Change-Id: Ie324a0b81931bbd427483878a87beeca455ada18 ---- - sdext/source/pdfimport/inc/pdfiprocessor.hxx | 12 ++++------- - sdext/source/pdfimport/tree/pdfiprocessor.cxx | 21 +++++++++++-------- - 2 files changed, 16 insertions(+), 17 deletions(-) - -diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx -index 89f9d601b7b0..9e08d6a6a765 100644 ---- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx -+++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx -@@ -37,9 +37,6 @@ - #include "treevisitorfactory.hxx" - #include "genericelements.hxx" - --#include --#include -- - namespace pdfi - { - -@@ -160,10 +157,8 @@ namespace pdfi - typedef std::unordered_map IdToFontMap; - typedef std::unordered_map FontToIdMap; - -- typedef boost::bimaps::bimap< -- boost::bimaps::unordered_set_of, -- boost::bimaps::unordered_set_of -- > GCToIdBiMap; -+ typedef std::unordered_map IdToGCMap; -+ typedef std::unordered_map GCToIdMap; - - typedef std::vector GraphicsContextStack; - -@@ -178,7 +173,8 @@ namespace pdfi - - GraphicsContextStack m_aGCStack; - sal_Int32 m_nNextGCId; -- GCToIdBiMap m_aGCToId; -+ IdToGCMap m_aIdToGC; -+ GCToIdMap m_aGCToId; - - ImageContainer m_aImages; - -diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx -index c6baa7fee8b2..ed2eaf6510b9 100644 ---- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx -+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx -@@ -54,6 +54,7 @@ namespace pdfi - m_aFontToId(), - m_aGCStack(), - m_nNextGCId( 1 ), -+ m_aIdToGC(), - m_aGCToId(), - m_aImages(), - m_nPages(0), -@@ -65,12 +66,13 @@ namespace pdfi - aDefFont.isBold = false; - aDefFont.isItalic = false; - aDefFont.size = 10*PDFI_OUTDEV_RESOLUTION/72; -- m_aIdToFont[ 0 ] = aDefFont; -- m_aFontToId[ aDefFont ] = 0; -+ m_aIdToFont.insert({0, aDefFont}); -+ m_aFontToId.insert({aDefFont, 0}); - - GraphicsContext aDefGC; - m_aGCStack.push_back( aDefGC ); -- m_aGCToId.insert(GCToIdBiMap::relation(aDefGC, 0)); -+ m_aGCToId.insert({aDefGC, 0}); -+ m_aIdToGC.insert({0, aDefGC}); - } - - void PDFIProcessor::setPageNum( sal_Int32 nPages ) -@@ -468,12 +470,13 @@ const FontAttributes& PDFIProcessor::getFont( sal_Int32 nFontId ) const - sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC ) - { - sal_Int32 nGCId = 0; -- auto it = m_aGCToId.left.find( rGC ); -- if( it != m_aGCToId.left.end() ) -+ auto it = m_aGCToId.find( rGC ); -+ if( it != m_aGCToId.end() ) - nGCId = it->second; - else - { -- m_aGCToId.insert(GCToIdBiMap::relation(rGC, m_nNextGCId)); -+ m_aGCToId.insert({rGC, m_nNextGCId}); -+ m_aIdToGC.insert({m_nNextGCId, rGC}); - nGCId = m_nNextGCId; - m_nNextGCId++; - } -@@ -483,9 +486,9 @@ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC ) - - const GraphicsContext& PDFIProcessor::getGraphicsContext( sal_Int32 nGCId ) const - { -- auto it = m_aGCToId.right.find( nGCId ); -- if( it == m_aGCToId.right.end() ) -- it = m_aGCToId.right.find( 0 ); -+ auto it = m_aIdToGC.find( nGCId ); -+ if( it == m_aIdToGC.end() ) -+ it = m_aIdToGC.find( 0 ); - return it->second; - } - --- -2.24.1 - diff --git a/libreoffice.spec b/libreoffice.spec index d04e441..5e60a6d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 6.4.5 +%global libo_version 7.0.0 # 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. @@ -49,8 +49,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 -Release: 6%{?libo_prerelease}%{?dist} +Version: %{libo_version}.3 +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/ @@ -64,15 +64,16 @@ Source6: gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc Source7: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll Source8: libreoffice-multiliblauncher.sh -Source9: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +Source9: %{external_url}/dtoa-20180411.tgz +Source10: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip %if 0%{?fedora} -Source10: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip -Source11: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +Source11: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip +Source12: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip %endif #Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose #backwards compatability. -Source12: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip -Source13: %{external_url}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf +Source13: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +Source14: %{external_url}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf %global bundling_options %{?bundling_options} --without-system-hsqldb Provides: bundled(hsqldb) = 1.8.0 @@ -239,12 +240,8 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch # rhbz#1736810 disable opencl by default again Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch # backported -Patch3: 0001-replace-boost-bimap-in-sdext-pdfimport.patch -Patch4: 0001-fix-detecting-qrcodegen.patch -Patch5: 0001-Flatpak-Add-app-bin-libreoffice-app-libreoffice-prog.patch -Patch6: 0001-Restructure-solenv-bin-assemble-flatpak.sh.patch -Patch7: 0001-Related-tdf-127782-resize-the-print-dialog-to-its-op.patch -Patch8: 0001-rhbz-1861794-csv-fixed-width-import-missing-split-ha.patch +Patch3: 0001-fix-detecting-qrcodegen.patch +Patch4: 0001-rhbz-1861794-csv-fixed-width-import-missing-split-ha.patch %if 0%{?rhel} # not upstreamed @@ -493,8 +490,7 @@ Requires: %{name}-data = %{epoch}:%{version}-%{release} Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release} %description graphicfilter -The graphicfilter module for LibreOffice provides graphic filters, e.g. svg and -flash filters. +The graphicfilter module for LibreOffice provides graphic filters, e.g. svg. %package xsltfilter Summary: Optional xsltfilter module for LibreOffice @@ -1054,7 +1050,7 @@ touch autogen.lastrun --disable-fetch-external \ --disable-openssl \ --disable-pdfium \ - --disable-gtk \ + --disable-skia \ --enable-dconf \ --enable-evolution2 \ --enable-ext-nlpsolver \ @@ -1235,10 +1231,11 @@ popd rm -rf %{buildroot}%{baseinstdir}/program/__pycache__ # rhbz#477435 package opensymbol separately -pushd %{buildroot}%{baseinstdir}/share/fonts/truetype +pushd %{buildroot}%{baseinstdir}/program/resource/common/fonts install -d -m 0755 %{buildroot}%{_fontdir} install -p -m 0644 *.ttf %{buildroot}%{_fontdir} popd +rm -rf %{buildroot}%{baseinstdir}/program/resource/common/fonts/*ttf rm -rf %{buildroot}%{baseinstdir}/share/fonts/truetype/*.ttf # move platform-independent data into shared dir @@ -1517,7 +1514,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libdeploymentgui.so %{baseinstdir}/program/libdlgprovlo.so %{baseinstdir}/program/libexpwraplo.so -%{baseinstdir}/program/flat_logo.svg %{baseinstdir}/program/libfps_officelo.so %{baseinstdir}/program/gdbtrace %{baseinstdir}/program/gengal @@ -1639,9 +1635,9 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/types/offapi.rdb %{baseinstdir}/program/libpasswordcontainerlo.so %{baseinstdir}/program/pagein-common -%if %{with langpacks} %dir %{baseinstdir}/program/resource -%endif +%dir %{baseinstdir}/program/resource/common +%dir %{baseinstdir}/program/resource/common/fonts %{baseinstdir}/program/senddoc %dir %{baseinstdir}/program/services %{baseinstdir}/program/services/services.rdb @@ -1677,10 +1673,13 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/share/basic %dir %{baseinstdir}/share/config %{baseinstdir}/share/config/images_breeze.zip +%{baseinstdir}/share/config/images_breeze_svg.zip %{baseinstdir}/share/config/images_breeze_dark.zip %{baseinstdir}/share/config/images_breeze_dark_svg.zip %{baseinstdir}/share/config/images_colibre.zip +%{baseinstdir}/share/config/images_colibre_svg.zip %{baseinstdir}/share/config/images_elementary.zip +%{baseinstdir}/share/config/images_elementary_svg.zip %{baseinstdir}/share/config/images_helpimg.zip %{baseinstdir}/share/config/images_karasa_jaga.zip %{baseinstdir}/share/config/images_karasa_jaga_svg.zip @@ -1688,10 +1687,8 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/share/config/images_sifr_dark.zip %{baseinstdir}/share/config/images_sifr_dark_svg.zip %{baseinstdir}/share/config/images_sifr_svg.zip -%{baseinstdir}/share/config/images_tango.zip -%{baseinstdir}/share/config/images_breeze_svg.zip -%{baseinstdir}/share/config/images_colibre_svg.zip -%{baseinstdir}/share/config/images_elementary_svg.zip +%{baseinstdir}/share/config/images_sukapura.zip +%{baseinstdir}/share/config/images_sukapura_svg.zip %dir %{baseinstdir}/share/tipoftheday %{baseinstdir}/share/tipoftheday/*.png %dir %{baseinstdir}/share/config/soffice.cfg @@ -1721,6 +1718,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %dir %{baseinstdir}/share/registry/res %dir %{baseinstdir}/share/template %dir %{baseinstdir}/share/template/common +%{baseinstdir}/share/template/common/draw %{baseinstdir}/share/template/common/internal %{baseinstdir}/share/template/common/officorr %{baseinstdir}/share/template/common/offimisc @@ -2018,7 +2016,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %if 0%{?fedora} %{baseinstdir}/program/graphicfilter.abignore %endif -%{baseinstdir}/program/libflashlo.so %{baseinstdir}/program/libgraphicfilterlo.so %{baseinstdir}/program/libsvgfilterlo.so %{baseinstdir}/program/libwpftdrawlo.so @@ -2039,7 +2036,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %endif %{baseinstdir}/program/libpostgresql-sdbclo.so %{baseinstdir}/program/libpostgresql-sdbc-impllo.so -%{baseinstdir}/program/postgresql-sdbc.ini %{baseinstdir}/program/services/postgresql-sdbc.rdb %{baseinstdir}/share/registry/postgresql.xcd @@ -2047,6 +2043,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/classes/java_uno.jar %{baseinstdir}/program/classes/juh.jar %{baseinstdir}/program/classes/jurt.jar +%{baseinstdir}/program/classes/libreoffice.jar %{baseinstdir}/program/classes/ridl.jar %{baseinstdir}/program/classes/unoloader.jar %{baseinstdir}/program/javaldx @@ -2223,6 +2220,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Thu Aug 06 2020 Caolán McNamara - 1:7.0.0.3-1 +- 7.0.0 + * Wed Aug 05 2020 Caolán McNamara - 1:6.4.5.2-6 - Resolves: rhbz#1745771 + drop the GTK3-KF5 VCL plugin (formerly subpackage kf5) diff --git a/sources b/sources index 54eb064..a61befa 100644 --- a/sources +++ b/sources @@ -6,9 +6,10 @@ SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025 SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 SHA512 (884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = ce7e23e750f2c6f7ff2e590cc8941caa18eaae2727c9ca31313ab72ab19278055bd9393d38b0b5b685594e2f04ee15cb83b3bbb25d09665fe7383d7f26bf2ae8 SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd -SHA512 (libreoffice-6.4.5.2.tar.xz) = f0a5ac37b9c8e46bfd50bf9137d193a83d55d8d451c5b27d86b7f257633e861eb79422e1e64f7c462ae4a9045e00827beed302ab6f0773f8864c03bb11d3b752 -SHA512 (libreoffice-6.4.5.2.tar.xz.asc) = a1b2951f9436fd2ff3a5b636abb21743471362020c80e15b006522ddbe5d4d0a9818e2f8d5dba8789ce4ea5d2b25046533a97d254a9aefa53af43da68f5c50b5 -SHA512 (libreoffice-help-6.4.5.2.tar.xz) = fffa5338baa5ebd7bdf607f83b31440c66c19c42136b41505074fe1a7a4bb1630e080e4fc2dd114f8ab0654507f4a84d4190bb134a4756d895ec350cccc10e11 -SHA512 (libreoffice-help-6.4.5.2.tar.xz.asc) = b0947361507e249cb4ba18b055c3bc8508cc5fd7e87e2fd5b51096943baf4b3d5077cc5fe9e6ae4cfb57ac771bb306a8da4b14353231135edb552ec6d204d23f -SHA512 (libreoffice-translations-6.4.5.2.tar.xz) = a7bc0f95edbeeea36fd832f5ce91e38e3803d7be1b56a5b3626cc5251eb6e1a25ad482b2cc1fb61a463470237805eecebaaf3efd375cb44e65b6cc5187cc8bfe -SHA512 (libreoffice-translations-6.4.5.2.tar.xz.asc) = eedc4d4d087a886dec53394ec7bbf2cbbf45446a25cd9c130b85476dc7af1bf7a5bb08eca14392a5931d7399d0f53e77c5941ee4954f9c871a2fed3e19584a31 +SHA512 (libreoffice-7.0.0.3.tar.xz) = 69695f8969b003794259cc352b32678d4ee4f823f9e92db92597429959e30605a0569ac442163a20c6675c8807e3a4085be12f34c6746ed15a30b414442779ca +SHA512 (libreoffice-7.0.0.3.tar.xz.asc) = 555f7cb77e3946003ae419be902a0c28193b766417f38bf67a6ca60e7a0d2a34d68d179caaeaff0555d0a96df00c7472209d2949a4e704b4f1464b1753ba5c7b +SHA512 (libreoffice-help-7.0.0.3.tar.xz) = 2dbbbdc3a649008dea186e3f5b56c37a9221278701c1953c6def5bfff5c1bd74e0ebe1047a11613623d574dcc505a3da8bbe22bf601e917aa44c34819ad0e990 +SHA512 (libreoffice-help-7.0.0.3.tar.xz.asc) = d2fb3f57507aade4c52f96caea0ef92db4a51f95f619fcc42a8ff4319de7292cef242c9395cca47b73d7c65127792bb1e616e0f544981bada37f7239606ef98f +SHA512 (libreoffice-translations-7.0.0.3.tar.xz) = be50a2f1b471adad0a3bd0125ac26958304aa830633c76f802fdb3cc6a4d33afd6d7e85d43b6a30acc4bb43d9bca0f7a392be8beabc86029a0092d57d564d8bc +SHA512 (libreoffice-translations-7.0.0.3.tar.xz.asc) = f87493ceee72f22ebf1827ca168ea80624653ed8ed9b1036e15e8565d3bf66ef824b2edca3628130a8568145f5fc3466b6d6251a0f44d8317c95872d36f64d3f +SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85