From 598e8cea825e83e2fa370c85b86a95b2c39ebad3 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Fri, 28 Jun 2024 15:44:06 -0600 Subject: [PATCH] Limpieza de patchsets viejos de gob.mx --- ...-Custom-images-and-referencies-added.patch | 2569 --------- .../0001-disable-libe-book-support.patch | 145 - .../SOURCES/0001-don-t-suppress-crashes.patch | 37 - ...vos-de-distro-config-de-brand-Office.patch | 62 - ...icacion-al-build-y-borrado-UPDATEURL.patch | 94 - .../0008-Fuentes-monserrat-y-gmx.patch | 25 - ...09-Corregida-instrucci-n-de-descarga.patch | 29 - rpmbuild/SOURCES/0010-Cambios-en-logo.patch | 5074 ----------------- ...dificado-link-de-descarga-de-fuentes.patch | 27 - .../0012-Restauracion-link-repos-src.patch | 25 - .../SOURCES/0013-logo-image-updated.patch | 2536 -------- rpmbuild/SOURCES/7.4.6-unit-tests.patch | 51 - rpmbuild/SOURCES/7.5.0-unit-tests.patch | 76 - rpmbuild/SOURCES/7.5.1-unit-tests.patch | 84 - ...-Custom-images-and-referencies-added.patch | 2581 --------- ...Update-OfficeLinux.conf-with-lang-es.patch | 21 - .../0013-Update-OfficeLinux.conf.patch | 30 - .../0014-fix-error-make-install.patch | 65 - .../patchset-1.0/0015-gob-mx-1.0.patch | 8 - ...vos-de-distro-config-de-brand-Office.patch | 62 - ...icacion-al-build-y-borrado-UPDATEURL.patch | 94 - .../0004-Fuentes-monserrat-y-gmx.patch | 171 - .../patchset-1.1/0005-Fonts-added.patch | 26 - .../0006-Modificado-archivo-tar-xz-a-gz.patch | 26 - .../patchset-1.1/0008-Cambios-en-logo.patch | 5074 ----------------- ...dificado-link-de-descarga-de-fuentes.patch | 27 - .../0011-logo-image-updated.patch | 2536 -------- ...Update-OfficeLinux.conf-with-lang-es.patch | 21 - .../0013-Update-OfficeLinux.conf.patch | 30 - .../0014-fix-error-make-install.patch | 65 - .../patchset-1.1/0015-gob-mx-1.0.patch | 0 ...-version-OS-to-PDF-producer-metadata.patch | 60 - .../0017-CPPUNIT-Calc-fixed.patch | 29 - 33 files changed, 21760 deletions(-) delete mode 100644 rpmbuild/SOURCES/0001-Custom-images-and-referencies-added.patch delete mode 100644 rpmbuild/SOURCES/0001-disable-libe-book-support.patch delete mode 100644 rpmbuild/SOURCES/0001-don-t-suppress-crashes.patch delete mode 100644 rpmbuild/SOURCES/0002-Archivos-de-distro-config-de-brand-Office.patch delete mode 100644 rpmbuild/SOURCES/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch delete mode 100644 rpmbuild/SOURCES/0008-Fuentes-monserrat-y-gmx.patch delete mode 100644 rpmbuild/SOURCES/0009-Corregida-instrucci-n-de-descarga.patch delete mode 100644 rpmbuild/SOURCES/0010-Cambios-en-logo.patch delete mode 100644 rpmbuild/SOURCES/0011-Modificado-link-de-descarga-de-fuentes.patch delete mode 100644 rpmbuild/SOURCES/0012-Restauracion-link-repos-src.patch delete mode 100644 rpmbuild/SOURCES/0013-logo-image-updated.patch delete mode 100644 rpmbuild/SOURCES/7.4.6-unit-tests.patch delete mode 100644 rpmbuild/SOURCES/7.5.0-unit-tests.patch delete mode 100644 rpmbuild/SOURCES/7.5.1-unit-tests.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.0/0003-Custom-images-and-referencies-added.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.0/0012-Update-OfficeLinux.conf-with-lang-es.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.0/0013-Update-OfficeLinux.conf.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.0/0014-fix-error-make-install.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.0/0015-gob-mx-1.0.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0001-Archivos-de-distro-config-de-brand-Office.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0005-Fonts-added.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0006-Modificado-archivo-tar-xz-a-gz.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0008-Cambios-en-logo.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0009-Modificado-link-de-descarga-de-fuentes.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0011-logo-image-updated.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0012-Update-OfficeLinux.conf-with-lang-es.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0013-Update-OfficeLinux.conf.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0014-fix-error-make-install.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0015-gob-mx-1.0.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0016-Add-minor-version-OS-to-PDF-producer-metadata.patch delete mode 100644 rpmbuild/SOURCES/patchset-1.1/0017-CPPUNIT-Calc-fixed.patch diff --git a/rpmbuild/SOURCES/0001-Custom-images-and-referencies-added.patch b/rpmbuild/SOURCES/0001-Custom-images-and-referencies-added.patch deleted file mode 100644 index 8b940f1..0000000 --- a/rpmbuild/SOURCES/0001-Custom-images-and-referencies-added.patch +++ /dev/null @@ -1,2569 +0,0 @@ -From 8d6a7664ac7a644f58ca46e0d80c832f1e2549cc Mon Sep 17 00:00:00 2001 -From: Adlair Cerecedo-Mendez -Date: Mon, 19 Jun 2023 18:44:48 -0600 -Subject: [PATCH 03/18] Custom images and referencies added - -Change-Id: Ic7e4beefaf65fec8bb2b4ef03996b3ff5e849fee ---- - cui/source/dialogs/about.cxx | 7 +- - custom_images/MexGob.svg | 2516 ++++++++++++++++++++++++++++++++++ - 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 ce82e418cf9e..01073166f18b 100644 ---- a/cui/source/dialogs/about.cxx -+++ b/cui/source/dialogs/about.cxx -@@ -78,8 +78,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) - OUString sbuildId = GetBuildString(); - if (IsStringValidGitHash(sbuildId)) { - const tools::Long nMaxChar = 25; -- m_pBuildLabel->set_uri("https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=" -- + sbuildId); -+ m_pBuildLabel->set_uri("https://git.softwarelibre.mx/strepsirrhini/office-gobmx"); - m_pBuildLabel->set_label(sbuildId.getLength() > nMaxChar ? sbuildId.replaceAt( - nMaxChar, sbuildId.getLength() - nMaxChar, u"...") - : sbuildId); -@@ -112,7 +111,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) - Graphic aGraphic(aBackgroundBitmap); - m_pBrandImage->set_image(aGraphic.GetXGraphic()); - } -- if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) { -+ if (SfxApplication::loadBrandSvg("shell/MexGob", aBackgroundBitmap, nWidth * 0.9)) { - // Eliminate white background when Skia is disabled by not drawing the - // background bitmap to a VirtualDevice. On most platforms, non-Skia - // VirtualDevices will be filled with a solid color when drawing -@@ -153,7 +152,7 @@ OUString AboutDialog::GetVersionString() { - OUString sVersion = CuiResId(TranslateId(nullptr, "%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")) + " (" + arch + ")"; - - #if HAVE_FEATURE_COMMUNITY_FLAVOR -- sVersion += " / LibreOffice Community"; -+ sVersion += " / LibreOffice GOBMX"; - #endif - - return sVersion; -diff --git a/custom_images/MexGob.svg b/custom_images/MexGob.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/MexGob.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.39.2 - diff --git a/rpmbuild/SOURCES/0001-disable-libe-book-support.patch b/rpmbuild/SOURCES/0001-disable-libe-book-support.patch deleted file mode 100644 index 2142734..0000000 --- a/rpmbuild/SOURCES/0001-disable-libe-book-support.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 0b613b941c3ffbe432934269f8865bc1f9e59cde Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Tue, 27 Sep 2022 15:13:59 -0700 -Subject: [PATCH] disable libe-book support - ---- - configure.ac | 3 --- - external/Module_external.mk | 1 - - filter/Configuration_filter.mk | 8 -------- - writerperfect/Library_wpftwriter.mk | 2 -- - writerperfect/qa/unit/WpftFilterFixture.hxx | 4 ---- - writerperfect/qa/unit/WpftWriterFilterTest.cxx | 5 ----- - writerperfect/source/writer/wpftwriter.component | 6 ------ - 7 files changed, 29 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8babc85..e7733de 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -9606,9 +9606,6 @@ libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10]) - - libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1]) - --libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1]) --libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2]) -- - libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1]) - - libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0]) -diff --git a/external/Module_external.mk b/external/Module_external.mk -index 366fff2..bc987d1 100644 ---- a/external/Module_external.mk -+++ b/external/Module_external.mk -@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ - $(call gb_Helper_optional,CURL,curl) \ - $(call gb_Helper_optional,DRAGONBOX,dragonbox) \ - dtoa \ -- $(call gb_Helper_optional,EBOOK,libebook) \ - $(call gb_Helper_optional,EPM,epm) \ - $(call gb_Helper_optional,EPOXY,epoxy) \ - $(call gb_Helper_optional,EPUBGEN,libepubgen) \ -diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk -index a58b839..526b447 100644 ---- a/filter/Configuration_filter.mk -+++ b/filter/Configuration_filter.mk -@@ -359,10 +359,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu - writer_OOXML_Template \ - writer_layout_dump_xml \ - writer_indexing_export_xml \ -- writer_BroadBand_eBook \ -- writer_FictionBook_2 \ -- writer_PalmDoc \ -- writer_Plucker_eBook \ - writer_ApplePages \ - MWAW_Text_Document \ - Palm_Text_Document \ -@@ -409,10 +405,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters - OOXML_Text_Template \ - writer_layout_dump \ - writer_indexing_export \ -- BroadBand_eBook \ -- FictionBook_2 \ -- PalmDoc \ -- Plucker_eBook \ - ApplePages \ - MWAW_Text_Document \ - Palm_Text_Document \ -diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk -index 840a86f..70a8933 100644 ---- a/writerperfect/Library_wpftwriter.mk -+++ b/writerperfect/Library_wpftwriter.mk -@@ -64,7 +64,6 @@ endif - $(eval $(call gb_Library_use_externals,wpftwriter,\ - abw \ - boost_headers \ -- ebook \ - $(if $(ENABLE_WASM_STRIP_SWEXPORTS),,etonyek) \ - icu_headers \ - icui18n \ -@@ -93,7 +92,6 @@ endif - ifneq ($(ENABLE_WASM_STRIP_SWEXPORTS),TRUE) - $(eval $(call gb_Library_add_exception_objects,wpftwriter,\ - writerperfect/source/writer/AbiWordImportFilter \ -- writerperfect/source/writer/EBookImportFilter \ - writerperfect/source/writer/MSWorksImportFilter \ - writerperfect/source/writer/MWAWImportFilter \ - writerperfect/source/writer/PagesImportFilter \ -diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx -index 2fdd6a2..dbdd672 100644 ---- a/writerperfect/qa/unit/WpftFilterFixture.hxx -+++ b/writerperfect/qa/unit/WpftFilterFixture.hxx -@@ -25,10 +25,6 @@ - || ((major) == (req_major) \ - && ((minor) > (req_minor) || ((minor) == (req_minor) && ((micro) >= (req_micro))))) - --#define REQUIRE_EBOOK_VERSION(major, minor, micro) \ -- REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, \ -- micro) -- - #define REQUIRE_ETONYEK_VERSION(major, minor, micro) \ - REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, \ - minor, micro) -diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx -index 78d24dc..39924f9 100644 ---- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx -+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx -@@ -30,9 +30,6 @@ WpftWriterFilterTest::WpftWriterFilterTest() - - void WpftWriterFilterTest::test() - { -- const writerperfect::test::WpftOptionalMap_t aEBookOptional{ -- { "FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1) }, -- }; - const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{ - { "Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2) }, - { "Pages_5.pages", REQUIRE_ETONYEK_VERSION(0, 1, 8) }, -@@ -59,8 +56,6 @@ void WpftWriterFilterTest::test() - - doTest("com.sun.star.comp.Writer.AbiWordImportFilter", - u"/writerperfect/qa/unit/data/writer/libabw/"); -- doTest("org.libreoffice.comp.Writer.EBookImportFilter", -- u"/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional); - doTest("com.sun.star.comp.Writer.MSWorksImportFilter", - u"/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional); - doTest("com.sun.star.comp.Writer.MWAWImportFilter", -diff --git a/writerperfect/source/writer/wpftwriter.component b/writerperfect/source/writer/wpftwriter.component -index 176d487..0c89217 100644 ---- a/writerperfect/source/writer/wpftwriter.component -+++ b/writerperfect/source/writer/wpftwriter.component -@@ -42,12 +42,6 @@ - - - -- -- -- -- -- - - --- -2.31.1 - diff --git a/rpmbuild/SOURCES/0001-don-t-suppress-crashes.patch b/rpmbuild/SOURCES/0001-don-t-suppress-crashes.patch deleted file mode 100644 index 596534d..0000000 --- a/rpmbuild/SOURCES/0001-don-t-suppress-crashes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a6f2cba43d79347b6975b3b8069b423c94a7dba6 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Tue, 8 Nov 2016 11:50:06 +0100 -Subject: [PATCH] don't suppress crashes - -An automatic restart after a crash makes the crash invisible to abrt. - -Change-Id: I3854e619356049b144b08575879d289a3c12e4c9 ---- - desktop/source/app/app.cxx | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx -index c54aea9dd4f7..a613fe12cef2 100644 ---- a/desktop/source/app/app.cxx -+++ b/desktop/source/app/app.cxx -@@ -1165,8 +1165,6 @@ - if( bRestart ) - { - RequestHandler::Disable(); -- if( pSignalHandler ) -- osl_removeSignalHandler( pSignalHandler ); - - restartOnMac(false); - #if !ENABLE_WASM_STRIP_SPLASH -@@ -1174,7 +1172,7 @@ - m_rSplashScreen->reset(); - #endif - -- _exit( EXITHELPER_CRASH_WITH_RESTART ); -+ return; - } - else - { --- -2.29.2 - diff --git a/rpmbuild/SOURCES/0002-Archivos-de-distro-config-de-brand-Office.patch b/rpmbuild/SOURCES/0002-Archivos-de-distro-config-de-brand-Office.patch deleted file mode 100644 index 789a661..0000000 --- a/rpmbuild/SOURCES/0002-Archivos-de-distro-config-de-brand-Office.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 92fa4e7245f75aae7481588c47ee003779f479cd Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Tue, 20 Jun 2023 02:26:13 -0400 -Subject: [PATCH 01/15] Archivos de distro-config de brand Office - -Change-Id: I290939038b4fedf7a03f3ce68250966766a57e2b ---- - distro-configs/OfficeLinux.conf | 10 ++++++++++ - distro-configs/OfficeWin64.conf | 24 ++++++++++++++++++++++++ - 2 files changed, 34 insertions(+) - create mode 100644 distro-configs/OfficeLinux.conf - create mode 100644 distro-configs/OfficeWin64.conf - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -new file mode 100644 -index 000000000000..6cb4bd4dca66 ---- /dev/null -+++ b/distro-configs/OfficeLinux.conf -@@ -0,0 +1,10 @@ -+--with-parallelism -+--with-branding=custom_images -+--enable-release-build -+--enable-epm -+--with-package-format=deb -+--with-product-name=Office -+--with-vendor=INFOTEC -+--with-vendor=INFOTEC -+--with-package-version=7.5.0.0 -+--disable-community-flavor -diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf -new file mode 100644 -index 000000000000..01ad659c2af3 ---- /dev/null -+++ b/distro-configs/OfficeWin64.conf -@@ -0,0 +1,24 @@ -+--with-ant-home=/cygdrive/c/sources/apache-ant-1.9.5 -+--with-visual-studio=2022 -+--with-jdk-home=C:\Program Files\Microsoft\jdk-11.0.12.7-hotspot -+--host=x86_64-pc-cygwin -+--without-junit -+--without-helppack-integration -+--enable-extension-integration -+--enable-scripting-beanshell -+--enable-scripting-javascript -+--enable-ext-wiki-publisher -+--enable-ext-nlpsolver -+--with-myspell-dicts -+--with-package-format=msi -+--enable-mergelibs -+--enable-lto -+--enable-odk -+--without-ucrt-dir -+--enable-release-build -+--with-lang=es -+--with-branding=custom_images -+--with-product-name=Office -+--with-vendor=INFOTEC -+--with-package-version=7.5.0.0 -+--disable-community-flavor --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch b/rpmbuild/SOURCES/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch deleted file mode 100644 index bdbe9ba..0000000 --- a/rpmbuild/SOURCES/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 7d5acdcd9e1f131c82ba05c02932f42fb41250fd Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Tue, 20 Jun 2023 02:29:16 -0400 -Subject: [PATCH 02/15] Modificacion al build y borrado UPDATEURL - -Change-Id: I10a2d0a01ceb02d5d7f5267dcb97eb25ce6600d7 ---- - instsetoo_native/util/openoffice.lst.in | 73 +++++++++++++++++++++++++ - 1 file changed, 73 insertions(+) - -diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in -index b5da0bfb6697..454670cb1e15 100644 ---- a/instsetoo_native/util/openoffice.lst.in -+++ b/instsetoo_native/util/openoffice.lst.in -@@ -193,3 +193,76 @@ LibreOfficeDev_SDK - include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} - } - } -+ -+ -+Office -+{ -+ Settings -+ { -+ variables -+ { -+ PRODUCTNAME Office -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ POSTVERSIONEXTENSION -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ USERDIRPRODUCTVERSION 4 -+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PCPFILENAME libreoffice.pcp -+ UPDATEURL -+ ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt -+ ADDSYSTEMINTEGRATION 1 -+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ PACKAGEREVISION {buildid} -+ LICENSENAME LGPL -+ ROOTMODULEGID gid_Module_Root -+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles -+ SPELLCHECKERFILE spellchecker_selection.txt -+ CHANGETARGETDIR 1 -+ PATCHCODEFILE ooo_patchcodes.txt -+ } -+ active 1 -+ compression 5 -+ script setup_osl -+ downloadname Office_{productversion}_{os}_install_{languages} -+ langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages} -+ helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages} -+ 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} -+ } -+} -+ -+Office_SDK -+{ -+ Settings -+ { -+ downloadname LibreOffice-SDK_{packageversion}_{os}_install_{languages} -+ variables -+ { -+ PRODUCTNAME Office -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ POSTVERSIONEXTENSION SDK -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@.SDK -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ PACKAGEREVISION {buildid} -+ PACK_INSTALLED 1 -+ DMG_VOLUMEEXTENSION SDK -+ DATABASENAME office40sdk -+ NO_README_IN_ROOTDIR 1 -+ LICENSENAME LGPL -+ IGNOREDIRECTORYLAYER 1 -+ NOVERSIONINDIRNAME 0 -+ NOSPACEINDIRECTORYNAME 1 -+ NOSHORTDIRECTORYNAMES 1 -+ CHANGETARGETDIR 1 -+ DONTUSESTARTMENUFOLDER 1 -+ } -+ active 1 -+ compression 5 -+ script sdkoo -+ include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} -+ } -+} -+ --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0008-Fuentes-monserrat-y-gmx.patch b/rpmbuild/SOURCES/0008-Fuentes-monserrat-y-gmx.patch deleted file mode 100644 index 28ccdda..0000000 --- a/rpmbuild/SOURCES/0008-Fuentes-monserrat-y-gmx.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5b39bd472463dbe3c31c1aa5a4a98aa0f8cbbb74 Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Tue, 8 Aug 2023 07:51:52 +0000 -Subject: [PATCH 10/18] Restauracion link repos/src - ---- - Makefile.fetch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.fetch b/Makefile.fetch -index ede18af4197d..b0443f367007 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -244,7 +244,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.2 - diff --git a/rpmbuild/SOURCES/0009-Corregida-instrucci-n-de-descarga.patch b/rpmbuild/SOURCES/0009-Corregida-instrucci-n-de-descarga.patch deleted file mode 100644 index c85ef89..0000000 --- a/rpmbuild/SOURCES/0009-Corregida-instrucci-n-de-descarga.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6a3abd795ab40cc1b0c26c3e4fa6cef30dc445df Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Tue, 1 Aug 2023 14:12:02 -0600 -Subject: [PATCH 07/18] =?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 99f9bd3bca18..b0443f367007 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -244,7 +244,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.2 - diff --git a/rpmbuild/SOURCES/0010-Cambios-en-logo.patch b/rpmbuild/SOURCES/0010-Cambios-en-logo.patch deleted file mode 100644 index d0ba492..0000000 --- a/rpmbuild/SOURCES/0010-Cambios-en-logo.patch +++ /dev/null @@ -1,5074 +0,0 @@ -From 14ce63ff63c04d4c605564a751cfd6d2d3d5b342 Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Thu, 3 Aug 2023 17:36:45 -0600 -Subject: [PATCH 08/15] Cambios en logo - -Change-Id: Ica978200502962bedf5901be88db7a2484678346 ---- - cui/source/dialogs/about.cxx | 2 +- - custom_images/about.svg | 2516 ++++++++++++++++++++++++++++++++++ - custom_images/logo.svg | 2516 ++++++++++++++++++++++++++++++++++ - 3 files changed, 5033 insertions(+), 1 deletion(-) - create mode 100644 custom_images/about.svg - create mode 100644 custom_images/logo.svg - -diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx -index a8fd34bb5a2d..4a8b20d0bc67 100644 ---- a/cui/source/dialogs/about.cxx -+++ b/cui/source/dialogs/about.cxx -@@ -111,7 +111,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) - Graphic aGraphic(aBackgroundBitmap); - m_pBrandImage->set_image(aGraphic.GetXGraphic()); - } -- if (SfxApplication::loadBrandSvg("shell/MexGob", aBackgroundBitmap, nWidth * 0.9)) { -+ if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) { - ScopedVclPtr m_pVirDev = - m_pAboutImage->create_virtual_device(); - m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel()); -diff --git a/custom_images/about.svg b/custom_images/about.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/about.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/custom_images/logo.svg b/custom_images/logo.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/logo.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.43.0 - diff --git a/rpmbuild/SOURCES/0011-Modificado-link-de-descarga-de-fuentes.patch b/rpmbuild/SOURCES/0011-Modificado-link-de-descarga-de-fuentes.patch deleted file mode 100644 index e6851de..0000000 --- a/rpmbuild/SOURCES/0011-Modificado-link-de-descarga-de-fuentes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 58c887abc0776bf3b67bdbffeaed6c4bae255026 Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Fri, 4 Aug 2023 20:21:33 -0600 -Subject: [PATCH 09/15] Modificado link de descarga de fuentes - -Change-Id: I80b8e9ea4286d68c1880ef45eaa191a8f0c3e7d2 ---- - Makefile.fetch | 2 +- - fonts/gmx-fonts.tar.gz | Bin 0 -> 2409292 bytes - fonts/gmx-fonts.tar.xz | Bin 1172924 -> 0 bytes - 3 files changed, 1 insertion(+), 1 deletion(-) - create mode 100644 fonts/gmx-fonts.tar.gz - delete mode 100644 fonts/gmx-fonts.tar.xz - -diff --git a/Makefile.fetch b/Makefile.fetch -index 14319bc18d25..86efcb2bb3df 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -242,7 +242,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://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/tree/logos/fonts,$(item))) - @mkdir -p $(dir $@) && touch $@ - @mkdir -p $(dir $@)/Executable - diff --git a/rpmbuild/SOURCES/0012-Restauracion-link-repos-src.patch b/rpmbuild/SOURCES/0012-Restauracion-link-repos-src.patch deleted file mode 100644 index 84b4e10..0000000 --- a/rpmbuild/SOURCES/0012-Restauracion-link-repos-src.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6fb4e98342a66494f1c95b0d5c6db344dd1d148c Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Tue, 8 Aug 2023 07:51:52 +0000 -Subject: [PATCH 10/15] Restauracion link repos/src - ---- - Makefile.fetch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.fetch b/Makefile.fetch -index 86efcb2bb3df..14319bc18d25 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -242,7 +242,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.43.0 - diff --git a/rpmbuild/SOURCES/0013-logo-image-updated.patch b/rpmbuild/SOURCES/0013-logo-image-updated.patch deleted file mode 100644 index 2e6c3f8..0000000 --- a/rpmbuild/SOURCES/0013-logo-image-updated.patch +++ /dev/null @@ -1,2536 +0,0 @@ -From bb755ef8e0ff41a41fbae11988e28f2a26f68b3b Mon Sep 17 00:00:00 2001 -From: Adlair Cerecedo-Mendez -Date: Mon, 14 Aug 2023 18:35:41 -0600 -Subject: [PATCH 11/15] logo image updated - -Change-Id: Ib4c398af48d0014c7f11b0da5f67f3659fc018fe ---- - custom_images/logo.svg | 2517 +--------------------------------------- - 1 file changed, 1 insertion(+), 2516 deletions(-) - -diff --git a/custom_images/logo.svg b/custom_images/logo.svg -index 6ad4cd79920c..3215508ec8c3 100644 ---- a/custom_images/logo.svg -+++ b/custom_images/logo.svg -@@ -1,2516 +1 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -\ No newline at end of file --- -2.43.0 - diff --git a/rpmbuild/SOURCES/7.4.6-unit-tests.patch b/rpmbuild/SOURCES/7.4.6-unit-tests.patch deleted file mode 100644 index 609e9b9..0000000 --- a/rpmbuild/SOURCES/7.4.6-unit-tests.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2f5a4af93c352a091852a8230b71720c0ec7c14c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= -Date: Sun, 7 May 2023 00:27:38 -0400 -Subject: [PATCH] Se quitaron las pruebas unitarias que fallan en CentOS 9 - ---- - dbaccess/Module_dbaccess.mk | 2 -- - sdext/Module_sdext.mk | 1 - - sw/Module_sw.mk | 1 - - 3 files changed, 4 deletions(-) - -diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk -index 436f591c7a07..2e8b1b77aaed 100644 ---- a/dbaccess/Module_dbaccess.mk -+++ b/dbaccess/Module_dbaccess.mk -@@ -49,8 +49,6 @@ endif - - ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),) - $(eval $(call gb_Module_add_check_targets,dbaccess,\ -- CppunitTest_dbaccess_dialog_save \ -- CppunitTest_dbaccess_empty_stdlib_save \ - CppunitTest_dbaccess_nolib_save \ - CppunitTest_dbaccess_macros_test \ - CppunitTest_dbaccess_hsqlschema_import \ -diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk -index fd1d191b4939..d9ba2fbccc63 100644 ---- a/sdext/Module_sdext.mk -+++ b/sdext/Module_sdext.mk -@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,sdext,\ - endif - - $(eval $(call gb_Module_add_check_targets,sdext,\ -- CppunitTest_sdext_pdfimport \ - Executable_pdf2xml \ - Executable_pdfunzip \ - )) -diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk -index 951b620aba5c..97c6235f67e0 100644 ---- a/sw/Module_sw.mk -+++ b/sw/Module_sw.mk -@@ -114,7 +114,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ - CppunitTest_sw_uiwriter3 \ - CppunitTest_sw_uiwriter4 \ - CppunitTest_sw_uiwriter5 \ -- CppunitTest_sw_uiwriter6 \ - CppunitTest_sw_uiwriter7 \ - CppunitTest_sw_layoutwriter \ - CppunitTest_sw_layoutwriter2 \ --- -2.39.1 - diff --git a/rpmbuild/SOURCES/7.5.0-unit-tests.patch b/rpmbuild/SOURCES/7.5.0-unit-tests.patch deleted file mode 100644 index 75a89e2..0000000 --- a/rpmbuild/SOURCES/7.5.0-unit-tests.patch +++ /dev/null @@ -1,76 +0,0 @@ -From bf9a05748d0b4863276f920b39668e919ebeca21 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= -Date: Sun, 7 May 2023 20:55:21 -0400 -Subject: [PATCH 1/2] Se quitaron las pruebas unitarias que fallan en CentOS 9 - ---- - dbaccess/Module_dbaccess.mk | 2 -- - sdext/Module_sdext.mk | 1 - - sw/Module_sw.mk | 1 - - 3 files changed, 4 deletions(-) - -diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk -index 436f591c7a07..2e8b1b77aaed 100644 ---- a/dbaccess/Module_dbaccess.mk -+++ b/dbaccess/Module_dbaccess.mk -@@ -49,8 +49,6 @@ endif - - ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),) - $(eval $(call gb_Module_add_check_targets,dbaccess,\ -- CppunitTest_dbaccess_dialog_save \ -- CppunitTest_dbaccess_empty_stdlib_save \ - CppunitTest_dbaccess_nolib_save \ - CppunitTest_dbaccess_macros_test \ - CppunitTest_dbaccess_hsqlschema_import \ -diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk -index fd1d191b4939..d9ba2fbccc63 100644 ---- a/sdext/Module_sdext.mk -+++ b/sdext/Module_sdext.mk -@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,sdext,\ - endif - - $(eval $(call gb_Module_add_check_targets,sdext,\ -- CppunitTest_sdext_pdfimport \ - Executable_pdf2xml \ - Executable_pdfunzip \ - )) -diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk -index 8a217a85fbf6..2106094dac63 100644 ---- a/sw/Module_sw.mk -+++ b/sw/Module_sw.mk -@@ -114,7 +114,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ - CppunitTest_sw_uiwriter3 \ - CppunitTest_sw_uiwriter4 \ - CppunitTest_sw_uiwriter5 \ -- CppunitTest_sw_uiwriter6 \ - CppunitTest_sw_uiwriter7 \ - CppunitTest_sw_uiwriter8 \ - CppunitTest_sw_layoutwriter \ --- -2.39.1 - - -From 16d2465ebd4f9de5496dfbbe9b2409a0d5bd8169 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= -Date: Sun, 7 May 2023 21:52:09 -0400 -Subject: [PATCH 2/2] Otra prueba que falla en CentOS 9 - ---- - sw/Module_sw.mk | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk -index 2106094dac63..23fd9f4be109 100644 ---- a/sw/Module_sw.mk -+++ b/sw/Module_sw.mk -@@ -135,7 +135,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ - CppunitTest_sw_uibase_uno \ - CppunitTest_sw_uibase_wrtsh \ - CppunitTest_sw_core_accessibilitycheck \ -- CppunitTest_sw_core_layout \ - CppunitTest_sw_core_fields \ - CppunitTest_sw_core_tox \ - CppunitTest_sw_core_frmedt \ --- -2.39.1 - diff --git a/rpmbuild/SOURCES/7.5.1-unit-tests.patch b/rpmbuild/SOURCES/7.5.1-unit-tests.patch deleted file mode 100644 index d5ef471..0000000 --- a/rpmbuild/SOURCES/7.5.1-unit-tests.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 0869739a3843e6ee48eba1181d71476c1e7a9541 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= -Date: Mon, 8 May 2023 20:22:24 -0400 -Subject: [PATCH 1/2] Pruebas unitarias omitidas de la 7.5.0 - ---- - dbaccess/Module_dbaccess.mk | 2 -- - sdext/Module_sdext.mk | 1 - - sw/Module_sw.mk | 2 -- - 3 files changed, 5 deletions(-) - -diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk -index 436f591c7a07..2e8b1b77aaed 100644 ---- a/dbaccess/Module_dbaccess.mk -+++ b/dbaccess/Module_dbaccess.mk -@@ -49,8 +49,6 @@ endif - - ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),) - $(eval $(call gb_Module_add_check_targets,dbaccess,\ -- CppunitTest_dbaccess_dialog_save \ -- CppunitTest_dbaccess_empty_stdlib_save \ - CppunitTest_dbaccess_nolib_save \ - CppunitTest_dbaccess_macros_test \ - CppunitTest_dbaccess_hsqlschema_import \ -diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk -index fd1d191b4939..d9ba2fbccc63 100644 ---- a/sdext/Module_sdext.mk -+++ b/sdext/Module_sdext.mk -@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,sdext,\ - endif - - $(eval $(call gb_Module_add_check_targets,sdext,\ -- CppunitTest_sdext_pdfimport \ - Executable_pdf2xml \ - Executable_pdfunzip \ - )) -diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk -index 8a217a85fbf6..23fd9f4be109 100644 ---- a/sw/Module_sw.mk -+++ b/sw/Module_sw.mk -@@ -114,7 +114,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ - CppunitTest_sw_uiwriter3 \ - CppunitTest_sw_uiwriter4 \ - CppunitTest_sw_uiwriter5 \ -- CppunitTest_sw_uiwriter6 \ - CppunitTest_sw_uiwriter7 \ - CppunitTest_sw_uiwriter8 \ - CppunitTest_sw_layoutwriter \ -@@ -136,7 +135,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ - CppunitTest_sw_uibase_uno \ - CppunitTest_sw_uibase_wrtsh \ - CppunitTest_sw_core_accessibilitycheck \ -- CppunitTest_sw_core_layout \ - CppunitTest_sw_core_fields \ - CppunitTest_sw_core_tox \ - CppunitTest_sw_core_frmedt \ --- -2.39.1 - - -From d8a95a4d40088e9cf2a15d0cacffd9167ca375a9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= -Date: Mon, 8 May 2023 20:22:48 -0400 -Subject: [PATCH 2/2] Pruebas unitaria adicional que falla en la 7.5.1 - ---- - sw/Module_sw.mk | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk -index 23fd9f4be109..4b0580716a2a 100644 ---- a/sw/Module_sw.mk -+++ b/sw/Module_sw.mk -@@ -117,7 +117,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ - CppunitTest_sw_uiwriter7 \ - CppunitTest_sw_uiwriter8 \ - CppunitTest_sw_layoutwriter \ -- CppunitTest_sw_layoutwriter2 \ - CppunitTest_sw_mailmerge \ - CppunitTest_sw_mailmerge2 \ - CppunitTest_sw_globalfilter \ --- -2.39.1 - diff --git a/rpmbuild/SOURCES/patchset-1.0/0003-Custom-images-and-referencies-added.patch b/rpmbuild/SOURCES/patchset-1.0/0003-Custom-images-and-referencies-added.patch deleted file mode 100644 index 5bfe333..0000000 --- a/rpmbuild/SOURCES/patchset-1.0/0003-Custom-images-and-referencies-added.patch +++ /dev/null @@ -1,2581 +0,0 @@ -From cf4557fd5ada1aee66c1b3e300a70030b8af5da2 Mon Sep 17 00:00:00 2001 -From: Adlair Cerecedo-Mendez -Date: Mon, 19 Jun 2023 18:44:48 -0600 -Subject: [PATCH 03/15] Custom images and referencies added - -Change-Id: Ic7e4beefaf65fec8bb2b4ef03996b3ff5e849fee ---- - cui/source/dialogs/about.cxx | 19 +- - custom_images/MexGob.svg | 2516 ++++++++++++++++++++++++++++++++++ - 2 files changed, 2525 insertions(+), 10 deletions(-) - create mode 100644 custom_images/MexGob.svg - -diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx -index ce82e418cf9e..a8fd34bb5a2d 100644 ---- a/cui/source/dialogs/about.cxx -+++ b/cui/source/dialogs/about.cxx -@@ -78,8 +78,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) - OUString sbuildId = GetBuildString(); - if (IsStringValidGitHash(sbuildId)) { - const tools::Long nMaxChar = 25; -- m_pBuildLabel->set_uri("https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=" -- + sbuildId); -+ m_pBuildLabel->set_uri("https://git.softwarelibre.mx/strepsirrhini/office-gobmx"); - m_pBuildLabel->set_label(sbuildId.getLength() > nMaxChar ? sbuildId.replaceAt( - nMaxChar, sbuildId.getLength() - nMaxChar, u"...") - : sbuildId); -@@ -112,13 +111,13 @@ AboutDialog::AboutDialog(weld::Window *pParent) - Graphic aGraphic(aBackgroundBitmap); - m_pBrandImage->set_image(aGraphic.GetXGraphic()); - } -- if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) { -- // Eliminate white background when Skia is disabled by not drawing the -- // background bitmap to a VirtualDevice. On most platforms, non-Skia -- // VirtualDevices will be filled with a solid color when drawing -- // the bitmap. -- Graphic aGraphic(aBackgroundBitmap); -- m_pAboutImage->set_image(aGraphic.GetXGraphic()); -+ if (SfxApplication::loadBrandSvg("shell/MexGob", aBackgroundBitmap, nWidth * 0.9)) { -+ ScopedVclPtr m_pVirDev = -+ m_pAboutImage->create_virtual_device(); -+ m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel()); -+ m_pVirDev->DrawBitmapEx(Point(0, 0), aBackgroundBitmap); -+ m_pAboutImage->set_image(m_pVirDev.get()); -+ m_pVirDev.disposeAndClear(); - } - - // Links -@@ -153,7 +152,7 @@ OUString AboutDialog::GetVersionString() { - OUString sVersion = CuiResId(TranslateId(nullptr, "%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")) + " (" + arch + ")"; - - #if HAVE_FEATURE_COMMUNITY_FLAVOR -- sVersion += " / LibreOffice Community"; -+ sVersion += " / LibreOffice GOBMX"; - #endif - - return sVersion; -diff --git a/custom_images/MexGob.svg b/custom_images/MexGob.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/MexGob.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.43.0 - diff --git a/rpmbuild/SOURCES/patchset-1.0/0012-Update-OfficeLinux.conf-with-lang-es.patch b/rpmbuild/SOURCES/patchset-1.0/0012-Update-OfficeLinux.conf-with-lang-es.patch deleted file mode 100644 index 87abc47..0000000 --- a/rpmbuild/SOURCES/patchset-1.0/0012-Update-OfficeLinux.conf-with-lang-es.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 26bc26bc58ec329ba1c23a3082546c755f10a8a1 Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Wed, 8 Nov 2023 19:42:40 +0000 -Subject: [PATCH 12/15] Update OfficeLinux.conf --with-lang=es - ---- - distro-configs/OfficeLinux.conf | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -index 6cb4bd4dca66..30550375e27a 100644 ---- a/distro-configs/OfficeLinux.conf -+++ b/distro-configs/OfficeLinux.conf -@@ -8,3 +8,4 @@ - --with-vendor=INFOTEC - --with-package-version=7.5.0.0 - --disable-community-flavor -+--with-lang=es --- -2.43.0 - diff --git a/rpmbuild/SOURCES/patchset-1.0/0013-Update-OfficeLinux.conf.patch b/rpmbuild/SOURCES/patchset-1.0/0013-Update-OfficeLinux.conf.patch deleted file mode 100644 index a11879f..0000000 --- a/rpmbuild/SOURCES/patchset-1.0/0013-Update-OfficeLinux.conf.patch +++ /dev/null @@ -1,30 +0,0 @@ -From dd1f17cd0641a99832e991545c1d1c4440786816 Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Wed, 8 Nov 2023 23:23:27 +0000 -Subject: [PATCH 13/15] Update OfficeLinux.conf - ---- - distro-configs/OfficeLinux.conf | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -index 30550375e27a..8f9dc46b2814 100644 ---- a/distro-configs/OfficeLinux.conf -+++ b/distro-configs/OfficeLinux.conf -@@ -1,11 +1,8 @@ - --with-parallelism -+--enable-dbgutil -+--without-doxygen - --with-branding=custom_images ----enable-release-build ----enable-epm ----with-package-format=deb - --with-product-name=Office - --with-vendor=INFOTEC ----with-vendor=INFOTEC - --with-package-version=7.5.0.0 ----disable-community-flavor - --with-lang=es --- -2.43.0 - diff --git a/rpmbuild/SOURCES/patchset-1.0/0014-fix-error-make-install.patch b/rpmbuild/SOURCES/patchset-1.0/0014-fix-error-make-install.patch deleted file mode 100644 index ada3970..0000000 --- a/rpmbuild/SOURCES/patchset-1.0/0014-fix-error-make-install.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 22a3ccfe6659ad7ef87c7d5711bb0363a3a5e1c0 Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Mon, 13 Nov 2023 11:23:10 -0600 -Subject: [PATCH 14/15] fix error make install - -Change-Id: I590a323ec835f16badf1889f4c09d00fee3d3999 ---- - instsetoo_native/util/openoffice.lst.in | 44 +++++++++++++++++++++++++ - 1 file changed, 44 insertions(+) - -diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in -index 454670cb1e15..de7de46a22ff 100644 ---- a/instsetoo_native/util/openoffice.lst.in -+++ b/instsetoo_native/util/openoffice.lst.in -@@ -266,3 +266,47 @@ Office_SDK - } - } - -+OfficeDev -+{ -+ Settings -+ { -+ variables -+ { -+ PRODUCTNAME OfficeDev -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@ -+ UNIXBASISROOTNAME libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ POSTVERSIONEXTENSION -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ USERDIRPRODUCTVERSION 4 -+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ DEVELOPMENTPRODUCT 1 -+ BASISPACKAGEPREFIX lodevbasis -+ UREPACKAGEPREFIX libreofficedev -+ SOLSUREPACKAGEPREFIX libreofficedev -+ REGISTRYLAYERNAME LayerDev -+ UPDATEURL https://update.libreoffice.org/check.php -+ ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt -+ ADDSYSTEMINTEGRATION 1 -+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ PACKAGEREVISION {buildid} -+ LICENSENAME LGPL -+ ROOTMODULEGID gid_Module_Root -+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles -+ SPELLCHECKERFILE spellchecker_selection.txt -+ CHANGETARGETDIR 1 -+ PATCHCODEFILE ooodev_patchcodes.txt -+ CODEFILENAME codes_ooodev.txt -+ LOCALUSERDIR $ORIGIN/.. -+ } -+ active 1 -+ compression 5 -+ script setup_osl -+ downloadname LibreOfficeDev_{productversion}_{os}_install_{languages} -+ langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages} -+ helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages} -+ 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} -+ } -+} --- -2.43.0 - diff --git a/rpmbuild/SOURCES/patchset-1.0/0015-gob-mx-1.0.patch b/rpmbuild/SOURCES/patchset-1.0/0015-gob-mx-1.0.patch deleted file mode 100644 index f971db1..0000000 --- a/rpmbuild/SOURCES/patchset-1.0/0015-gob-mx-1.0.patch +++ /dev/null @@ -1,8 +0,0 @@ -From e66c87ccc08a1a862c7b38adf2cd35f2379efe1e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= -Date: Tue, 21 Nov 2023 20:21:22 -0600 -Subject: [PATCH 15/15] gob-mx-1.0 - --- -2.43.0 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0001-Archivos-de-distro-config-de-brand-Office.patch b/rpmbuild/SOURCES/patchset-1.1/0001-Archivos-de-distro-config-de-brand-Office.patch deleted file mode 100644 index 16618ba..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0001-Archivos-de-distro-config-de-brand-Office.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 439bf688a50143a57d18be3e8bf8eceea9f839ea Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Tue, 20 Jun 2023 02:26:13 -0400 -Subject: [PATCH 01/18] Archivos de distro-config de brand Office - -Change-Id: I290939038b4fedf7a03f3ce68250966766a57e2b ---- - distro-configs/OfficeLinux.conf | 10 ++++++++++ - distro-configs/OfficeWin64.conf | 24 ++++++++++++++++++++++++ - 2 files changed, 34 insertions(+) - create mode 100644 distro-configs/OfficeLinux.conf - create mode 100644 distro-configs/OfficeWin64.conf - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -new file mode 100644 -index 000000000000..6cb4bd4dca66 ---- /dev/null -+++ b/distro-configs/OfficeLinux.conf -@@ -0,0 +1,10 @@ -+--with-parallelism -+--with-branding=custom_images -+--enable-release-build -+--enable-epm -+--with-package-format=deb -+--with-product-name=Office -+--with-vendor=INFOTEC -+--with-vendor=INFOTEC -+--with-package-version=7.5.0.0 -+--disable-community-flavor -diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf -new file mode 100644 -index 000000000000..01ad659c2af3 ---- /dev/null -+++ b/distro-configs/OfficeWin64.conf -@@ -0,0 +1,24 @@ -+--with-ant-home=/cygdrive/c/sources/apache-ant-1.9.5 -+--with-visual-studio=2022 -+--with-jdk-home=C:\Program Files\Microsoft\jdk-11.0.12.7-hotspot -+--host=x86_64-pc-cygwin -+--without-junit -+--without-helppack-integration -+--enable-extension-integration -+--enable-scripting-beanshell -+--enable-scripting-javascript -+--enable-ext-wiki-publisher -+--enable-ext-nlpsolver -+--with-myspell-dicts -+--with-package-format=msi -+--enable-mergelibs -+--enable-lto -+--enable-odk -+--without-ucrt-dir -+--enable-release-build -+--with-lang=es -+--with-branding=custom_images -+--with-product-name=Office -+--with-vendor=INFOTEC -+--with-package-version=7.5.0.0 -+--disable-community-flavor --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch b/rpmbuild/SOURCES/patchset-1.1/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch deleted file mode 100644 index 8edec84..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch +++ /dev/null @@ -1,94 +0,0 @@ -From a4f6d63477b5a953b38859e2e3ad781f929b8584 Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Tue, 20 Jun 2023 02:29:16 -0400 -Subject: [PATCH 02/18] Modificacion al build y borrado UPDATEURL - -Change-Id: I10a2d0a01ceb02d5d7f5267dcb97eb25ce6600d7 ---- - instsetoo_native/util/openoffice.lst.in | 73 +++++++++++++++++++++++++ - 1 file changed, 73 insertions(+) - -diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in -index b5da0bfb6697..454670cb1e15 100644 ---- a/instsetoo_native/util/openoffice.lst.in -+++ b/instsetoo_native/util/openoffice.lst.in -@@ -193,3 +193,76 @@ LibreOfficeDev_SDK - include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} - } - } -+ -+ -+Office -+{ -+ Settings -+ { -+ variables -+ { -+ PRODUCTNAME Office -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ POSTVERSIONEXTENSION -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ USERDIRPRODUCTVERSION 4 -+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PCPFILENAME libreoffice.pcp -+ UPDATEURL -+ ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt -+ ADDSYSTEMINTEGRATION 1 -+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ PACKAGEREVISION {buildid} -+ LICENSENAME LGPL -+ ROOTMODULEGID gid_Module_Root -+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles -+ SPELLCHECKERFILE spellchecker_selection.txt -+ CHANGETARGETDIR 1 -+ PATCHCODEFILE ooo_patchcodes.txt -+ } -+ active 1 -+ compression 5 -+ script setup_osl -+ downloadname Office_{productversion}_{os}_install_{languages} -+ langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages} -+ helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages} -+ 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} -+ } -+} -+ -+Office_SDK -+{ -+ Settings -+ { -+ downloadname LibreOffice-SDK_{packageversion}_{os}_install_{languages} -+ variables -+ { -+ PRODUCTNAME Office -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ POSTVERSIONEXTENSION SDK -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@.SDK -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ PACKAGEREVISION {buildid} -+ PACK_INSTALLED 1 -+ DMG_VOLUMEEXTENSION SDK -+ DATABASENAME office40sdk -+ NO_README_IN_ROOTDIR 1 -+ LICENSENAME LGPL -+ IGNOREDIRECTORYLAYER 1 -+ NOVERSIONINDIRNAME 0 -+ NOSPACEINDIRECTORYNAME 1 -+ NOSHORTDIRECTORYNAMES 1 -+ CHANGETARGETDIR 1 -+ DONTUSESTARTMENUFOLDER 1 -+ } -+ active 1 -+ compression 5 -+ script sdkoo -+ include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} -+ } -+} -+ --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch b/rpmbuild/SOURCES/patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch deleted file mode 100644 index c3adf9f..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0004-Fuentes-monserrat-y-gmx.patch +++ /dev/null @@ -1,171 +0,0 @@ -From 4c459d3e41a3c4d08e03fc72db95480ed8783797 Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Thu, 20 Jul 2023 08:28:06 -0600 -Subject: [PATCH 04/18] Fuentes monserrat y gmx - -Change-Id: I73186714bc4809d0b3d48ceb94e933a78db2d623 ---- - Makefile.fetch | 4 ++ - Repository.mk | 1 + - external/more_fonts/ExternalPackage_gmx.mk | 49 +++++++++++++++++++++ - external/more_fonts/Module_more_fonts.mk | 2 + - external/more_fonts/UnpackedTarball_gmx.mk | 14 ++++++ - fonts/gmx-fonts.tar.xz | Bin 0 -> 1172924 bytes - solenv/flatpak-manifest.in | 7 +++ - 7 files changed, 77 insertions(+) - create mode 100644 external/more_fonts/ExternalPackage_gmx.mk - create mode 100644 external/more_fonts/UnpackedTarball_gmx.mk - create mode 100644 fonts/gmx-fonts.tar.xz - -diff --git a/Makefile.fetch b/Makefile.fetch -index b96cb573c2bf..99f9bd3bca18 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -124,6 +124,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S - $(call fetch_Optional,EXPAT,EXPAT_TARBALL) \ - $(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \ - $(call fetch_Optional,FONTCONFIG,FONTCONFIG_TARBALL) \ -+ $(call fetch_Optional,FONTGMXCONFIG,FONTGMXCONFIG_TARBALL) \ - $(call fetch_Optional,FREEHAND,FREEHAND_TARBALL) \ - $(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \ - FROZEN_TARBALL \ -@@ -241,6 +242,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))) -+ $(foreach item, \ -+ $(call fetch_Optional,MORE_FONTS,FONT_GMX_TARBALL) \ -+ ,$(call fetch__Download_item,https://repos.libreoffice.gob.mx/src,$(item))) - @mkdir -p $(dir $@) && touch $@ - @mkdir -p $(dir $@)/Executable - -diff --git a/Repository.mk b/Repository.mk -index 3e2e29098e66..c04fb9cd4108 100644 ---- a/Repository.mk -+++ b/Repository.mk -@@ -1044,6 +1044,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ - $(call gb_Helper_optional,MORE_FONTS,\ - fonts_alef \ - fonts_amiri \ -+ fonts_gmx \ - fonts_caladea \ - fonts_carlito \ - $(if $(MPL_SUBSET),,fonts_culmus) \ -diff --git a/external/more_fonts/ExternalPackage_gmx.mk b/external/more_fonts/ExternalPackage_gmx.mk -new file mode 100644 -index 000000000000..ccc1b03c5db2 ---- /dev/null -+++ b/external/more_fonts/ExternalPackage_gmx.mk -@@ -0,0 +1,49 @@ -+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -+# -+# This file is part of the LibreOffice project. -+# -+# This Source Code Form is subject to the terms of the Mozilla Public -+# License, v. 2.0. If a copy of the MPL was not distributed with this -+# file, You can obtain one at http://mozilla.org/MPL/2.0/. -+# -+ -+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gmx,font_gmx)) -+ -+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gmx,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ -+ GMX-BlackItalic.otf \ -+ GMX-BlackItalicSc.otf \ -+ GMX-Black.otf \ -+ GMX-BlackSc.otf \ -+ GMX-BoldItalic.otf \ -+ GMX-BoldItalicSc.otf \ -+ GMX-Bold.otf \ -+ GMX-BoldSc.otf \ -+ GMX-LightItalic.otf \ -+ GMX-LightItalicSc.otf \ -+ GMX-Light.otf \ -+ GMX-LightSc.otf \ -+ GMX-RegularItalic.otf \ -+ GMX-RegularItalicSc.otf \ -+ GMX-Regular.otf \ -+ GMX-RegularSc.otf \ -+ Montserrat-BlackItalic.ttf \ -+ Montserrat-Black.ttf \ -+ Montserrat-BoldItalic.ttf \ -+ Montserrat-Bold.ttf \ -+ Montserrat-ExtraBoldItalic.ttf \ -+ Montserrat-ExtraBold.ttf \ -+ Montserrat-ExtraLightItalic.ttf \ -+ Montserrat-ExtraLight.ttf \ -+ Montserrat-Italic.ttf \ -+ Montserrat-LightItalic.ttf \ -+ Montserrat-Light.ttf \ -+ Montserrat-MediumItalic.ttf \ -+ Montserrat-Medium.ttf \ -+ Montserrat-Regular.ttf \ -+ Montserrat-SemiBoldItalic.ttf \ -+ Montserrat-SemiBold.ttf \ -+ Montserrat-ThinItalic.ttf \ -+ Montserrat-Thin.ttf \ -+)) -+ -+# vim: set noet sw=4 ts=4: -\ No newline at end of file -diff --git a/external/more_fonts/Module_more_fonts.mk b/external/more_fonts/Module_more_fonts.mk -index e17af9a15141..b85f7468528f 100644 ---- a/external/more_fonts/Module_more_fonts.mk -+++ b/external/more_fonts/Module_more_fonts.mk -@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,more_fonts)) - $(eval $(call gb_Module_add_targets,more_fonts,\ - ExternalPackage_alef \ - ExternalPackage_amiri \ -+ ExternalPackage_gmx \ - ExternalPackage_caladea \ - ExternalPackage_carlito \ - $(if $(MPL_SUBSET),,ExternalPackage_culmus) \ -@@ -39,6 +40,7 @@ $(eval $(call gb_Module_add_targets,more_fonts,\ - ExternalPackage_scheherazade \ - UnpackedTarball_alef \ - UnpackedTarball_amiri \ -+ UnpackedTarball_gmx \ - UnpackedTarball_caladea \ - UnpackedTarball_carlito \ - $(if $(MPL_SUBSET),,UnpackedTarball_culmus) \ -diff --git a/external/more_fonts/UnpackedTarball_gmx.mk b/external/more_fonts/UnpackedTarball_gmx.mk -new file mode 100644 -index 000000000000..ac8020494d7e ---- /dev/null -+++ b/external/more_fonts/UnpackedTarball_gmx.mk -@@ -0,0 +1,14 @@ -+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -+# -+# This file is part of the LibreOffice project. -+# -+# This Source Code Form is subject to the terms of the Mozilla Public -+# License, v. 2.0. If a copy of the MPL was not distributed with this -+# file, You can obtain one at http://mozilla.org/MPL/2.0/. -+# -+ -+$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_gmx)) -+ -+$(eval $(call gb_UnpackedTarball_set_tarball,font_gmx,$(FONT_GMX_TARBALL))) -+ -+# vim: set noet sw=4 ts=4: -\ No newline at end of file -diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in -index a8d8b88394a8..89a2a6b63e3c 100644 ---- a/solenv/flatpak-manifest.in -+++ b/solenv/flatpak-manifest.in -@@ -590,6 +590,13 @@ - "dest": "external/tarballs", - "dest-filename": "@FONT_AMIRI_TARBALL@" - }, -+ { -+ "url": "https://repos.libreoffice.gob.mx/src/@FONT_GMX_TARBALL@", -+ "sha256": "@FONT_GMX_SHA256SUM@", -+ "type": "file", -+ "dest": "external/tarballs", -+ "dest-filename": "@FONT_GMX_TARBALL@" -+ }, - { - "url": "https://dev-www.libreoffice.org/src/@FONT_CULMUS_TARBALL@", - "sha256": "@FONT_CULMUS_SHA256SUM@", --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0005-Fonts-added.patch b/rpmbuild/SOURCES/patchset-1.1/0005-Fonts-added.patch deleted file mode 100644 index fbe1da0..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0005-Fonts-added.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2113fc78a62a38827221225aaa4734e2af417499 Mon Sep 17 00:00:00 2001 -From: Adlair Cerecedo-Mendez -Date: Mon, 17 Jul 2023 21:13:49 -0600 -Subject: [PATCH 05/18] Fonts added - -Change-Id: I32fb8011dd391d35c34627713cb38e5432927c7e ---- - .git-hooks/pre-commit | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit -index 521ed202b9ac..bdb5022849a6 100755 ---- a/.git-hooks/pre-commit -+++ b/.git-hooks/pre-commit -@@ -426,7 +426,7 @@ while () - } - my $size = `git cat-file -s :$_`; - # For now let's say large is 500KB -- my $limit = 500; -+ my $limit = 10000; - if ($size > $limit * 1024) - { - print "Error: Attempt to add a large file: $_, pleasy try to fit into $limit KB.\n"; --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0006-Modificado-archivo-tar-xz-a-gz.patch b/rpmbuild/SOURCES/patchset-1.1/0006-Modificado-archivo-tar-xz-a-gz.patch deleted file mode 100644 index 80fda0c..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0006-Modificado-archivo-tar-xz-a-gz.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3564089ff7f4e618a52be93d2bff34cf911d7b3a Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Mon, 31 Jul 2023 20:23:12 -0600 -Subject: [PATCH 06/18] Modificado archivo tar xz a gz - ---- - download.lst | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/download.lst b/download.lst -index 302e27ce3371..94875f843058 100644 ---- a/download.lst -+++ b/download.lst -@@ -3,6 +3,9 @@ - # There is a script solenv/bin/generate-flatpak-manifest.sh to substitute the variables, - # so upgrading to a new version only requires changes in download.lst. - -+FONT_GMX_TARBALL := gmx-fonts.tar.gz -+FONT_GMX_SHA256SUM := -+# - ABW_SHA256SUM := e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed - ABW_TARBALL := libabw-0.1.3.tar.xz - # three static lines --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0008-Cambios-en-logo.patch b/rpmbuild/SOURCES/patchset-1.1/0008-Cambios-en-logo.patch deleted file mode 100644 index 53a8ecf..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0008-Cambios-en-logo.patch +++ /dev/null @@ -1,5074 +0,0 @@ -From 6e573dc3c83437278f4d1f5bf1419c91f811ebb7 Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Thu, 3 Aug 2023 17:36:45 -0600 -Subject: [PATCH 08/18] Cambios en logo - -Change-Id: Ica978200502962bedf5901be88db7a2484678346 ---- - cui/source/dialogs/about.cxx | 2 +- - custom_images/about.svg | 2516 ++++++++++++++++++++++++++++++++++ - custom_images/logo.svg | 2516 ++++++++++++++++++++++++++++++++++ - 3 files changed, 5033 insertions(+), 1 deletion(-) - create mode 100644 custom_images/about.svg - create mode 100644 custom_images/logo.svg - -diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx -index 01073166f18b..496cc16676c2 100644 ---- a/cui/source/dialogs/about.cxx -+++ b/cui/source/dialogs/about.cxx -@@ -111,7 +111,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) - Graphic aGraphic(aBackgroundBitmap); - m_pBrandImage->set_image(aGraphic.GetXGraphic()); - } -- if (SfxApplication::loadBrandSvg("shell/MexGob", aBackgroundBitmap, nWidth * 0.9)) { -+ if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) { - // Eliminate white background when Skia is disabled by not drawing the - // background bitmap to a VirtualDevice. On most platforms, non-Skia - // VirtualDevices will be filled with a solid color when drawing -diff --git a/custom_images/about.svg b/custom_images/about.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/about.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/custom_images/logo.svg b/custom_images/logo.svg -new file mode 100644 -index 000000000000..6ad4cd79920c ---- /dev/null -+++ b/custom_images/logo.svg -@@ -0,0 +1,2516 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0009-Modificado-link-de-descarga-de-fuentes.patch b/rpmbuild/SOURCES/patchset-1.1/0009-Modificado-link-de-descarga-de-fuentes.patch deleted file mode 100644 index a259665..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0009-Modificado-link-de-descarga-de-fuentes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8c17c500df9200c842e90751c8dd64ff5059e58b Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Fri, 4 Aug 2023 20:21:33 -0600 -Subject: [PATCH 09/18] Modificado link de descarga de fuentes - -Change-Id: I80b8e9ea4286d68c1880ef45eaa191a8f0c3e7d2 ---- - Makefile.fetch | 2 +- - fonts/gmx-fonts.tar.gz | Bin 0 -> 2409292 bytes - fonts/gmx-fonts.tar.xz | Bin 1172924 -> 0 bytes - 3 files changed, 1 insertion(+), 1 deletion(-) - create mode 100644 fonts/gmx-fonts.tar.gz - delete mode 100644 fonts/gmx-fonts.tar.xz - -diff --git a/Makefile.fetch b/Makefile.fetch -index b0443f367007..ede18af4197d 100644 ---- a/Makefile.fetch -+++ b/Makefile.fetch -@@ -244,7 +244,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://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/tree/logos/fonts,$(item))) - @mkdir -p $(dir $@) && touch $@ - @mkdir -p $(dir $@)/Executable - diff --git a/rpmbuild/SOURCES/patchset-1.1/0011-logo-image-updated.patch b/rpmbuild/SOURCES/patchset-1.1/0011-logo-image-updated.patch deleted file mode 100644 index 1a2a862..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0011-logo-image-updated.patch +++ /dev/null @@ -1,2536 +0,0 @@ -From 908f246483f5588a181df2428fbfc248935474d1 Mon Sep 17 00:00:00 2001 -From: Adlair Cerecedo-Mendez -Date: Mon, 14 Aug 2023 18:35:41 -0600 -Subject: [PATCH 11/18] logo image updated - -Change-Id: Ib4c398af48d0014c7f11b0da5f67f3659fc018fe ---- - custom_images/logo.svg | 2517 +--------------------------------------- - 1 file changed, 1 insertion(+), 2516 deletions(-) - -diff --git a/custom_images/logo.svg b/custom_images/logo.svg -index 6ad4cd79920c..3215508ec8c3 100644 ---- a/custom_images/logo.svg -+++ b/custom_images/logo.svg -@@ -1,2516 +1 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -\ No newline at end of file --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0012-Update-OfficeLinux.conf-with-lang-es.patch b/rpmbuild/SOURCES/patchset-1.1/0012-Update-OfficeLinux.conf-with-lang-es.patch deleted file mode 100644 index c5750a9..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0012-Update-OfficeLinux.conf-with-lang-es.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 3776d246c8aaa46a6ff233e1ce9ea1712c06818e Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Wed, 8 Nov 2023 19:42:40 +0000 -Subject: [PATCH 12/18] Update OfficeLinux.conf --with-lang=es - ---- - distro-configs/OfficeLinux.conf | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -index 6cb4bd4dca66..30550375e27a 100644 ---- a/distro-configs/OfficeLinux.conf -+++ b/distro-configs/OfficeLinux.conf -@@ -8,3 +8,4 @@ - --with-vendor=INFOTEC - --with-package-version=7.5.0.0 - --disable-community-flavor -+--with-lang=es --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0013-Update-OfficeLinux.conf.patch b/rpmbuild/SOURCES/patchset-1.1/0013-Update-OfficeLinux.conf.patch deleted file mode 100644 index 238da89..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0013-Update-OfficeLinux.conf.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 183e1b54c959e3d1c1b3e00646689c011ebed810 Mon Sep 17 00:00:00 2001 -From: Israel Paredes -Date: Wed, 8 Nov 2023 23:23:27 +0000 -Subject: [PATCH 13/18] Update OfficeLinux.conf - ---- - distro-configs/OfficeLinux.conf | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf -index 30550375e27a..8f9dc46b2814 100644 ---- a/distro-configs/OfficeLinux.conf -+++ b/distro-configs/OfficeLinux.conf -@@ -1,11 +1,8 @@ - --with-parallelism -+--enable-dbgutil -+--without-doxygen - --with-branding=custom_images ----enable-release-build ----enable-epm ----with-package-format=deb - --with-product-name=Office - --with-vendor=INFOTEC ----with-vendor=INFOTEC - --with-package-version=7.5.0.0 ----disable-community-flavor - --with-lang=es --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0014-fix-error-make-install.patch b/rpmbuild/SOURCES/patchset-1.1/0014-fix-error-make-install.patch deleted file mode 100644 index 21e5ce4..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0014-fix-error-make-install.patch +++ /dev/null @@ -1,65 +0,0 @@ -From c3f7bf02d9b70a46695e6f854a261a596824ddcd Mon Sep 17 00:00:00 2001 -From: Artukryp -Date: Mon, 13 Nov 2023 11:23:10 -0600 -Subject: [PATCH 14/18] fix error make install - -Change-Id: I590a323ec835f16badf1889f4c09d00fee3d3999 ---- - instsetoo_native/util/openoffice.lst.in | 44 +++++++++++++++++++++++++ - 1 file changed, 44 insertions(+) - -diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in -index 454670cb1e15..de7de46a22ff 100644 ---- a/instsetoo_native/util/openoffice.lst.in -+++ b/instsetoo_native/util/openoffice.lst.in -@@ -266,3 +266,47 @@ Office_SDK - } - } - -+OfficeDev -+{ -+ Settings -+ { -+ variables -+ { -+ PRODUCTNAME OfficeDev -+ PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ WINDOWSBASISROOTNAME LibreOfficeDev @LIBO_VERSION_MAJOR@ -+ UNIXBASISROOTNAME libreofficedev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ POSTVERSIONEXTENSION -+ BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ -+ BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ USERDIRPRODUCTVERSION 4 -+ BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ -+ DEVELOPMENTPRODUCT 1 -+ BASISPACKAGEPREFIX lodevbasis -+ UREPACKAGEPREFIX libreofficedev -+ SOLSUREPACKAGEPREFIX libreofficedev -+ REGISTRYLAYERNAME LayerDev -+ UPDATEURL https://update.libreoffice.org/check.php -+ ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt -+ ADDSYSTEMINTEGRATION 1 -+ PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ -+ PACKAGEREVISION {buildid} -+ LICENSENAME LGPL -+ ROOTMODULEGID gid_Module_Root -+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles -+ SPELLCHECKERFILE spellchecker_selection.txt -+ CHANGETARGETDIR 1 -+ PATCHCODEFILE ooodev_patchcodes.txt -+ CODEFILENAME codes_ooodev.txt -+ LOCALUSERDIR $ORIGIN/.. -+ } -+ active 1 -+ compression 5 -+ script setup_osl -+ downloadname LibreOfficeDev_{productversion}_{os}_install_{languages} -+ langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages} -+ helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages} -+ 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} -+ } -+} --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0015-gob-mx-1.0.patch b/rpmbuild/SOURCES/patchset-1.1/0015-gob-mx-1.0.patch deleted file mode 100644 index e69de29..0000000 diff --git a/rpmbuild/SOURCES/patchset-1.1/0016-Add-minor-version-OS-to-PDF-producer-metadata.patch b/rpmbuild/SOURCES/patchset-1.1/0016-Add-minor-version-OS-to-PDF-producer-metadata.patch deleted file mode 100644 index 6142371..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0016-Add-minor-version-OS-to-PDF-producer-metadata.patch +++ /dev/null @@ -1,60 +0,0 @@ -From ed8a0ebfc1d6cfebc45db69064b56c7215638654 Mon Sep 17 00:00:00 2001 -From: Octavio Alvarez -Date: Thu, 1 Feb 2024 07:55:21 +0000 -Subject: [PATCH 16/18] Add minor version / OS to PDF producer metadata. - -Change-Id: Idca8cd73217779ab8cc8283e19ae8989d03434be ---- - filter/source/pdf/pdfexport.cxx | 13 ++++++++++++- - vcl/qa/cppunit/pdfexport/pdfexport2.cxx | 1 - - 2 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx -index 7d07f8182bdc..b6ff5fc7a95e 100644 ---- a/filter/source/pdf/pdfexport.cxx -+++ b/filter/source/pdf/pdfexport.cxx -@@ -65,6 +65,8 @@ - - #include - -+#include -+ - using namespace ::com::sun::star; - using namespace ::com::sun::star::io; - using namespace ::com::sun::star::uno; -@@ -505,10 +507,19 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& - if (!aProducerOverride.isEmpty()) - aContext.DocumentInfo.Producer = aProducerOverride; - else -+ { -+ OUString arch; -+ auto const ok = rtl::Bootstrap::get("_ARCH", arch); -+ assert(ok); (void) ok; - aContext.DocumentInfo.Producer = - utl::ConfigManager::getProductName() + - " " + -- utl::ConfigManager::getProductVersion(); -+ utl::ConfigManager::getAboutBoxProductVersion() + -+ " (" + arch + ")"; -+ #if HAVE_FEATURE_COMMUNITY_FLAVOR -+ aContext.DocumentInfo.Producer += " / LibreOffice Community"; -+ #endif -+ } - } - - aContext.DocumentInfo.Creator = aCreator; -diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx -index d2811f32fbd4..4d6c06c40057 100644 ---- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx -+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx -@@ -4311,7 +4311,6 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testPdfImageEncryption) - aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export"); - uno::Sequence aFilterData = { - comphelper::makePropertyValue("EncryptFile", true), -- comphelper::makePropertyValue("DocumentOpenPassword", OUString("secret")), - }; - aMediaDescriptor["FilterData"] <<= aFilterData; - xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); --- -2.39.2 - diff --git a/rpmbuild/SOURCES/patchset-1.1/0017-CPPUNIT-Calc-fixed.patch b/rpmbuild/SOURCES/patchset-1.1/0017-CPPUNIT-Calc-fixed.patch deleted file mode 100644 index 1c403da..0000000 --- a/rpmbuild/SOURCES/patchset-1.1/0017-CPPUNIT-Calc-fixed.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3b71303250467c0122af5fe3874e93bbf5e548c3 Mon Sep 17 00:00:00 2001 -From: Adlair Cerecedo-Mendez -Date: Fri, 12 Jan 2024 17:04:55 -0600 -Subject: [PATCH 17/18] CPPUNIT Calc - fixed - -Change-Id: I44c20706730c444e229e8f5eb17f2a9b7fca33ab ---- - sc/qa/unit/subsequent_export_test4.cxx | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/sc/qa/unit/subsequent_export_test4.cxx b/sc/qa/unit/subsequent_export_test4.cxx -index 95c7057aef2d..dc8a9073a1e7 100644 ---- a/sc/qa/unit/subsequent_export_test4.cxx -+++ b/sc/qa/unit/subsequent_export_test4.cxx -@@ -820,10 +820,7 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf147088) - - ScDocument* pDoc = getScDoc(); - -- // Without the fix in place, this test would have failed with -- // - Expected: _xffff_ -- // - Actual : -- CPPUNIT_ASSERT_EQUAL(OUString("_xffff_"), pDoc->GetString(0, 0, 0)); -+ CPPUNIT_ASSERT_EQUAL(static_cast(0), pDoc->GetPrintRangeCount(0)); - } - - CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf84874) --- -2.39.2 -