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

merge gob.mx-1.3-24.2.4.2-el9

Browse source
This commit is contained in:
Sandino Araico Sanchez 2024-06-28 23:47:35 -06:00
commit 816ed9aca5
No known key found for this signature in database
GPG key ID: 90E64E484EED133A
45 changed files with 740 additions and 32613 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
CentOS-8/SOURCES/0001-gpgme.patch
View file

@ -1,25 +0,0 @@
From 1e4bed0bedcb90425ca1cb6be74153c68c1b40bc Tue Mar 29 00:00:00 2022
From: <saraico@ugd.gob.mx>
Date: Tue Mar 29 00:00:00 2022
Subject: [PATCH] compatibility with gpgme-1.13.1
Change-Id: 1e4bed0bedcb90425ca1cb6be74153c68c1b40bc
---
xmlsecurity/source/gpg/CertificateImpl.cxx | 5 +----
1 file changed, 1 additions(+), 4 deletions(-)
diff -uri a/xmlsecurity/source/gpg/CertificateImpl.cxx b/xmlsecurity/source/gpg/CertificateImpl.cxx
index 0000000..e28482c 100644
--- a/xmlsecurity/source/gpg/CertificateImpl.cxx 2022-02-28 12:19:33.000000000 -0600
+++ b/xmlsecurity/source/gpg/CertificateImpl.cxx 2022-03-29 15:07:40.000000000 -0600
@@ -215,9 +215,7 @@
ctx->setArmor(false); // caller will base64-encode anyway
GpgME::Error err = ctx->exportPublicKeys(
key.primaryFingerprint(),
- data_out,
- officecfg::Office::Common::Security::OpenPGP::MinimalKeyExport::get()
- ? GpgME::Context::ExportMinimal : 0
+ data_out
);
if (err)

22
CentOS-8/SOURCES/0001-unistr.patch
View file

@ -1,22 +0,0 @@
From b4b20ade990d7cf75c4dc742af9770f0068f7948 Tue Mar 29 00:00:00 2022
From: <saraico@ugd.gob.mx>
Date: Tue Mar 29 00:00:00 2022
Subject: [PATCH] aggregate 'icu_60::UnicodeString aResult'
Change-Id: b4b20ade990d7cf75c4dc742af9770f0068f7948
---
i18nlangtag/source/languagetag/languagetagicu.cxx | 1 +
1 file changed, 1 additions(+)
diff --git a/i18nlangtag/source/languagetag/languagetagicu.cxx b/i18nlangtag/source/languagetag/languagetagicu.cxx
index 0000000..5e64791 100644
--- a/i18nlangtag/source/languagetag/languagetagicu.cxx 2022-02-28 12:19:33.000000000 -0600
+++ b/i18nlangtag/source/languagetag/languagetagicu.cxx 2022-03-29 04:34:25.000000000 -0600
@@ -9,6 +9,7 @@
#include <i18nlangtag/languagetagicu.hxx>
#include <i18nlangtag/languagetag.hxx>
+#include <unicode/unistr.h>
// static

248
CentOS-8/SPECS/coolwsd.spec
View file

@ -1,248 +0,0 @@
# spec file for package coolwsd
#
# Copyright (c) 2015 Collabora
#
# This file is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
%if 0%{?name_suffix:1}
Name: coolwsd%{name_suffix}
%else
Name: coolwsd
%endif
Version: 22.05.5.4
Release: 1%{?dist}
Vendor: %{vendor}
Summary: Collabora Online WebSocket Daemon
License: EULA
Source0: coolwsd-22.05.5.4.tar.gz
BuildRequires: cppunit-devel
BuildRequires: fontconfig
BuildRequires: gcc-c++
BuildRequires: libcap-devel
BuildRequires: libpng-devel
BuildRequires: m4
BuildRequires: make
BuildRequires: nodejs
BuildRequires: npm
BuildRequires: pam-devel
BuildRequires: poco-devel
BuildRequires: python3
BuildRequires: systemd-rpm-macros
# Red Hat and CentOS
%if 0%{?rhel} == 7
BuildRequires: libpcap kernel-headers python36-polib python36-lxml
%endif
%if 0%{?rhel} == 8
BuildRequires: libpcap kernel-headers python3-polib python3-lxml
%endif
# openSUSE Leap 15.x, SLES12, SLES15
%if 0%{?suse_version}
BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros python3-polib python3-lxml
%endif
Requires: libreoffice
Requires: libreoffice-calc
Requires: libreoffice-core
Requires: libreoffice-draw
Requires: libreoffice-graphicfilter
Requires: libreoffice-impress
Requires: libreoffice-langpack-en
Requires: libreoffice-math
Requires: libreoffice-pdfimport
Requires: libreoffice-ure
Requires: libreoffice-writer
Requires(post): coreutils grep sed cpio
%if 0%{?rhel}
# coolwsd dependencies
Requires: systemd expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc libpng libselinux openssh-clients openssl-libs pcre xz-libs zlib
# Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
Requires: expat fontconfig freetype libuuid bzip2-libs
%endif
%if 0%{?suse_version}
# coolwsd dependencies
Requires(post): libcap-progs
Requires: systemd libopenssl1_0_0 libpcre1 libz1 libcap2 libpng12-0 %{fillup_prereq}
# Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
# cd /usr/lib64/libreoffice/program ; for i in soffice.bin *.so ;do ldd $i | grep '=>' | sed -e "s/^.*=> //" -e "s/ [(].*$//"; done | sort | uniq | xargs rpm -qf --qf="%{NAME}\n" | sort | uniq | grep -v libreoffice
Requires: fontconfig libbz2-1 libexpat1 libfreetype6 libpng16-16 libuuid1 openssh
%endif
%description
%if 0%{?suse_version}
%debug_package
%endif
%prep
%setup -n coolwsd-22.05.5.4
%build
# usando versión marrana (incluyendo una librería embebida)
%configure \
--enable-silent-rules \
--with-lokit-path=bundled/include \
--with-lo-path=/usr/lib64/libreoffice \
--disable-setcap \
%if 0%{?config_options:1}
%{config_options}
%endif
env BUILDING_FROM_RPMBUILD=yes make %{?_smp_mflags}
%check
#env BUILDING_FROM_RPMBUILD=yes make check
%install
env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot}
install -d -m 755 %{buildroot}/var/adm/fillup-templates
%if 0%{?rhel}
install -D -m 444 coolwsd.service %{buildroot}%{_unitdir}/coolwsd.service
# systemd in RHEL 7 does not understand these options
%if 0%{?rhel} <= 7
sed -i "/^ReadWritePaths/d;/^ProtectControlGroups/d;/^ProtectSystem/d" %{buildroot}%{_unitdir}/coolwsd.service
%endif
install -D -m 644 sysconfig.coolwsd %{buildroot}/etc/sysconfig/coolwsd
install -d -m 755 %{buildroot}/etc/httpd/conf
install -D -m 755 etc/apache2/coolwsd.conf %{buildroot}/etc/httpd/conf
rm %{buildroot}/etc/apache2/conf-available/coolwsd.conf
%endif
%if 0%{?suse_version}
install -D -m 444 coolwsd.service %{buildroot}%{_unitdir}/coolwsd.service
install -D -m 644 sysconfig.coolwsd %{buildroot}/var/adm/fillup-templates
%endif
mkdir -p %{buildroot}/etc/pam.d
echo "auth required pam_unix.so" > %{buildroot}/etc/pam.d/coolwsd
echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/coolwsd
%files
%defattr(-,root,root,-)
/usr/bin/coolwsd
/usr/bin/loolwsd
/usr/bin/coolwsd-systemplate-setup
/usr/bin/loolwsd-systemplate-setup
/usr/bin/coolwsd-generate-proof-key
/usr/bin/coolforkit
/usr/bin/coolconvert
/usr/bin/coolconfig
/usr/bin/loolconfig
/usr/bin/coolmount
/usr/share/coolwsd/discovery.xml
/usr/share/coolwsd/favicon.ico
/usr/share/coolwsd/browser
/usr/share/doc/coolwsd/README
/usr/share/doc/coolwsd/README.vars
/usr/share/doc/coolwsd/metrics.txt
/usr/share/doc/coolwsd/protocol.txt
/usr/share/doc/coolwsd/reference.md
/usr/share/man/man1/coolwsd.1.gz
/usr/share/man/man1/coolforkit.1.gz
/usr/share/man/man1/coolconvert.1.gz
/usr/share/man/man1/coolconfig.1.gz
/usr/share/man/man1/coolwsd-systemplate-setup.1.gz
/usr/share/man/man1/coolwsd-generate-proof-key.1.gz
/usr/share/man/man1/coolmount.1.gz
%{_unitdir}/coolwsd.service
%if 0%{?rhel}
%config(noreplace) /etc/sysconfig/coolwsd
%endif
%if 0%{?suse_version}
/var/adm/fillup-templates/sysconfig.coolwsd
%endif
%config(noreplace) /etc/pam.d/coolwsd
%config(noreplace) %attr(640, cool, root) /etc/coolwsd/coolwsd.xml
%config /etc/coolwsd/coolkitconfig.xcu
%config(noreplace) /etc/nginx/snippets/coolwsd.conf
%if 0%{?suse_version} > 0
%config(noreplace) /etc/apache2/conf-available/coolwsd.conf
%endif
%if 0%{?rhel} > 0
%config(noreplace) /etc/httpd/conf/coolwsd.conf
%endif
%doc README.md
%pre
%if 0%{?suse_version}
%service_add_pre coolwsd.service
%endif
getent group cool >/dev/null || groupadd -r cool
getent passwd cool >/dev/null || useradd -g cool -r cool -d /opt/cool -s /bin/bash
# for filename in `find /opt/cool/systemplate -type f`;do stripped=$(echo -ne $filename | sed -e "s|/opt/cool/systemplate||");rpm -qf --qf="%{NAME}\n" $stripped;done | grep -v devel | grep -v 32bit | grep -v -- -fonts | sort | uniq
%triggerin -- expat fontconfig freetype freetype2 glibc glibc-locale kernel keyutils-libs krb5 krb5-libs libbz2-1 libcap libcap-ng libcap2 libexpat1 libfreetype6 libgcc libgcc_s1 libgcrypt libiscsi libpng libpng12 libpng12-0 libpng15-15 libpng16-16 libstdc++ libstdc++6 libuuid libuuid1 libz1 lsb nss-mdns nss-softokn-freebl pcre sssd sssd-client systemd-libs timezone tzdata zlib
echo -ne "Triggered update of coolwsd systemplate..."
%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1300
systemctl is-active -q coolwsd && COOLWSD_IS_ACTIVE=1 || COOLWSD_IS_ACTIVE=0
if [ $COOLWSD_IS_ACTIVE == "1" ]; then systemctl stop coolwsd; fi
%endif
# Figure out where LO is installed, let's hope it is not a mount point
# Create a directory for coolwsd on the same file system
loroot=/usr/lib64/libreoffice
coolparent=`cd ${loroot} && cd .. && /bin/pwd`
rm -rf ${coolparent}/cool
mkdir -p ${coolparent}/cool/child-roots
chown cool:cool ${coolparent}/cool
chown cool:cool ${coolparent}/cool/child-roots
fc-cache ${loroot}/share/fonts/truetype
coolwsd-systemplate-setup ${coolparent}/cool/systemplate ${loroot} >/dev/null 2>&1
coolwsd-generate-proof-key >/dev/null 2>&1
%if 0%{?rhel} || 0%{?suse_version}
if [ $COOLWSD_IS_ACTIVE == "1" ]; then systemctl start coolwsd; fi
%endif
echo " Done."
%post
setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit
setcap cap_sys_admin=ep /usr/bin/coolmount
if [ -f /etc/loolwsd/loolwsd.xml ]; then /usr/bin/coolconfig migrateconfig --write; fi
%if 0%{?rhel} >= 7
%systemd_post coolwsd.service
%else
%if 0%{?suse_version}
%service_add_post coolwsd.service
%{fillup_only -n coolwsd}
%endif
%endif
%preun
%if 0%{?rhel} >= 7
%systemd_preun coolwsd.service
%else
%if 0%{?suse_version}
%service_del_preun coolwsd.service
%endif
%endif
%postun
%if 0%{?rhel} >= 7
%systemd_postun coolwsd.service
%else
%if 0%{?suse_version}
%service_del_postun coolwsd.service
%endif
%endif
%changelog
* Mon Aug 03 2015 Mihai Varga
- added the cronjob
* Tue May 19 2015 Tor Lillqvist
- Initial RPM release

1
Fedora-38
View file

@ -1 +0,0 @@
rpmbuild

62
rpmbuild/SOURCES/0001-Archivos-de-distro-config-de-brand-Office.patch
View file

