Author: hdu
Date: Wed Nov 6 08:32:13 2013
New Revision: 1539267
URL: http://svn.apache.org/r1539267
Log:
#i123623# RmMoz 8/9: remove the obsoleted seamonkey 1.1.14 module
That module was used for its security libs and its address book support.
With #i122365# the dependency on its security libs was replaced with plain NSS.
With #i123575# the already quite bit-rotten seamonkey address books were
removed.
Now there is nothing left for it to do and so that huge and complex module can
finally be retired after all these years.
Removed:
openoffice/trunk/main/automation/source/mozillaserver/
openoffice/trunk/main/connectivity/workben/testmoz/
openoffice/trunk/main/moz/
openoffice/trunk/main/solenv/inc/tg_moz.mk
Modified:
openoffice/trunk/.gitignore
openoffice/trunk/main/configure.in
openoffice/trunk/main/set_soenv.in
openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk
openoffice/trunk/main/xmlsecurity/tools/demo/makefile.mk
Modified: openoffice/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/openoffice/trunk/.gitignore?rev=1539267&r1=1539266&r2=1539267&view=diff
==============================================================================
--- openoffice/trunk/.gitignore (original)
+++ openoffice/trunk/.gitignore Wed Nov 6 08:32:13 2013
@@ -57,7 +57,6 @@ TAGS
# externals
/main/external/unowinreg/unowinreg.dll
/main/external/msvcp90/*
-/main/moz/zipped/*
# $INPATH output directories
/*/*/unxlng??
Modified: openoffice/trunk/main/configure.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1539267&r1=1539266&r2=1539267&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Wed Nov 6 08:32:13 2013
@@ -603,10 +603,6 @@ AC_ARG_WITH(system-mdds,
AC_ARG_WITH(system-vigra,
[ --with-system-vigra Use vigra already on system
],,)
-AC_ARG_ENABLE(Xaw,
-[ --disable-Xaw Disables the use of Xaw for the Netscape/Mozilla
- plugin
-],,)
AC_ARG_ENABLE(hunspell,
[ --enable-hunspell Determines whether to enable the Hunspell library.
If enabled, the library will be built unless you
@@ -5003,28 +4999,6 @@ fi
AC_SUBST(XLIB)
AC_SUBST(XAU_LIBS)
-if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
- dnl ===================================================================
- dnl Check for using Xaw
- dnl ===================================================================
- AC_MSG_CHECKING([whether to use Xaw])
- if test "$enable_Xaw" = "no"; then
- DISABLE_XAW=TRUE
- AC_MSG_RESULT([no])
- AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt include headers
not found])],
- [#include <X11/Intrinsic.h>])
- else
- AC_MSG_RESULT([yes])
- AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers
not found])],
- [#include <X11/Intrinsic.h>])
- AC_CHECK_LIB(Xaw, main, [],
- [AC_MSG_ERROR(Xaw library not found or functional)], [])
- fi
-fi
-AC_SUBST(DISABLE_XAW)
-
-
-
dnl ===================================================================
dnl Check if fontconfig/fontconfig.h is available
dnl ===================================================================
Modified: openoffice/trunk/main/set_soenv.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1539267&r1=1539266&r2=1539267&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Wed Nov 6 08:32:13 2013
@@ -1958,7 +1958,6 @@ ToFile( "SYSTEM_PANGO", "@SYSTEM_PA
ToFile( "SYSTEM_LIBPNG", "@SYSTEM_LIBPNG@", "e" );
ToFile( "SYSTEM_LIBJPEG", "@SYSTEM_LIBJPEG@", "e" );
ToFile( "RAT_JAR_HOME", "@RAT_JAR_HOME@", "e" );
-ToFile( "DISABLE_XAW", "@DISABLE_XAW@", "e" );
ToFile( "DMAKE_URL", "@DMAKE_URL@", "e" );
ToFile( "DMAKE_PATH", "@DMAKE_PATH@", "e" );
ToFile( "IS_SYSTEM_DMAKE", "@IS_SYSTEM_DMAKE@", "e" );
Modified: openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk?rev=1539267&r1=1539266&r2=1539267&view=diff
==============================================================================
--- openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk (original)
+++ openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk Wed Nov 6
08:32:13 2013
@@ -52,13 +52,6 @@ NSS_INC = $(MOZ_NSS_CFLAGS)
NSPR_INC = $(MOZ_INC)$/nspr
.ENDIF
-.IF "$(GUI)"=="UNX"
-.IF "$(COMNAME)"=="sunpro5"
-CFLAGS += -features=tmplife
-#This flag is needed to build mozilla 1.7 code
-.ENDIF # "$(COMNAME)"=="sunpro5"
-.ENDIF
-
.IF "$(GUI)" == "WNT"
.IF "$(DBG_LEVEL)" == "0"
INCPRE += \
Modified: openoffice/trunk/main/xmlsecurity/tools/demo/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/tools/demo/makefile.mk?rev=1539267&r1=1539266&r2=1539267&view=diff
==============================================================================
--- openoffice/trunk/main/xmlsecurity/tools/demo/makefile.mk (original)
+++ openoffice/trunk/main/xmlsecurity/tools/demo/makefile.mk Wed Nov 6
08:32:13 2013
@@ -98,14 +98,6 @@ APP3STDLIBS+=$(SHARE_LIBS)
APP3OBJS= $(SHARE_OBJS) $(OBJ)$/multisigdemo.obj
#
-# ---------- mozprofile ----------
-#
-APP4TARGET=mozprofile
-APP4DEPN=makefile.mk
-APP4STDLIBS+=$(SHARE_LIBS)
-APP4OBJS= $(SHARE_OBJS) $(OBJ)$/mozprofile.obj
-
-#
# ---------- performance ----------
#
APP5TARGET=performance
