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

Actualización de parches gob.mx

Browse source
This commit is contained in:
Sandino Araico Sanchez 2023-08-18 21:54:58 -06:00
parent dcc81a0078
commit a931a51606
No known key found for this signature in database
GPG key ID: 90E64E484EED133A
17 changed files with 5197 additions and 2576 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,17 +1,17 @@
From 57502deddd20146d2db5b3fa7ef5fc789770f800 Mon Sep 17 00:00:00 2001
From 342bd97085b9f5253854153ca559270df8e81138 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/10] Custom images and referencies added
Subject: [PATCH 01/13] Custom images and referencies added
Change-Id: Ic7e4beefaf65fec8bb2b4ef03996b3ff5e849fee
---
cui/source/dialogs/about.cxx | 5 +-
cui/source/dialogs/about.cxx | 7 +-
custom_images/MexGob.svg | 2516 ++++++++++++++++++++++++++++++++++
2 files changed, 2518 insertions(+), 3 deletions(-)
2 files changed, 2519 insertions(+), 4 deletions(-)
create mode 100644 custom_images/MexGob.svg
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index b3911bc61179..e56a85d545b6 100644
index b3911bc61179..6da7886e4870 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -78,8 +78,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
@ -24,6 +24,15 @@ index b3911bc61179..e56a85d545b6 100644
m_pBuildLabel->set_label(sbuildId.getLength() > nMaxChar ? sbuildId.replaceAt(
nMaxChar, sbuildId.getLength() - nMaxChar, u"...")
: sbuildId);
@@ -112,7 +111,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
m_pBrandImage->set_image(m_pVirDev.get());
m_pVirDev.disposeAndClear();
}
- if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) {
+ if (SfxApplication::loadBrandSvg("shell/MexGob", aBackgroundBitmap, nWidth * 0.9)) {
ScopedVclPtr<VirtualDevice> m_pVirDev =
m_pAboutImage->create_virtual_device();
m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel());
@@ -157,7 +156,7 @@ OUString AboutDialog::GetVersionString() {
OUString sVersion = CuiResId(TranslateId(nullptr, "%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")) + " (" + arch + ")";

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

@ -1,7 +1,7 @@
From d042629b598a48b3ff5e9f843d25e985b2078bbf Mon Sep 17 00:00:00 2001
From 38db47a28ad0c0df44b2f4fa13b56cc01b375ab1 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/10] 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 30bf05ae1014ac5d2b9b19a18f68b82e9ab2a5d2 Mon Sep 17 00:00:00 2001
From 70709c6186a6f8d6bb1736465ba540626ff9b5ff 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/10] Modificacion al build y borrado UPDATEURL
Subject: [PATCH 03/13] Modificacion al build y borrado UPDATEURL
Change-Id: I10a2d0a01ceb02d5d7f5267dcb97eb25ce6600d7
---

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

@ -1,26 +0,0 @@
From 1fe69f3eeb6670fdc69098b3041540216e306ae3 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 04/10] Custom images and referencies added
Change-Id: Ic7e4beefaf65fec8bb2b4ef03996b3ff5e849fee
---
cui/source/dialogs/about.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index e56a85d545b6..6da7886e4870 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -111,7 +111,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
m_pBrandImage->set_image(m_pVirDev.get());
m_pVirDev.disposeAndClear();
}
- if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) {
+ if (SfxApplication::loadBrandSvg("shell/MexGob", aBackgroundBitmap, nWidth * 0.9)) {
ScopedVclPtr<VirtualDevice> m_pVirDev =
m_pAboutImage->create_virtual_device();
m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel());
--
2.39.3

4
CentOS-9/SOURCES/0005-Fuentes-monserrat-y-gmx.patch → CentOS-9/SOURCES/0004-Fuentes-monserrat-y-gmx.patch
View file

@ -1,7 +1,7 @@
From 66b0570d0d7c01ae9314b8dbda7152e5e69be8f8 Mon Sep 17 00:00:00 2001
From 6530a88db69f407569478c7fb24b585accb6f94e 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 05/10] Fuentes monserrat y gmx
Subject: [PATCH 04/13] Fuentes monserrat y gmx
Change-Id: I73186714bc4809d0b3d48ceb94e933a78db2d623
---

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