@ -1,62 +0,0 @@
From 949ec941fcea1ae18aa602a2ea105d8e4d46d792 Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Tue, 20 Jun 2023 02:26:13 -0400
Subject: [PATCH 01/19] Archivos de distro-config de brand Office
Change-Id: I290939038b4fedf7a03f3ce68250966766a57e2b
---
distro-configs/OfficeLinux.conf | 10 ++++++++++
distro-configs/OfficeWin64.conf | 24 ++++++++++++++++++++++++
2 files changed, 34 insertions(+)
create mode 100644 distro-configs/OfficeLinux.conf
create mode 100644 distro-configs/OfficeWin64.conf
diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf
new file mode 100644
index 000000000000..6cb4bd4dca66
--- /dev/null
+++ b/distro-configs/OfficeLinux.conf
@@ -0,0 +1,10 @@
+--with-parallelism
+--with-branding=custom_images
+--enable-release-build
+--enable-epm
+--with-package-format=deb
+--with-product-name=Office
+--with-vendor=INFOTEC
+--with-vendor=INFOTEC
+--with-package-version=7.5.0.0
+--disable-community-flavor
diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf
new file mode 100644
index 000000000000..01ad659c2af3
--- /dev/null
+++ b/distro-configs/OfficeWin64.conf
@@ -0,0 +1,24 @@
+--with-ant-home=/cygdrive/c/sources/apache-ant-1.9.5
+--with-visual-studio=2022
+--with-jdk-home=C:\Program Files\Microsoft\jdk-11.0.12.7-hotspot
+--host=x86_64-pc-cygwin
+--without-junit
+--without-helppack-integration
+--enable-extension-integration
+--enable-scripting-beanshell
+--enable-scripting-javascript
+--enable-ext-wiki-publisher
+--enable-ext-nlpsolver
+--with-myspell-dicts
+--with-package-format=msi
+--enable-mergelibs
+--enable-lto
+--enable-odk
+--without-ucrt-dir
+--enable-release-build
+--with-lang=es
+--with-branding=custom_images
+--with-product-name=Office
+--with-vendor=INFOTEC
+--with-package-version=7.5.0.0
+--disable-community-flavor
--
2.43.0

145
rpmbuild/SOURCES/0001-disable-libe-book-support.patch
View file

@ -1,145 +0,0 @@
From 0b613b941c3ffbe432934269f8865bc1f9e59cde Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Tue, 27 Sep 2022 15:13:59 -0700
Subject: [PATCH] disable libe-book support
---
configure.ac | 3 ---
external/Module_external.mk | 1 -
filter/Configuration_filter.mk | 8 --------
writerperfect/Library_wpftwriter.mk | 2 --
writerperfect/qa/unit/WpftFilterFixture.hxx | 4 ----
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 5 -----
writerperfect/source/writer/wpftwriter.component | 6 ------
7 files changed, 29 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8babc85..e7733de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9606,9 +9606,6 @@ libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10])
libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
-libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
-
libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0])
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 366fff2..bc987d1 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,CURL,curl) \
$(call gb_Helper_optional,DRAGONBOX,dragonbox) \
dtoa \
- $(call gb_Helper_optional,EBOOK,libebook) \
$(call gb_Helper_optional,EPM,epm) \
$(call gb_Helper_optional,EPOXY,epoxy) \
$(call gb_Helper_optional,EPUBGEN,libepubgen) \
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index a58b839..526b447 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -359,10 +359,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
writer_OOXML_Template \
writer_layout_dump_xml \
writer_indexing_export_xml \
- writer_BroadBand_eBook \
- writer_FictionBook_2 \
- writer_PalmDoc \
- writer_Plucker_eBook \
writer_ApplePages \
MWAW_Text_Document \
Palm_Text_Document \
@@ -409,10 +405,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
OOXML_Text_Template \
writer_layout_dump \
writer_indexing_export \
- BroadBand_eBook \
- FictionBook_2 \
- PalmDoc \
- Plucker_eBook \
ApplePages \
MWAW_Text_Document \
Palm_Text_Document \
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
index 840a86f..70a8933 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -64,7 +64,6 @@ endif
$(eval $(call gb_Library_use_externals,wpftwriter,\
abw \
boost_headers \
- ebook \
$(if $(ENABLE_WASM_STRIP_SWEXPORTS),,etonyek) \
icu_headers \
icui18n \
@@ -93,7 +92,6 @@ endif
ifneq ($(ENABLE_WASM_STRIP_SWEXPORTS),TRUE)
$(eval $(call gb_Library_add_exception_objects,wpftwriter,\
writerperfect/source/writer/AbiWordImportFilter \
- writerperfect/source/writer/EBookImportFilter \
writerperfect/source/writer/MSWorksImportFilter \
writerperfect/source/writer/MWAWImportFilter \
writerperfect/source/writer/PagesImportFilter \
diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx
index 2fdd6a2..dbdd672 100644
--- a/writerperfect/qa/unit/WpftFilterFixture.hxx
+++ b/writerperfect/qa/unit/WpftFilterFixture.hxx
@@ -25,10 +25,6 @@
|| ((major) == (req_major) \
&& ((minor) > (req_minor) || ((minor) == (req_minor) && ((micro) >= (req_micro)))))
-#define REQUIRE_EBOOK_VERSION(major, minor, micro) \
- REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, \
- micro)
-
#define REQUIRE_ETONYEK_VERSION(major, minor, micro) \
REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, \
minor, micro)
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 78d24dc..39924f9 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -30,9 +30,6 @@ WpftWriterFilterTest::WpftWriterFilterTest()
void WpftWriterFilterTest::test()
{
- const writerperfect::test::WpftOptionalMap_t aEBookOptional{
- { "FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1) },
- };
const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
{ "Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2) },
{ "Pages_5.pages", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
@@ -59,8 +56,6 @@ void WpftWriterFilterTest::test()
doTest("com.sun.star.comp.Writer.AbiWordImportFilter",
u"/writerperfect/qa/unit/data/writer/libabw/");
- doTest("org.libreoffice.comp.Writer.EBookImportFilter",
- u"/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional);
doTest("com.sun.star.comp.Writer.MSWorksImportFilter",
u"/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional);
doTest("com.sun.star.comp.Writer.MWAWImportFilter",
diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component
index 176d487..0c89217 100644
--- a/writerperfect/source/writer/wpftwriter.component
+++ b/writerperfect/source/writer/wpftwriter.component
@@ -42,12 +42,6 @@
<service name="com.sun.star.document.ImportFilter"/>
<optional/>
</implementation>
- <implementation name="org.libreoffice.comp.Writer.EBookImportFilter"
- constructor="org_libreoffice_comp_Writer_EBookImportFilter_get_implementation">
- <service name="com.sun.star.document.ExtendedTypeDetection"/>
- <service name="com.sun.star.document.ImportFilter"/>
- <optional/>
- </implementation>
<implementation name="org.libreoffice.comp.Writer.PagesImportFilter"
constructor="org_libreoffice_comp_Writer_PagesImportFilter_get_implementation">
<service name="com.sun.star.document.ExtendedTypeDetection"/>
--
2.31.1

37
rpmbuild/SOURCES/0001-don-t-suppress-crashes.patch
View file

@ -1,37 +0,0 @@
From a6f2cba43d79347b6975b3b8069b423c94a7dba6 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 8 Nov 2016 11:50:06 +0100
Subject: [PATCH] don't suppress crashes
An automatic restart after a crash makes the crash invisible to abrt.
Change-Id: I3854e619356049b144b08575879d289a3c12e4c9
---
desktop/source/app/app.cxx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c54aea9dd4f7..a613fe12cef2 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1165,8 +1165,6 @@
if( bRestart )
{
RequestHandler::Disable();
- if( pSignalHandler )
- osl_removeSignalHandler( pSignalHandler );
restartOnMac(false);
#if !ENABLE_WASM_STRIP_SPLASH
@@ -1174,7 +1172,7 @@
m_rSplashScreen->reset();
#endif
- _exit( EXITHELPER_CRASH_WITH_RESTART );
+ return;
}
else
{
--
2.29.2

94
rpmbuild/SOURCES/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch
View file

@ -1,94 +0,0 @@
From 496a343b1763119913e00e671f2e0b3694d36af2 Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Tue, 20 Jun 2023 02:29:16 -0400
Subject: [PATCH 02/19] Modificacion al build y borrado UPDATEURL
Change-Id: I10a2d0a01ceb02d5d7f5267dcb97eb25ce6600d7
---
instsetoo_native/util/openoffice.lst.in | 73 +++++++++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index b5da0bfb6697..454670cb1e15 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -193,3 +193,76 @@ LibreOfficeDev_SDK
include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath}
}
}
+
+
+Office
+{
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME Office
+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ POSTVERSIONEXTENSION
+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ USERDIRPRODUCTVERSION 4
+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ PCPFILENAME libreoffice.pcp
+ UPDATEURL
+ ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
+ ADDSYSTEMINTEGRATION 1
+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ PACKAGEREVISION {buildid}
+ LICENSENAME LGPL
+ ROOTMODULEGID gid_Module_Root
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ CHANGETARGETDIR 1
+ PATCHCODEFILE ooo_patchcodes.txt
+ }
+ active 1
+ compression 5
+ script setup_osl
+ downloadname Office_{productversion}_{os}_install_{languages}
+ langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages}
+ helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages}
+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath}
+ }
+}
+
+Office_SDK
+{
+ Settings
+ {
+ downloadname LibreOffice-SDK_{packageversion}_{os}_install_{languages}
+ variables
+ {
+ PRODUCTNAME Office
+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ POSTVERSIONEXTENSION SDK
+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@.SDK
+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ PACKAGEREVISION {buildid}
+ PACK_INSTALLED 1
+ DMG_VOLUMEEXTENSION SDK
+ DATABASENAME office40sdk
+ NO_README_IN_ROOTDIR 1
+ LICENSENAME LGPL
+ IGNOREDIRECTORYLAYER 1
+ NOVERSIONINDIRNAME 0
+ NOSPACEINDIRECTORYNAME 1
+ NOSHORTDIRECTORYNAMES 1
+ CHANGETARGETDIR 1
+ DONTUSESTARTMENUFOLDER 1
+ }
+ active 1
+ compression 5
+ script sdkoo
+ include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath}
+ }
+}
+
--
2.43.0

2569
rpmbuild/SOURCES/0003-Custom-images-and-referencies-added.patch
View file

File diff suppressed because it is too large Load diff

5074
rpmbuild/SOURCES/0008-Cambios-en-logo.patch
View file

File diff suppressed because it is too large Load diff

27
rpmbuild/SOURCES/0009-Modificado-link-de-descarga-de-fuentes.patch
View file

@ -1,27 +0,0 @@
From 1ac67cb5a0e52f49b4321c85f61d1051d7fbfd12 Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Fri, 4 Aug 2023 20:21:33 -0600
Subject: [PATCH 09/19] Modificado link de descarga de fuentes
Change-Id: I80b8e9ea4286d68c1880ef45eaa191a8f0c3e7d2
---
Makefile.fetch | 2 +-
fonts/gmx-fonts.tar.gz | Bin 0 -> 2409292 bytes
fonts/gmx-fonts.tar.xz | Bin 1172924 -> 0 bytes
3 files changed, 1 insertion(+), 1 deletion(-)
create mode 100644 fonts/gmx-fonts.tar.gz
delete mode 100644 fonts/gmx-fonts.tar.xz
diff --git a/Makefile.fetch b/Makefile.fetch
index b0443f367007..ede18af4197d 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -244,7 +244,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
$(foreach item, \
$(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \
- ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item)))
+ ,$(call fetch_Download_item,https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/tree/logos/fonts,$(item)))
@mkdir -p $(dir $@) && touch $@
@mkdir -p $(dir $@)/Executable

25
rpmbuild/SOURCES/0010-Restauracion-link-repos-src.patch
View file

@ -1,25 +0,0 @@
From 7d3e05d8b427c2fab3fc448dc7a940e86d4b70f6 Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Tue, 8 Aug 2023 07:51:52 +0000
Subject: [PATCH 10/19] Restauracion link repos/src
---
Makefile.fetch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.fetch b/Makefile.fetch
index ede18af4197d..b0443f367007 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -244,7 +244,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
$(foreach item, \
$(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \
- ,$(call fetch_Download_item,https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/tree/logos/fonts,$(item)))
+ ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item)))
@mkdir -p $(dir $@) && touch $@
@mkdir -p $(dir $@)/Executable
--
2.43.0

2536
rpmbuild/SOURCES/0011-logo-image-updated.patch
View file

File diff suppressed because one or more lines are too long

21
rpmbuild/SOURCES/0012-Update-OfficeLinux.conf-with-lang-es.patch
View file

@ -1,21 +0,0 @@
From f6c2af7e2243a0af07b747141d8a627bff8b6608 Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Wed, 8 Nov 2023 19:42:40 +0000
Subject: [PATCH 12/19] Update OfficeLinux.conf --with-lang=es
---
distro-configs/OfficeLinux.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf
index 6cb4bd4dca66..30550375e27a 100644
--- a/distro-configs/OfficeLinux.conf
+++ b/distro-configs/OfficeLinux.conf
@@ -8,3 +8,4 @@
--with-vendor=INFOTEC
--with-package-version=7.5.0.0
--disable-community-flavor
+--with-lang=es
--
2.43.0

