From 9d3047df7effdf90c228b8d5ae9aa41bfae27f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= Date: Sat, 14 Sep 2024 00:22:28 -0600 Subject: [PATCH] Parche gob.mx 1.5.1 --- ...reoffice-24.8.1.2+gobmx1.5.1-patchset.patch} | 17 ++++++++++------- rpmbuild/SPECS/libreoffice.spec | 7 ++++--- 2 files changed, 14 insertions(+), 10 deletions(-) rename rpmbuild/SOURCES/{libreoffice-24.8.0.3+gobmx1.5-patchset.patch => libreoffice-24.8.1.2+gobmx1.5.1-patchset.patch} (99%) diff --git a/rpmbuild/SOURCES/libreoffice-24.8.0.3+gobmx1.5-patchset.patch b/rpmbuild/SOURCES/libreoffice-24.8.1.2+gobmx1.5.1-patchset.patch similarity index 99% rename from rpmbuild/SOURCES/libreoffice-24.8.0.3+gobmx1.5-patchset.patch rename to rpmbuild/SOURCES/libreoffice-24.8.1.2+gobmx1.5.1-patchset.patch index 0671036..500e588 100644 --- a/rpmbuild/SOURCES/libreoffice-24.8.0.3+gobmx1.5-patchset.patch +++ b/rpmbuild/SOURCES/libreoffice-24.8.1.2+gobmx1.5.1-patchset.patch @@ -198,7 +198,7 @@ index 000000000000..25996d9d6710 +--with-vendor=INFOTEC +--disable-community-flavor diff --git a/download.lst b/download.lst -index 82309a256e28..51accbc1e2e4 100644 +index 8876b44aa0ed..06e6fe34798c 100644 --- a/download.lst +++ b/download.lst @@ -3,6 +3,9 @@ @@ -305,10 +305,10 @@ index 000000000000..28b53b415a2a + +# vim: set noet sw=4 ts=4: diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc -index 35997819573d..bceccd006a10 100644 +index d8e1de9ae66c..cd616e033d7d 100644 --- a/include/sfx2/strings.hrc +++ b/include/sfx2/strings.hrc -@@ -356,10 +356,13 @@ +@@ -357,10 +357,13 @@ #define STR_ACTION_RESET_IMPRESS_TEMPLATE NC_("STR_ACTION_RESET_IMPRESS_TEMPLATE","Reset De~fault Presentation") #define STR_ACTION_RESET_DRAW_TEMPLATE NC_("STR_ACTION_RESET_DRAW_TEMPLATE","Reset De~fault Drawing") #define STR_ACTION_IMPORT NC_("STR_ACTION_IMPORT","~Import") @@ -601,7 +601,7 @@ index ca165c99e9c6..2463be11701f 100644 TemplateLocalView::getFilteredItems(const std::function &rFunc) const { diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx -index f0f0322a14d9..c68db2c1f134 100644 +index f0f0322a14d9..e158df74b965 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -52,6 +52,10 @@ @@ -691,7 +691,7 @@ index f0f0322a14d9..c68db2c1f134 100644 IMPL_LINK_NOARG(SfxTemplateManagerDlg, OpenRegionHdl, void*, void) { maSelTemplates.clear(); -@@ -991,6 +1036,93 @@ void SfxTemplateManagerDlg::OnTemplateImportCategory(std::u16string_view sCatego +@@ -991,6 +1036,96 @@ void SfxTemplateManagerDlg::OnTemplateImportCategory(std::u16string_view sCatego } } @@ -712,10 +712,13 @@ index f0f0322a14d9..c68db2c1f134 100644 + fs::create_directories(tempDir); + } + // Ejecutar el comando de descarga -+ std::string command = "wget -r -np -nH --cut-dirs=2 -P " + tempDir.string() + " " + repoUrl; ++ std::string command; + #if defined(_WIN32) || defined(_WIN64) -+ std::string command = "curl -o " + tempDir.string() + " " + repoUrl; ++ command = "curl -o \"" + tempDir.string() + "\" \"" + repoUrl + "\""; ++ #else ++ command = "wget -r -np -nH --cut-dirs=2 -P \"" + tempDir.string() + "\" \"" + repoUrl + "\""; + #endif ++ + int result = std::system(command.c_str()); + if (result != 0) + { diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index 97053aa..c723432 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -78,7 +78,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 2+gob.mx1.5%{?dist} +Release: 2+gob.mx1.5.1%{?dist} # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 @@ -362,7 +362,7 @@ Patch11: lo-7.6-ppc64le-tests.patch Patch12: cflags.patch # Patchset gob.mx 1.5 -Patch21: libreoffice-24.8.0.3+gobmx1.5-patchset.patch +Patch21: libreoffice-24.8.1.2+gobmx1.5.1-patchset.patch Patch500: 0001-disable-libe-book-support.patch # https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html @@ -2867,8 +2867,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog -* Sat Sep 14 2024 Sandino Araico Sánchez - 1:24.8.1.2-2+gob.mx1.5 +* Sat Sep 14 2024 Sandino Araico Sánchez - 1:24.8.1.2-2+gob.mx1.5.1 - Merge 24.8.1.2-fc40 +- Parche gob.mx 1.5.1 * Wed Sep 11 2024 Gwyn Ciesla - 1:24.8.1.2-1 - 24.8.1.2