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

merge gob.mx/fedora-40

Browse source
This commit is contained in:
Sandino Araico Sánchez 2024-09-10 01:09:31 -06:00
commit 3abd9bc344
3 changed files with 381 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
rpmbuild/SOURCES/ed25519.key.asc
View file

@ -5,10 +5,13 @@ mDMEYtcYTRYJKwYBBAHaRw8BAQdAup3AWA5CpavhOX16tLl1r2LukqxrJq/ZW6BK
YXF1ZXRlcyBkZSBnb2IubXguKSA8YnVpbGRlckB1Z2QuZ29iLm14PoiTBBMWCgA7
FiEEK0iGmHzdXnGx0L9QwXjKx7ZXh80FAmLXGE0CGwMFCwkIBwICIgIGFQoJCAsC
BBYCAwECHgcCF4AACgkQwXjKx7ZXh82vRQEA20a8r7jKovPMlxGFRenlSdf5W4g4
5VuSsZbslPeWK7oA/3jD6Na0othI93yCNabafOs/7u16M6UrbQO0GNFn/h4KuDgE
YtcYTRIKKwYBBAGXVQEFAQEHQF+XtJhl1KnE524dVYn/SE+/cHCE19+p+IZ9RYPA
aV0aAwEIB4h4BBgWCgAgFiEEK0iGmHzdXnGx0L9QwXjKx7ZXh80FAmLXGE0CGwwA
CgkQwXjKx7ZXh826EgD9HnaC2QyPWl7kYqCAMabqaGxekt8gAAgKiF+RNm4FmdAA
/2FhYOTg3uBaYjaESC+tdt4T+lPAyiSIRtcxTfyQMN4A
=UtGC
5VuSsZbslPeWK7oA/3jD6Na0othI93yCNabafOs/7u16M6UrbQO0GNFn/h4KiHUE
EBYIAB0WIQRpHwIZww2CmITkZ9qZHV1AzGIkTwUCZt1/swAKCRCZHV1AzGIkT7dU
AP9yKPqhD2/HAbH95UjafeJu7Y6ErJeWWEHM9SSeJXvcCgEAwouzIh33rUr8tFDG
hDrbWohZEJcaYQH/F/u9KU9BMwe4OARi1xhNEgorBgEEAZdVAQUBAQdAX5e0mGXU
qcTnbh1Vif9IT79wcITX36n4hn1Fg8BpXRoDAQgHiHgEGBYKACAWIQQrSIaYfN1e
cbHQv1DBeMrHtleHzQUCYtcYTQIbDAAKCRDBeMrHtleHzboSAP0edoLZDI9aXuRi
oIAxpupobF6S3yAACAqIX5E2bgWZ0AD/YWFg5ODe4FpiNoRIL6123hP6U8DKJIhG
1zFN/JAw3gA=
=0yC5
-----END PGP PUBLIC KEY BLOCK-----