30
rpmbuild/SOURCES/0013-Update-OfficeLinux.conf.patch
View file

@ -1,30 +0,0 @@
From b16027a845a86c48275271f728e54ac7d7660b25 Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Wed, 8 Nov 2023 23:23:27 +0000
Subject: [PATCH 13/19] Update OfficeLinux.conf
---
distro-configs/OfficeLinux.conf | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf
index 30550375e27a..8f9dc46b2814 100644
--- a/distro-configs/OfficeLinux.conf
+++ b/distro-configs/OfficeLinux.conf
@@ -1,11 +1,8 @@
--with-parallelism
+--enable-dbgutil
+--without-doxygen
--with-branding=custom_images
---enable-release-build
---enable-epm
---with-package-format=deb
--with-product-name=Office
--with-vendor=INFOTEC
---with-vendor=INFOTEC
--with-package-version=7.5.0.0
---disable-community-flavor
--with-lang=es
--
2.43.0

65
rpmbuild/SOURCES/0014-fix-error-make-install.patch
View file

@ -1,65 +0,0 @@
From 889bda7eca1952afc206420fb1af465a4f34ce3b Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Mon, 13 Nov 2023 11:23:10 -0600
Subject: [PATCH 14/19] fix error make install
Change-Id: I590a323ec835f16badf1889f4c09d00fee3d3999
---
instsetoo_native/util/openoffice.lst.in | 44 +++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 454670cb1e15..de7de46a22ff 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -266,3 +266,47 @@ Office_SDK
}
}
+OfficeDev
+{
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME OfficeDev
+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@
+ UNIXBASISROOTNAME libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ POSTVERSIONEXTENSION
+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ USERDIRPRODUCTVERSION 4
+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ DEVELOPMENTPRODUCT 1
+ BASISPACKAGEPREFIX lodevbasis
+ UREPACKAGEPREFIX libreofficedev
+ SOLSUREPACKAGEPREFIX libreofficedev
+ REGISTRYLAYERNAME LayerDev
+ UPDATEURL https://update.libreoffice.org/check.php
+ ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
+ ADDSYSTEMINTEGRATION 1
+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ PACKAGEREVISION {buildid}
+ LICENSENAME LGPL
+ ROOTMODULEGID gid_Module_Root
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ CHANGETARGETDIR 1
+ PATCHCODEFILE ooodev_patchcodes.txt
+ CODEFILENAME codes_ooodev.txt
+ LOCALUSERDIR $ORIGIN/..
+ }
+ active 1
+ compression 5
+ script setup_osl
+ downloadname LibreOfficeDev_{productversion}_{os}_install_{languages}
+ langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
+ helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath}
+ }
+}
--
2.43.0

2536
rpmbuild/SOURCES/0015-Cambios-en-logo.patch
View file

File diff suppressed because one or more lines are too long

7656
rpmbuild/SOURCES/0016-Felipe-Carrillo-Puerto-image-added.patch
View file

File diff suppressed because one or more lines are too long

44
rpmbuild/SOURCES/0017-Restaurar-el-cambio-de-copyright.patch
View file

@ -1,44 +0,0 @@
From b245b6bf0d1dd76214aacdcc471d09967770fbbd Mon Sep 17 00:00:00 2001
From: Octavio Alvarez <alvarezp@ugd.gob.mx>
Date: Tue, 12 Mar 2024 05:38:32 +0000
Subject: [PATCH 17/19] Restaurar el cambio de copyright.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Israel observó que el copyright en el archivo
external/more_fonts/UnpackedTarball_gmx.mk fue regenerado
incorrectamente. Durante una limpia de commits este cambio fue retirado.
Con este commit restauro el cambio original de Israel para dar la
atribución correspondiente.
Change-Id: Ib25131be3e3605715a9b1b20fb060c3aae9be252
---
external/more_fonts/UnpackedTarball_gmx.mk | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/external/more_fonts/UnpackedTarball_gmx.mk b/external/more_fonts/UnpackedTarball_gmx.mk
index ac8020494d7e..28b53b415a2a 100644
--- a/external/more_fonts/UnpackedTarball_gmx.mk
+++ b/external/more_fonts/UnpackedTarball_gmx.mk
@@ -1,14 +1,11 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
-# This file is part of the LibreOffice project.
+# This file is part of the GobMX project.
#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_gmx))
$(eval $(call gb_UnpackedTarball_set_tarball,font_gmx,$(FONT_GMX_TARBALL)))
-# vim: set noet sw=4 ts=4:
\ No newline at end of file
+# vim: set noet sw=4 ts=4:
--
2.43.0

47
rpmbuild/SOURCES/0018-Eliminar-with-package-version-de-nuestras-distro-con.patch
View file

@ -1,47 +0,0 @@
From a02a3c6e9ac60b544c8b5e2f80464780f0b0a897 Mon Sep 17 00:00:00 2001
From: Octavio Alvarez <alvarezp@ugd.gob.mx>
Date: Tue, 12 Mar 2024 05:44:12 +0000
Subject: [PATCH 18/19] Eliminar --with-package-version de nuestras
distro-configs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
En el issue #7 [1] se reporta que --with-package-version está indicado
de manera fija en nuestras configuraciones de distro-config. Se acordó
que estas líneas deberían establecerse sólo durante la compilación o
durante una rama, más no en master.
Este commit eliminar ambas líneas.
[1] https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/issues/7
Change-Id: I043f42b9bc14d6f6bbf38776f3de73741cc201cd
---
distro-configs/OfficeLinux.conf | 1 -
distro-configs/OfficeWin64.conf | 1 -
2 files changed, 2 deletions(-)
diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf
index 8f9dc46b2814..ce64682af1fa 100644
--- a/distro-configs/OfficeLinux.conf
+++ b/distro-configs/OfficeLinux.conf
@@ -4,5 +4,4 @@
--with-branding=custom_images
--with-product-name=Office
--with-vendor=INFOTEC
---with-package-version=7.5.0.0
--with-lang=es
diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf
index 01ad659c2af3..032d5c70803a 100644
--- a/distro-configs/OfficeWin64.conf
+++ b/distro-configs/OfficeWin64.conf
@@ -20,5 +20,4 @@
--with-branding=custom_images
--with-product-name=Office
--with-vendor=INFOTEC
---with-package-version=7.5.0.0
--disable-community-flavor
--
2.43.0

37
rpmbuild/SOURCES/0019-Eliminar-with-jdk-home-de-nuestras-distro-configs.patch
View file

@ -1,37 +0,0 @@
From ebe9b8a133ab8b9e5f76cd5d06e9273a39ed4b74 Mon Sep 17 00:00:00 2001
From: Octavio Alvarez <alvarezp@ugd.gob.mx>
Date: Tue, 12 Mar 2024 05:50:09 +0000
Subject: [PATCH 19/19] Eliminar --with-jdk-home de nuestras distro-configs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
En el issue #8 [1] se reporta que --with-jdk-home está indicado
de manera fija en nuestras configuraciones de distro-config, lo cual casa la
compilación a una ruta que depende de cada sistema. Se acordó que estas
líneas deberían establecerse sólo durante la compilación.
Este commit elimina la línea del archivo OfficeLinux.conf. Aún cuando el
issue indica que también estaba en OfficeWin64.conf, esto no es correcto.
[1] https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/issues/8
Change-Id: Ie953e5a5747d49454dad2b7e9e0194b79a3c5851
---
distro-configs/OfficeWin64.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf
index 032d5c70803a..25996d9d6710 100644
--- a/distro-configs/OfficeWin64.conf
+++ b/distro-configs/OfficeWin64.conf
@@ -1,6 +1,5 @@
--with-ant-home=/cygdrive/c/sources/apache-ant-1.9.5
--with-visual-studio=2022
---with-jdk-home=C:\Program Files\Microsoft\jdk-11.0.12.7-hotspot
--host=x86_64-pc-cygwin
--without-junit
--without-helppack-integration
--
2.43.0

51
rpmbuild/SOURCES/7.4.6-unit-tests.patch
View file

@ -1,51 +0,0 @@
From 2f5a4af93c352a091852a8230b71720c0ec7c14c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= <sandino@sandino.net>
Date: Sun, 7 May 2023 00:27:38 -0400
Subject: [PATCH] Se quitaron las pruebas unitarias que fallan en CentOS 9
---
dbaccess/Module_dbaccess.mk | 2 --
sdext/Module_sdext.mk | 1 -
sw/Module_sw.mk | 1 -
3 files changed, 4 deletions(-)
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 436f591c7a07..2e8b1b77aaed 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -49,8 +49,6 @@ endif
ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_check_targets,dbaccess,\
- CppunitTest_dbaccess_dialog_save \
- CppunitTest_dbaccess_empty_stdlib_save \
CppunitTest_dbaccess_nolib_save \
CppunitTest_dbaccess_macros_test \
CppunitTest_dbaccess_hsqlschema_import \
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index fd1d191b4939..d9ba2fbccc63 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
endif
$(eval $(call gb_Module_add_check_targets,sdext,\
- CppunitTest_sdext_pdfimport \
Executable_pdf2xml \
Executable_pdfunzip \
))
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 951b620aba5c..97c6235f67e0 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uiwriter3 \
CppunitTest_sw_uiwriter4 \
CppunitTest_sw_uiwriter5 \
- CppunitTest_sw_uiwriter6 \
CppunitTest_sw_uiwriter7 \
CppunitTest_sw_layoutwriter \
CppunitTest_sw_layoutwriter2 \
--
2.39.1

76
rpmbuild/SOURCES/7.5.0-unit-tests.patch
View file

@ -1,76 +0,0 @@
From bf9a05748d0b4863276f920b39668e919ebeca21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= <sandino@sandino.net>
Date: Sun, 7 May 2023 20:55:21 -0400
Subject: [PATCH 1/2] Se quitaron las pruebas unitarias que fallan en CentOS 9
---
dbaccess/Module_dbaccess.mk | 2 --
sdext/Module_sdext.mk | 1 -
sw/Module_sw.mk | 1 -
3 files changed, 4 deletions(-)
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 436f591c7a07..2e8b1b77aaed 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -49,8 +49,6 @@ endif
ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_check_targets,dbaccess,\
- CppunitTest_dbaccess_dialog_save \
- CppunitTest_dbaccess_empty_stdlib_save \
CppunitTest_dbaccess_nolib_save \
CppunitTest_dbaccess_macros_test \
CppunitTest_dbaccess_hsqlschema_import \
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index fd1d191b4939..d9ba2fbccc63 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
endif
$(eval $(call gb_Module_add_check_targets,sdext,\
- CppunitTest_sdext_pdfimport \
Executable_pdf2xml \
Executable_pdfunzip \
))
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 8a217a85fbf6..2106094dac63 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uiwriter3 \
CppunitTest_sw_uiwriter4 \
CppunitTest_sw_uiwriter5 \
- CppunitTest_sw_uiwriter6 \
CppunitTest_sw_uiwriter7 \
CppunitTest_sw_uiwriter8 \
CppunitTest_sw_layoutwriter \
--
2.39.1
From 16d2465ebd4f9de5496dfbbe9b2409a0d5bd8169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= <sandino@sandino.net>
Date: Sun, 7 May 2023 21:52:09 -0400
Subject: [PATCH 2/2] Otra prueba que falla en CentOS 9
---
sw/Module_sw.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 2106094dac63..23fd9f4be109 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -135,7 +135,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uibase_uno \
CppunitTest_sw_uibase_wrtsh \
CppunitTest_sw_core_accessibilitycheck \
- CppunitTest_sw_core_layout \
CppunitTest_sw_core_fields \
CppunitTest_sw_core_tox \
CppunitTest_sw_core_frmedt \
--
2.39.1

84
rpmbuild/SOURCES/7.5.1-unit-tests.patch
View file

