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

merge gob.mx-1.5.1-24.8.1.2-fc39

Browse source
This commit is contained in:
Sandino Araico Sánchez 2024-09-19 02:54:14 -06:00
commit 11e084b2f9
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
rpmbuild/SOURCES/libreoffice-24.8.0.3+gobmx1.5-patchset.patch → rpmbuild/SOURCES/libreoffice-24.8.1.2+gobmx1.5.1-patchset.patch
View file

@ -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<bool (const TemplateItemProperties&)> &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)
+ {

17
rpmbuild/SPECS/libreoffice.spec
View file

@ -378,7 +378,7 @@ Patch12: cflags.patch
Patch15: CentOS-9-std-strcmp.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
@ -2927,17 +2927,25 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
* Thu Sep 19 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.1.2-6+gob.mx1.5.1
- Merge gob.mx-1.5.1-24.8.1.2-fc39
* Wed Sep 18 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.1.2-5
- Backport 24.8.1.2 to CentOS 9
* Tue Sep 17 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.1.2-4+gob.mx1.5.1
- Merge 24.8.1.2-fc39
- Merge gob.mx-1.5.1-24.8.1.2-fc40
* Sat Sep 14 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.1.2-3
- Backport 24.8.1.2 to Fedora 39
* Thu Sep 12 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-9+gob.mx1.5
- Backport 24.8.0.3 + gob.mx 1.5 to CentOS 9
* Mon Sep 09 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-7+gob.mx1.5
- Backport 24.8.0.3 + gob.mx 1.5 to Fedora 39
* Sat Sep 14 2024 Sandino Araico Sánchez <sandino@sandino.net> - 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 <gwync@protonmail.com> - 1:24.8.1.2-1
- 24.8.1.2
@ -2945,6 +2953,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
* Tue Sep 10 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-8
- Backport 24.8.0.3 to CentOS 9
* Mon Sep 09 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-7+gob.mx1.5
- Backport 24.8.0.3 + gob.mx 1.5 to Fedora 39
* Mon Sep 09 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-6
- Backport 24.8.0.3 to Fedora 39