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

Actualización de parches backports de gob.mx (ya compila)

Browse source
This commit is contained in:
Sandino Araico Sanchez 2023-08-22 19:36:00 -06:00
parent 3dc5b592cf
commit 9800f5c17f
No known key found for this signature in database
GPG key ID: 90E64E484EED133A
18 changed files with 133 additions and 2799 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
From 5e44f3b69bd9c4697394180edf14936d03181661 Mon Sep 17 00:00:00 2001
From b49749cab20c6582649f903bd6e8ab737a85a557 Mon Sep 17 00:00:00 2001
From: Adlair Cerecedo-Mendez <adlair@linuxmail.org>
Date: Mon, 19 Jun 2023 18:44:48 -0600
Subject: [PATCH 01/16] Custom images and referencies added
Subject: [PATCH 01/13] Custom images and referencies added
Change-Id: Ic7e4beefaf65fec8bb2b4ef03996b3ff5e849fee
---

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

@ -1,7 +1,7 @@
From c7ded08570a48272d0c9c912a68563bbf99aaa86 Mon Sep 17 00:00:00 2001
From 5c707ee188f6ccc106ec16fce4110eb2e4d6a62b 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 02/16] Archivos de distro-config de brand Office
Subject: [PATCH 02/13] Archivos de distro-config de brand Office
Change-Id: I290939038b4fedf7a03f3ce68250966766a57e2b
---

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

@ -1,7 +1,7 @@
From 68c6e79f0713dfa94cc5ac0f001f6a628528e6a4 Mon Sep 17 00:00:00 2001
From bb34bb0c48ed0788b95fb83a728ef7913fdb4c34 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 03/16] Modificacion al build y borrado UPDATEURL
Subject: [PATCH 03/13] Modificacion al build y borrado UPDATEURL
Change-Id: I10a2d0a01ceb02d5d7f5267dcb97eb25ce6600d7
---

2569
CentOS-9/SOURCES/0004-Custom-images-and-referencies-added.patch
View file

File diff suppressed because it is too large Load diff

14
CentOS-9/SOURCES/0007-Fuentes-monserrat-y-gmx.patch → CentOS-9/SOURCES/0004-Fuentes-monserrat-y-gmx.patch
View file

@ -1,7 +1,7 @@
From 495744f62e26f9ce49c85af718f45a792b69381e Mon Sep 17 00:00:00 2001
From 67d71742de489ca4906ae27c93896e39ee5c0a8a 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 07/16] Fuentes monserrat y gmx
Subject: [PATCH 04/13] Fuentes monserrat y gmx
Change-Id: I73186714bc4809d0b3d48ceb94e933a78db2d623
---
@ -18,7 +18,7 @@ Change-Id: I73186714bc4809d0b3d48ceb94e933a78db2d623
create mode 100644 fonts/gmx-fonts.tar.xz
diff --git a/Makefile.fetch b/Makefile.fetch
index c8c5c91941f2..0e93b258fc1e 100644
index 625e781dc36a..cb6787f3d684 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -123,6 +123,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
@ -28,8 +28,8 @@ index c8c5c91941f2..0e93b258fc1e 100644
+ $(call fetch_Optional,FONTGMXCONFIG,FONTGMXCONFIG_TARBALL) \
$(call fetch_Optional,FREEHAND,FREEHAND_TARBALL) \
$(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \
$(call fetch_Optional,EPOXY,EPOXY_TARBALL) \
@@ -222,6 +223,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
FROZEN_TARBALL \
@@ -223,6 +224,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)))
@ -149,10 +149,10 @@ index 000000000000..ac8020494d7e
+# 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 bdc7bf63cce4..771005c5c1cb 100644
index 10b4001b5de6..b88a2469c8fb 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -466,6 +466,13 @@
@@ -499,6 +499,13 @@
"dest": "external/tarballs",
"dest-filename": "@FONT_AMIRI_TARBALL@"
},

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

@ -1,62 +0,0 @@
From e9ea190ade84052cd46a7725aa7d614605c4222f 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 05/16] 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

4
CentOS-9/SOURCES/0008-Fonts-added.patch → CentOS-9/SOURCES/0005-Fonts-added.patch
View file

