strepsirrhini/libreoffice-compilar
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge 24.8.0.3-fc40

Browse source
This commit is contained in:
Sandino Araico Sánchez 2024-09-08 04:39:50 -06:00
commit 70acecfe01
1 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
rpmbuild/SPECS/libreoffice.spec
View file

@ -1,6 +1,6 @@
# download path contains version without the last (fourth) digit
%global libo_version 24.2.5
%global libo_version 24.8.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.
@ -77,8 +77,8 @@ ExcludeArch: %{ix86}
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
Release: 3+gob.mx1.4%{?dist}
Version: %{libo_version}.3
Release: 4+gob.mx1.4%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
@ -112,7 +112,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
# Fonts GMX (gob.mx)
Source21: https://repos.libreoffice.gob.mx/src/gmx-fonts.tar.gz
@ -293,6 +293,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
@ -328,6 +329,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
@ -353,17 +355,18 @@ 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
#Patch3: 0001-default-to-sifr-for-gnome-light-mode.patch
# backported
Patch4: py313.patch
#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
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
Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch
#Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch
# Patchset gob.mx 1.3
Patch21: libreoffice-24.2.5.2+gobmx1.4-patchset.patch
@ -1582,7 +1585,7 @@ 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
%endif
@ -1615,6 +1618,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
@ -1624,6 +1628,12 @@ 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
%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
%endif
# Pruebas que fallan al poner la opción --with-product-name=Office
#sed -i -e /CppunitTest_sc_subsequent_export_test2/d sc/Module_sc.mk
@ -1634,6 +1644,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
@ -1667,8 +1678,8 @@ export CXXFLAGS="$ARCH_FLAGS -I%{_includedir}/zxcvbn -I%{_includedir}/KF6/KConfi
%define with_lang --with-lang='%{langpack_langs}'
%endif
aclocal -I m4
autoconf
#aclocal -I m4
#autoconf
SMP_MFLAGS=%{?_smp_mflags}
SMP_MFLAGS=$[${SMP_MFLAGS/-j/}]
@ -2157,7 +2168,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
@ -2173,10 +2183,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
@ -2190,7 +2197,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
@ -2264,7 +2270,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
@ -2540,8 +2545,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
@ -2607,7 +2610,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
@ -2871,6 +2874,16 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
## START: Generated by rpmautospec
* Sun Sep 08 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-4+gob.mx1.4
- Merge 24.8.0.3-fc40
* 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
* Wed Jul 31 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.5.2-3+gob.mx1.4
- patchset gob.mx 1.4
@ -5764,5 +5777,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