Merge branch 'renich/symlink' into 'backports/centos-9'

cs9: removí un symlink que no sería para nada

See merge request strepsirrhini/libreoffice-compilar!14

Fedora-39

@@ -1 +0,0 @@
-CentOS-9

rpmbuild/SOURCES/CentOS-9-std-strcmp.patch

@@ -0,0 +1,10 @@
+--- libreoffice-24.8.1.2/sw/source/uibase/config/usrpref.cxx.orig	2024-09-18 07:28:47.126523151 -0400
++++ libreoffice-24.8.1.2/sw/source/uibase/config/usrpref.cxx	2024-09-18 07:26:15.439701646 -0400
+@@ -29,6 +29,7 @@
+ #include <com/sun/star/uno/Any.hxx>
+ #include <com/sun/star/uno/Sequence.hxx>
+ #include <unotools/localedatawrapper.hxx>
++#include <cstring>
+ 
+ using namespace utl;
+ using namespace ::com::sun::star;

rpmbuild/SPECS/libreoffice.spec

@@ -1,6 +1,6 @@
 
 # download path contains version without the last (fourth) digit
-%global libo_version 24.2.5
+%global libo_version 24.8.1
 # 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.
@@ -78,7 +78,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        3%{?libo_prerelease}%{?dist}
+Release:        5%{dist}
 # default new files are: MPLv2
 # older files are typically: MPLv2 incorporating work under ASLv2
 # nlpsolver is: LGPLv3
@@ -111,7 +111,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
@@ -253,6 +253,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
@@ -288,6 +289,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
@@ -322,32 +324,19 @@ Patch0: 0001-don-t-suppress-crashes.patch
 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-default-to-sifr-for-gnome-light-mode.patch
-# backported
-Patch4: py313.patch
 # not upstreamed
 # fix FTB in ppc64le from sharkcz
 # https://lists.freedesktop.org/archives/libreoffice/2023-August/090870.html
 Patch11: lo-7.6-ppc64le-tests.patch
-# icu 74 compatibility patch, from gentoo, via arch linux
+Patch12: cflags.patch
-# https://bugs.gentoo.org/917618
+
-# https://bugs.documentfoundation.org/show_bug.cgi?id=158108
+# Patches for CentOS 9
-Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch
+Patch15: CentOS-9-std-strcmp.patch
+
 Patch500: 0001-disable-libe-book-support.patch
 # https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html
 Patch501: kahansum_test_fix_for_aarc64_s390x.patch
 
-# Parches para CentOS 9
-# ICE
-#Patch11: 0001-workaround-x86-ICE-with-gcc-12.patch
-#Patch12: 0001-s390x-canvas-test-fails.patch
-#Patch13: 0001-tdf-144862-use-resolution-independent-positions-for-.patch
-# ICU
-#Patch14: 0001-unistr.patch
-# gpgme
-Patch15: 0001-gpgme.patch
-
 %global instdir %{_libdir}
 %global baseinstdir %{instdir}/libreoffice
 %global sdkinstdir %{baseinstdir}/sdk
@@ -1104,9 +1093,9 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 
 # apply patches
 %autopatch -p1 -M 99
-%if 0%{?rhel}
+#if ! (0%{?fedora} || 0%{?rhel} >= 10)
-%patch -P 500 -p1
+#patch -P 500 -p1
-%endif
+#endif
 
 %ifarch aarch64 s390x ppc64le
 %patch -P 501 -p1
@@ -1137,6 +1126,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
@@ -1144,17 +1134,13 @@ sed -i -e /CppunitTest_sd_png_export_tests/d sd/Module_sd.mk
 sed -i -e s/CustomTarget_uno_test// testtools/Module_testtools.mk
 sed -i -e s/CppunitTest_sw_macros_test// sw/Module_sw.mk
 # https://bugs.documentfoundation.org/show_bug.cgi?id=152943
-sed -i -e s/CppunitTest_sc_ucalc_formula2// sc/Module_sc.mk
+sed -i -e s/CppunitTest_sc_ucalc_formula2// sc/Module_sc.mCppunitTest_sw_layoutwriter2k
+%endif
+%ifarch x86_64
+%if 0%{?rhel} >= 10
+# Test already limited to x86, also fails with x86-64-v3
+sed -i -e 's/defined X86_64/0/' sc/qa/unit/functions_array.cxx
 %endif
-
-%if 0%{?rhel}
-# Pruebas unitarias que fallan en 24.2.0.1
-sed -i -e /CppunitTest_sc_ucalc_formula\ /d sc/Module_sc.mk
-sed -i -e /CppunitTest_sdext_pdfimport/d sdext/Module_sdext.mk
-sed -i -e /CppunitTest_sw_core_layout/d sw/Module_sw.mk
-sed -i -e /CppunitTest_sw_htmlimport/d sw/Module_sw.mk
-sed -i -e /CppunitTest_sw_layoutwriter/d sw/Module_sw.mk # Se borran todas, 1 2 y 3
-sed -i -e /CppunitTest_sw_uiwriter6/d sw/Module_sw.mk
 %endif
 
 