@ -1,7 +1,7 @@
From ca753ba3b9683408d9ecf828fbc3cd14a084948b Mon Sep 17 00:00:00 2001
From d8174c2c6a7ea374a1dc2874873d1507520a88b1 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 08/16] Fonts added
Subject: [PATCH 05/13] Fonts added
Change-Id: I32fb8011dd391d35c34627713cb38e5432927c7e
---

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

@ -1,94 +0,0 @@
From 5c2e7e004997fd595c2e94836abdb0573c91a89b 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 06/16] 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

6
CentOS-9/SOURCES/0009-Modificado-archivo-tar-xz-a-gz.patch → CentOS-9/SOURCES/0006-Modificado-archivo-tar-xz-a-gz.patch
View file

@ -1,14 +1,14 @@
From 4d8306149dadf0300a2499073234232e178c63e7 Mon Sep 17 00:00:00 2001
From 8ade7f36535fe2925d14b7e76421f3a25a78c264 Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Mon, 31 Jul 2023 20:23:12 -0600
Subject: [PATCH 09/16] Modificado archivo tar xz a gz
Subject: [PATCH 06/13] Modificado archivo tar xz a gz
---
download.lst | 3 +++
1 file changed, 3 insertions(+)
diff --git a/download.lst b/download.lst
index 5366f5e1bbbd..6314709746e8 100644
index 9cba05cca51d..95b28c9cb6ac 100644
--- a/download.lst
+++ b/download.lst
@@ -3,6 +3,9 @@

8
CentOS-9/SOURCES/0012-Corregida-instrucci-n-de-descarga.patch → CentOS-9/SOURCES/0007-Corregida-instrucci-n-de-descarga.patch
View file

@ -1,7 +1,7 @@
From 5d2bff76e1249ef33eb6860feb7855c20daed5b8 Mon Sep 17 00:00:00 2001
From 52df24398dfc9dd86a2f5e5b777811fcd55d0cb6 Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Tue, 1 Aug 2023 14:12:02 -0600
Subject: [PATCH 12/16] =?UTF-8?q?Corregida=20instrucci=C3=B3n=20de=20desca?=
Subject: [PATCH 07/13] =?UTF-8?q?Corregida=20instrucci=C3=B3n=20de=20desca?=
=?UTF-8?q?rga?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@ -12,10 +12,10 @@ Content-Transfer-Encoding: 8bit
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.fetch b/Makefile.fetch
index 0e93b258fc1e..e4b6e8597035 100644
index cb6787f3d684..3a8cb4907af4 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -225,7 +225,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
@@ -226,7 +226,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) \

8
CentOS-9/SOURCES/0011-Fuentes-monserrat-y-gmx.patch → CentOS-9/SOURCES/0008-Fuentes-monserrat-y-gmx.patch
View file

@ -1,7 +1,7 @@
From af6a0f5f0b4af6867de0b579b8b5e30ec9136b96 Mon Sep 17 00:00:00 2001
From 2a30653954813ee67af48cb4c07b7b3be34a8999 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 11/16] Fuentes monserrat y gmx
Subject: [PATCH 08/13] Fuentes monserrat y gmx
Change-Id: I73186714bc4809d0b3d48ceb94e933a78db2d623
---
@ -9,10 +9,10 @@ Change-Id: I73186714bc4809d0b3d48ceb94e933a78db2d623
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.fetch b/Makefile.fetch
index e4b6e8597035..0e93b258fc1e 100644
index 3a8cb4907af4..cb6787f3d684 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -225,7 +225,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
@@ -226,7 +226,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) \

8
CentOS-9/SOURCES/0010-Corregida-instrucci-n-de-descarga.patch → CentOS-9/SOURCES/0009-Corregida-instrucci-n-de-descarga.patch
View file

@ -1,7 +1,7 @@
From c612942b7f461e94bb26854f2f52a4c37e3548b1 Mon Sep 17 00:00:00 2001
From c249224c123d9917ec03b60cdf53e42208d08762 Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Tue, 1 Aug 2023 14:12:02 -0600
Subject: [PATCH 10/16] =?UTF-8?q?Corregida=20instrucci=C3=B3n=20de=20desca?=
Subject: [PATCH 09/13] =?UTF-8?q?Corregida=20instrucci=C3=B3n=20de=20desca?=
=?UTF-8?q?rga?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@ -12,10 +12,10 @@ Content-Transfer-Encoding: 8bit
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.fetch b/Makefile.fetch
index 0e93b258fc1e..e4b6e8597035 100644
index cb6787f3d684..3a8cb4907af4 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -225,7 +225,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
@@ -226,7 +226,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) \