@ -1,7 +1,7 @@
From ea8537d40131f40648dd85deeb9a0556b2d34d5d Mon Sep 17 00:00:00 2001
From 7357239b4e145ab4353f719e2da5f9b318bd7e8b 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 06/10] Fonts added
Subject: [PATCH 05/13] Fonts added
Change-Id: I32fb8011dd391d35c34627713cb38e5432927c7e
---

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

@ -1,7 +1,7 @@
From 80c07550e681c5eced344aa60a24367c6e4b073d Mon Sep 17 00:00:00 2001
From dd12ecc769301f2280a1c7c4e46da20ab92d3862 Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Mon, 31 Jul 2023 20:23:12 -0600
Subject: [PATCH 07/10] Modificado archivo tar xz a gz
Subject: [PATCH 06/13] Modificado archivo tar xz a gz
---
download.lst | 3 +++

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

@ -1,7 +1,7 @@
From 9978f91f8de39236f78d961d104823e3d040084a Mon Sep 17 00:00:00 2001
From 684bdc893345bd6a495a1bbb2dae948e4ef7e2eb Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Tue, 1 Aug 2023 14:12:02 -0600
Subject: [PATCH 08/10] =?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

26
CentOS-9/SOURCES/0008-Fuentes-monserrat-y-gmx.patch Normal file
View file

