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

Patchset gob.mx 1.3

Browse source
This commit is contained in:
Sandino Araico Sanchez 2024-06-25 03:11:29 -06:00
parent e37e2a0b8c
commit 0b8497aa8c
No known key found for this signature in database
GPG key ID: 90E64E484EED133A
23 changed files with 458 additions and 21190 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
rpmbuild/SOURCES/0001-Archivos-de-distro-config-de-brand-Office.patch
View file

@ -1,62 +0,0 @@
From 1b55f6f6b91efdd1de3025dbd2bce026104a19ec Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Tue, 20 Jun 2023 02:26:13 -0400
Subject: [PATCH 01/19] 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

41
rpmbuild/SOURCES/0001-cui-fix-without-java-build.patch
View file

@ -1,41 +0,0 @@
From af3963c32c63893949a3028396af90ee7d811e5b Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.com>
Date: Wed, 21 Jun 2023 12:06:42 +0200
Subject: [PATCH 1/2] cui: fix --without-java build
This went wrong in commit 7795a2adc0a724220440dca997495043902f1384
(Allow bootstrap variables in Java user classpath settings, 2nd try,
2023-06-12), I assume that _rPath is always empty in the without-java
case.
Change-Id: I8749f5bd30b0853a76fb9ccf5d1e7a8e4e23f1ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153386
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Tested-by: Jenkins
---
cui/source/options/optjava.cxx | 2 ++
1 file changed, 2 insertions(+)
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 17f128ce9b3b..7a537dfe4eed 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -940,6 +940,7 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
if ( m_sOldPath.isEmpty() )
m_sOldPath = _rPath;
m_xPathList->clear();
+#if HAVE_FEATURE_JAVA
if (!_rPath.isEmpty())
{
std::vector paths = jfw_convertUserPathList(_rPath);
@@ -961,6 +962,7 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
// select first entry
m_xPathList->select(0);
}
+#endif
SelectHdl_Impl(*m_xPathList);
}
--
2.39.3

94
rpmbuild/SOURCES/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch
View file

@ -1,94 +0,0 @@
From 37041efced586f0bf56aeddd9503a912245909a5 Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Tue, 20 Jun 2023 02:29:16 -0400
Subject: [PATCH 02/19] 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

51
rpmbuild/SOURCES/0002-cui-don-t-build-SvxJavaClassPathDlg-SetClassPath-for.patch
View file

@ -1,51 +0,0 @@
From 8b330bb761e05fcfabd5a30f8784046c93b91431 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.com>
Date: Wed, 21 Jun 2023 16:16:57 +0200
Subject: [PATCH 2/2] cui: don't build SvxJavaClassPathDlg::SetClassPath() for
the non-java case
Since SvxJavaClassPathDlg::SetClassPath is only called from #if
HAVE_FEATURE_JAVA code (in IMPL_LINK_NOARG(SvxJavaOptionsPage,
ClassPathHdl_Impl, weld::Button&, void) in
cui/source/options/optjava.cxx ) anyway, see
<https://gerrit.libreoffice.org/c/core/+/153386/2#message-06ee95be419a14ee8f08035142b5718e0377d120>.
Change-Id: I0e5a21036ce048c18d408c07cce088dbab7fc030
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153396
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
---
cui/source/options/optjava.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 7a537dfe4eed..64ba41c3fe0b 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -935,12 +935,12 @@ OUString SvxJavaClassPathDlg::GetClassPath() const
return sPath.makeStringAndClear();
}
+#if HAVE_FEATURE_JAVA
void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
{
if ( m_sOldPath.isEmpty() )
m_sOldPath = _rPath;
m_xPathList->clear();
-#if HAVE_FEATURE_JAVA
if (!_rPath.isEmpty())
{
std::vector paths = jfw_convertUserPathList(_rPath);
@@ -962,8 +962,8 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
// select first entry
m_xPathList->select(0);
}
-#endif
SelectHdl_Impl(*m_xPathList);
}
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
2.39.3

2569
rpmbuild/SOURCES/0003-Custom-images-and-referencies-added.patch
View file

File diff suppressed because it is too large Load diff

171
rpmbuild/SOURCES/0004-Fuentes-monserrat-y-gmx.patch
View file

@ -1,171 +0,0 @@
From ab48e5d8b266e50ba168c58d1a3ba599916f7a4b Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Thu, 20 Jul 2023 08:28:06 -0600
Subject: [PATCH 04/19] 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 74beb39f21b9..78b044fa4745 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.43.0

26
rpmbuild/SOURCES/0005-Fonts-added.patch
View file

@ -1,26 +0,0 @@
From 0df3ee0d443227d03bd151dbe9d430a86aca071f Mon Sep 17 00:00:00 2001
From: Adlair Cerecedo-Mendez <adlair@linuxmail.org>
Date: Mon, 17 Jul 2023 21:13:49 -0600
Subject: [PATCH 05/19] 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 (<FILES>)
}
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.43.0

26
rpmbuild/SOURCES/0006-Modificado-archivo-tar-xz-a-gz.patch
View file

