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

merge backports/centos-9

Browse source
This commit is contained in:
Sandino Araico Sánchez 2024-09-19 02:49:02 -06:00
commit 0e3b2bbb6f
2 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rpmbuild/SOURCES/CentOS-9-std-strcmp.patch Normal file
View file

@ -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;

32
rpmbuild/SPECS/libreoffice.spec
View file

@ -1,6 +1,6 @@
# download path contains version without the last (fourth) digit
%global libo_version 24.8.0
%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.
@ -77,8 +77,8 @@ ExcludeArch: %{ix86}
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.3
Release: 9+gob.mx1.5%{?dist}
Version: %{libo_version}.2
Release: 6+gob.mx1.5.1%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
@ -368,16 +368,15 @@ 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
Patch12: cflags.patch
# Patches for CentOS 9
Patch15: CentOS-9-std-strcmp.patch
# Patchset gob.mx 1.5
Patch21: libreoffice-24.8.0.3+gobmx1.5-patchset.patch
@ -2928,11 +2927,26 @@ 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
* Thu Sep 12 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-9+gob.mx1.5
- Backport to CentOS 9
- Backport 24.8.0.3 + gob.mx 1.5 to CentOS 9
* Mon Sep 09 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-7+gob.mx1.5
- Backport to Fedora 39
- Backport 24.8.0.3 + gob.mx 1.5 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
* Sun Sep 08 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-5+gob.mx1.5
- Actualización del parche gob.mx 1.5