Actualización del parche gob.mx 1.4

This commit is contained in:
Sandino Araico Sánchez 2024-09-08 04:47:00 -06:00
parent 70acecfe01
commit 77dc439965
2 changed files with 9 additions and 8 deletions

View file

@ -32,10 +32,10 @@ index c441234d6030..d77ba6275c9a 100644
+ url = https://github.com/LibreOffice/translations.git
branch = .
diff --git a/Makefile.fetch b/Makefile.fetch
index b96cb573c2bf..6ff404e031f9 100644
index ed019e800954..7cb4fa60f0f3 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -241,6 +241,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
@@ -240,6 +240,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)))
@ -46,10 +46,10 @@ index b96cb573c2bf..6ff404e031f9 100644
@mkdir -p $(dir $@)/Executable
diff --git a/Repository.mk b/Repository.mk
index 3e2e29098e66..c04fb9cd4108 100644
index 4a505655d209..f88a6245b993 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1044,6 +1044,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
@@ -1048,6 +1048,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
$(call gb_Helper_optional,MORE_FONTS,\
fonts_alef \
fonts_amiri \
@ -58,7 +58,7 @@ index 3e2e29098e66..c04fb9cd4108 100644
fonts_carlito \
$(if $(MPL_SUBSET),,fonts_culmus) \
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ce82e418cf9e..496cc16676c2 100644
index 353d23b16f07..0ceea4703f84 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -78,8 +78,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
@ -198,7 +198,7 @@ index 000000000000..25996d9d6710
+--with-vendor=INFOTEC
+--disable-community-flavor
diff --git a/download.lst b/download.lst
index 2c76067761b7..b4e5d9bbf8a3 100644
index 82309a256e28..51accbc1e2e4 100644
--- a/download.lst
+++ b/download.lst
@@ -3,6 +3,9 @@
@ -305,7 +305,7 @@ index 000000000000..28b53b415a2a
+
+# vim: set noet sw=4 ts=4:
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index 48efab143c82..8c7e14e709f6 100644
index b78899a2c10b..5534755ac7dc 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -185,7 +185,7 @@ ExtensionUpdateURL=https://updateexte.libreoffice.org/ExtensionUpdateService/che
@ -443,7 +443,7 @@ index b5da0bfb6697..abd2276640fd 100644
+ }
+}
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index ad004c1868bb..a171c9d5280d 100644
index 3aef4468fa0d..3808a26e79e4 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -592,6 +592,13 @@

View file

@ -2877,6 +2877,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
## START: Generated by rpmautospec
* Sun Sep 08 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-4+gob.mx1.4
- Merge 24.8.0.3-fc40
- Actualización del parche gob.mx 1.4
* Fri Sep 06 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.8.0.3-3
- 24.8.0.3