@ -1,26 +0,0 @@
From fdef54d83b3f6dda5e4dccde556bc75a7a47dcd3 Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Mon, 31 Jul 2023 20:23:12 -0600
Subject: [PATCH 06/19] Modificado archivo tar xz a gz
---
download.lst | 3 +++
1 file changed, 3 insertions(+)
diff --git a/download.lst b/download.lst
index 438359f38b65..9f675b2d8fe5 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.43.0

29
rpmbuild/SOURCES/0007-Corregida-instrucci-n-de-descarga.patch
View file

@ -1,29 +0,0 @@
From 92412588b836b3072ab6ea851b05482dea81adb5 Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Tue, 1 Aug 2023 14:12:02 -0600
Subject: [PATCH 07/19] =?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.43.0

5074
rpmbuild/SOURCES/0008-Cambios-en-logo.patch
View file

File diff suppressed because it is too large Load diff

27
rpmbuild/SOURCES/0009-Modificado-link-de-descarga-de-fuentes.patch
View file

@ -1,27 +0,0 @@
From fade2024ec205e42737df7943b81a562ab26f07e Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Fri, 4 Aug 2023 20:21:33 -0600
Subject: [PATCH 09/19] 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

25
rpmbuild/SOURCES/0010-Restauracion-link-repos-src.patch
View file

@ -1,25 +0,0 @@
From 4b0bec8364de1be8d4fd1bfd0aeb9ba6a7db5b1f Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Tue, 8 Aug 2023 07:51:52 +0000
Subject: [PATCH 10/19] 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.43.0

2536
rpmbuild/SOURCES/0011-logo-image-updated.patch
View file

File diff suppressed because one or more lines are too long

21
rpmbuild/SOURCES/0012-Update-OfficeLinux.conf-with-lang-es.patch
View file

@ -1,21 +0,0 @@
From 43e7cc35717147e6f4fe17b60eaffb33e35b42e1 Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Wed, 8 Nov 2023 19:42:40 +0000
Subject: [PATCH 12/19] 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

30
rpmbuild/SOURCES/0013-Update-OfficeLinux.conf.patch
View file

@ -1,30 +0,0 @@
From 9e87d8e75c5d8b22e033be9eafd8dd24716c3ad0 Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Wed, 8 Nov 2023 23:23:27 +0000
Subject: [PATCH 13/19] 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

65
rpmbuild/SOURCES/0014-fix-error-make-install.patch
View file

@ -1,65 +0,0 @@
From f843392687060dcff3ae87cde1df1f1a3da5d02f Mon Sep 17 00:00:00 2001
From: Artukryp <isark3@hotmail.com>
Date: Mon, 13 Nov 2023 11:23:10 -0600
Subject: [PATCH 14/19] 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

2536
rpmbuild/SOURCES/0015-Cambios-en-logo.patch
View file

File diff suppressed because one or more lines are too long

7656
rpmbuild/SOURCES/0016-Felipe-Carrillo-Puerto-image-added.patch
View file

File diff suppressed because one or more lines are too long

44
rpmbuild/SOURCES/0017-Restaurar-el-cambio-de-copyright.patch
View file

@ -1,44 +0,0 @@
From b0641618f267f2cf3a8d8842a487252741516de4 Mon Sep 17 00:00:00 2001
From: Octavio Alvarez <alvarezp@ugd.gob.mx>
Date: Tue, 12 Mar 2024 05:38:32 +0000
Subject: [PATCH 17/19] Restaurar el cambio de copyright.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Israel observó que el copyright en el archivo
external/more_fonts/UnpackedTarball_gmx.mk fue regenerado
incorrectamente. Durante una limpia de commits este cambio fue retirado.
Con este commit restauro el cambio original de Israel para dar la
atribución correspondiente.
Change-Id: Ib25131be3e3605715a9b1b20fb060c3aae9be252
---
external/more_fonts/UnpackedTarball_gmx.mk | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/external/more_fonts/UnpackedTarball_gmx.mk b/external/more_fonts/UnpackedTarball_gmx.mk
index ac8020494d7e..28b53b415a2a 100644
--- a/external/more_fonts/UnpackedTarball_gmx.mk
+++ b/external/more_fonts/UnpackedTarball_gmx.mk
@@ -1,14 +1,11 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
-# This file is part of the LibreOffice project.
+# This file is part of the GobMX 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
+# vim: set noet sw=4 ts=4:
--
2.43.0

47
rpmbuild/SOURCES/0018-Eliminar-with-package-version-de-nuestras-distro-con.patch
View file