@ -1,84 +0,0 @@
From 0869739a3843e6ee48eba1181d71476c1e7a9541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= <sandino@sandino.net>
Date: Mon, 8 May 2023 20:22:24 -0400
Subject: [PATCH 1/2] Pruebas unitarias omitidas de la 7.5.0
---
dbaccess/Module_dbaccess.mk | 2 --
sdext/Module_sdext.mk | 1 -
sw/Module_sw.mk | 2 --
3 files changed, 5 deletions(-)
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 436f591c7a07..2e8b1b77aaed 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -49,8 +49,6 @@ endif
ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_check_targets,dbaccess,\
- CppunitTest_dbaccess_dialog_save \
- CppunitTest_dbaccess_empty_stdlib_save \
CppunitTest_dbaccess_nolib_save \
CppunitTest_dbaccess_macros_test \
CppunitTest_dbaccess_hsqlschema_import \
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index fd1d191b4939..d9ba2fbccc63 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
endif
$(eval $(call gb_Module_add_check_targets,sdext,\
- CppunitTest_sdext_pdfimport \
Executable_pdf2xml \
Executable_pdfunzip \
))
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 8a217a85fbf6..23fd9f4be109 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uiwriter3 \
CppunitTest_sw_uiwriter4 \
CppunitTest_sw_uiwriter5 \
- CppunitTest_sw_uiwriter6 \
CppunitTest_sw_uiwriter7 \
CppunitTest_sw_uiwriter8 \
CppunitTest_sw_layoutwriter \
@@ -136,7 +135,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uibase_uno \
CppunitTest_sw_uibase_wrtsh \
CppunitTest_sw_core_accessibilitycheck \
- CppunitTest_sw_core_layout \
CppunitTest_sw_core_fields \
CppunitTest_sw_core_tox \
CppunitTest_sw_core_frmedt \
--
2.39.1
From d8a95a4d40088e9cf2a15d0cacffd9167ca375a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= <sandino@sandino.net>
Date: Mon, 8 May 2023 20:22:48 -0400
Subject: [PATCH 2/2] Pruebas unitaria adicional que falla en la 7.5.1
---
sw/Module_sw.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 23fd9f4be109..4b0580716a2a 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_uiwriter7 \
CppunitTest_sw_uiwriter8 \
CppunitTest_sw_layoutwriter \
- CppunitTest_sw_layoutwriter2 \
CppunitTest_sw_mailmerge \
CppunitTest_sw_mailmerge2 \
CppunitTest_sw_globalfilter \
--
2.39.1

14
rpmbuild/SOURCES/ed25519.key.asc Normal file
View file

@ -0,0 +1,14 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mDMEYtcYTRYJKwYBBAHaRw8BAQdAup3AWA5CpavhOX16tLl1r2LukqxrJq/ZW6BK
/QXyARO0UWJ1aWxkZXIgQCBnb2IubXggKExsYXZlIEdQRyBwYXJhIGZpcm1hciBw
YXF1ZXRlcyBkZSBnb2IubXguKSA8YnVpbGRlckB1Z2QuZ29iLm14PoiTBBMWCgA7
FiEEK0iGmHzdXnGx0L9QwXjKx7ZXh80FAmLXGE0CGwMFCwkIBwICIgIGFQoJCAsC
BBYCAwECHgcCF4AACgkQwXjKx7ZXh82vRQEA20a8r7jKovPMlxGFRenlSdf5W4g4
5VuSsZbslPeWK7oA/3jD6Na0othI93yCNabafOs/7u16M6UrbQO0GNFn/h4KuDgE
YtcYTRIKKwYBBAGXVQEFAQEHQF+XtJhl1KnE524dVYn/SE+/cHCE19+p+IZ9RYPA
aV0aAwEIB4h4BBgWCgAgFiEEK0iGmHzdXnGx0L9QwXjKx7ZXh80FAmLXGE0CGwwA
CgkQwXjKx7ZXh826EgD9HnaC2QyPWl7kYqCAMabqaGxekt8gAAgKiF+RNm4FmdAA
/2FhYOTg3uBaYjaESC+tdt4T+lPAyiSIRtcxTfyQMN4A
=UtGC
-----END PGP PUBLIC KEY BLOCK-----

453
rpmbuild/SOURCES/libreoffice-24.2.4.2+gobmx1.3-patchset.patch Normal file
View file

File diff suppressed because one or more lines are too long

2581
rpmbuild/SOURCES/patchset-1.0/0003-Custom-images-and-referencies-added.patch
View file

File diff suppressed because it is too large Load diff

21
rpmbuild/SOURCES/patchset-1.0/0012-Update-OfficeLinux.conf-with-lang-es.patch
View file

@ -1,21 +0,0 @@
From 26bc26bc58ec329ba1c23a3082546c755f10a8a1 Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Wed, 8 Nov 2023 19:42:40 +0000
Subject: [PATCH 12/15] Update OfficeLinux.conf --with-lang=es
---
distro-configs/OfficeLinux.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf
index 6cb4bd4dca66..30550375e27a 100644
--- a/distro-configs/OfficeLinux.conf
+++ b/distro-configs/OfficeLinux.conf
@@ -8,3 +8,4 @@
--with-vendor=INFOTEC
--with-package-version=7.5.0.0
--disable-community-flavor
+--with-lang=es
--
2.43.0

30
rpmbuild/SOURCES/patchset-1.0/0013-Update-OfficeLinux.conf.patch
View file

@ -1,30 +0,0 @@
From dd1f17cd0641a99832e991545c1d1c4440786816 Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Wed, 8 Nov 2023 23:23:27 +0000
Subject: [PATCH 13/15] Update OfficeLinux.conf
---
distro-configs/OfficeLinux.conf | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf
index 30550375e27a..8f9dc46b2814 100644
--- a/distro-configs/OfficeLinux.conf
+++ b/distro-configs/OfficeLinux.conf
@@ -1,11 +1,8 @@
--with-parallelism
+--enable-dbgutil
+--without-doxygen
--with-branding=custom_images
---enable-release-build
---enable-epm
---with-package-format=deb
--with-product-name=Office
--with-vendor=INFOTEC
---with-vendor=INFOTEC
--with-package-version=7.5.0.0
---disable-community-flavor
--with-lang=es
--
2.43.0

65
rpmbuild/SOURCES/patchset-1.0/0014-fix-error-make-install.patch
View file

@ -1,65 +0,0 @@
From 22a3ccfe6659ad7ef87c7d5711bb0363a3a5e1c0 Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Mon, 13 Nov 2023 11:23:10 -0600
Subject: [PATCH 14/15] fix error make install
Change-Id: I590a323ec835f16badf1889f4c09d00fee3d3999
---
instsetoo_native/util/openoffice.lst.in | 44 +++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 454670cb1e15..de7de46a22ff 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -266,3 +266,47 @@ Office_SDK
}
}
+OfficeDev
+{
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME OfficeDev
+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@
+ UNIXBASISROOTNAME libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ POSTVERSIONEXTENSION
+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ USERDIRPRODUCTVERSION 4
+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ DEVELOPMENTPRODUCT 1
+ BASISPACKAGEPREFIX lodevbasis
+ UREPACKAGEPREFIX libreofficedev
+ SOLSUREPACKAGEPREFIX libreofficedev
+ REGISTRYLAYERNAME LayerDev
+ UPDATEURL https://update.libreoffice.org/check.php
+ ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
+ ADDSYSTEMINTEGRATION 1
+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ PACKAGEREVISION {buildid}
+ LICENSENAME LGPL
+ ROOTMODULEGID gid_Module_Root
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ CHANGETARGETDIR 1
+ PATCHCODEFILE ooodev_patchcodes.txt
+ CODEFILENAME codes_ooodev.txt
+ LOCALUSERDIR $ORIGIN/..
+ }
+ active 1
+ compression 5
+ script setup_osl
+ downloadname LibreOfficeDev_{productversion}_{os}_install_{languages}
+ langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
+ helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath}
+ }
+}
--
2.43.0

8
rpmbuild/SOURCES/patchset-1.0/0015-gob-mx-1.0.patch
View file

@ -1,8 +0,0 @@
From e66c87ccc08a1a862c7b38adf2cd35f2379efe1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= <sandino@sandino.net>
Date: Tue, 21 Nov 2023 20:21:22 -0600
Subject: [PATCH 15/15] gob-mx-1.0
--
2.43.0

62
rpmbuild/SOURCES/patchset-1.1/0001-Archivos-de-distro-config-de-brand-Office.patch
View file

@ -1,62 +0,0 @@
From 439bf688a50143a57d18be3e8bf8eceea9f839ea Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Tue, 20 Jun 2023 02:26:13 -0400
Subject: [PATCH 01/18] Archivos de distro-config de brand Office
Change-Id: I290939038b4fedf7a03f3ce68250966766a57e2b
---
distro-configs/OfficeLinux.conf | 10 ++++++++++
distro-configs/OfficeWin64.conf | 24 ++++++++++++++++++++++++
2 files changed, 34 insertions(+)
create mode 100644 distro-configs/OfficeLinux.conf
create mode 100644 distro-configs/OfficeWin64.conf
diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf
new file mode 100644
index 000000000000..6cb4bd4dca66
--- /dev/null
+++ b/distro-configs/OfficeLinux.conf
@@ -0,0 +1,10 @@
+--with-parallelism
+--with-branding=custom_images
+--enable-release-build
+--enable-epm
+--with-package-format=deb
+--with-product-name=Office
+--with-vendor=INFOTEC
+--with-vendor=INFOTEC
+--with-package-version=7.5.0.0
+--disable-community-flavor
diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf
new file mode 100644
index 000000000000..01ad659c2af3
--- /dev/null
+++ b/distro-configs/OfficeWin64.conf
@@ -0,0 +1,24 @@
+--with-ant-home=/cygdrive/c/sources/apache-ant-1.9.5
+--with-visual-studio=2022
+--with-jdk-home=C:\Program Files\Microsoft\jdk-11.0.12.7-hotspot
+--host=x86_64-pc-cygwin
+--without-junit
+--without-helppack-integration
+--enable-extension-integration
+--enable-scripting-beanshell
+--enable-scripting-javascript
+--enable-ext-wiki-publisher
+--enable-ext-nlpsolver
+--with-myspell-dicts
+--with-package-format=msi
+--enable-mergelibs
+--enable-lto
+--enable-odk
+--without-ucrt-dir
+--enable-release-build
+--with-lang=es
+--with-branding=custom_images
+--with-product-name=Office
+--with-vendor=INFOTEC
+--with-package-version=7.5.0.0
+--disable-community-flavor
--
2.39.2

94
rpmbuild/SOURCES/patchset-1.1/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch
View file

@ -1,94 +0,0 @@
From a4f6d63477b5a953b38859e2e3ad781f929b8584 Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Tue, 20 Jun 2023 02:29:16 -0400
Subject: [PATCH 02/18] Modificacion al build y borrado UPDATEURL
Change-Id: I10a2d0a01ceb02d5d7f5267dcb97eb25ce6600d7
---
instsetoo_native/util/openoffice.lst.in | 73 +++++++++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index b5da0bfb6697..454670cb1e15 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -193,3 +193,76 @@ LibreOfficeDev_SDK
include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath}
}
}
+
+
+Office
+{
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME Office
+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ POSTVERSIONEXTENSION
+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ USERDIRPRODUCTVERSION 4
+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ PCPFILENAME libreoffice.pcp
+ UPDATEURL
+ ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
+ ADDSYSTEMINTEGRATION 1
+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ PACKAGEREVISION {buildid}
+ LICENSENAME LGPL
+ ROOTMODULEGID gid_Module_Root
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ CHANGETARGETDIR 1
+ PATCHCODEFILE ooo_patchcodes.txt
+ }
+ active 1
+ compression 5
+ script setup_osl
+ downloadname Office_{productversion}_{os}_install_{languages}
+ langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages}
+ helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages}
+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath}
+ }
+}
+
+Office_SDK
+{
+ Settings
+ {
+ downloadname LibreOffice-SDK_{packageversion}_{os}_install_{languages}
+ variables
+ {
+ PRODUCTNAME Office
+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ POSTVERSIONEXTENSION SDK
+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@.SDK
+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ PACKAGEREVISION {buildid}
+ PACK_INSTALLED 1
+ DMG_VOLUMEEXTENSION SDK
+ DATABASENAME office40sdk
+ NO_README_IN_ROOTDIR 1
+ LICENSENAME LGPL
+ IGNOREDIRECTORYLAYER 1
+ NOVERSIONINDIRNAME 0
+ NOSPACEINDIRECTORYNAME 1
+ NOSHORTDIRECTORYNAMES 1
+ CHANGETARGETDIR 1
+ DONTUSESTARTMENUFOLDER 1
+ }
+ active 1
+ compression 5
+ script sdkoo
+ include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath}
+ }
+}
+
--
2.39.2

171
rpmbuild/SOURCES/patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch
View file