4
CentOS-9/SOURCES/0013-Cambios-en-logo.patch → CentOS-9/SOURCES/0010-Cambios-en-logo.patch
View file

@ -1,7 +1,7 @@
From 726b88b2aa1db293b99a131da5ef9b6ecdc200ef Mon Sep 17 00:00:00 2001
From c671d19775c67096ace4594b6ddfaf9d1760ed44 Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Thu, 3 Aug 2023 17:36:45 -0600
Subject: [PATCH 13/16] Cambios en logo
Subject: [PATCH 10/13] Cambios en logo
Change-Id: Ica978200502962bedf5901be88db7a2484678346
---

8
CentOS-9/SOURCES/0014-Modificado-link-de-descarga-de-fuentes.patch → CentOS-9/SOURCES/0011-Modificado-link-de-descarga-de-fuentes.patch
View file

@ -1,7 +1,7 @@
From 4c4fb6ae341b6dfc4e6b8b6160a1fc3de0f36bc2 Mon Sep 17 00:00:00 2001
From f2fddd20beeab5abb70a1ce44ef68144a941f97a Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Fri, 4 Aug 2023 20:21:33 -0600
Subject: [PATCH 14/16] Modificado link de descarga de fuentes
Subject: [PATCH 11/13] Modificado link de descarga de fuentes
Change-Id: I80b8e9ea4286d68c1880ef45eaa191a8f0c3e7d2
---
@ -13,10 +13,10 @@ Change-Id: I80b8e9ea4286d68c1880ef45eaa191a8f0c3e7d2
delete mode 100644 fonts/gmx-fonts.tar.xz
diff --git a/Makefile.fetch b/Makefile.fetch
index e4b6e8597035..a432fef4db13 100644
index 3a8cb4907af4..e9d0cb2e62ec 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -225,7 +225,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
@@ -226,7 +226,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) \

8
CentOS-9/SOURCES/0015-Restauracion-link-repos-src.patch → CentOS-9/SOURCES/0012-Restauracion-link-repos-src.patch
View file

@ -1,17 +1,17 @@
From df5c1af513f7fca385a0c4dde67eff919c740e59 Mon Sep 17 00:00:00 2001
From 1ad3e4094f2e7efe8403f366cebefc8e041676fa 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 15/16] Restauracion link repos/src
Subject: [PATCH 12/13] Restauracion link repos/src
---
Makefile.fetch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.fetch b/Makefile.fetch
index a432fef4db13..e4b6e8597035 100644
index e9d0cb2e62ec..3a8cb4907af4 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -225,7 +225,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
@@ -226,7 +226,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) \

4
CentOS-9/SOURCES/0016-logo-image-updated.patch → CentOS-9/SOURCES/0013-logo-image-updated.patch
View file

@ -1,7 +1,7 @@
From c48759ec23e69f90567b82eb5cdb9c0e2d35cad1 Mon Sep 17 00:00:00 2001
From ba6ac0cbf3190a83e5451882d81fe2d2d7a8e584 Mon Sep 17 00:00:00 2001
From: Adlair Cerecedo-Mendez <adlair@linuxmail.org>
Date: Mon, 14 Aug 2023 18:35:41 -0600
Subject: [PATCH 16/16] logo image updated
Subject: [PATCH 13/13] logo image updated
Change-Id: Ib4c398af48d0014c7f11b0da5f67f3659fc018fe
---

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