@ -1,47 +0,0 @@
From b6b09ecad240232728f680ebd476d6c1f78b6ea8 Mon Sep 17 00:00:00 2001
From: Octavio Alvarez <alvarezp@ugd.gob.mx>
Date: Tue, 12 Mar 2024 05:44:12 +0000
Subject: [PATCH 18/19] Eliminar --with-package-version de nuestras
distro-configs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
En el issue #7 [1] se reporta que --with-package-version está indicado
de manera fija en nuestras configuraciones de distro-config. Se acordó
que estas líneas deberían establecerse sólo durante la compilación o
durante una rama, más no en master.
Este commit eliminar ambas líneas.
[1] https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/issues/7
Change-Id: I043f42b9bc14d6f6bbf38776f3de73741cc201cd
---
distro-configs/OfficeLinux.conf | 1 -
distro-configs/OfficeWin64.conf | 1 -
2 files changed, 2 deletions(-)
diff --git a/distro-configs/OfficeLinux.conf b/distro-configs/OfficeLinux.conf
index 8f9dc46b2814..ce64682af1fa 100644
--- a/distro-configs/OfficeLinux.conf
+++ b/distro-configs/OfficeLinux.conf
@@ -4,5 +4,4 @@
--with-branding=custom_images
--with-product-name=Office
--with-vendor=INFOTEC
---with-package-version=7.5.0.0
--with-lang=es
diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf
index 01ad659c2af3..032d5c70803a 100644
--- a/distro-configs/OfficeWin64.conf
+++ b/distro-configs/OfficeWin64.conf
@@ -20,5 +20,4 @@
--with-branding=custom_images
--with-product-name=Office
--with-vendor=INFOTEC
---with-package-version=7.5.0.0
--disable-community-flavor
--
2.43.0

37
rpmbuild/SOURCES/0019-Eliminar-with-jdk-home-de-nuestras-distro-configs.patch
View file

@ -1,37 +0,0 @@
From 89d5d6206298c93dd203c796c1d21aba2b09b9ca Mon Sep 17 00:00:00 2001
From: Octavio Alvarez <alvarezp@ugd.gob.mx>
Date: Tue, 12 Mar 2024 05:50:09 +0000
Subject: [PATCH 19/19] Eliminar --with-jdk-home de nuestras distro-configs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
En el issue #8 [1] se reporta que --with-jdk-home está indicado
de manera fija en nuestras configuraciones de distro-config, lo cual casa la
compilación a una ruta que depende de cada sistema. Se acordó que estas
líneas deberían establecerse sólo durante la compilación.
Este commit elimina la línea del archivo OfficeLinux.conf. Aún cuando el
issue indica que también estaba en OfficeWin64.conf, esto no es correcto.
[1] https://git.softwarelibre.mx/strepsirrhini/office-gobmx/-/issues/8
Change-Id: Ie953e5a5747d49454dad2b7e9e0194b79a3c5851
---
distro-configs/OfficeWin64.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/distro-configs/OfficeWin64.conf b/distro-configs/OfficeWin64.conf
index 032d5c70803a..25996d9d6710 100644
--- a/distro-configs/OfficeWin64.conf
+++ b/distro-configs/OfficeWin64.conf
@@ -1,6 +1,5 @@
--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
--
2.43.0

453
rpmbuild/SOURCES/libreoffice-24.2.3.2+gobmx1.3-patchset.patch Normal file
View file

File diff suppressed because one or more lines are too long

28
rpmbuild/SPECS/libreoffice.spec
View file

@ -78,7 +78,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
Release: 5+gob.mx1.2%{?dist}
Release: 2+gob.mx1.3%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
@ -365,27 +365,8 @@ Patch11: lo-7.6-ppc64le-tests.patch
# https://bugs.documentfoundation.org/show_bug.cgi?id=158108
Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch
# Parches gob.mx 1.2
Patch21: 0001-Archivos-de-distro-config-de-brand-Office.patch
Patch22: 0002-Modificacion-al-build-y-borrado-UPDATEURL.patch
Patch23: 0003-Custom-images-and-referencies-added.patch
Patch24: 0004-Fuentes-monserrat-y-gmx.patch
Patch25: 0005-Fonts-added.patch
Patch26: 0006-Modificado-archivo-tar-xz-a-gz.patch
Patch27: 0007-Corregida-instrucci-n-de-descarga.patch
Patch28: 0008-Cambios-en-logo.patch
Patch29: 0009-Modificado-link-de-descarga-de-fuentes.patch
Patch30: 0010-Restauracion-link-repos-src.patch
Patch31: 0011-logo-image-updated.patch
Patch32: 0012-Update-OfficeLinux.conf-with-lang-es.patch
Patch33: 0013-Update-OfficeLinux.conf.patch
Patch34: 0014-fix-error-make-install.patch
Patch35: 0015-Cambios-en-logo.patch
Patch36: 0016-Felipe-Carrillo-Puerto-image-added.patch
Patch37: 0017-Restaurar-el-cambio-de-copyright.patch
Patch38: 0018-Eliminar-with-package-version-de-nuestras-distro-con.patch
Patch39: 0019-Eliminar-with-jdk-home-de-nuestras-distro-configs.patch
# Patchset gob.mx 1.3
Patch21: libreoffice-24.2.3.2+gobmx1.3-patchset.patch
Patch500: 0001-disable-libe-book-support.patch
# https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html
@ -2873,8 +2854,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
* Tue Jun 25 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.3.2-2+gob.mx1.2
* Tue Jun 25 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.3.2-2+gob.mx1.3
- Merge 24.2.3.2.fc40
- Patchset gob.mx 1.3
* Mon Jun 24 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.2.2-5+gob.mx1.2
- Temporarily disabled patch for kf6 scaling