@@ -1162,33 +1148,41 @@ sed -i -e /CppunitTest_sw_uiwriter6/d sw/Module_sw.mk
 rm -f vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff
 
 %if 0%{?rhel}
-# Pruebas unitarias que fallaban en CentOS 8
+# Pruebas unitarias que fallan en 24.8.0
+sed -i -e s/CppunitTest_basic_macros// basic/Module_basic.mk
+sed -i -e /CppunitTest_sc_tiledrendering\ /d sc/Module_sc.mk
+sed -i -e /CppunitTest_sw_tiledrendering\ /d sw/Module_sw.mk
+sed -i -e /CppunitTest_sw_htmlimpor/d sw/Module_sw.mk
+%endif
+
+%if 0%{?rhel}
+# Pruebas unitarias que fallaban desde CentOS 8
 #sed -i -e /CppunitTest_i18nlangtag_test_languagetag/d i18nlangtag/Module_i18nlangtag.mk
 #sed -i -e /CppunitTest_i18npool_test_breakiterator/d i18npool/Module_i18npool.mk
 #sed -i -e /CppunitTest_vcl_text/d vcl/Module_vcl.mk
 #sed -i -e /CppunitTest_writerperfect_writer/d writerperfect/Module_writerperfect.mk 
-# Pruebas unitarias que fallaban en 7.4.6
+# Pruebas unitarias que fallaban desde 7.4.6
 #sed -i -e /CppunitTest_dbaccess_dialog_save/d dbaccess/Module_dbaccess.mk
 #sed -i -e /CppunitTest_dbaccess_empty_stdlib_save/d dbaccess/Module_dbaccess.mk
 sed -i -e /CppunitTest_sdext_pdfimport/d sdext/Module_sdext.mk
 sed -i -e /CppunitTest_sw_uiwriter6/d sw/Module_sw.mk
 # Pruebas unitarias que fallaban en 7.5.0
 sed -i -e /CppunitTest_sw_core_layout/d sw/Module_sw.mk
-# Pruebas unitarias que fallaban en 7.5.1
+# Pruebas unitarias que fallaban desde 7.5.1
 sed -i -e /CppunitTest_sw_layoutwriter2/d  sw/Module_sw.mk
-# Pruebas unitarias que fallan en la 7.5.5
+# Pruebas unitarias que fallan desde 7.5.5
-sed -i -e /CppunitTest_sw_layoutwriter\\s/d  sw/Module_sw.mk
+sed -i -e /CppunitTest_sw_layoutwriter\ /d  sw/Module_sw.mk
-# Pruebas unitarias que fallan en la 7.6.0
+# Pruebas unitarias que fallan desde 7.6.0
 #sed -i -e /CppunitTest_sc_tiledrendering/d sc/Module_sc.mk
-sed -i -e /CppunitTest_sc_ucalc_formula\\s/d sc/Module_sc.mk
+sed -i -e /CppunitTest_sc_ucalc_formula\ /d sc/Module_sc.mk
-# Pruebas unitarias que fallan en la 7.6.2
+# Pruebas unitarias que fallan desde 7.6.2
-sed -i -e /CppunitTest_sw_htmlimport/d  sw/Module_sw.mk
 sed -i -e /CppunitTest_sw_layoutwriter3/d  sw/Module_sw.mk
 
 %endif
 
 # 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
@@ -1222,8 +1216,8 @@ export CXXFLAGS="$ARCH_FLAGS -I%{_includedir}/zxcvbn -I%{_includedir}/KF6/KConfi
 %define with_lang --with-lang='%{langpack_langs}'
 %endif
 
-aclocal -I m4
+#aclocal -I m4
-autoconf
+#autoconf
 
 SMP_MFLAGS=%{?_smp_mflags}
 SMP_MFLAGS=$[${SMP_MFLAGS/-j/}]
@@ -1251,7 +1245,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 \
@@ -1262,7 +1255,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} \
@@ -1705,7 +1697,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
@@ -1721,10 +1712,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
@@ -1738,7 +1726,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
@@ -1812,7 +1799,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
@@ -2088,8 +2074,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
@@ -2151,7 +2135,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
@@ -2415,6 +2399,27 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Wed Sep 18 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.1.2-5
+- Backport 24.8.1.2 to CentOS 9
+
+* Sat Sep 14 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.1.2-3
+- Backport 24.8.1.2 to Fedora 39
+
+* Wed Sep 11 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.8.1.2-1
+- 24.8.1.2
+
+* Tue Sep 10 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-8
+- Backport 24.8.0.3 to CentOS 9
+
+* Mon Sep 09 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-6
+- Backport 24.8.0.3 to Fedora 39
+
+* Fri Sep 06 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.8.0.3-3
+- 24.8.0.3
+
+* Fri Aug 30 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.8.0.3-2
+- RPMAUTOSPEC: unresolvable merge
+
 * Fri Jul 26 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.5.2-3
 - Backport to CentOS 9
 
@@ -5390,4 +5395,3 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
 * Wed Sep 29 2010 Caolán McNamara <caolanm@redhat.com> 3.2.99.1-1
 - initial import of the leviathan
 
-## END: Generated by rpmautospec