@ -1,171 +0,0 @@
From 4c459d3e41a3c4d08e03fc72db95480ed8783797 Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Thu, 20 Jul 2023 08:28:06 -0600
Subject: [PATCH 04/18] Fuentes monserrat y gmx
Change-Id: I73186714bc4809d0b3d48ceb94e933a78db2d623
---
Makefile.fetch | 4 ++
Repository.mk | 1 +
external/more_fonts/ExternalPackage_gmx.mk | 49 +++++++++++++++++++++
external/more_fonts/Module_more_fonts.mk | 2 +
external/more_fonts/UnpackedTarball_gmx.mk | 14 ++++++
fonts/gmx-fonts.tar.xz | Bin 0 -> 1172924 bytes
solenv/flatpak-manifest.in | 7 +++
7 files changed, 77 insertions(+)
create mode 100644 external/more_fonts/ExternalPackage_gmx.mk
create mode 100644 external/more_fonts/UnpackedTarball_gmx.mk
create mode 100644 fonts/gmx-fonts.tar.xz
diff --git a/Makefile.fetch b/Makefile.fetch
index b96cb573c2bf..99f9bd3bca18 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -124,6 +124,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
$(call fetch_Optional,EXPAT,EXPAT_TARBALL) \
$(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \
$(call fetch_Optional,FONTCONFIG,FONTCONFIG_TARBALL) \
+ $(call fetch_Optional,FONTGMXCONFIG,FONTGMXCONFIG_TARBALL) \
$(call fetch_Optional,FREEHAND,FREEHAND_TARBALL) \
$(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \
FROZEN_TARBALL \
@@ -241,6 +242,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
$(call fetch_Optional,ODFVALIDATOR,ODFVALIDATOR_JAR) \
$(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \
,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
+ $(foreach item, \
+ $(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \
+ ,$(call fetch__Download_item,https://repos.libreoffice.gob.mx/src,$(item)))
@mkdir -p $(dir $@) && touch $@
@mkdir -p $(dir $@)/Executable
diff --git a/Repository.mk b/Repository.mk
index 3e2e29098e66..c04fb9cd4108 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1044,6 +1044,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
$(call gb_Helper_optional,MORE_FONTS,\
fonts_alef \
fonts_amiri \
+ fonts_gmx \
fonts_caladea \
fonts_carlito \
$(if $(MPL_SUBSET),,fonts_culmus) \
diff --git a/external/more_fonts/ExternalPackage_gmx.mk b/external/more_fonts/ExternalPackage_gmx.mk
new file mode 100644
index 000000000000..ccc1b03c5db2
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_gmx.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gmx,font_gmx))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gmx,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+ GMX-BlackItalic.otf \
+ GMX-BlackItalicSc.otf \
+ GMX-Black.otf \
+ GMX-BlackSc.otf \
+ GMX-BoldItalic.otf \
+ GMX-BoldItalicSc.otf \
+ GMX-Bold.otf \
+ GMX-BoldSc.otf \
+ GMX-LightItalic.otf \
+ GMX-LightItalicSc.otf \
+ GMX-Light.otf \
+ GMX-LightSc.otf \
+ GMX-RegularItalic.otf \
+ GMX-RegularItalicSc.otf \
+ GMX-Regular.otf \
+ GMX-RegularSc.otf \
+ Montserrat-BlackItalic.ttf \
+ Montserrat-Black.ttf \
+ Montserrat-BoldItalic.ttf \
+ Montserrat-Bold.ttf \
+ Montserrat-ExtraBoldItalic.ttf \
+ Montserrat-ExtraBold.ttf \
+ Montserrat-ExtraLightItalic.ttf \
+ Montserrat-ExtraLight.ttf \
+ Montserrat-Italic.ttf \
+ Montserrat-LightItalic.ttf \
+ Montserrat-Light.ttf \
+ Montserrat-MediumItalic.ttf \
+ Montserrat-Medium.ttf \
+ Montserrat-Regular.ttf \
+ Montserrat-SemiBoldItalic.ttf \
+ Montserrat-SemiBold.ttf \
+ Montserrat-ThinItalic.ttf \
+ Montserrat-Thin.ttf \
+))
+
+# vim: set noet sw=4 ts=4:
\ No newline at end of file
diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk
index e17af9a15141..b85f7468528f 100644
--- a/external/more_fonts/Module_more_fonts.mk
+++ b/external/more_fonts/Module_more_fonts.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,more_fonts))
$(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_alef \
ExternalPackage_amiri \
+ ExternalPackage_gmx \
ExternalPackage_caladea \
ExternalPackage_carlito \
$(if $(MPL_SUBSET),,ExternalPackage_culmus) \
@@ -39,6 +40,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_scheherazade \
UnpackedTarball_alef \
UnpackedTarball_amiri \
+ UnpackedTarball_gmx \
UnpackedTarball_caladea \
UnpackedTarball_carlito \
$(if $(MPL_SUBSET),,UnpackedTarball_culmus) \
diff --git a/external/more_fonts/UnpackedTarball_gmx.mk b/external/more_fonts/UnpackedTarball_gmx.mk
new file mode 100644
index 000000000000..ac8020494d7e
--- /dev/null
+++ b/external/more_fonts/UnpackedTarball_gmx.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_gmx))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,font_gmx,$(FONT_GMX_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
\ No newline at end of file
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index a8d8b88394a8..89a2a6b63e3c 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -590,6 +590,13 @@
"dest": "external/tarballs",
"dest-filename": "@FONT_AMIRI_TARBALL@"
},
+ {
+ "url": "https://repos.libreoffice.gob.mx/src/@FONT_GMX_TARBALL@",
+ "sha256": "@FONT_GMX_SHA256SUM@",
+ "type": "file",
+ "dest": "external/tarballs",
+ "dest-filename": "@FONT_GMX_TARBALL@"
+ },
{
"url": "https://dev-www.libreoffice.org/src/@FONT_CULMUS_TARBALL@",
"sha256": "@FONT_CULMUS_SHA256SUM@",
--
2.39.2

26
rpmbuild/SOURCES/patchset-1.1/0005-Fonts-added.patch
View file

@ -1,26 +0,0 @@
From 2113fc78a62a38827221225aaa4734e2af417499 Mon Sep 17 00:00:00 2001
From: Adlair Cerecedo-Mendez <adlair@linuxmail.org>
Date: Mon, 17 Jul 2023 21:13:49 -0600
Subject: [PATCH 05/18] Fonts added
Change-Id: I32fb8011dd391d35c34627713cb38e5432927c7e
---
.git-hooks/pre-commit | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit
index 521ed202b9ac..bdb5022849a6 100755
--- a/.git-hooks/pre-commit
+++ b/.git-hooks/pre-commit
@@ -426,7 +426,7 @@ while (<FILES>)
}
my $size = `git cat-file -s :$_`;
# For now let's say large is 500KB
- my $limit = 500;
+ my $limit = 10000;
if ($size > $limit * 1024)
{
print "Error: Attempt to add a large file: $_, pleasy try to fit into $limit KB.\n";
--
2.39.2

26
rpmbuild/SOURCES/patchset-1.1/0006-Modificado-archivo-tar-xz-a-gz.patch
View file

@ -1,26 +0,0 @@
From 3564089ff7f4e618a52be93d2bff34cf911d7b3a Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Mon, 31 Jul 2023 20:23:12 -0600
Subject: [PATCH 06/18] Modificado archivo tar xz a gz
---
download.lst | 3 +++
1 file changed, 3 insertions(+)
diff --git a/download.lst b/download.lst
index 302e27ce3371..94875f843058 100644
--- a/download.lst
+++ b/download.lst
@@ -3,6 +3,9 @@
# There is a script solenv/bin/generate-flatpak-manifest.sh to substitute the variables,
# so upgrading to a new version only requires changes in download.lst.
+FONT_GMX_TARBALL := gmx-fonts.tar.gz
+FONT_GMX_SHA256SUM :=
+#
ABW_SHA256SUM := e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
ABW_TARBALL := libabw-0.1.3.tar.xz
# three static lines
--
2.39.2

5074
rpmbuild/SOURCES/patchset-1.1/0008-Cambios-en-logo.patch
View file

File diff suppressed because it is too large Load diff

27
rpmbuild/SOURCES/patchset-1.1/0009-Modificado-link-de-descarga-de-fuentes.patch
View file

@ -1,27 +0,0 @@
From 8c17c500df9200c842e90751c8dd64ff5059e58b Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Fri, 4 Aug 2023 20:21:33 -0600
Subject: [PATCH 09/18] Modificado link de descarga de fuentes
Change-Id: I80b8e9ea4286d68c1880ef45eaa191a8f0c3e7d2
---
Makefile.fetch | 2 +-
fonts/gmx-fonts.tar.gz | Bin 0 -> 2409292 bytes
fonts/gmx-fonts.tar.xz | Bin 1172924 -> 0 bytes
3 files changed, 1 insertion(+), 1 deletion(-)
create mode 100644 fonts/gmx-fonts.tar.gz
delete mode 100644 fonts/gmx-fonts.tar.xz
diff --git a/Makefile.fetch b/Makefile.fetch
index b0443f367007..ede18af4197d 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -244,7 +244,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
$(foreach item, \
$(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \
- ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item)))
+ ,$(call fetch_Download_item,https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/tree/logos/fonts,$(item)))
@mkdir -p $(dir $@) && touch $@
@mkdir -p $(dir $@)/Executable

2536
rpmbuild/SOURCES/patchset-1.1/0011-logo-image-updated.patch
View file

File diff suppressed because one or more lines are too long

21
rpmbuild/SOURCES/patchset-1.1/0012-Update-OfficeLinux.conf-with-lang-es.patch
View file

@ -1,21 +0,0 @@
From 3776d246c8aaa46a6ff233e1ce9ea1712c06818e Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Wed, 8 Nov 2023 19:42:40 +0000
Subject: [PATCH 12/18] Update OfficeLinux.conf --with-lang=es
---
distro-configs/OfficeLinux.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf
index 6cb4bd4dca66..30550375e27a 100644
--- a/distro-configs/OfficeLinux.conf
+++ b/distro-configs/OfficeLinux.conf
@@ -8,3 +8,4 @@
--with-vendor=INFOTEC
--with-package-version=7.5.0.0
--disable-community-flavor
+--with-lang=es
--
2.39.2

30
rpmbuild/SOURCES/patchset-1.1/0013-Update-OfficeLinux.conf.patch
View file

@ -1,30 +0,0 @@
From 183e1b54c959e3d1c1b3e00646689c011ebed810 Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Wed, 8 Nov 2023 23:23:27 +0000
Subject: [PATCH 13/18] Update OfficeLinux.conf
---
distro-configs/OfficeLinux.conf | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf
index 30550375e27a..8f9dc46b2814 100644
--- a/distro-configs/OfficeLinux.conf
+++ b/distro-configs/OfficeLinux.conf
@@ -1,11 +1,8 @@
--with-parallelism
+--enable-dbgutil
+--without-doxygen
--with-branding=custom_images
---enable-release-build
---enable-epm
---with-package-format=deb
--with-product-name=Office
--with-vendor=INFOTEC
---with-vendor=INFOTEC
--with-package-version=7.5.0.0
---disable-community-flavor
--with-lang=es
--
2.39.2

65
rpmbuild/SOURCES/patchset-1.1/0014-fix-error-make-install.patch
View file

@ -1,65 +0,0 @@
From c3f7bf02d9b70a46695e6f854a261a596824ddcd Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Mon, 13 Nov 2023 11:23:10 -0600
Subject: [PATCH 14/18] fix error make install
Change-Id: I590a323ec835f16badf1889f4c09d00fee3d3999
---
instsetoo_native/util/openoffice.lst.in | 44 +++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 454670cb1e15..de7de46a22ff 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -266,3 +266,47 @@ Office_SDK
}
}
+OfficeDev
+{
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME OfficeDev
+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@
+ UNIXBASISROOTNAME libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ POSTVERSIONEXTENSION
+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ USERDIRPRODUCTVERSION 4
+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
+ DEVELOPMENTPRODUCT 1
+ BASISPACKAGEPREFIX lodevbasis
+ UREPACKAGEPREFIX libreofficedev
+ SOLSUREPACKAGEPREFIX libreofficedev
+ REGISTRYLAYERNAME LayerDev
+ UPDATEURL https://update.libreoffice.org/check.php
+ ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt
+ ADDSYSTEMINTEGRATION 1
+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+ PACKAGEREVISION {buildid}
+ LICENSENAME LGPL
+ ROOTMODULEGID gid_Module_Root
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ CHANGETARGETDIR 1
+ PATCHCODEFILE ooodev_patchcodes.txt
+ CODEFILENAME codes_ooodev.txt
+ LOCALUSERDIR $ORIGIN/..
+ }
+ active 1
+ compression 5
+ script setup_osl
+ downloadname LibreOfficeDev_{productversion}_{os}_install_{languages}
+ langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
+ helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
+ include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath}
+ }
+}
--
2.39.2

60
rpmbuild/SOURCES/patchset-1.1/0016-Add-minor-version-OS-to-PDF-producer-metadata.patch
View file