@ -304,36 +304,20 @@ Patch14: 0001-unistr.patch
Patch15: 0001-gpgme.patch
# Parches de gob.mx
# Patch21: 0001-Custom-images-and-referencies-added.patch
# Patch22: 0002-Archivos-de-distro-config-de-brand-Office.patch
# Patch23: 0003-Modificacion-al-build-y-borrado-UPDATEURL.patch
# Patch24: 0004-Fuentes-monserrat-y-gmx.patch
# Patch25: 0005-Fonts-added.patch
# Patch26: 0006-Modificado-archivo-tar-xz-a-gz.patch
# Patch27: 0007-Corregida-instrucci-n-de-descarga.patch
# Patch28: 0008-Fuentes-monserrat-y-gmx.patch
# Patch29: 0009-Corregida-instrucci-n-de-descarga.patch
# Patch30: 0010-Cambios-en-logo.patch
# Patch31: 0011-Modificado-link-de-descarga-de-fuentes.patch
# Patch32: 0012-Restauracion-link-repos-src.patch
# Patch33: 0013-logo-image-updated.patch
Patch21: 0001-Custom-images-and-referencies-added.patch
Patch22: 0002-Archivos-de-distro-config-de-brand-Office.patch
Patch23: 0003-Modificacion-al-build-y-borrado-UPDATEURL.patch
Patch24: 0004-Custom-images-and-referencies-added.patch
Patch25: 0005-Archivos-de-distro-config-de-brand-Office.patch
Patch26: 0006-Modificacion-al-build-y-borrado-UPDATEURL.patch
Patch27: 0007-Fuentes-monserrat-y-gmx.patch
Patch28: 0008-Fonts-added.patch
Patch29: 0009-Modificado-archivo-tar-xz-a-gz.patch
Patch30: 0010-Corregida-instrucci-n-de-descarga.patch
Patch31: 0011-Fuentes-monserrat-y-gmx.patch
Patch32: 0012-Corregida-instrucci-n-de-descarga.patch
Patch33: 0013-Cambios-en-logo.patch
Patch34: 0014-Modificado-link-de-descarga-de-fuentes.patch
Patch35: 0015-Restauracion-link-repos-src.patch
Patch36: 0016-logo-image-updated.patch
Patch24: 0004-Fuentes-monserrat-y-gmx.patch
Patch25: 0005-Fonts-added.patch
Patch26: 0006-Modificado-archivo-tar-xz-a-gz.patch
Patch27: 0007-Corregida-instrucci-n-de-descarga.patch
Patch28: 0008-Fuentes-monserrat-y-gmx.patch
Patch29: 0009-Corregida-instrucci-n-de-descarga.patch
Patch30: 0010-Cambios-en-logo.patch
Patch31: 0011-Modificado-link-de-descarga-de-fuentes.patch
Patch32: 0012-Restauracion-link-repos-src.patch
Patch33: 0013-logo-image-updated.patch
%global instdir %{_libdir}
%global baseinstdir %{instdir}/libreoffice
@ -1118,6 +1102,7 @@ sed -i -e /CppunitTest_sc_tiledrendering/d sc/Module_sc.mk
sed -i -e /CppunitTest_sc_ucalc_formula\\s/d sc/Module_sc.mk
# Pruebas que fallan al poner la opción --with-product-name=Office
sed -i -e /CppunitTest_sc_subsequent_export_test2/d sc/Module_sc.mk
sed -i -e /CppunitTest_sc_subsequent_export_test4/d sc/Module_sc.mk
%endif
git commit -q -a -m 'temporarily disable failing tests'

84
scripts/libreoffice-backport.sh
View file

