Bug 57917 - --enable-ext-oooblogger does not work with Python 3
Remove the oooblogger extension. It is unmaintained and the original author (caolan) wants it dead. Change-Id: Iff89f5badbb74f465c57e068a9e1acbbc13bc235
This commit is contained in:
@@ -173,7 +173,6 @@ $(WORKDIR)/download: $(SRCDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)/M
|
||||
$(DIAGRAM_EXTENSION_PACK) \
|
||||
$(HUNART_EXTENSION_PACK) \
|
||||
$(NUMBERTEXT_EXTENSION_PACK) \
|
||||
$(OOOBLOGGER_EXTENSION_PACK) \
|
||||
$(OOOP_FONTS_PACK) \
|
||||
$(OOOP_GALLERY_PACK) \
|
||||
$(OOOP_SAMPLES_PACK) \
|
||||
|
@@ -408,7 +408,6 @@ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
|
||||
@x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@
|
||||
@x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@
|
||||
export OBJDUMP=@OBJDUMP@
|
||||
export OOOBLOGGER_EXTENSION_PACK=@OOOBLOGGER_EXTENSION_PACK@
|
||||
export OOODMAKEMODE=YES
|
||||
export OOOP_FONTS_PACK=@OOOP_FONTS_PACK@
|
||||
export OOOP_GALLERY_PACK=@OOOP_GALLERY_PACK@
|
||||
|
21
configure.ac
21
configure.ac
@@ -617,11 +617,6 @@ AC_ARG_ENABLE(ext-numbertext,
|
||||
[Enable the Numbertext extension.])
|
||||
)
|
||||
|
||||
AC_ARG_ENABLE(ext-oooblogger,
|
||||
AS_HELP_STRING([--enable-ext-oooblogger],
|
||||
[Enable the OOo Blogger extension.])
|
||||
)
|
||||
|
||||
AC_ARG_ENABLE(ext-presenter-minimizer,
|
||||
AS_HELP_STRING([--disable-ext-presenter-minimizer],
|
||||
[Disable the Presentation Minimizer extension.])
|
||||
@@ -10995,22 +10990,6 @@ else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
dnl ===================================================================
|
||||
dnl Test whether to include oooblogger extension
|
||||
dnl ===================================================================
|
||||
AC_MSG_CHECKING([for oooblogger extension integration])
|
||||
OOOBLOGGER_EXTENSION_PACK=
|
||||
if test "x$enable_ext_oooblogger" = "xyes" -a "x$enable_extension_integration" != "xno"; then
|
||||
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_OOOBLOGGER"
|
||||
OOOBLOGGER_EXTENSION_PACK="b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt"
|
||||
WITH_EXTRA_EXTENSIONS=YES
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
AC_SUBST(OOOBLOGGER_EXTENSION_PACK)
|
||||
###############################################################################
|
||||
|
||||
dnl ===================================================================
|
||||
dnl Test whether to include Sun Professional Template Pack
|
||||
dnl ===================================================================
|
||||
|
@@ -49,7 +49,6 @@
|
||||
--enable-ext-diagram
|
||||
--enable-ext-validator
|
||||
--enable-ext-barcode
|
||||
--disable-ext-oooblogger
|
||||
--enable-ext-mysql-connector
|
||||
--enable-postgresql-sdbc
|
||||
--with-sun-templates
|
||||
|
@@ -27,7 +27,6 @@
|
||||
--enable-ext-diagram
|
||||
--enable-ext-validator
|
||||
--enable-ext-barcode
|
||||
--disable-ext-oooblogger
|
||||
--with-sun-templates
|
||||
--disable-cairo
|
||||
--with-jdk-home=/usr/local/jdk1.6.0_23/
|
||||
|
@@ -26,9 +26,6 @@ endif
|
||||
ifneq ($(NUMBERTEXT_EXTENSION_PACK),)
|
||||
$(eval $(call gb_Package_add_file,extras_extensions,bin/numbertext.oxt,$(NUMBERTEXT_EXTENSION_PACK)))
|
||||
endif
|
||||
ifneq ($(OOOBLOGGER_EXTENSION_PACK),)
|
||||
$(eval $(call gb_Package_add_file,extras_extensions,bin/oooblogger.oxt,$(OOOBLOGGER_EXTENSION_PACK)))
|
||||
endif
|
||||
ifneq ($(SUNTEMPLATES_DE_PACK),)
|
||||
$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-de,$(SUNTEMPLATES_DE_PACK)))
|
||||
endif
|
||||
|
@@ -198,17 +198,6 @@ End
|
||||
|
||||
#endif
|
||||
|
||||
/* ** oooblogger ** */
|
||||
|
||||
#ifdef WITH_EXTENSION_OOOBLOGGER
|
||||
|
||||
Directory gid_Brand_Dir_Share_Extensions_OOoBlogger
|
||||
ParentID = gid_Brand_Dir_Share_Extensions;
|
||||
DosName = "oooblogger";
|
||||
End
|
||||
|
||||
#endif
|
||||
|
||||
/* ** Sun Template Pack ** */
|
||||
|
||||
#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
|
||||
|
@@ -228,19 +228,6 @@ End
|
||||
|
||||
#endif
|
||||
|
||||
/* ** oooblogger ** */
|
||||
|
||||
#ifdef WITH_EXTENSION_OOOBLOGGER
|
||||
|
||||
File gid_File_Oxt_OOoBlogger
|
||||
TXT_FILE_BODY;
|
||||
Styles = (PACKED, ARCHIVE);
|
||||
Dir = gid_Brand_Dir_Share_Extensions_OOoBlogger;
|
||||
Name = "oooblogger.oxt";
|
||||
End
|
||||
|
||||
#endif
|
||||
|
||||
/* ** Sun Template Pack ** */
|
||||
|
||||
#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
|
||||
|
@@ -267,21 +267,6 @@ Module gid_Module_Optional_Extensions_MySQLConnector
|
||||
End
|
||||
#endif
|
||||
|
||||
/* ** oooblogger ** */
|
||||
|
||||
#ifdef WITH_EXTENSION_OOOBLOGGER
|
||||
Module gid_Module_Optional_Extensions_OOoBlogger
|
||||
PackageInfo = "packinfo_extensions.txt";
|
||||
MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER);
|
||||
ParentID = gid_Module_Optional_Extensions;
|
||||
Files = (
|
||||
gid_File_Oxt_OOoBlogger );
|
||||
Minimal = NO;
|
||||
Default = YES;
|
||||
Styles = ( );
|
||||
End
|
||||
#endif
|
||||
|
||||
/* ** Sun Template Pack ** */
|
||||
|
||||
#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
|
||||
|
@@ -123,12 +123,6 @@ en-US = "MySQL Connector"
|
||||
[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MYSQLC]
|
||||
en-US = "MySQL Connector"
|
||||
|
||||
[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER]
|
||||
en-US = "Metaweblog Support"
|
||||
|
||||
[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER]
|
||||
en-US = "Metaweblog Support"
|
||||
|
||||
[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK]
|
||||
en-US = "Sun Professional Template Pack"
|
||||
|
||||
|
@@ -259,21 +259,6 @@ destpath = "/opt"
|
||||
packageversion = "%PACKAGEVERSION"
|
||||
End
|
||||
|
||||
Start
|
||||
module = "gid_Module_Optional_Extensions_OOoBlogger"
|
||||
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-oooblogger"
|
||||
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
|
||||
packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-oooblogger"
|
||||
requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
|
||||
linuxpatchrequires = ""
|
||||
copyright = "2005 by Caolan McNamara"
|
||||
solariscopyright = "solariscopyrightfile"
|
||||
vendor = "The Document Foundation"
|
||||
description = "oooblogger extension for %PRODUCTNAME %PRODUCTVERSION"
|
||||
destpath = "/opt"
|
||||
packageversion = "%PACKAGEVERSION"
|
||||
End
|
||||
|
||||
Start
|
||||
module = "gid_Module_Optional_Extensions_Script_Provider_For_Beanshell"
|
||||
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-beanshell-script-provider"
|
||||
|
Reference in New Issue
Block a user