From 48493cd91c15fa39b6b2f9ebda0350fdcbc79c6e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 6 Sep 2024 08:12:20 -0500 Subject: [PATCH] 24.8.0.3 --- .gitignore | 7 +++++++ cflags.patch | 10 ++++++++++ libreoffice.spec | 19 +++++++------------ sources | 14 +++++++------- 4 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 cflags.patch diff --git a/.gitignore b/.gitignore index 53a5966..a859034 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,10 @@ /libreoffice-help-24.2.5.2.tar.xz.asc /libreoffice-translations-24.2.5.2.tar.xz /libreoffice-translations-24.2.5.2.tar.xz.asc +/libreoffice-24.8.0.3.tar.xz +/libreoffice-24.8.0.3.tar.xz.asc +/libreoffice-help-24.8.0.3.tar.xz +/libreoffice-help-24.8.0.3.tar.xz.asc +/libreoffice-translations-24.8.0.3.tar.xz +/libreoffice-translations-24.8.0.3.tar.xz.asc +/Java-WebSocket-1.5.6.tar.gz diff --git a/cflags.patch b/cflags.patch new file mode 100644 index 0000000..f7fa293 --- /dev/null +++ b/cflags.patch @@ -0,0 +1,10 @@ +--- a/configure~ 2024-08-22 09:49:41.957960557 -0500 ++++ b/configure 2024-08-23 10:31:14.357014789 -0500 +@@ -7399,7 +7399,6 @@ + # AC_PROG_CC sets CFLAGS to -g -O2 if not set, avoid that (and avoid -O2 during AC_PROG_CC, + # Clang 12.0.1 occasionally SEGVs on some of the test invocations during AC_PROG_CC with -O2): + save_CFLAGS=$CFLAGS +- CFLAGS=-g + + + diff --git a/libreoffice.spec b/libreoffice.spec index 497af88..bd5766a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -119,7 +119,7 @@ Source11: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi # with system provided hsqldb without major hacking. Source12: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Source13: %{external_url}/../extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf -Source14: %{external_url}/Java-WebSocket-1.5.4.tar.gz +Source14: %{external_url}/Java-WebSocket-1.5.6.tar.gz %global bundling_options %{?bundling_options} --without-system-hsqldb Provides: bundled(hsqldb) = 1.8.0 @@ -258,6 +258,7 @@ BuildRequires: kf5-kwindowsystem-devel %if %{with kf6} BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qtmultimedia-devel BuildRequires: kf6-kconfig-devel BuildRequires: kf6-kcoreaddons-devel BuildRequires: kf6-ki18n-devel @@ -293,6 +294,7 @@ BuildRequires: dejavu-serif-fonts BuildRequires: google-carlito-fonts BuildRequires: google-rubik-fonts BuildRequires: google-crosextra-caladea-fonts +BuildRequires: google-noto-sans-hebrew-fonts # Amiri used in vcl/qa/cppunit tests BuildRequires: amiri-fonts BuildRequires: amiri-quran-fonts @@ -325,6 +327,7 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch # fix FTB in ppc64le from sharkcz # https://lists.freedesktop.org/archives/libreoffice/2023-August/090870.html Patch11: lo-7.6-ppc64le-tests.patch +Patch12: cflags.patch # icu 74 compatibility patch, from gentoo, via arch linux # https://bugs.gentoo.org/917618 # https://bugs.documentfoundation.org/show_bug.cgi?id=158108 @@ -1121,6 +1124,7 @@ sed -i -e /CppunitTest_desktop_lib/d desktop/Module_desktop.mk sed -i -e /CppunitTest_vcl_png_test/d vcl/Module_vcl.mk # https://bugs.documentfoundation.org/show_bug.cgi?id=159211 sed -i -e /CppunitTest_sd_png_export_tests/d sd/Module_sd.mk +sed -i -e /CppunitTest_sw_core_text/d sw/Module_sw.mk %endif %ifarch riscv64 # Failed test on RV64 @@ -1142,6 +1146,7 @@ rm -f vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff # Failing on multiple arches sed -i -e /CppunitTest_svgio/d svgio/Module_svgio.mk +sed -i -e /CppunitTest_sw_layoutwriter3/d sw/Module_sw.mk %build # path to external tarballs @@ -1204,7 +1209,6 @@ touch autogen.lastrun --enable-odk \ --enable-release-build \ --enable-symbols \ - --with-build-version="%{version}-%{release}" \ --with-external-dict-dir=/usr/share/hunspell \ --with-external-tar="$EXTSRCDIR" \ --with-help \ @@ -1215,7 +1219,6 @@ touch autogen.lastrun --without-lxml \ --without-system-libfixmath \ --enable-python=system \ - --with-idlc-cpp=cpp \ --disable-scripting-beanshell --disable-scripting-javascript \ --enable-gtk4 \ %{javaoptions} \ @@ -1653,7 +1656,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libchart*lo.so %{baseinstdir}/program/libclewlo.so %{baseinstdir}/program/libcmdmaillo.so -%{baseinstdir}/program/libcollator_data.so %{baseinstdir}/program/libcomphelper.so %{baseinstdir}/program/libconfigmgrlo.so %{baseinstdir}/program/libcppcanvaslo.so @@ -1669,10 +1671,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libdeployment.so %{baseinstdir}/program/libdeploymentgui.so %{baseinstdir}/program/libdeploymentmisclo.so -%{baseinstdir}/program/libdesktop_detectorlo.so %{baseinstdir}/program/libdesktopbe1lo.so -%{baseinstdir}/program/libdict_ja.so -%{baseinstdir}/program/libdict_zh.so %{baseinstdir}/program/libdlgprovlo.so %{baseinstdir}/program/libdocmodello.so %{baseinstdir}/program/libdrawinglayerlo.so @@ -1686,7 +1685,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libfps_officelo.so %{baseinstdir}/program/libfwklo.so %{baseinstdir}/program/libicglo.so -%{baseinstdir}/program/libindex_data.so %{baseinstdir}/program/libfilelo.so %{baseinstdir}/program/libfilterconfiglo.so %{baseinstdir}/program/libflatlo.so @@ -1760,7 +1758,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libswdlo.so %{baseinstdir}/program/libswlo.so %{baseinstdir}/program/libsysshlo.so -%{baseinstdir}/program/libtextconv_dict.so %{baseinstdir}/program/libtextconversiondlgslo.so %{baseinstdir}/program/libtextfdlo.so %{baseinstdir}/program/libtklo.so @@ -2036,8 +2033,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libpdfimportlo.so %{baseinstdir}/program/xpdfimport %{baseinstdir}/share/registry/pdfimport.xcd -%dir %{baseinstdir}/share/xpdfimport -%{baseinstdir}/share/xpdfimport/xpdfimport_err.pdf %_font_pkg -n %{fontname} opens___.ttf %doc instdir/LICENSE @@ -2099,7 +2094,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libswuilo.so %{baseinstdir}/program/libt602filterlo.so %{baseinstdir}/program/libwpftwriterlo.so -%{baseinstdir}/program/libwriterfilterlo.so +%{baseinstdir}/program/libsw_writerfilterlo.so %{baseinstdir}/program/libwriterlo.so %{baseinstdir}/program/libvbaswobjlo.so %{baseinstdir}/share/registry/writer.xcd diff --git a/sources b/sources index 16dd2c7..ce30098 100644 --- a/sources +++ b/sources @@ -1,13 +1,13 @@ -SHA512 (libreoffice-24.2.5.2.tar.xz) = 6f2893bc4e00a988e5f16e6288c95c66faf86f366c3fbfdfac3d6d46c6c03501504adb41ab7e51a7eba749be07cac1e124f97805500d29808155653c217b7c07 -SHA512 (libreoffice-24.2.5.2.tar.xz.asc) = c270913317cab366da47f0d69e5080a297f2ad1a6e68ccb7ed7db8f39819fa1afaedbabe3171890b2132b489369da2231ac459f9215d0a38ac84103199290cd7 -SHA512 (libreoffice-help-24.2.5.2.tar.xz) = c7a8c5051797d722c7f250828e53eba7603212db3df119d92b4c4a492e0e79cb9e1da5b016b9664f2133ced6fa414f08a0edcd44cba291757b7ba8e7ae46493d -SHA512 (libreoffice-help-24.2.5.2.tar.xz.asc) = e7e493f2094270317d90013b3febb899c25ad455456591a2bbbb5cb134aad6277cce893a4d19b1a90716871aeff65f16aa7032b3292052a93c237927e5d51daa -SHA512 (libreoffice-translations-24.2.5.2.tar.xz) = b33b4d5a908221cdf983f003619cc8380a1e870d2be25a5f14ab96aaecf12b3076db601fd1dfbaf1aeef763acc21a6b9c95f7838297c9128a2bcb67a7d98dd8f -SHA512 (libreoffice-translations-24.2.5.2.tar.xz.asc) = 8aade1abc1c09e42d6fa15e5b914af30c7e92f9255da81a9766b26580561caebcfebcbc6d04065880d92fbc671d97223c3b0be90c8e8944f0216b0684b7345e9 +SHA512 (libreoffice-24.8.0.3.tar.xz) = 92aece843cdc62d161cc78c61deebf3226da073e1bdd3e91a32cc16f06ee7f1435ea5f8b2fdc681500b95e645e744b33860107b5fc6e3ee6323d4cfdfbe18210 +SHA512 (libreoffice-24.8.0.3.tar.xz.asc) = 47238a34c2c39454ba3974bd2757d98c984992147c2dd6a81b01e3aa1a3a26b9620573ecf25d21fcb24598cdf3ec3bfd59284c96c44875dc7fa3371e0918eb81 +SHA512 (libreoffice-help-24.8.0.3.tar.xz) = cc3fc4dec46d62b83b191eb5d9e47163821fd9536914e0613f54e52b7959d066ac4a99e5aefbacdfce6c5584d60ca36cc615a02b4c164ab4a9bbf6c22e58eeb5 +SHA512 (libreoffice-help-24.8.0.3.tar.xz.asc) = 47db6c2eef2c1f3e2b81cf2370f6f08b45bcd946ec79007cbf70bf6b4b2011acb63c9315f81f126de483ad1d3ca56f9fb31433a54b3bc07836ff53fd71db8f65 +SHA512 (libreoffice-translations-24.8.0.3.tar.xz) = 36817a41801a6b112f7a30c9166dfe90c45f756ac6d98530e38cc600365e9fe5e7ad6e0a188138bd013647362e41821c213db4fea22806c921fabcb460414791 +SHA512 (libreoffice-translations-24.8.0.3.tar.xz.asc) = 5ecc4bc66e2f278b83313b5cd7b4816196b45d88f7c52fbd07afb6c0b8fda7b7244a80eb12a0f64ba893316fc078971381db7c4fb8dbadf07cc6fa047ab142e8 SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 -SHA512 (Java-WebSocket-1.5.4.tar.gz) = e195ccaa97a7f167a7b27a28226a0bccde7a5cc3cde9b3e718860bd7ceb86da2c272ec2512cb1d0d893dbd6ac47633978a44a8620a2ffbb0652aaeeb2c4ecb08 +SHA512 (Java-WebSocket-1.5.6.tar.gz) = 452c28af503ec184ece224fadcab0fed718fb6d71856c552160075a287c1473d31aae0ac0094de31619b195d7a5aa0015d03f2f448c8c5af0f21c67b1d9c3ca1