diff --git a/libreoffice-7.4.1.1.tar.xz b/libreoffice-7.4.1.1.tar.xz deleted file mode 100644 index 6e9025c..0000000 --- a/libreoffice-7.4.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c5c219c538776b4ec3815fe74c1915024cbe17dd0950e725e544ff49b20a28c -size 263297300 diff --git a/libreoffice-7.4.1.1.tar.xz.asc b/libreoffice-7.4.1.1.tar.xz.asc deleted file mode 100644 index 8a79f38..0000000 --- a/libreoffice-7.4.1.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmMGVUEACgkQ9DSh76/u -rqM4zg/9EvpdhG6GifHKkT0pr5P8raIBwuQ4ZFVos32vuaQsPpdA/5YsXi5HlZwT -3f8/XJVTI0RXdjFjsbNQ6WKlp36ulXZFpCJbvG4cDmzkiJw9TnrnBi55Kbb/DpbJ -k/HYVz0sFl53TaXgKYfRKW8YsgjR+eqXYjPDtQH4qQMLVkgxUG7HgE7whXUqeFUS -dmClNYYb56WYWDYrMCBbt3y2M3WS79yn/6t/dwT+LK7iP3ft+fo4V9a3q2dJ1a12 -fP/t7ZUsIbVOm3Vy1CcqlQz/op0mmHsEACRpEoVCsvYbEAvhuYvfdRGkLYWKQnqu -ZWq3Fa+0CDMHMoZopd8tvQZ5PDi3In02XNDO415mt+1+gGwfuukkU+zQd1fyB10Q -IQAzVpDS5j6zk3/wCFnG0xoGoWJvggSsnhXv1IZClMaYKHzJ7fPLJKTIalqd+UWL -sYfjRDCn0YyYqUZKHxCZqvciAPHuS04XkdksChYrwcvvF73tQY+ygXqqnHZV8unx -iF4xgvxJBHWf90e4A2KRuzkTUWd3mTRb0mocC/Y1kLKq6xBuIAfG6s3yLi5r1I3/ -moWFdf1V4YAGDfRGhryMRE2nxC5ekc0qX+i/+B8/KkJ83kCINmLylDsInI4pz0rN -jHv1BbWiwsvhNWfVFa1M87jzg+8Uqtc99b2AMwbjX0vG47mUCnE= -=ShB/ ------END PGP SIGNATURE----- diff --git a/libreoffice-7.4.1.2.tar.xz b/libreoffice-7.4.1.2.tar.xz new file mode 100644 index 0000000..eab54d1 --- /dev/null +++ b/libreoffice-7.4.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92f78421bb3ffa6723f8e14c0dab5ee7bc68939fad8ff9f146ccecac02d2de84 +size 263306664 diff --git a/libreoffice-7.4.1.2.tar.xz.asc b/libreoffice-7.4.1.2.tar.xz.asc new file mode 100644 index 0000000..989eb9a --- /dev/null +++ b/libreoffice-7.4.1.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmMbjn0ACgkQ9DSh76/u +rqNOdw//fd7+HxL62Nt5oZaKCM++E1fucqnQxU19TIyyq+mBZXwnjnuFvj6Yi8nS +gQCqNWDlTuZ+ZGkh4Av5IwU+k804jggT+PbiTDs6HxXtZt+hZJK+UHHn2jqagOli +vTE8RcHuY/mAb0VPhjp/AEb48QqPvV/eOn+zfcugmq3tj/0eBbtRgv8Nc7YGvOxj +WTRmk29+Jjw09cNMEV8iZxqi6rXOmab75PNcghGjVqYKI1d5/Vw/OFF007SQLN1Z +OQfCZ4+Eh9wpl0zhTcYvBJL93wlBpjFeRsq9y/NyMb0jeQJXlCwdpUsRDKUaeIYd +hRfEndSngO8KamKRPCxg9BmgDIrUqaQre/0gXRdSKxCJBSRSCzKXThid2z3AI9Iu +Q6UxjqAut4Kb3u9ukWa525Q6wLeRCjvvGT5m4EGpyi/bnfyrADLcbv2zXNmW7uvL +x9vCoqJoDn8ShKqXqHavFr6F6lnxwvH9cPKKqEKQnSm6oz5QNOPP+IIvFkhwULS/ +vrLUjNsQJN2TVvEek/8W7C2bGBqW8zjSU2eFO5/ptRJKuvXThGYl/AG1C4mk9r5X +UhNrwDcIR/1b3BuU4tC2ujtfrviNUfxG72z/n4j585GZHi0MBQBSfo3bcfR+u6HJ +G8hlHRjzglvz2YGdJ/uEWKBm8ugwCAbM+2CZ2HgknGbkLWFSp0k= +=h7wY +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-7.4.1.1.tar.xz b/libreoffice-help-7.4.1.1.tar.xz deleted file mode 100644 index a4b899d..0000000 --- a/libreoffice-help-7.4.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17f0ef8b8722d399b070036cf11da9af33a2b9f7261a02bd5c89416d94c819c3 -size 112593804 diff --git a/libreoffice-help-7.4.1.1.tar.xz.asc b/libreoffice-help-7.4.1.1.tar.xz.asc deleted file mode 100644 index 79021bb..0000000 --- a/libreoffice-help-7.4.1.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmMGVUgACgkQ9DSh76/u -rqOGuhAAoCVUJgbkQa8a/EteYjqiIGFgibY8y19sDZh5eMeXlZnh1eSagWdodZvi -Lm1yO9KAj19HP8g1JJoJyPmfK1xVrrxAtAspUh3GeOBfoV1uLNQvUyiKfoPlKE42 -xU3+mggivcnIYarHQ0/W9NwdWH9cocz6YrXvb6VsFTNvXBHFnFcfYWdgf6Sx9QjL -/deLBO8st9/nTpWmCsbVjT8FoOH12r1fzqnbJckh27xM2wdYrdkSoMTBomsOGd1B -YOOCHXvNQDzHhk/D3zc1FhFDwcaQV9oJ6nWchEm9N5lh325m5qm8e9mx68Q8vgxC -y80b3xyijGiE7oKJWkf12hXaXH0xp63yDCHKmhLGLd/39b8XiYFgKDK/O/AA+P8Q -cG0Ba0o7KfCfaycYFT1AWQXIuOnqhCfm7XrSlQhXO1J1HZS4DoL91d1NegmXd1V2 -nSEwohl19jSXqTw1aJwyfqkRihGPPE1nnh/U0Ja9oI0F9wpyO3NuZW/MU1krT97Z -xllVj7SrVHY4LFzRcQfJ+uSS5B/cly+XFugQstQcOG41MjMWLrJ93otQV6w2EUnd -N5PfWKORUBKpRmvE2VSTPmdYuY2FWtYahNnvpPASBiUUM/M+mSjesnO6EUSupYon -TCMO1k64ZzuwhQMTENExTvyr/PRsr6aNLzBzqJVXjcA0/xU88sg= -=CkYk ------END PGP SIGNATURE----- diff --git a/libreoffice-help-7.4.1.2.tar.xz b/libreoffice-help-7.4.1.2.tar.xz new file mode 100644 index 0000000..0de1c2f --- /dev/null +++ b/libreoffice-help-7.4.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:842b24e72345aeed8305342003a4bbc6346173ea9457b38950b3b6ab89e2d89f +size 112592980 diff --git a/libreoffice-help-7.4.1.2.tar.xz.asc b/libreoffice-help-7.4.1.2.tar.xz.asc new file mode 100644 index 0000000..ddb749e --- /dev/null +++ b/libreoffice-help-7.4.1.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmMbjoMACgkQ9DSh76/u +rqPpaQ//X3HqXHAyB4taKdADam0rqqLt3mB0I6V+SNrstV/82orsPnvoUA+Ahrly +vmVmGgdPTg3gdAMxPTRWGaZUxWPx7lXh0ULlk4xkYcNyK14j9A+bUhtWnNwZThh+ +uvQWumIfKQLOJzRlP8QG0eN8b0oPmSbGZUHixCzOcAOvBi5Iw2YKNTWnnkZFY502 +SDCpduUenwAED5S+gHJBm4bOHbgIGNpJConYzjTBs2gp0faZQOm0UB401P+Qk7w4 +YxOB6hwxy6E/PLZhnGm1v7xW3GYUuoM8j0VDYEGrYcdD2rho+jO4KmDx4vAjFXMS +b+a5jeh6scVS1X/NuppHA+uxqWF95b0q4zXI3J1JU03FFyoUCivpx6nb91Vi3kf5 +NAQMaGLKrH1P++eCXnz17lkgAvfyLuKAA0vIOMQqJHe1dRzEB1CpHYIO8flMlZzm +zEntxgddGE2JiPYtQ9spfpu1Mv0E3oQBjcl0XYKDfmepGmn3bP3xPW1mRQL+eFT0 +8QY6swHQL21Pns4nTBhZfVrwmLh1RqVum79U0Ed/W9hPKyNWYcr3RQg6NZI2ggMa +iFhqzqauBtCYpUTqnwQ8PjtpdxOgD6r6IL7ZtL+GcfnBcodW2P7PJbmPxsWYYwoP +6m95LrwJ9yVzv3dy8yCDxSLmO+1U/d/EthnboCgVH0p+PtkFuqY= +=Ye92 +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.4.1.1.tar.xz b/libreoffice-translations-7.4.1.1.tar.xz deleted file mode 100644 index 3044b1a..0000000 --- a/libreoffice-translations-7.4.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0d19967f81f53ea57b5a933ade455c81ad8c9a6c5c4e2442695138b2e816afe -size 199118572 diff --git a/libreoffice-translations-7.4.1.1.tar.xz.asc b/libreoffice-translations-7.4.1.1.tar.xz.asc deleted file mode 100644 index fda3f00..0000000 --- a/libreoffice-translations-7.4.1.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmMGVUgACgkQ9DSh76/u -rqM42Q//cXQQaUJuh80MgBr+GSRRGzqB/j6ePUFs6JuhHEH+QFVDmEad/1Z9EtRU -tXAPtTak7/LYsX2KMa7GlZNXqACYZgt3CUvYHUnRvz4GYBFCm8mefVoOkUuhfvNE -vJ1mRqnUxcd7zr4ed3ESLXjrcVRDOcZZA64uCmOJ8xNt+iSyS+h5q0j+A2/TghQq -fInlrAIO2H9ndkbutZZyf+1gnoNp7eUlgU3iWQjc8YSnN4lqFawS4myewrD6ZzeS -PFmAWF7X19rAscQns82fIpMhxmb4M0Ig3eyHNlprItgEM34nDFaeSEz6WvQ5H39w -6W8+9Zqk5bTKEppdDhF5zaDFiYEi59wJDS7jQNPC7HO3x/ZhpEhlLd6jt1/dD3Dk -vAULxKB/aud04d4d3pz91tTtQWpegpzZDSZU6Vj4Q2K1Jyw5ruHqv9hF3w/nnI4U -eGLWIqZoj7vXVB3OAzIV5CXbRwbsI6z/ihSq7N+avxtAIvYSEiqBbs/sSazspiDd -c9A42PMR0n0saQzrsoAw0KAVA3+ZeVqyZFr/WmfLXziZ6DpGlRdX4qW0F1tah6AT -ySbXEhxIAnGda4zEEBi0c9qq6IZQ6recR8Bg9YDtVCYo1Zl7WgEzSgDPh3DdnZPk -hgynxpRv7s5Ojp+r3Z7eCJfKPvxNaKeXU1U+dV92KgAXaZGYjxQ= -=CN4T ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.4.1.2.tar.xz b/libreoffice-translations-7.4.1.2.tar.xz new file mode 100644 index 0000000..445fe9e --- /dev/null +++ b/libreoffice-translations-7.4.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f77a382d562b6bcebaec69321de4b6ab6daec0240216d314d0c8c6fee4c32fae +size 199194804 diff --git a/libreoffice-translations-7.4.1.2.tar.xz.asc b/libreoffice-translations-7.4.1.2.tar.xz.asc new file mode 100644 index 0000000..145f6d4 --- /dev/null +++ b/libreoffice-translations-7.4.1.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmMbjoMACgkQ9DSh76/u +rqORwQ/+PtY6ixz/N9bdVUe8eeGHdsW8IpPZ279zqqx1ApqnysJM2QvjEMV8b1Pc +4IrV2kVWA9XAaiQMCUtauOCO+av3/nO8vUj8Y4XHf0Z785D21bsIiB5yG/7xEx4H +FL2r3LSeCRYkDqNMiEi6WsB5jIEuKeGSkHooq6rT4MeZvDnEqE5aKqt5tBnvZnRl +ZnsXOmH/yH04PeKtG8DQ0JePuaBt1zhyQRt/G1FIn48zKL01wA7ogNyAfOZArh2j +9yHSjPe+7lTuFlc5P7T0PiUOa6qq6yeTN5pEnSJ57D8cBDxHHTD2vOL7xCKo21pn +n8w9ga6VDOeqq2ziqg8zox50TZDW9rNRl1U4haGLaolxbq/oTYAQn/ZcAUo9XDtL +saP/4I1/02k04fGFqbMGYGkTF5brlq1VU2+HYdYrvqZO7GLGw6qjKeADAlezUx65 +611I4/yYZeeNPMcOmzu6FrzySgHCJocdatq/tbMTaIkOWagosjdqMa5R4FPV0dDK +lkhepL1FwU6rFJxly+O+18pgkzmXyU5bwqMaiyuCAoTpq/HLmJP2PUxsqxbMgCfu +Tha4qXetcK5MQQC/WHXMV94dunz5+nAe9WDS9is3C3i3XINARWgznDKn9tg5XUEZ +LQ5KKRIKIYI/5c/clu1qOSOC7CQ9pVaORaEXZP0DeDwFLTK3FFc= +=Qbaa +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index 15f6abe..60c834a 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -4,6 +4,19 @@ Tue Sep 20 16:28:58 UTC 2022 - Christophe Giboudeaux - Add popper 22.09 compatibility fix: * 0001-Fix-build-with-Poppler-22.09.0.patch +------------------------------------------------------------------- +Fri Sep 16 13:39:02 UTC 2022 - Danilo Spinella + +- Update to 7.4.1.2: + https://wiki.documentfoundation.org/Releases/7.4.1/RC2 +- Fix build on SLE-15-SP3 + +------------------------------------------------------------------- +Thu Sep 15 10:20:54 UTC 2022 - Danilo Spinella + +- Fix build with poppler 22.09 on TW + * poppler-22.09.0.patch + ------------------------------------------------------------------- Wed Aug 31 07:45:42 UTC 2022 - Danilo Spinella diff --git a/libreoffice.spec b/libreoffice.spec index 9e084d2..8c335e8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -49,7 +49,7 @@ %endif %bcond_with firebird Name: libreoffice -Version: 7.4.1.1 +Version: 7.4.1.2 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -109,6 +109,7 @@ Patch3: mediawiki-no-broken-help.diff Patch6: gcc11-fix-error.patch Patch9: fix_math_desktop_file.patch Patch10: fix_gtk_popover_on_3.20.patch +Patch11: poppler-22.09.0.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -126,6 +127,7 @@ BuildRequires: commons-logging BuildRequires: cups-devel BuildRequires: fixmath-devel BuildRequires: libwebp-devel +BuildRequires: zlib-devel %if %{with system_curl} BuildRequires: curl-devel >= 7.68.0 %else @@ -142,6 +144,7 @@ BuildRequires: glm-devel # Needed for tests BuildRequires: google-carlito-fonts BuildRequires: abseil-cpp-devel +BuildRequires: dragonbox-devel BuildRequires: gperf >= 3.1 BuildRequires: graphviz BuildRequires: hyphen-devel @@ -175,7 +178,6 @@ BuildRequires: update-desktop-files BuildRequires: xml-commons-apis BuildRequires: xz BuildRequires: zip -BuildRequires: cmake(dragonbox) BuildRequires: perl(Archive::Zip) BuildRequires: perl(Digest::MD5) BuildRequires: pkgconfig(apr-util-1) @@ -219,6 +221,7 @@ BuildRequires: pkgconfig(libqxp-0.0) BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1 BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libstaroffice-0.0) >= 0.0.7 +BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libvisio-0.1) >= 0.1 BuildRequires: pkgconfig(libwpd-0.10) >= 0.10 BuildRequires: pkgconfig(libwpg-0.3) @@ -285,8 +288,6 @@ BuildRequires: pkgconfig(poppler-cpp) # Too old icu on the system Source2021: %{external_url}/icu4c-71_1-src.tgz Source2022: %{external_url}/icu4c-71_1-data.zip -BuildRequires: gcc7 -BuildRequires: gcc7-c++ BuildRequires: java-devel >= 1.8 BuildRequires: libBox2D-devel BuildRequires: libmysqlclient-devel @@ -299,8 +300,6 @@ BuildConflicts: java-headless >= 9 Requires(post): update-desktop-files Requires(postun):update-desktop-files %else -BuildRequires: gcc >= 7 -BuildRequires: gcc-c++ >= 7 # genbrk binary is required BuildRequires: icu BuildRequires: java-devel >= 9 @@ -312,6 +311,14 @@ BuildConflicts: java-devel < 9 BuildConflicts: java-headless < 9 BuildRequires: pkgconfig(libopenjp2) %endif +# Dragonbox requires gcc11 +%if 0%{?suse_version} > 1550 +BuildRequires: gcc >= 11 +BuildRequires: gcc-c++ >= 11 +%else +BuildRequires: gcc11 +BuildRequires: gcc11-c++ +%endif %if 0%{?suse_version} # needed by python3_sitelib BuildRequires: python-rpm-macros @@ -1023,6 +1030,9 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch10 -p1 %patch101 -p1 %endif +%if 0%{?suse_version} > 1550 +%patch11 -p1 +%endif %patch990 -p1 %patch991 -p1 @@ -1077,9 +1087,9 @@ CFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS -%if 0%{?suse_version} < 1500 -export CC=gcc-7 -export CXX=g++-7 +%if 0%{?suse_version} < 1550 +export CC=gcc-11 +export CXX=g++-11 %endif # Fake the epoch stuff in generated zip files @@ -1115,6 +1125,8 @@ export NOCONFIGURE=yes --with-system-ucpp \ --with-system-dicts \ --with-system-libpng \ + --with-system-dragonbox \ + --with-system-libfixmath \ --without-system-libcmis \ --with-vendor=SUSE \ --with-tls=nss \ diff --git a/poppler-22.09.0.patch b/poppler-22.09.0.patch new file mode 100644 index 0000000..2dfd600 --- /dev/null +++ b/poppler-22.09.0.patch @@ -0,0 +1,46 @@ +https://gerrit.libreoffice.org/c/core/+/139249 + +From 8bad83bf044661357b02b695e6f53e2e19dea396 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Fri, 2 Sep 2022 04:31:18 +0100 +Subject: [PATCH] Fix build with Poppler 22.09.0 + +With Poppler 22.09.0, LO fails to build with: +``` +/var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments + state->getLineDash(&dashArray, &arrayLen, &startOffset); + ~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~ +/usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here + const std::vector &getLineDash(double *start) + ^ +1 error generated. +``` + +Poppler changed the getLineDash interface: +``` +- void getLineDash(double **dash, int *length, double *start) ++ const std::vector &getLineDash(double *start) +``` + +Signed-off-by: Sam James +Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -678,8 +678,16 @@ void PDFOutDev::updateLineDash(GfxState *state) + return; + assert(state); + +- double* dashArray; int arrayLen; double startOffset; ++ int arrayLen; double startOffset; ++#if POPPLER_CHECK_VERSION(22, 9, 0) ++ const double* dashArray; ++ const std::vector &dash = state->getLineDash(&startOffset); ++ dashArray = dash.data(); ++ arrayLen = dash.size(); ++#else ++ double* dashArray; + state->getLineDash(&dashArray, &arrayLen, &startOffset); ++#endif + + printf( "updateLineDash" ); + if( arrayLen && dashArray )