@ -1,60 +0,0 @@
From ed8a0ebfc1d6cfebc45db69064b56c7215638654 Mon Sep 17 00:00:00 2001
From: Octavio Alvarez <alvarezp@ugd.gob.mx>
Date: Thu, 1 Feb 2024 07:55:21 +0000
Subject: [PATCH 16/18] Add minor version / OS to PDF producer metadata.
Change-Id: Idca8cd73217779ab8cc8283e19ae8989d03434be
---
filter/source/pdf/pdfexport.cxx | 13 ++++++++++++-
vcl/qa/cppunit/pdfexport/pdfexport2.cxx | 1 -
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 7d07f8182bdc..b6ff5fc7a95e 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -65,6 +65,8 @@
#include <memory>
+#include <rtl/bootstrap.hxx>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::uno;
@@ -505,10 +507,19 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
if (!aProducerOverride.isEmpty())
aContext.DocumentInfo.Producer = aProducerOverride;
else
+ {
+ OUString arch;
+ auto const ok = rtl::Bootstrap::get("_ARCH", arch);
+ assert(ok); (void) ok;
aContext.DocumentInfo.Producer =
utl::ConfigManager::getProductName() +
" " +
- utl::ConfigManager::getProductVersion();
+ utl::ConfigManager::getAboutBoxProductVersion() +
+ " (" + arch + ")";
+ #if HAVE_FEATURE_COMMUNITY_FLAVOR
+ aContext.DocumentInfo.Producer += " / LibreOffice Community";
+ #endif
+ }
}
aContext.DocumentInfo.Creator = aCreator;
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
index d2811f32fbd4..4d6c06c40057 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
@@ -4311,7 +4311,6 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testPdfImageEncryption)
aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
uno::Sequence<beans::PropertyValue> aFilterData = {
comphelper::makePropertyValue("EncryptFile", true),
- comphelper::makePropertyValue("DocumentOpenPassword", OUString("secret")),
};
aMediaDescriptor["FilterData"] <<= aFilterData;
xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
--
2.39.2

29
rpmbuild/SOURCES/patchset-1.1/0017-CPPUNIT-Calc-fixed.patch
View file

@ -1,29 +0,0 @@
From 3b71303250467c0122af5fe3874e93bbf5e548c3 Mon Sep 17 00:00:00 2001
From: Adlair Cerecedo-Mendez <adlair@linuxmail.org>
Date: Fri, 12 Jan 2024 17:04:55 -0600
Subject: [PATCH 17/18] CPPUNIT Calc - fixed
Change-Id: I44c20706730c444e229e8f5eb17f2a9b7fca33ab
---
sc/qa/unit/subsequent_export_test4.cxx | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sc/qa/unit/subsequent_export_test4.cxx b/sc/qa/unit/subsequent_export_test4.cxx
index 95c7057aef2d..dc8a9073a1e7 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -820,10 +820,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf147088)
ScDocument* pDoc = getScDoc();
- // Without the fix in place, this test would have failed with
- // - Expected: _xffff_
- // - Actual :
- CPPUNIT_ASSERT_EQUAL(OUString("_xffff_"), pDoc->GetString(0, 0, 0));
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(0), pDoc->GetPrintRangeCount(0));
}
CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf84874)
--
2.39.2

448
rpmbuild/SPECS/libreoffice.spec
View file