@ -0,0 +1,26 @@
From ed08ea286b25a89313343af6b0332420db05fd30 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 08/13] Fuentes monserrat y gmx
Change-Id: I73186714bc4809d0b3d48ceb94e933a78db2d623
---
Makefile.fetch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.fetch b/Makefile.fetch
index 82ba52469024..0bff63e01cb4 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -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) \
- ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item)))
+ ,$(call fetch__Download_item,https://repos.libreoffice.gob.mx/src,$(item)))
@mkdir -p $(dir $@) && touch $@
@mkdir -p $(dir $@)/Executable
--
2.39.3

29
CentOS-9/SOURCES/0009-Corregida-instrucci-n-de-descarga.patch Normal file
View file

@ -0,0 +1,29 @@
From 512a322aa72f1101b4d868d2633b5352eb82397d Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Tue, 1 Aug 2023 14:12:02 -0600
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
Content-Transfer-Encoding: 8bit
---
Makefile.fetch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.fetch b/Makefile.fetch
index 0bff63e01cb4..82ba52469024 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -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) \
- ,$(call fetch__Download_item,https://repos.libreoffice.gob.mx/src,$(item)))
+ ,$(call fetch_Download_item,https://repos.libreoffice.gob.mx/src,$(item)))
@mkdir -p $(dir $@) && touch $@
@mkdir -p $(dir $@)/Executable
--
2.39.3

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

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

4
CentOS-9/SOURCES/0010-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 1cd25600e1271e8e3bfa8dee815f2fa5f5218edc Mon Sep 17 00:00:00 2001
From add6a95dbdaf12d57f12872f9c90f42d0ec39a4e Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Fri, 4 Aug 2023 20:21:33 -0600
Subject: [PATCH 10/10] Modificado link de descarga de fuentes
Subject: [PATCH 11/13] Modificado link de descarga de fuentes
Change-Id: I80b8e9ea4286d68c1880ef45eaa191a8f0c3e7d2
---

25
CentOS-9/SOURCES/0012-Restauracion-link-repos-src.patch Normal file
View file

@ -0,0 +1,25 @@
From af9834b0d961af866c570b6cb33f03abbfba54c5 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 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 889f32acfd4e..82ba52469024 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -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) \
- ,$(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.39.3

2536
CentOS-9/SOURCES/0013-logo-image-updated.patch Normal file
View file

File diff suppressed because one or more lines are too long

BIN
CentOS-9/SOURCES/GMX-Acuerdo.pdf Normal file
View file

Binary file not shown.

29
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: 4+gob.mx%{?libo_prerelease}%{?dist}
Release: 5+gob.mx%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@ -83,7 +83,7 @@ Source12: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zi
Source13: %{external_url}/../extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
# Fonts GMX (gob.mx)
Source21: https://repos.libreoffice.gob.mx/src/gmx-fonts.tar.gz
# Source22: licenciade GMX
Source22: GMX-Acuerdo.pdf
# More fonts
Source23: %{external_url}/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
Source24: %{external_url}/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
@ -304,13 +304,17 @@ Patch15: 0001-gpgme.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-Fuentes-monserrat-y-gmx.patch
Patch26: 0006-Fonts-added.patch
Patch27: 0007-Modificado-archivo-tar-xz-a-gz.patch
Patch28: 0008-Corregida-instrucci-n-de-descarga.patch
Patch29: 0009-Cambios-en-logo.patch
Patch30: 0010-Modificado-link-de-descarga-de-fuentes.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
@ -363,7 +367,7 @@ Requires: google-crosextra-caladea-fonts, google-crosextra-carlito-fonts
# Fonts para gob.mx
Requires: %{name}-gmx-fonts = %{epoch}:%{version}-%{release}
Requires: julietaula-montserrat-fonts
Requires: %{name}-langpack-en = %{epoch}:%{version}-%{release}
Requires: %{name}-langpack-es = %{epoch}:%{version}-%{release}
%ifarch %{java_arches}
# rhbz#949106 libreoffice-core drags in both openjdk 1.7.0 and 1.8.0
Requires: java-headless >= 1:1.6
@ -1355,6 +1359,7 @@ pushd %{buildroot}%{baseinstdir}/share/fonts/truetype
#install -p -m 0644 GMX-* %{buildroot}%{baseinstdir}/share/fonts/gmx
install -d -m 0755 %{buildroot}%{_datadir}/fonts/gmx
install -p -m 0644 GMX-* %{buildroot}%{_datadir}/fonts/gmx
install -p -m 0644 %{SOURCE22} %{buildroot}%{_datadir}/fonts/gmx
popd
rm -vf %{buildroot}%{baseinstdir}/program/resource/common/fonts/*ttf
@ -2345,6 +2350,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
* Fri Aug 18 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.5.5.2-5+gob.mx
- Actualización de parches de gob.mx
- Acuerdo de licenciamiento de fuentes GMX
* Thu Aug 17 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.5.5.2-4+gob.mx
- Se cambió la ruta de gmx-fonts a /usr/share/fonts/gmx
- Opción de compilación --with-product-name=Office

19
scripts/libreoffice-backport.sh
View file

@ -411,9 +411,22 @@ git push --set-upstream origin office-gobmx-7.5.5.1
# To git.softwarelibre.mx:strepsirrhini/office-gobmx.git
# * [new branch] office-gobmx-7.5.5.1 -> office-gobmx-7.5.5.1
# branch 'office-gobmx-7.5.5.1' set up to track 'origin/office-gobmx-7.5.5.1'.
git diff libreoffice-7.5.5.1
mkdir ../formatpatch-2023-08-18
git format-patch -o ../formatpatch-2023-08-18 libreoffice-7.5.5.1
# ../formatpatch-2023-08-18/0001-Custom-images-and-referencies-added.patch
# ../formatpatch-2023-08-18/0002-Archivos-de-distro-config-de-brand-Office.patch
# ../formatpatch-2023-08-18/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch
# ../formatpatch-2023-08-18/0004-Fuentes-monserrat-y-gmx.patch
# ../formatpatch-2023-08-18/0005-Fonts-added.patch
# ../formatpatch-2023-08-18/0006-Modificado-archivo-tar-xz-a-gz.patch
# ../formatpatch-2023-08-18/0007-Corregida-instrucci-n-de-descarga.patch
# ../formatpatch-2023-08-18/0008-Fuentes-monserrat-y-gmx.patch
# ../formatpatch-2023-08-18/0009-Corregida-instrucci-n-de-descarga.patch
# ../formatpatch-2023-08-18/0010-Cambios-en-logo.patch
# ../formatpatch-2023-08-18/0011-Modificado-link-de-descarga-de-fuentes.patch
# ../formatpatch-2023-08-18/0012-Restauracion-link-repos-src.patch
# ../formatpatch-2023-08-18/0013-logo-image-updated.patch