Makefile.fetch | 1
Repository.mk | 6 ---
config_host.mk.in | 1
configure.ac | 1
distro-configs/CPLinux-LOKit.conf | 2 -
distro-configs/Jenkins/Linux_ubsan_master.conf | 1
distro-configs/LibreOfficeVanillaMacAppStore.conf | 1
download.lst | 4 --
external/misc_extensions/ExtensionPackageSet_misc_extensions.mk | 4 --
readlicense_oo/license/license.xml | 15
---------
scp2/AutoInstall.mk | 1
scp2/InstallModule_extensions.mk | 1
scp2/source/extensions/module_extensions.scp | 16
----------
scp2/source/extensions/module_extensions.ulf | 6 ---
scp2/source/ooo/directory_ooo.scp | 5 ---
setup_native/source/packinfo/packinfo_extensions.txt | 15
---------
16 files changed, 80 deletions(-)
New commits:
commit a76a0ca930b8329f588c7da90c15674751db7b7b
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sat Feb 1 12:24:44 2025 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Feb 1 16:47:45 2025 +0100
Remove obsolete Numbertext 0.9.5 extension
There is no point to bundle it, because
1) it is an old version
2) since LibreOffice 7.5 there are built-in number formats in
Calc with the same functionality (using libnumbertext FWIW)
Change-Id: I8cfb24f7e6f045bd51fea620aca6a61269dba77a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180996
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/Makefile.fetch b/Makefile.fetch
index 9828a88de380..58d1d0359fda 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -213,7 +213,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
$(call fetch_Optional,MYTHES,MYTHES_TARBALL) \
$(call fetch_Optional,NSS,NSS_TARBALL) \
- $(call fetch_Optional_pack,NUMBERTEXT_EXTENSION_PACK) \
$(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \
$(call fetch_Optional,ONLINEUPDATE,ONLINEUPDATE_TARBALL) \
$(call fetch_Optional,OPENLDAP,OPENLDAP_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index 0357827b13d5..277a1fb99b8b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -838,12 +838,6 @@ $(eval $(call
gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
))
endif
-ifeq (NUMBERTEXT,$(filter NUMBERTEXT,$(BUILD_TYPE)))
-$(eval $(call gb_Helper_register_packages_for_install,extensions_numbertext,\
- numbertext \
-))
-endif
-
$(eval $(call gb_Helper_register_jars,OXT, \
EvolutionarySolver \
active_java \
diff --git a/config_host.mk.in b/config_host.mk.in
index cdf47d5072b9..41aa4f801165 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -525,7 +525,6 @@ export NAFLAGS=@NAFLAGS@
export NM=@NM@
export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@
export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@
-export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
export nodep=@nodep@
@x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@
@x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@
diff --git a/configure.ac b/configure.ac
index b00228c511b0..63bf9c8c14b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14050,7 +14050,6 @@ dnl There are standalone tests for each of these below.
WITH_EXTRA_EXTENSIONS=
AC_SUBST([WITH_EXTRA_EXTENSIONS])
-libo_CHECK_EXTENSION([Numbertext],[NUMBERTEXT],[numbertext],[numbertext],[b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt])
if test "x$with_java" != "xno"; then
libo_CHECK_EXTENSION([NLPSolver],[NLPSOLVER],[nlpsolver],[nlpsolver],[])
fi
diff --git a/distro-configs/CPLinux-LOKit.conf
b/distro-configs/CPLinux-LOKit.conf
index 6533a63bcdb3..321cb967b217 100644
--- a/distro-configs/CPLinux-LOKit.conf
+++ b/distro-configs/CPLinux-LOKit.conf
@@ -55,8 +55,6 @@
--disable-postgresql-sdbc
--disable-firebird-sdbc
--disable-randr
---disable-ext-numbertext
-#--disable-ext-ct2n
--enable-epm
--enable-python=internal
--disable-online-update
diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf
b/distro-configs/Jenkins/Linux_ubsan_master.conf
index b1b928e7e41e..436845e67d18 100644
--- a/distro-configs/Jenkins/Linux_ubsan_master.conf
+++ b/distro-configs/Jenkins/Linux_ubsan_master.conf
@@ -7,7 +7,6 @@
--enable-epm
--enable-evolution2
--enable-ext-nlpsolver
---enable-ext-numbertext
--enable-ext-wiki-publisher
--enable-gstreamer-1-0
--enable-python=fully-internal
diff --git a/distro-configs/LibreOfficeVanillaMacAppStore.conf
b/distro-configs/LibreOfficeVanillaMacAppStore.conf
index 68a85690b8b8..6c96b7896005 100644
--- a/distro-configs/LibreOfficeVanillaMacAppStore.conf
+++ b/distro-configs/LibreOfficeVanillaMacAppStore.conf
@@ -1,4 +1,3 @@
---disable-ext-numbertext
--disable-firebird-sdbc
--disable-lotuswordpro
--disable-lpsolve
diff --git a/download.lst b/download.lst
index 014dacbcff4b..98f1c20de9db 100644
--- a/download.lst
+++ b/download.lst
@@ -695,9 +695,5 @@ ZXING_TARBALL := zxing-cpp-2.3.0.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-NUMBERTEXT_EXTENSION_SHA256SUM :=
1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
-# three static lines
-# so that git cherry-pick
-# will not run into conflicts
OPENSYMBOL_SHA256SUM :=
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
OPENSYMBOL_TTF :=
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
diff --git a/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk
b/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk
index b03254845ee7..1196cd7e5cf1 100644
--- a/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk
+++ b/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk
@@ -9,8 +9,4 @@
$(eval $(call gb_ExtensionPackageSet_ExtensionPackageSet,misc_extensions))
-ifneq ($(NUMBERTEXT_EXTENSION_PACK),)
-$(eval $(call
gb_ExtensionPackageSet_add_extension,misc_extensions,numbertext,$(NUMBERTEXT_EXTENSION_PACK)))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/license/license.xml
b/readlicense_oo/license/license.xml
index 33d4e361c3ac..7bf940853021 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -2281,21 +2281,6 @@
<hr />
<h1><a id="a__Extensions" name="a__Extensions">Extensions</a></h1>
<p>Only third party extensions are listed here whose source code is not in
the LibreOffice tree.</p>
- <div class="NUMBERTEXT"><!-- FIXME: license_*.xsl written in XSLT 1.0
matches this when LIBNUMBERTEXT is defined -->
- <h2>Numbertext</h2>
- <p>The following software may be included in this product: Numbertext.
Use of any of this software is governed
- by the terms of the license below:</p>
- <p>License: LGPL/BSD dual-license, 2009-2010 (C) László Németh (nemeth
at openoffice dot org)</p>
- <p>Numbertext language data (Soros programs):</p>
- <p>LGPL/BSD dual-license, 2009-2010 (C) László Németh et al. (see
AUTHORS)</p>
- <p>Serbian modules:</p>
- <p>CC/LGPL/BSD tri-license, 2009 (C) Goran Rakić (grakic at devbase
dot net)</p>
- <p>Note: for full distribution with specifications, IDE and JavaScript
implementation, see <a href=
- "http://NUMBERTEXT.org/";>http://NUMBERTEXT.org</a></p>
- <p>Software distributed under the License is distributed on an "AS IS"
basis, WITHOUT WARRANTY OF ANY KIND,
- either express or implied.</p>
- <p><a href="#a__LGPL_version_3">Jump to LGPL Version 3</a></p>
- </div>
<div class="NLPSOLVER">
<h2>Solver for Nonlinear Programming</h2>
<p>The following software may be included in this product: Solver for
Nonlinear Programming. Use of any of this
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 4cfcbde8c88f..e07de841357f 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -19,7 +19,6 @@ $(eval $(call
gb_AutoInstall_add_module,calc,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
$(eval $(call
gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
$(eval $(call
gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
-$(eval $(call
gb_AutoInstall_add_module,extensions_numbertext,,,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))
$(eval $(call
gb_AutoInstall_add_module,firebirdsdbc,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE,LIBO_EXECUTABLE))
diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk
index fe5a969d694e..bde1fd7a3095 100644
--- a/scp2/InstallModule_extensions.mk
+++ b/scp2/InstallModule_extensions.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/extensions))
$(eval $(call
gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_bsh))
$(eval $(call
gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_rhino))
-$(eval $(call
gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_numbertext))
$(eval $(call gb_InstallModule_add_scpfiles,scp2/extensions,\
scp2/source/extensions/file_extensions \
diff --git a/scp2/source/extensions/module_extensions.scp
b/scp2/source/extensions/module_extensions.scp
index 7f8061f99857..d8ddeea34295 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -45,22 +45,6 @@ Module gid_Module_Optional_Extensions_MEDIAWIKI
End
#endif
-/* ** Numbertext ** */
-
-#ifdef WITH_EXTENSION_NUMBERTEXT
-
-#include "AutoInstall/extensions_numbertext"
-
-Module gid_Module_Optional_Extensions_NumberText
- PackageInfo = "packinfo_extensions.txt";
- MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT);
- ParentID = gid_Module_Optional_Extensions;
- Files = (auto_extensions_numbertext_ALL);
- Default = YES;
- Styles = ( );
-End
-#endif
-
/* ** NLPSolver ** */
#ifdef WITH_EXTENSION_NLPSOLVER
diff --git a/scp2/source/extensions/module_extensions.ulf
b/scp2/source/extensions/module_extensions.ulf
index 6218564c08f0..ff61f86f7209 100644
--- a/scp2/source/extensions/module_extensions.ulf
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -28,12 +28,6 @@ en-US = "MediaWiki Publisher"
[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
en-US = "MediaWiki Publisher"
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
-en-US = "Numbertext"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
-en-US = "Provides the NUMBERTEXT/MONEYTEXT spreadsheet functions which convert
numbers to localized text, e.g. '100' to 'hundred'."
-
[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER]
en-US = "Solver for Nonlinear Programming"
diff --git a/scp2/source/ooo/directory_ooo.scp
b/scp2/source/ooo/directory_ooo.scp
index af1d16f64563..eb1c7b36d9dc 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -420,11 +420,6 @@ Directory gid_Dir_Share_Fingerprint
DosName = "fingerprint";
End
-Directory gid_Dir_Share_Numbertext
- ParentID = gid_Brand_Dir_Share;
- DosName = "numbertext";
-End
-
Directory gid_Dir_Help
#if defined MACOSX
ParentID = gid_Dir_Bundle_Contents_Resources;
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt
b/setup_native/source/packinfo/packinfo_extensions.txt
index a56390d8b503..0fe27993ed31 100644
--- a/setup_native/source/packinfo/packinfo_extensions.txt
+++ b/setup_native/source/packinfo/packinfo_extensions.txt
@@ -49,21 +49,6 @@ destpath = "/opt"
packageversion = "%PACKAGEVERSION"
End
-Start
-module = "gid_Module_Optional_Extensions_NumberText"
-solarispackagename =
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-numbertext"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-numbertext"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION
%PACKAGEVERSION-%PACKAGEREVISION"
-linuxpatchrequires = ""
-copyright = "2009 by FSF.hu"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "Numbertext extension for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
Start
module = "gid_Module_Optional_Extensions_NLPSolver"
solarispackagename =
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-nlpsolver"