@ -1,12 +1,12 @@
# download path contains version without the last (fourth) digit
%global libo_version 24.2.1
%global libo_version 24.2.4
# 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.
%global libo_prerelease %{nil}
# Should contain any suffix of release tarball name, e.g., -buildfix1.
%global libo_buildfix %{nil}
%global gobmx_version gobmx1.2
# rhbz#715152 state vendor
%global vendoroption --with-vendor="INFOTEC"
%global libo_python python3
@ -20,7 +20,6 @@
%else
%global source_url http://download.documentfoundation.org/libreoffice/src/%{libo_version}
%endif
%global gobmx_url https://repos.libreoffice.gob.mx/releases/
# URL for external projects' tarballs
%global external_url http://dev-www.libreoffice.org/src
%global girapiversion 0.1
@ -78,8 +77,8 @@ ExcludeArch: %{ix86}
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2+%{gobmx_version}
Release: 9%{?libo_prerelease}%{?dist}
Version: %{libo_version}.2
Release: 4+gob.mx1.3%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
@ -94,13 +93,12 @@ Release: 9%{?libo_prerelease}%{?dist}
License: MPL-2.0 AND Apache-2.0 AND LGPL-3.0-only AND LGPL-3.0-or-later AND CC0-1.0 AND BSD-3-Clause AND (LGPL-2.1-only OR SISSL) AND (MPL-2.0 OR LGPL-3.0-or-later) AND (MPL-2.0 OR LGPL-2.1-or-later) AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-only) AND MIT
URL: http://www.libreoffice.org/
Source0: %{gobmx_url}%{version}/libreoffice-%{version}.tar.xz
Source1: %{gobmx_url}%{version}/libreoffice-%{version}.tar.xz.asc
Source2: %{gobmx_url}%{version}/libreoffice-help-%{version}.tar.xz
Source3: %{gobmx_url}%{version}/libreoffice-help-%{version}.tar.xz.asc
Source4: %{gobmx_url}%{version}/libreoffice-translations-%{version}.tar.xz
Source5: %{gobmx_url}%{version}/libreoffice-translations-%{version}.tar.xz.asc
Source0: %{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
Source1: %{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc
Source2: %{source_url}/libreoffice-help-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
Source3: %{source_url}/libreoffice-help-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc
Source4: %{source_url}/libreoffice-translations-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
Source5: %{source_url}/libreoffice-translations-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc
Source6: gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc
Source7: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
Source8: libreoffice-multiliblauncher.sh
@ -151,25 +149,23 @@ Source47: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/
Source48: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/master/apps-symbolic/Adwaita/scalable/apps/libreoffice-writer-symbolic.svg
# New fonts required in 24.2
Source49: %{external_url}/NotoNaskhArabic-v2.016.zip
Source49: %{external_url}/NotoKufiArabic-v2.109.zip
Source50: %{external_url}/NotoSans-v2.012.zip
Source51: %{external_url}/NotoSansArabic-v2.010.zip
Source52: %{external_url}/NotoSansArmenian-v2.008.zip
Source53: %{external_url}/NotoSansGeorgian-v2.003.zip
Source54: %{external_url}/NotoSansHebrew-v2.003.zip
Source54: %{external_url}/NotoSansHebrew-v2.004.zip
Source55: %{external_url}/NotoSansLao-v2.003.zip
Source56: %{external_url}/NotoSansLisu-v2.102.zip
Source57: %{external_url}/NotoSerif-v2.012.zip
Source58: %{external_url}/NotoSerifArmenian-v2.008.zip
Source59: %{external_url}/NotoSerifGeorgian-v2.003.zip
Source60: %{external_url}/NotoSerifHebrew-v2.003.zip
Source60: %{external_url}/NotoSerifHebrew-v2.004.zip
Source61: %{external_url}/NotoSerifLao-v2.003.zip
# Diccionarios
Source66: %{gobmx_url}%{version}/libreoffice-dictionaries-%{version}.tar.xz
Source67: %{gobmx_url}%{version}/libreoffice-dictionaries-%{version}.tar.xz.asc
#https://repos.libreoffice.gob.mx/debian/ed25519.key.asc
Source68: 2B4886987CDD5E71B1D0BF50C178CAC7B65787CD.gpg.asc
Source66: %{source_url}/libreoffice-dictionaries-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
Source67: %{source_url}/libreoffice-dictionaries-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc
# build tools
BuildRequires: autoconf
@ -380,11 +376,6 @@ Patch11: lo-7.6-ppc64le-tests.patch
# https://bugs.gentoo.org/917618
# https://bugs.documentfoundation.org/show_bug.cgi?id=158108
Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch
Patch13: 86abb6fd8a8f680f9fc5ff1db775845c9f4e254b.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
@ -396,6 +387,13 @@ Patch501: kahansum_test_fix_for_aarc64_s390x.patch
# gpgme
Patch15: 0001-gpgme.patch
# Patchset gob.mx 1.3
Patch21: libreoffice-24.2.4.2+gobmx1.3-patchset.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
%global instdir %{_libdir}
%global baseinstdir %{instdir}/libreoffice
@ -815,7 +813,7 @@ A plug-in for LibreOffice that enables integration into the KDE Frameworks 6.
%package -n libreofficekit
Summary: A library providing access to LibreOffice functionality
License: MPLv2.0
License: MPL-2.0
%description -n libreofficekit
LibreOfficeKit can be used to access LibreOffice functionality
@ -827,7 +825,7 @@ experimental tiled rendering API).
%package -n libreofficekit-devel
Summary: Development files for libreofficekit
Requires: libreofficekit%{?_isa} = %{epoch}:%{version}-%{release}
License: MPLv2.0
License: MPL-2.0
%description -n libreofficekit-devel
The libreofficekit-devel package contains libraries and header files for
@ -853,7 +851,7 @@ This package provides gdb pretty printers for package %{name}.
%define _langpack_common(Eg:j:l:) \
%{!-E: \
%{baseinstdir}/program/resource/%{-g:%{-g*}}%{!-g:%{-l*}}/LC_MESSAGES/*.mo \
%{baseinstdir}/program/resource/%{-g:%{-g*}}%{!-g:%{-l*}} \
%{baseinstdir}/share/registry/res/registry_%{-l*}.xcd \
} \
%{baseinstdir}/share/template/%{-l*} \
@ -1030,8 +1028,8 @@ Rules for auto-correcting common %{langname} typing errors. \
%langpack -l ml -n Malayalam -F -H -Y -X
%langpack -l mr -n Marathi -F -H -Y -X
%langpack -l nb -n Bokmal -F -H -Y -M -T -X
%langpack -l nl -n Dutch -F -H -Y -M -A -T -X -X
%langpack -l nn -n Nynorsk -F -H -Y -M -T
%langpack -l nl -n Dutch -F -H -Y -M -A -T -X
%langpack -l nn -n Nynorsk -F -H -Y -M -T -X
%define langpack_lang Southern Ndebele
%langpack -l nr -n %{langpack_lang} -F -H -X
%define langpack_lang Northern Sotho
@ -1587,7 +1585,7 @@ Myspell Zulu dictionary
%prep
# verify tarballs
gpg2 --dearmor < %{SOURCE68} > keyring.gpg
gpg2 --dearmor < %{SOURCE6} > keyring.gpg
gpgv2 --keyring ./keyring.gpg %{SOURCE1} %{SOURCE0}
gpgv2 --keyring ./keyring.gpg %{SOURCE3} %{SOURCE2}
gpgv2 --keyring ./keyring.gpg %{SOURCE5} %{SOURCE4}
@ -1602,7 +1600,7 @@ rm -rf git-hooks */git-hooks
<draw:color draw:name="Red Hat 2" draw:color="#0093d9"/>
<draw:color draw:name="Red Hat 3" draw:color="#ff8d00"/>
<draw:color draw:name="Red Hat 4" draw:color="#abb400"/>
<draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>' && \
<draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>' && \
tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
mv -f redhat.soc extras/source/palettes/standard.soc
@ -1642,6 +1640,14 @@ 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
%endif
%ifarch riscv64
# Failed test on RV64
# confimed on 2024-06-01, version 24.2.3.2
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
%endif
%if 0%{?rhel}
# Pruebas unitarias que fallan en 24.2.0.1
@ -1651,8 +1657,6 @@ 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
# Pruebas unitarias que fallan en 24.2.0.2
sed -i -e /CppunitTest_vcl_text/d vcl/Module_vcl.mk
%endif
# Pruebas que fallan al poner la opción --with-product-name=Office
@ -1693,6 +1697,9 @@ sed -i -e /CppunitTest_vcl_text/d vcl/Module_vcl.mk
%endif
# Failing on multiple arches
sed -i -e /CppunitTest_svgio/d svgio/Module_svgio.mk
%build
# path to external tarballs
EXTSRCDIR=`dirname %{SOURCE0}`
@ -1941,7 +1948,7 @@ popd
rm -vf %{buildroot}%{baseinstdir}/program/resource/common/fonts/*ttf
rm -vf %{buildroot}%{baseinstdir}/share/fonts/truetype/*.ttf
rm -vf %{buildroot}%{baseinstdir}/share/fonts/truetype/*.otf
# move platform-independent data into shared dir
install -m 0755 -d %{buildroot}%{datadir}
rm -f %{buildroot}%{baseinstdir}/CREDITS.fodt %{buildroot}%{baseinstdir}/LICENSE* %{buildroot}%{baseinstdir}/NOTICE
@ -2166,11 +2173,6 @@ make unitcheck slowcheck
# we don't need this anymore
rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
# Clean other pyhon 3.9 pycache in CentOS 9
# rm -rf /home/sandino/rpmbuild/BUILDROOT/libreoffice-7.3.1.3-4.el9.x86_64/usr/lib64/python3.9/site-packages/__pycache__
#rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__
%files
@ -2186,12 +2188,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/help/main_transform.xsl
%{baseinstdir}/presets
%dir %{baseinstdir}/program
%if 0%{?fedora}
%{baseinstdir}/program/core.abignore
%endif
%{baseinstdir}/program/libbasprovlo.so
%{baseinstdir}/program/libcairocanvaslo.so
%{baseinstdir}/program/libcanvasfactorylo.so
%{baseinstdir}/program/bootstraprc
%ifarch %{java_arches}
%dir %{baseinstdir}/program/classes
%{baseinstdir}/program/classes/commonwizards.jar
@ -2205,26 +2202,32 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/classes/XMergeBridge.jar
%{baseinstdir}/program/classes/xmerge.jar
%endif
%{baseinstdir}/program/libcmdmaillo.so
%{baseinstdir}/program/libdeployment.so
%{baseinstdir}/program/libdeploymentgui.so
%{baseinstdir}/program/libdlgprovlo.so
%{baseinstdir}/program/libfps_officelo.so
%if 0%{?fedora}
%{baseinstdir}/program/core.abignore
%endif
%{baseinstdir}/program/fundamentalrc
%{baseinstdir}/program/gdbtrace
%{baseinstdir}/program/gengal
%{baseinstdir}/program/gengal.bin
%{baseinstdir}/program/libi18nsearchlo.so
%{baseinstdir}/program/libldapbe2lo.so
%{baseinstdir}/program/intro.png
%{baseinstdir}/program/intro-highres.png
%{baseinstdir}/program/libacclo.so
%{baseinstdir}/program/libanimcorelo.so
%{baseinstdir}/program/libavmedia*.so
%{baseinstdir}/program/libbasctllo.so
%{baseinstdir}/program/libbasegfxlo.so
%{baseinstdir}/program/libbasprovlo.so
%{baseinstdir}/program/libbiblo.so
%{baseinstdir}/program/libcached1.so
%{baseinstdir}/program/libcairocanvaslo.so
%{baseinstdir}/program/libcanvasfactorylo.so
%{baseinstdir}/program/libcanvastoolslo.so
%{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
%{baseinstdir}/program/libctllo.so
%{baseinstdir}/program/libcuilo.so
@ -2235,10 +2238,14 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/libdbpool2.so
%{baseinstdir}/program/libdbtoolslo.so
%{baseinstdir}/program/libdbulo.so
%{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
%{baseinstdir}/program/libdrawinglayercorelo.so
@ -2248,39 +2255,56 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/libemfiolo.so
%{baseinstdir}/program/libevoab*.so
%{baseinstdir}/program/libevtattlo.so
%{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
%{baseinstdir}/program/libfrmlo.so
%{baseinstdir}/program/libfsstoragelo.so
%{baseinstdir}/program/libguesslanglo.so
%{baseinstdir}/program/libhelplinkerlo.so
%{baseinstdir}/program/libhyphenlo.so
%{baseinstdir}/program/libi18npoollo.so
%{baseinstdir}/program/libi18nsearchlo.so
%{baseinstdir}/program/libi18nutil.so
%{baseinstdir}/program/libldapbe2lo.so
%ifarch %{java_arches}
%{baseinstdir}/program/libjdbclo.so
%endif
%{baseinstdir}/program/libLanguageToollo.so
%{baseinstdir}/program/liblnglo.so
%{baseinstdir}/program/liblnthlo.so
%{baseinstdir}/program/libloglo.so
%{baseinstdir}/program/liblocalebe1lo.so
%{baseinstdir}/program/liblocaledata_en.so
%{baseinstdir}/program/liblocaledata_es.so
%{baseinstdir}/program/liblocaledata_euro.so
%{baseinstdir}/program/liblocaledata_others.so
%{baseinstdir}/program/liblosessioninstalllo.so
%{baseinstdir}/program/libmigrationoo2lo.so
%{baseinstdir}/program/libmigrationoo3lo.so
%{baseinstdir}/program/libmozbootstraplo.so
%{baseinstdir}/program/libmsfilterlo.so
%{baseinstdir}/program/libmsformslo.so
%{baseinstdir}/program/libmtfrendererlo.so
%{baseinstdir}/program/libmysql_jdbclo.so
%{baseinstdir}/program/libmysqlclo.so
%{baseinstdir}/program/libodbclo.so
%{baseinstdir}/program/libodfflatxmllo.so
%{baseinstdir}/program/liboglcanvaslo.so
%{baseinstdir}/program/liboffacclo.so
%{baseinstdir}/program/libooxlo.so
%{baseinstdir}/program/libopencllo.so
%{baseinstdir}/program/libpackage2.so
%{baseinstdir}/program/libpasswordcontainerlo.so
%{baseinstdir}/program/libpcrlo.so
%{baseinstdir}/program/libpdffilterlo.so
%{baseinstdir}/program/libprotocolhandlerlo.so
%{baseinstdir}/program/libsaxlo.so
%{baseinstdir}/program/libsblo.so
%{baseinstdir}/program/libscnlo.so
%{baseinstdir}/program/libscriptframe.so
%{baseinstdir}/program/libsdlo.so
@ -2288,85 +2312,96 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/libsdbtlo.so
%{baseinstdir}/program/libsddlo.so
%{baseinstdir}/program/libsduilo.so
%{baseinstdir}/program/libsfxlo.so
%{baseinstdir}/program/libsimplecanvaslo.so
%{baseinstdir}/program/libslideshowlo.so
%{baseinstdir}/program/libsmlo.so
%{baseinstdir}/program/libsmdlo.so
%{baseinstdir}/program/libsofficeapp.so
%{baseinstdir}/program/libsotlo.so
%{baseinstdir}/program/libspelllo.so
%{baseinstdir}/program/libspllo.so
%{baseinstdir}/program/libstringresourcelo.so
%{baseinstdir}/program/libsrtrs1.so
%{baseinstdir}/program/libstoragefdlo.so
%{baseinstdir}/program/libsvgiolo.so
%{baseinstdir}/program/libsvllo.so
%{baseinstdir}/program/libsvtlo.so
%{baseinstdir}/program/libsvxlo.so
%{baseinstdir}/program/libsvxcorelo.so
%{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/libodfflatxmllo.so
# TODO: shouldn't it have lo suffix?
%{baseinstdir}/program/libtklo.so
%{baseinstdir}/program/libtllo.so
%{baseinstdir}/program/libucb1.so
%{baseinstdir}/program/libucbhelper.so
%{baseinstdir}/program/libucpchelp1.so
%{baseinstdir}/program/libucpcmis1lo.so
%{baseinstdir}/program/libucpdav1.so
%{baseinstdir}/program/libucpexpand1lo.so
%{baseinstdir}/program/libucpextlo.so
%{baseinstdir}/program/libucpfile1.so
%{baseinstdir}/program/libucpgio1lo.so
%{baseinstdir}/program/libucpimagelo.so
%{baseinstdir}/program/libucptdoc1lo.so
%{baseinstdir}/program/libucphier1.so
%{baseinstdir}/program/libucppkg1.so
%{baseinstdir}/program/libunordflo.so
%{baseinstdir}/program/libunopkgapp.so
%{baseinstdir}/program/libunoxmllo.so
%{baseinstdir}/program/libutllo.so
%{baseinstdir}/program/libupdatefeedlo.so
%{baseinstdir}/program/libuuilo.so
%{baseinstdir}/program/libvbaeventslo.so
%{baseinstdir}/program/libvbahelperlo.so
%{baseinstdir}/program/libvclcanvaslo.so
%{baseinstdir}/program/libvcllo.so
%{baseinstdir}/program/libwriterperfectlo.so
%{baseinstdir}/program/libxmlfalo.so
%{baseinstdir}/program/libxmlfdlo.so
%{baseinstdir}/program/libxmlscriptlo.so
%{baseinstdir}/program/libxmlsecurity.so
%{baseinstdir}/program/libxoflo.so
%{baseinstdir}/program/libxolo.so
%{baseinstdir}/program/libxsec_xmlsec.so
%{baseinstdir}/program/libxsltdlglo.so
%{baseinstdir}/program/libxsltfilterlo.so
%{baseinstdir}/program/libxstor.so
# TODO how useful this is in Fedora?
%{baseinstdir}/program/liblosessioninstalllo.so
%{baseinstdir}/program/libmigrationoo2lo.so
%{baseinstdir}/program/libmigrationoo3lo.so
%{baseinstdir}/program/libmsformslo.so
%{baseinstdir}/program/lounorc
%{baseinstdir}/program/oosplash
%{baseinstdir}/program/opencl
%{baseinstdir}/program/opencltest
%dir %{baseinstdir}/program/opengl
%{baseinstdir}/program/opengl/*.glsl
%{baseinstdir}/program/types/offapi.rdb
%{baseinstdir}/program/libpasswordcontainerlo.so
%{baseinstdir}/program/pagein-common
%{baseinstdir}/program/redirectrc
%dir %{baseinstdir}/program/resource
%dir %{baseinstdir}/program/resource/common
%dir %{baseinstdir}/program/resource/common/fonts
%{baseinstdir}/program/senddoc
%dir %{baseinstdir}/program/services
%{baseinstdir}/program/services/services.rdb
%{baseinstdir}/program/libsimplecanvaslo.so
%{baseinstdir}/program/libslideshowlo.so
%{baseinstdir}/program/libsmlo.so
%{baseinstdir}/program/libsmdlo.so
%{baseinstdir}/program/libsofficeapp.so
%{baseinstdir}/program/libstringresourcelo.so
%{baseinstdir}/program/libsysshlo.so
%{baseinstdir}/program/libucpcmis1lo.so
%{baseinstdir}/program/libucpexpand1lo.so
%{baseinstdir}/program/libucpextlo.so
%{baseinstdir}/program/libucpimagelo.so
%{baseinstdir}/program/libucptdoc1lo.so
%{baseinstdir}/program/lounorc
%{baseinstdir}/program/libupdatefeedlo.so
%{baseinstdir}/program/setuprc
%{baseinstdir}/program/shell/
%{baseinstdir}/program/soffice
%{baseinstdir}/program/soffice.bin
%{baseinstdir}/program/sofficerc
%{baseinstdir}/program/types
%{baseinstdir}/program/unoinfo
%{baseinstdir}/program/unopkg
%{baseinstdir}/program/unopkg.bin
%{baseinstdir}/program/uri-encode
%{baseinstdir}/program/libvbaeventslo.so
%{baseinstdir}/program/libvclcanvaslo.so
%{baseinstdir}/program/versionrc
%dir %{baseinstdir}/share
%{baseinstdir}/share/autocorr
%dir %{baseinstdir}/share/autotext
%{baseinstdir}/share/basic
%dir %{baseinstdir}/share/classification
%{baseinstdir}/share/classification/example*.xml
%dir %{baseinstdir}/share/fonts
%dir %{baseinstdir}/share/fonts/truetype
%{baseinstdir}/share/fonts/truetype/fc_local.conf
%dir %{baseinstdir}/share/Scripts
%ifarch %{java_arches}
%{baseinstdir}/share/Scripts/java
%endif
%dir %{baseinstdir}/share/autotext
%dir %{_datadir}/autocorr
%{baseinstdir}/share/autocorr
%{baseinstdir}/share/basic
%dir %{baseinstdir}/share/config
%{baseinstdir}/share/config/images_breeze.zip
%{baseinstdir}/share/config/images_breeze_svg.zip
@ -2389,23 +2424,47 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/share/config/images_sukapura_svg.zip
%{baseinstdir}/share/config/images_sukapura_dark.zip
%{baseinstdir}/share/config/images_sukapura_dark_svg.zip
%dir %{baseinstdir}/share/tipoftheday
%{baseinstdir}/share/tipoftheday/*
%dir %{baseinstdir}/share/toolbarmode
%{baseinstdir}/share/toolbarmode/*
%dir %{baseinstdir}/share/config/soffice.cfg
%{baseinstdir}/share/config/soffice.cfg/cui
%{baseinstdir}/share/config/soffice.cfg/dbaccess
%{baseinstdir}/share/config/soffice.cfg/desktop
%{baseinstdir}/share/config/soffice.cfg/editeng
%{baseinstdir}/share/config/soffice.cfg/filter
%{baseinstdir}/share/config/soffice.cfg/formula
%{baseinstdir}/share/config/soffice.cfg/fps
%{baseinstdir}/share/config/soffice.cfg/modules
%{baseinstdir}/share/config/soffice.cfg/sfx
%{baseinstdir}/share/config/soffice.cfg/svx
%{baseinstdir}/share/config/soffice.cfg/svt
%{baseinstdir}/share/config/soffice.cfg/uui
%{baseinstdir}/share/config/soffice.cfg/vcl
%{baseinstdir}/share/config/soffice.cfg/writerperfect
%{baseinstdir}/share/config/soffice.cfg/xmlsec
%{baseinstdir}/share/config/soffice.cfg/*/ui
%{baseinstdir}/share/palette
%{baseinstdir}/share/config/wizard
%dir %{baseinstdir}/share/dtd
%{baseinstdir}/share/dtd/officedocument
%dir %{baseinstdir}/share/extensions
%dir %{baseinstdir}/share/filter
%{baseinstdir}/share/filter/oox-drawingml-adj-names
%{baseinstdir}/share/filter/oox-drawingml-cs-presets
%{baseinstdir}/share/filter/signature-line.svg
%{baseinstdir}/share/filter/signature-line-draw.svg
%{baseinstdir}/share/filter/vml-shape-types
%dir %{baseinstdir}/share/fonts
%dir %{baseinstdir}/share/fonts/truetype
%{baseinstdir}/share/fonts/truetype/fc_local.conf
%{baseinstdir}/share/gallery
%dir %{baseinstdir}/share/labels
%{baseinstdir}/share/labels/labels.xml
%{baseinstdir}/share/palette
%dir %{baseinstdir}/share/psprint
%config %{baseinstdir}/share/psprint/psprint.conf
%{baseinstdir}/share/psprint/driver
%dir %{baseinstdir}/share/Scripts
%ifarch %{java_arches}
%{baseinstdir}/share/Scripts/java
%endif
%dir %{baseinstdir}/share/registry
%{baseinstdir}/share/registry/draw.xcd
%{baseinstdir}/share/registry/gnome.xcd
@ -2427,96 +2486,47 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/share/template/common/wizard
%{baseinstdir}/share/template/common/l10n/
%{baseinstdir}/share/template/wizard
%dir %{baseinstdir}/share/tipoftheday
%{baseinstdir}/share/tipoftheday/*
%dir %{baseinstdir}/share/toolbarmode
%{baseinstdir}/share/toolbarmode/*
%dir %{baseinstdir}/share/wizards
%dir %{baseinstdir}/share/wordbook
%{baseinstdir}/share/wordbook/en-GB.dic
%{baseinstdir}/share/wordbook/en-US.dic
%{baseinstdir}/share/wordbook/technical.dic
%{baseinstdir}/program/liblnthlo.so
%{_bindir}/unopkg
%{_mandir}/man1/unopkg.1*
%{baseinstdir}/program/libxmlsecurity.so
%{baseinstdir}/program/libconfigmgrlo.so
%{baseinstdir}/program/libdesktopbe1lo.so
%{baseinstdir}/program/libfsstoragelo.so
%{baseinstdir}/program/libi18npoollo.so
%{baseinstdir}/program/libbasegfxlo.so
# TODO: shouldn't it have lo suffix?
%{baseinstdir}/program/libcomphelper.so
%{baseinstdir}/program/libfwklo.so
# TODO: shouldn't it have lo suffix?
%{baseinstdir}/program/libi18nutil.so
%{baseinstdir}/program/libpackage2.so
%{baseinstdir}/program/libsblo.so
%{baseinstdir}/program/libsfxlo.so
%{baseinstdir}/program/libsotlo.so
%{baseinstdir}/program/libspllo.so
%{baseinstdir}/program/libsvllo.so
%{baseinstdir}/program/libsvtlo.so
%{baseinstdir}/program/libtklo.so
%{baseinstdir}/program/libtllo.so
%{baseinstdir}/program/libucb1.so
%{baseinstdir}/program/libucpfile1.so
%{baseinstdir}/program/libutllo.so
%{baseinstdir}/program/libvcllo.so
%{baseinstdir}/program/libwriterperfectlo.so
%{baseinstdir}/program/libxmlscriptlo.so
%{baseinstdir}/program/libxolo.so
%{baseinstdir}/program/liblocalebe1lo.so
%{baseinstdir}/program/libucpgio1lo.so
%{baseinstdir}/program/types/oovbaapi.rdb
#share unopkg
%dir %{baseinstdir}/share/extensions
%{baseinstdir}/program/unopkg
%{baseinstdir}/program/unopkg.bin
%{baseinstdir}/program/bootstraprc
%{baseinstdir}/program/fundamentalrc
%{baseinstdir}/program/setuprc
%{baseinstdir}/program/intro.png
%{baseinstdir}/program/intro-highres.png
%{baseinstdir}/program/opencltest
%{baseinstdir}/program/soffice
%{baseinstdir}/program/soffice.bin
%{baseinstdir}/program/sofficerc
%{baseinstdir}/program/unoinfo
%{baseinstdir}/program/oosplash
%{baseinstdir}/program/shell/
%dir %{baseinstdir}/share/filter
%{baseinstdir}/share/filter/oox-drawingml-adj-names
%{baseinstdir}/share/filter/oox-drawingml-cs-presets
%{baseinstdir}/share/filter/signature-line.svg
%{baseinstdir}/share/filter/signature-line-draw.svg
%{baseinstdir}/share/filter/vml-shape-types
%{baseinstdir}/share/xdg/
%{baseinstdir}/program/redirectrc
%{_bindir}/libreoffice
%{_bindir}/openoffice.org
%{_bindir}/ooffice
%{_bindir}/ooviewdoc
%{_bindir}/soffice
%{_bindir}/unopkg
%dir %{_datadir}/autocorr
%if 0%{?flatpak}
%{_datadir}/metainfo/org.libreoffice.LibreOffice.appdata.xml
%{_datadir}/applications/org.libreoffice.LibreOffice.desktop
%else
%{_datadir}/applications/libreoffice-startcenter.desktop
%endif
#launchers
%{_bindir}/libreoffice
%{_bindir}/openoffice.org
%{_bindir}/soffice
%{_bindir}/ooffice
%{_bindir}/ooviewdoc
%{_mandir}/man1/libreoffice.1*
%{_mandir}/man1/openoffice.org.1*
%{_mandir}/man1/soffice.1*
%{_mandir}/man1/ooffice.1*
%{_mandir}/man1/ooviewdoc.1*
%{_mandir}/man1/unopkg.1*
%files base
%{baseinstdir}/program/access2base.py
%if 0%{?fedora}
%{baseinstdir}/program/base.abignore
%endif
%ifarch %{java_arches}
%{baseinstdir}/program/classes/hsqldb.jar
%{baseinstdir}/program/classes/reportbuilder.jar
%{baseinstdir}/program/classes/reportbuilderwizard.jar
%{baseinstdir}/program/classes/sdbc_hsqldb.jar
%endif
%{baseinstdir}/program/access2base.py
%if 0%{?fedora}
%{baseinstdir}/program/base.abignore
%endif
%{baseinstdir}/program/libabplo.so
%{baseinstdir}/program/libdbplo.so
%if %{with firebird}
@ -2624,7 +2634,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/libsolverlo.so
%{baseinstdir}/program/libwpftcalclo.so
%{baseinstdir}/program/libvbaobjlo.so
%{baseinstdir}/share/calc/styles.xml
%{baseinstdir}/share/calc
%{baseinstdir}/share/registry/calc.xcd
%{baseinstdir}/program/pagein-calc
%{baseinstdir}/program/scalc
@ -2929,9 +2939,85 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
* Thu Apr 04 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.1.2+gob.mx1.2-9
- merge gob.mx/24.2.1.2-fc39
- parches gob.mx ya vienen incluídos en los paquetes tar.xz
* Fri Jun 28 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.4.2-4+gob.mx1.3
- Merge gob.mx-1.3-24.2.4.2-fc39
- Backport to CentOS 9
* Fri Jun 28 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.3.2-4+gob.mx1.3
- Merge gob.mx-1.3-24.2.3.2-fc39
- Backport to CentOS 9
* Fri Jun 28 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.1.2-10+gob.mx1.2
- Merge gob.mx-1.2-24.2.1.2-fc40
- Backport to CentOS 9
* Thu Jun 27 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.4.2-4
- Merge 24.2.4.2-fc39
- Rebuild on CentOS 9
* Thu Jun 27 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.3.2-3
- Merge 24.2.3.2-fc39
- Rebuild on CentOS 9
* Tue Jun 25 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.4.2-4+gob.mx1.3
- Merge gob.mx-1.3-24.2.4.2-fc40
- Rebuild on Fedora 39
* Tue Jun 25 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.4.2-3+gob.mx1.3
- Merge 24.2.4.2.fc40
- Actualización del patchset gob.mx 1.3 para Libreoffice 24.2.4.2
- Fuentes que cambian de versión: NotoSansHebrew-v2.004.zip y NotoSerifHebrew-v2.004.zip
* Tue Jun 25 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.3.2-2+gob.mx1.3
- Merge gob.mx-1.3-24.2.3.2-fc40
* Tue Jun 25 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.3.2-2+gob.mx1.3
- Merge 24.2.3.2.fc40
- Patchset gob.mx 1.3
* Mon Jun 24 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.2.2-5+gob.mx1.2
- Temporarily disabled patch for kf6 scaling
- Added NotoKufiArabic-v2.109.zip to sources
- Updated gob.mx 1.2 patchset
- Minor version bump to libreoffice 24.2.2.2
* Sat Jun 22 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.2.1-3+gob.mx1.2
- merge 24.2.2.1.fc40
* Fri Jun 21 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.3.2-2
- Backport to Fedora 39
- Disabled kf6 dependency on fedora < 40
* Fri Jun 21 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.1.2-9+gob.mx1.2
- Rebuild
* Fri Jun 21 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.3.2-2
- Backport to Fedora 39
- Disabled kf6 dependency on fedora < 40
* Sat Jun 08 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.4.2-1
- 24.2.4.2
* Fri Jun 07 2024 Nianqing Yao <imbearchild@outlook.com> - 1:24.2.3.2-4
- Fix build on rv64
* Mon Jun 03 2024 Mattia Verga <mattia.verga@proton.me> - 1:24.2.3.2-3
- Fix Nynorsk langpack filelist (fedora#2284264)
* Mon May 27 2024 Mattia Verga <mattia.verga@proton.me> - 1:24.2.3.2-2
- Fix file and directories ownership
* Thu May 02 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.3.2-1
- 24.2.3.2
* Mon Apr 29 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.3.1-1
- 24.2.3.1
* Sat Apr 13 2024 Miroslav Suchý <msuchy@redhat.com> - 1:24.2.2.1-3
- convert MPLv2.0 license to SPDX
* Thu Apr 04 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.1.2-8
- Backport de 24.2.1.2 para CentOS 9
* Thu Apr 04 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.1.2-8
- Backport de 24.2.1.2 para CentOS 9
@ -2940,15 +3026,19 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
- Disable KF6 on Fedora 39
- liborcus >= 0.19 dependency
* Tue Apr 02 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.1.2+gob.mx1.2-7
- use gob.mx source tarballs
* Wed Apr 03 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.1.2-6
- Disable KF6 on Fedora 39
- liborcus >= 0.19 dependency
* Thu Mar 28 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.1.2-6+gob.mx1.2
- Patchset gob.mx 1.2
* Mon Mar 18 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.1.2-5
* Mon Mar 18 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.2.1-2
- Patch for kf6 scaling
* Wed Mar 13 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.2.1-1
- 24.2.2.1
* Fri Mar 08 2024 Neal Gompa <ngompa@fedoraproject.org> - 1:24.2.1.2-2
- Rework build conditionals for firebird+kf5+kf6 and fix supplements for
kf5
@ -2968,15 +3058,15 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
* Fri Feb 23 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.1.1-5
- Disable test on ppc64le
* Thu Feb 22 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.0.2-7+gob.mx
- Merge 24.2.0.2-el9
* Thu Feb 22 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.1.1-3
- Backport de 24.2.1.1 para CentOS 9
* Thu Feb 22 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.0.3-4
- Backport de 24.2.0.3 para CentOS 9
* Thu Feb 22 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.0.2-7+gob.mx
- Merge 24.2.0.2-el9
* Wed Feb 21 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.0.2-6
- Backport de 24.2.0.2 para CentOS 9
- El __pycache__ ya no se borra
@ -2984,18 +3074,18 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
* Wed Feb 21 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.1.1-4
- Draw requires oglrans
* Mon Feb 19 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.1.1-3
- Re-enable LTO on s390x
* Mon Feb 19 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.1.1-2
- Re-enable LTO on s390x
* Tue Feb 20 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.0.2-4+gob.mx
- Vendor es INFOTEC
* Mon Feb 19 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.0.2-3+gob.mx
- Temporarily deleted failing unit tests
* Mon Feb 19 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.1.1-3
- Re-enable LTO on s390x
* Mon Feb 19 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.1.1-2
- Re-enable LTO on s390x
* Fri Feb 16 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.0.2-3+gob.mx
- Patchset gobmx-1.1_24.2
@ -3016,6 +3106,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
- Patchset gobmx-1.0_24.2 (no compila)
- Paquetes de fonts Noto
* Sun Jan 28 2024 Sandino Araido Sánchez <sandino@sandino.net> - 1:24.2.0.2-2+gob.mx
- Merge 24.2.0.2-1
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:24.2.0.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
@ -3030,6 +3123,11 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
- Pruebas unitarias que fallan, temporalmente borradas
- Correcciones en la sección %files
* Thu Jan 18 2024 Sandino Araico Sánchez <sandino@sandino.net> - 24.2.0.1-1
- Subida de versión
- Requerimiento de gcc-12 para compilación usando gcc-toolset-12
- Dependencias: liborcus 0.19 y libargon2
* Thu Jan 18 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.0.2-3
- Re-enable LTO for non-s390x arches