aboutsummaryrefslogtreecommitdiff
path: root/editors/openoffice-3/files/moz-patch_i59729
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice-3/files/moz-patch_i59729')
-rw-r--r--editors/openoffice-3/files/moz-patch_i59729151
1 files changed, 0 insertions, 151 deletions
diff --git a/editors/openoffice-3/files/moz-patch_i59729 b/editors/openoffice-3/files/moz-patch_i59729
deleted file mode 100644
index aa8178d0d4f3..000000000000
--- a/editors/openoffice-3/files/moz-patch_i59729
+++ /dev/null
@@ -1,151 +0,0 @@
-Index: extensions/source/plugin/base/makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/base/makefile.mk,v
-retrieving revision 1.8
-diff -u -p -r1.8 makefile.mk
---- extensions/source/plugin/base/makefile.mk 8 Sep 2005 19:50:31 -0000 1.8
-+++ extensions/source/plugin/base/makefile.mk 25 Jan 2006 14:30:56 -0000
-@@ -41,6 +41,8 @@ ENABLE_EXCEPTIONS=TRUE
-
- .INCLUDE : ..$/util$/makefile.pmk
-
-+.IF "$(WITH_MOZILLA)" != "NO"
-+
- SLOFILES= \
- $(SLO)$/plctrl.obj \
- $(SLO)$/service.obj \
-@@ -53,6 +55,8 @@ SLOFILES= \
- $(SLO)$/multiplx.obj \
- $(SLO)$/plmodel.obj
-
-+.ENDIF # $(WITH_MOZILLA) != "NO"
-+
- # --- Targets ------------------------------------------------------
-
- .INCLUDE : target.mk
-Index: extensions/source/plugin/unx/makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/unx/makefile.mk,v
-retrieving revision 1.8
-diff -u -p -r1.8 makefile.mk
---- extensions/source/plugin/unx/makefile.mk 8 Sep 2005 19:55:36 -0000 1.8
-+++ extensions/source/plugin/unx/makefile.mk 25 Jan 2006 14:30:56 -0000
-@@ -42,6 +42,8 @@ TARGETTYPE=CUI
-
- # --- Files --------------------------------------------------------
-
-+.IF "$(WITH_MOZILLA)" != "NO"
-+
- SLOFILES=\
- $(SLO)$/nppapi.obj \
- $(SLO)$/sysplug.obj \
-@@ -73,6 +75,7 @@ APP1STDLIBS+=-lXaw -lXt -lXext -lX11 -ld
-
- APP1DEF= $(MISC)$/$(TARGET).def
-
-+.ENDIF # $(WITH_MOZILLA) != "NO"
-
- # --- Targets ------------------------------------------------------
-
-Index: extensions/source/plugin/util/makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/util/makefile.mk,v
-retrieving revision 1.12
-diff -u -p -r1.12 makefile.mk
---- extensions/source/plugin/util/makefile.mk 8 Sep 2005 19:57:10 -0000 1.12
-+++ extensions/source/plugin/util/makefile.mk 25 Jan 2006 14:30:56 -0000
-@@ -43,6 +43,9 @@ TARGETTYPE=GUI
- .INCLUDE : settings.mk
-
- # --- Files --------------------------------------------------------
-+
-+.IF "$(WITH_MOZILLA)" != "NO"
-+
- LIB1TARGET = $(SLB)$/plall.lib
- LIB1FILES = \
- $(SLB)$/plbase.lib \
-@@ -97,6 +100,8 @@ SHL1STDLIBS+= -lX11
-
- SHL1STDLIBS+=$(SHL1OWNLIBS)
-
-+.ENDIF # $(WITH_MOZILLA) != "NO"
-+
- # --- Targets ------------------------------------------------------
-
- .INCLUDE : target.mk
-Index: extensions/source/plugin/win/makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/win/makefile.mk,v
-retrieving revision 1.4
-diff -u -p -r1.4 makefile.mk
---- extensions/source/plugin/win/makefile.mk 8 Sep 2005 19:58:00 -0000 1.4
-+++ extensions/source/plugin/win/makefile.mk 25 Jan 2006 14:30:56 -0000
-@@ -46,6 +46,8 @@ ENABLE_EXCEPTIONS=TRUE
-
- # --- Types -------------------------------------
-
-+.IF "$(WITH_MOZILLA)" != "NO"
-+
- #UNOUCROUT=$(OUT)$/inc$/$(PRJNAME)
- #INCPRE+=$(UNOUCROUT)
-
-@@ -54,7 +56,9 @@ ENABLE_EXCEPTIONS=TRUE
- SLOFILES = $(SLO)$/winmgr.obj \
- $(SLO)$/sysplug.obj
-
-+.ENDIF # $(WITH_MOZILLA) != "NO"
- .ENDIF
-+
- # ------------------------------------------------------------------
-
-
-Index: extensions/source/ooo/file_library_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
-retrieving revision 1.177
-diff -u -p -r1.177 file_library_ooo.scp
---- scp2/source/ooo/file_library_ooo.scp 16 Jan 2006 15:32:35 -0000 1.177
-+++ scp2/source/ooo/file_library_ooo.scp 25 Jan 2006 14:43:34 -0000
-@@ -1434,7 +1434,9 @@ File gid_File_Lib_DeploymentGui
- PACKED_UNO_LIB_FILE_BODY_PATCH;
- End
-
-+#ifndef WITHOUT_MOZILLA
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Pl , pl)
-+#endif
-
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Preload, preload)
-
-Index: scp2/source/ooo/file_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v
-retrieving revision 1.134
-diff -u -p -r1.134 file_ooo.scp
---- scp2/source/ooo/file_ooo.scp 5 Jan 2006 14:55:20 -0000 1.134
-+++ scp2/source/ooo/file_ooo.scp 25 Jan 2006 14:43:38 -0000
-@@ -163,6 +163,8 @@ File gid_File_Bin_MsiPkgchk
- End
- #endif
-
-+#ifndef WITHOUT_MOZILLA
-+
- #if !defined(UNX) || defined(ENABLE_GTK)
- File gid_File_Lib_Npsoplugin
- BIN_FILE_BODY;
-@@ -184,6 +186,7 @@ File gid_File_Exe_Nsplugin
- #endif
- End
- #endif
-+#endif
-
- File gid_File_Bin_Uno
- BIN_FILE_BODY;
-@@ -291,7 +294,7 @@ File gid_File_Rdb_Gengal
- Name = "gengal.rdb";
- End
-
--#ifdef UNX
-+#if !defined(WITHOUT_MOZILLA) && defined(UNX)
-
- File gid_File_Bin_Pluginapp
- BIN_FILE_BODY;