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

7.5.4.2-8.gob.mx: Parches gob.mx

Browse source
This commit is contained in:
Sandino Araico Sánchez 2023-07-17 21:25:56 -06:00
parent 0c6f9e70be
commit 5559688fd8
No known key found for this signature in database
GPG key ID: 90E64E484EED133A
4 changed files with 2686 additions and 2522 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5042
CentOS-9/SOURCES/0001-Custom-images-and-referencies-added.patch
View file

File diff suppressed because it is too large Load diff

62
CentOS-9/SOURCES/0002-Archivos-de-distro-config-de-brand-Office.patch Normal file
View file

@ -0,0 +1,62 @@
From 447616056e24eb3ef3c59ad4a0eec72ab0a7a9b3 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 2/3] 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.3

94
CentOS-9/SOURCES/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch Normal file
View file

@ -0,0 +1,94 @@
From f983157cbec66658910545bdfe6e2bee62c32f41 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 3/3] 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 fb0ff9c81f9d..ba7f9eb0dfeb 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.3

10
CentOS-9/SPECS/libreoffice.spec
View file

@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
Release: 7.gob.mx%{?libo_prerelease}%{?dist}
Release: 8.gob.mx%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@ -281,6 +281,8 @@ Patch15: 0001-gpgme.patch
# Parches de gob.mx
Patch20: 0001-Custom-images-and-referencies-added.patch
Patch21: 0002-Archivos-de-distro-config-de-brand-Office.patch
Patch22: 0003-Modificacion-al-build-y-borrado-UPDATEURL.patch
%global instdir %{_libdir}
%global baseinstdir %{instdir}/libreoffice
@ -2284,6 +2286,11 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
* Sat Jul 08 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.5.4.2-8.gob.mx
- Parches de Israel Paredes <israel.paredes@ugd.gob.mx>
- 0002-Archivos-de-distro-config-de-brand-Office.patch
- 0003-Modificacion-al-build-y-borrado-UPDATEURL.patch
* Tue Jun 20 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.5.4.2-7.gob.mx
- Merge 7.5.4.2-6
@ -2292,6 +2299,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
- Se rehabilitaron algunas pruebas unitarias para CentOS 9
* Tue Jun 20 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.5.4.2-5.gob.mx
- Parches de Adlair Cerecedo-Mendez <adlair@linuxmail.org>
- 0001-Custom-images-and-referencies-added.patch
* Tue Jun 20 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.5.4.2-4