359
rpmbuild/SOURCES/libreoffice-24.2.5.2+gobmx1.4-patchset.patch → rpmbuild/SOURCES/libreoffice-24.8.0.3+gobmx1.5-patchset.patch
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 @@
@ -304,8 +304,93 @@ index 000000000000..28b53b415a2a
+$(eval $(call gb_UnpackedTarball_set_tarball,font_gmx,$(FONT_GMX_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 35997819573d..bceccd006a10 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -356,10 +356,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")
+#define STR_ACTION_IMPORT_GMX NC_("STR_ACTION_IMPORT","~Importar GobMX")
#define STR_ACTION_EXTENSIONS NC_("STR_ACTION_EXTENSIONS","E~xtensions")
#define STR_WINDOW_TITLE_RENAME_TEMPLATE NC_("STR_WINDOW_TITLE_RENAME_TEMPLATE","Rename")
#define STR_WINDOW_TITLE_RENAME_CATEGORY NC_("STR_WINDOW_TITLE_RENAME_CATEGORY","Rename Category")
#define STR_WINDOW_TITLE_RENAME_NEW_CATEGORY NC_("STR_WINDOW_TITLE_RENAME_NEW_CATEGORY","New Category")
+#define STR_WINDOW_TITLE_RENAME_IMPORT_GMX NC_("STC_WINDOW_TITLE_IMPORT_GMX", "Importar Templates GobMX")
+#define STR_MSG_ERROR_FILE_INSTITUTIONS NC_("STR_MSG_ERROR_IMPORT", "Error en el archivo de instituciones $1:\n$2")
#define STR_OBJECT_INSPECTOR NC_("STR_OBJECT_INSPECTOR", "UNO Object Inspector")
#endif
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index c8f2ddf19655..d68bf4afb99d 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -62,6 +62,7 @@ protected:
DECL_DLLPRIVATE_LINK(OkClickHdl, weld::Button&, void);
SAL_DLLPRIVATE void ImportActionHdl();
SAL_DLLPRIVATE static void ExtensionsActionHdl();
+ SAL_DLLPRIVATE void ImportActionGmxTemplates(); //GMX-CODE
DECL_DLLPRIVATE_LINK(TVItemStateHdl, const ThumbnailViewItem*, void);
@@ -90,6 +91,7 @@ protected:
DECL_DLLPRIVATE_LINK(FocusRectLocalHdl, weld::Widget&, tools::Rectangle);
SAL_DLLPRIVATE void OnTemplateImportCategory(std::u16string_view sCategory);
+ SAL_DLLPRIVATE void OnTemplateImportGmxCategory(std::u16string_view sCategory); //GMX-CODE
// static void OnTemplateLink ();
SAL_DLLPRIVATE void OnTemplateOpen();
SAL_DLLPRIVATE void OnTemplateExport();
@@ -185,6 +187,34 @@ private:
Idle maIdle;
};
+// class SfxTemplateGmxDialog -------------------------------------------------------------------
+
+class SfxTemplateGmxDialog final : public weld::GenericDialogController
+{
+private:
+ OUString msSelectedCategory;
+ bool mbIsNewCategory;
+
+ std::unique_ptr<weld::TreeView> mxLBCategory;
+ std::unique_ptr<weld::Entry> mxNewCategoryEdit;
+ std::unique_ptr<weld::Button> mxOKButton;
+
+public:
+ //DECL_LINK(NewCategoryEditHdl, weld::Entry&, void);
+ DECL_LINK(SelectCategoryHdl, weld::TreeView&, void);
+
+ void SetCategoryLBEntries(std::vector<OUString> names);
+
+ const OUString& GetSelectedCategory() const { return msSelectedCategory; };
+
+ bool IsNewCategoryCreated() const { return mbIsNewCategory; }
+
+public:
+ explicit SfxTemplateGmxDialog(weld::Window* pParent);
+
+ virtual ~SfxTemplateGmxDialog() override;
+};
+
#endif // INCLUDED_SFX2_INC_TEMPLATEDLG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index 4284c74b334f..9e37a6e1d846 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -98,6 +98,7 @@ public:
OUString getRegionItemName(const sal_uInt16 nItemId) const;
std::vector<OUString> getFolderNames ();
+ std::vector<OUString> getGmxLinks ();
std::vector<TemplateItemProperties>
getFilteredItems (const std::function<bool (const TemplateItemProperties&) > &rFunc) const;
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
@ -442,8 +527,266 @@ index b5da0bfb6697..abd2276640fd 100644
+ 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}
+ }
+}
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index ca165c99e9c6..2463be11701f 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -32,7 +32,13 @@
#include <sfxurlrelocator.hxx>
#include <../doc/doctemplateslocal.hxx>
+#include <fstream>
+#include <iostream>
+#include <unotools/pathoptions.hxx>
+#include <filesystem>
+
using namespace ::com::sun::star;
+namespace fs = std::filesystem;
bool ViewFilter_Application::isFilteredExtension(FILTER_APPLICATION filter, std::u16string_view rExt)
{
@@ -289,6 +295,54 @@ std::vector<OUString> TemplateLocalView::getFolderNames()
return ret;
}
+// GMX-CODE Listado de instituciones
+std::vector<OUString> TemplateLocalView::getGmxLinks()
+{
+ std::vector<OUString> ret;
+ fs::path tmpDir = fs::temp_directory_path();
+ // Verificar si el directorio temporal existe
+ if (!fs::exists(tmpDir))
+ {
+ fs::create_directories(tmpDir);
+ }
+ std::string fileName = "instituciones.txt";
+ std::string command = "wget -O ";
+ std::string urlFile = " https://repos.libreoffice.gob.mx/templates/instituciones.txt";
+
+ fs::path filePath = tmpDir / fileName;
+
+ #if defined(_WIN32) || defined(_WIN64)
+ command = "curl -o ";
+ #endif
+
+ command += filePath.string() + urlFile;
+ // Descargar el archivo de instituciones
+ int result = system(command.c_str());
+ if (result != 0)
+ {
+ std::cerr << "Error al descargar el archivo. Instituciones.txt" << std::endl;
+ return ret;
+ }
+ std::ifstream file(filePath);
+ if (file.is_open()){
+ std::string line;
+ while (std::getline(file, line))
+ {
+ ret.push_back(OUString::createFromAscii(line.c_str()));
+ }
+ file.close();
+ } else {
+ OUString aMsg(SfxResId(STR_MSG_ERROR_FILE_INSTITUTIONS));
+ aMsg = aMsg.replaceFirst("$1", "Error no se pudo abrir archivo de instituciones");
+ std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetDrawingArea(),
+ VclMessageType::Warning, VclButtonsType::Ok,
+ aMsg));
+ xBox->run();
+ }
+
+ return ret;
+}
+
std::vector<TemplateItemProperties>
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
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -52,6 +52,10 @@
#include <sfx2/strings.hrc>
#include <bitmaps.hlst>
+#include <filesystem>
+#include <iostream>
+#include <string>
+#include <unicode/unistr.h>
constexpr OUString TM_SETTING_MANAGER = u"TemplateManager"_ustr;
constexpr OUString TM_SETTING_LASTFOLDER = u"LastFolder"_ustr;
@@ -68,6 +72,7 @@ constexpr OUString MNI_ACTION_DEFAULT_IMPRESS = u"default_impress"_ustr;
constexpr OUString MNI_ACTION_DEFAULT_DRAW = u"default_draw"_ustr;
constexpr OUString MNI_ACTION_IMPORT = u"import_template"_ustr;
constexpr OUString MNI_ACTION_EXTENSIONS = u"extensions"_ustr;
+constexpr OUString MNI_ACTION_IMPORT_GMX = u"import_template_gmx"_ustr;
#define MNI_ALL_APPLICATIONS 0
#define MNI_WRITER 1
#define MNI_CALC 2
@@ -81,6 +86,7 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::document;
+namespace fs = std::filesystem;
static bool lcl_getServiceName (const OUString &rFileURL, OUString &rName );
@@ -182,6 +188,8 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(weld::Window *pParent)
mxActionBar->append_separator(u"separator2"_ustr);
mxActionBar->append_item(MNI_ACTION_IMPORT, SfxResId(STR_ACTION_IMPORT), BMP_ACTION_IMPORT);
mxActionBar->append_item(MNI_ACTION_EXTENSIONS, SfxResId(STR_ACTION_EXTENSIONS), BMP_ACTION_EXTENSIONS);
+ mxActionBar->append_separator(u"separator2"_ustr); //GMX-CODE
+ mxActionBar->append_item(MNI_ACTION_IMPORT_GMX, SfxResId(STR_ACTION_IMPORT_GMX), BMP_ACTION_IMPORT); //Agrega en lista la opción para importar GMX
mxActionBar->connect_selected(LINK(this,SfxTemplateManagerDlg,MenuSelectHdl));
@@ -529,6 +537,8 @@ IMPL_LINK(SfxTemplateManagerDlg, MenuSelectHdl, const OUString&, rIdent, void)
ImportActionHdl();
else if(rIdent == MNI_ACTION_EXTENSIONS)
ExtensionsActionHdl();
+ else if(rIdent == MNI_ACTION_IMPORT_GMX) //GMX-CODE
+ ImportActionGmxTemplates();
}
void SfxTemplateManagerDlg::DefaultTemplateMenuSelectHdl(std::u16string_view rIdent)
@@ -651,6 +661,41 @@ void SfxTemplateManagerDlg::ExtensionsActionHdl()
comphelper::dispatchCommand(u".uno:AdditionsDialog"_ustr, aArgs);
}
+ /* GMX-CODE
+ Código para importar las templates GMX
+ */
+void SfxTemplateManagerDlg::ImportActionGmxTemplates()
+{
+ SfxTemplateCategoryDialog xDlg(m_xDialog.get());
+ // Obtiene la lista de instituciones
+ xDlg.SetCategoryLBEntries(mxLocalView->getGmxLinks());
+
+ if (xDlg.run() == RET_OK)
+ {
+ const OUString& sCategory = xDlg.GetSelectedCategory();
+ bool bIsNewCategory = xDlg.IsNewCategoryCreated();
+ if(bIsNewCategory)
+ {
+ if(mxLocalView->createRegion(sCategory))
+ {
+ mxCBFolder->append_text(sCategory);
+ OnTemplateImportCategory(sCategory);
+ }
+ else
+ {
+ OUString aMsg( SfxResId(STR_CREATE_ERROR) );
+ std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(m_xDialog.get(),
+ VclMessageType::Warning, VclButtonsType::Ok,
+ aMsg.replaceFirst("$1", sCategory)));
+ xBox->run();
+ return;
+ }
+ }
+ else
+ OnTemplateImportGmxCategory(sCategory);
+ }
+}
+
IMPL_LINK_NOARG(SfxTemplateManagerDlg, OpenRegionHdl, void*, void)
{
maSelTemplates.clear();
@@ -991,6 +1036,93 @@ void SfxTemplateManagerDlg::OnTemplateImportCategory(std::u16string_view sCatego
}
}
+/* Based on OnTemplateImportCategory */
+void SfxTemplateManagerDlg::OnTemplateImportGmxCategory(std::u16string_view sCategory)
+{
+ std::u16string sCategoryStr(sCategory);
+ icu::UnicodeString unicodeString(reinterpret_cast<const UChar*>(sCategoryStr.data()), sCategoryStr.size());
+ std::string category;
+ unicodeString.toUTF8String(category);
+
+ const std::string repoUrl = "https://repos.libreoffice.gob.mx/templates/" + category;
+ fs::path tempDir = fs::temp_directory_path() / "temporal-gmx-templates" / category;
+
+ // Verificar si el directorio temporal existe
+ if (!fs::exists(tempDir))
+ {
+ fs::create_directories(tempDir);
+ }
+ // Ejecutar el comando de descarga
+ std::string command = "wget -r -np -nH --cut-dirs=2 -P " + tempDir.string() + " " + repoUrl;
+ #if defined(_WIN32) || defined(_WIN64)
+ std::string command = "curl -o " + tempDir.string() + " " + repoUrl;
+ #endif
+ int result = std::system(command.c_str());
+ if (result != 0)
+ {
+ OUString aMsg(SfxResId(STR_MSG_ERROR_IMPORT));
+ aMsg = aMsg.replaceFirst("$1", "Error clonando el repositorio");
+ std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(m_xDialog.get(),
+ VclMessageType::Warning, VclButtonsType::Ok,
+ aMsg));
+ xBox->run();
+ return;
+ }
+
+ // Obtener la lista de archivos en la carpeta clonada
+ std::vector<OUString> aFiles;
+ for (const auto& entry : std::filesystem::directory_iterator(tempDir))
+ {
+ if (entry.is_regular_file())
+ {
+ aFiles.push_back(OUString::fromUtf8(entry.path().string()));
+ }
+ }
+
+ if (aFiles.empty())
+ {
+ OUString aMsg(SfxResId(STR_MSG_ERROR_IMPORT));
+ aMsg = aMsg.replaceFirst("$1", "No se encontraron archivos en el repositorio clonado");
+ std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(m_xDialog.get(),
+ VclMessageType::Warning, VclButtonsType::Ok,
+ aMsg));
+ xBox->run();
+ return;
+ }
+
+ // Importar a las regiones seleccionadas
+ TemplateContainerItem* pContItem = mxLocalView->getRegion(sCategory);
+ if (!pContItem)
+ return;
+
+ OUString aTemplateList;
+
+ for (const auto& rFile : aFiles)
+ {
+ if (!mxLocalView->copyFrom(pContItem, rFile))
+ {
+ if (aTemplateList.isEmpty())
+ aTemplateList = rFile;
+ else
+ aTemplateList += "\n" + rFile;
+ }
+ }
+
+ if (!aTemplateList.isEmpty())
+ {
+ OUString aMsg(SfxResId(STR_MSG_ERROR_IMPORT));
+ aMsg = aMsg.replaceFirst("$1", pContItem->maTitle);
+ std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(m_xDialog.get(),
+ VclMessageType::Warning, VclButtonsType::Ok,
+ aMsg.replaceFirst("$2", aTemplateList)));
+ fs::remove_all(tempDir);
+ xBox->run();
+ }
+
+ // Eliminar la carpeta temporal
+ fs::remove_all(tempDir);
+}
+
void SfxTemplateManagerDlg::OnTemplateExport()
{
uno::Reference<XComponentContext> xContext(comphelper::getProcessComponentContext());
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 @@

37
rpmbuild/SPECS/libreoffice.spec
View file

@ -78,7 +78,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.3
Release: 4+gob.mx1.4%{?dist}
Release: 7+gob.mx1.5%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
@ -112,8 +112,7 @@ Source11: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi
# with system provided hsqldb without major hacking.
Source12: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
Source13: %{external_url}/../extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
<<<<<<< HEAD
Source14: %{external_url}/Java-WebSocket-1.5.4.tar.gz
Source14: %{external_url}/Java-WebSocket-1.5.6.tar.gz
# Fonts GMX (gob.mx)
Source21: https://repos.libreoffice.gob.mx/src/gmx-fonts.tar.gz
@ -124,7 +123,7 @@ Source24: %{external_url}/c74b7223abe75949b4af367942d96c7a-crosextrafonts-
Source25: %{external_url}/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
Source26: %{external_url}/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
Source27: %{external_url}/liberation-narrow-fonts-ttf-1.07.6.tar.gz
Source28: %{external_url}/liberation-fonts-ttf-2.1.4.tar.gz
Source28: %{external_url}/liberation-fonts-ttf-2.1.5.tar.gz
Source29: %{external_url}/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
Source30: %{external_url}/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
Source31: %{external_url}/noto-fonts-20171024.tar.gz
@ -135,9 +134,6 @@ Source35: %{external_url}/Amiri-1.000.zip
Source36: %{external_url}/ReemKufi-1.2.zip
Source37: %{external_url}/Scheherazade-2.100.zip
=======
Source14: %{external_url}/Java-WebSocket-1.5.6.tar.gz
>>>>>>> backports/fedora-39
%global bundling_options %{?bundling_options} --without-system-hsqldb
Provides: bundled(hsqldb) = 1.8.0
@ -155,18 +151,19 @@ Source48: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/
# New fonts required in 24.2
Source49: %{external_url}/NotoKufiArabic-v2.109.zip
Source50: %{external_url}/NotoNaskhArabic-v2.019.zip
Source51: %{external_url}/NotoSans-v2.012.zip
Source51: %{external_url}/NotoSans-v2.013.zip
Source52: %{external_url}/NotoSansArabic-v2.010.zip
Source53: %{external_url}/NotoSansArmenian-v2.008.zip
Source54: %{external_url}/NotoSansGeorgian-v2.003.zip
Source54: %{external_url}/NotoSansGeorgian-v2.005.zip
Source55: %{external_url}/NotoSansHebrew-v3.001.zip
Source56: %{external_url}/NotoSansLao-v2.003.zip
Source57: %{external_url}/NotoSansLisu-v2.102.zip
Source58: %{external_url}/NotoSerif-v2.012.zip
Source58: %{external_url}/NotoSerif-v2.013.zip
Source59: %{external_url}/NotoSerifArmenian-v2.008.zip
Source60: %{external_url}/NotoSerifGeorgian-v2.003.zip
Source61: %{external_url}/NotoSerifHebrew-v2.004.zip
Source62: %{external_url}/NotoSerifLao-v2.003.zip
Source63: %{external_url}/ReemKufi-1.7.zip
# Diccionarios
Source66: %{source_url}/libreoffice-dictionaries-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
@ -372,8 +369,8 @@ Patch12: cflags.patch
# https://bugs.documentfoundation.org/show_bug.cgi?id=158108
#Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch
# Patchset gob.mx 1.3
Patch21: libreoffice-24.2.5.2+gobmx1.4-patchset.patch
# Patchset gob.mx 1.5
Patch21: libreoffice-24.8.0.3+gobmx1.5-patchset.patch
Patch500: 0001-disable-libe-book-support.patch
# https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html
@ -2878,18 +2875,23 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
* Mon Sep 09 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-6
* Mon Sep 09 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-7+gob.mx1.5
- Backport to Fedora 39
* Sun Sep 08 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-5+gob.mx1.5
- Actualización del parche gob.mx 1.5
* 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
- Actualización d eversiones de fonts
* Fri Sep 06 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.8.0.3-3
- 24.8.0.3
* Fri Aug 30 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.8.0.3-2
- RPMAUTOSPEC: unresolvable merge
* Wed Jul 24 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.5.2-2
- Backport to Fedora 39
* Wed Jul 31 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.5.2-3+gob.mx1.4
- patchset gob.mx 1.4
@ -2902,6 +2904,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
- NotoNaskhArabic-v2.019.zip
- NotoSansHebrew-v3.001.zip
* Wed Jul 24 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.5.2-2
- Backport to Fedora 39
* Thu Jul 11 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.5.2-1
- 24.2.5.2