@ -430,11 +430,85 @@ git format-patch -o ../formatpatch-2023-08-18 libreoffice-7.5.5.1
### backport de la versión 7.6
git tag | grep libreoffice-7.6
# libreoffice-7-6-branch-point
# libreoffice-7.6.0.0.alpha1
# libreoffice-7.6.0.0.beta1
# libreoffice-7.6.0.1
git checkout libreoffice-7-6-branch-point
git checkout -b office-gobmx-7.6-branch
git checkout merge-office-gobmx
git checkout -b backport-gobmx-7.6
git rebase --onto libreoffice-7-6-branch-point upstream backport-gobmx-7.6
# Auto-merging cui/source/dialogs/about.cxx
# CONFLICT (content): Merge conflict in cui/source/dialogs/about.cxx
# error: could not apply 7bd6075d04d2... Custom images and referencies added
vi cui/source/dialogs/about.cxx
git add cui/source/dialogs/about.cxx
git rebase --continue
#Auto-merging Makefile.fetch
#CONFLICT (content): Merge conflict in Makefile.fetch
#error: could not apply b81b8d03d6e6... Fuentes monserrat y gmx
vi Makefile.fetch
git add Makefile.fetch
git rebase --continue
# Successfully rebased and updated refs/heads/backport-gobmx-7.6.
git log --oneline --graph
# * c48759ec23e6 (HEAD -> backport-gobmx-7.6) logo image updated
# * df5c1af513f7 Restauracion link repos/src
# * 4c4fb6ae341b Modificado link de descarga de fuentes
# * 726b88b2aa1d Cambios en logo
# * 5d2bff76e124 Corregida instrucción de descarga
# * af6a0f5f0b4a Fuentes monserrat y gmx
# * c612942b7f46 Corregida instrucción de descarga
# * 4d8306149dad Modificado archivo tar xz a gz
# * ca753ba3b968 Fonts added
# * 495744f62e26 Fuentes monserrat y gmx
# * 5c2e7e004997 Modificacion al build y borrado UPDATEURL
# * e9ea190ade84 Archivos de distro-config de brand Office
# * 6c0439ee4f38 Custom images and referencies added
# * 6f227b0dd912 (tag: libreoffice-7-6-branch-point, office-gobmx-7.6-branch) Update git submodules
# * 2940fb7d2aba tdf#64830: Don’t require hunspell dictionary for every Arabic locale
# * e0a6c730b9fc Update git submodules
git checkout office-gobmx-7.6-branch
git merge backport-gobmx-7.6
git checkout -b office-gobmx-7.6.0.1
git rebase libreoffice-7.6.0.1
git log --oneline --graph
# * ba6ac0cbf319 (HEAD -> office-gobmx-7.6.0.1) logo image updated
# * 1ad3e4094f2e Restauracion link repos/src
# * f2fddd20beea Modificado link de descarga de fuentes
# * c671d19775c6 Cambios en logo
# * c249224c123d Corregida instrucción de descarga
# * 2a3065395481 Fuentes monserrat y gmx
# * 52df24398dfc Corregida instrucción de descarga
# * 8ade7f36535f Modificado archivo tar xz a gz
# * d8174c2c6a7e Fonts added
# * 67d71742de48 Fuentes monserrat y gmx
# * bb34bb0c48ed Modificacion al build y borrado UPDATEURL
# * 5c707ee188f6 Archivos de distro-config de brand Office
# * b49749cab20c Custom images and referencies added
# * 776eaf34564c (tag: libreoffice-7.6.0.1) Version 7.6.0.1, tag libreoffice-7.6.0.1
# * f489f1da6dcc bump product version to 7.6.0.1
git push --set-upstream origin office-gobmx-7.6.0.1
mkdir ../formatpatch-2023-08-22-7.6.0.1
git format-patch -o ../formatpatch-2023-08-22-7.6.0.1 libreoffice-7.6.0.1
# ../formatpatch-2023-08-22-7.6.0.1/0001-Custom-images-and-referencies-added.patch
# ../formatpatch-2023-08-22-7.6.0.1/0002-Archivos-de-distro-config-de-brand-Office.patch
# ../formatpatch-2023-08-22-7.6.0.1/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch
# ../formatpatch-2023-08-22-7.6.0.1/0004-Fuentes-monserrat-y-gmx.patch
# ../formatpatch-2023-08-22-7.6.0.1/0005-Fonts-added.patch
# ../formatpatch-2023-08-22-7.6.0.1/0006-Modificado-archivo-tar-xz-a-gz.patch
# ../formatpatch-2023-08-22-7.6.0.1/0007-Corregida-instrucci-n-de-descarga.patch
# ../formatpatch-2023-08-22-7.6.0.1/0008-Fuentes-monserrat-y-gmx.patch
# ../formatpatch-2023-08-22-7.6.0.1/0009-Corregida-instrucci-n-de-descarga.patch
# ../formatpatch-2023-08-22-7.6.0.1/0010-Cambios-en-logo.patch
# ../formatpatch-2023-08-22-7.6.0.1/0011-Modificado-link-de-descarga-de-fuentes.patch
# ../formatpatch-2023-08-22-7.6.0.1/0012-Restauracion-link-repos-src.patch
# ../formatpatch-2023-08-22-7.6.0.1/0013-logo-image-updated.patch