update to m56

o mozilla 1.0 dependency issue
  1. reduce gtk dependency to xlib
  2. we need libIDL >=0.6.3 and glib >=1.2.0 to build mozilla.
     From mozilla/xpcom/typelib/xpidl/README
     xpidl depends on Andrew Veliath and Elliot Lee's libIDL, a part of the
     GNOME ORBit C ORB.  We currently require libIDL >= 0.6.3, which in turn
     requires glib >= 1.2.0
  3. libIDL (not libIDL2) port does not exist and orbit includes libIDL and
     libIDL dependency implies glib12
o No longer depends on Xvfb.
o Afaik, only JDK 1.4 is supported to build

4 files changed, 37 insertions, 24 deletions

diff --git a/editors/openoffice-1.1-devel/files/moz-patch b/editors/openoffice-1.1-devel/files/moz-patch
index 818bc154943d..5da4ae43ef25 100644
--- a/editors/openoffice-1.1-devel/files/moz-patch
+++ b/editors/openoffice-1.1-devel/files/moz-patch
@@ -23,7 +23,7 @@ this functionality is not used at all.
 
 --- moz/mozilla-source-1.0.patch.org	Tue Feb 10 19:44:34 2004
 +++ moz/mozilla-source-1.0.patch	Sat Mar 19 12:51:35 2005
-@@ -4471,14 +4471,15 @@
+@@ -4471,14 +4471,16 @@
       return NS_OK;
   }
  
@@ -31,13 +31,14 @@ this functionality is not used at all.
 +--- misc/build/mozilla/.mozconfig	Tue Jul 22 21:52:27 2003
  +++ misc/build/mozilla/.mozconfig	Mon Jul 28 15:07:20 2003
 -@@ -0,0 +1,8 @@
-+@@ -0,0 +1,9 @@
++@@ -0,0 +1,10 @@
  +ac_add_options --disable-tests
  +ac_add_options --disable-xprint
  +ac_add_options --without-system-zlib
  +ac_add_options --enable-ldap
  +ac_add_options --disable-debug
 ++ac_add_options --disable-freetype2
+++ac_add_options --enable-default-toolkit=xlib
  +ac_add_options --enable-optimize
  +ac_add_options --enable-crypto
  +ac_add_options --enable-strip
diff --git a/editors/openoffice-1.1-devel/files/patch-odfilter+prj+build.lst b/editors/openoffice-1.1-devel/files/patch-odfilter+prj+build.lst
new file mode 100644
index 000000000000..9e02c5438c2b
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-odfilter+prj+build.lst
@@ -0,0 +1,13 @@
+Index: odfilter/prj/build.lst
+===================================================================
+RCS file: /cvs/xml/odfilter/prj/build.lst,v
+retrieving revision 1.1
+diff -u -r1.1 build.lst
+--- odfilter/prj/build.lst	6 Jun 2005 12:36:50 -0000	1.1
++++ odfilter/prj/build.lst	1 Jul 2005 10:49:28 -0000
+@@ -1,4 +1,4 @@
+-xod	odfilter	:	offapi goodies comphelper NULL
++xod	odfilter	:	offapi goodies comphelper xmloff NULL
+ xod	odfilter									usr1	-	all	xod_mkout NULL
+ xod	odfilter\prj								get		-	all	xod_prj NULL
+ xod	odfilter\source								nmake	-	all	xod_transform NULL
diff --git a/editors/openoffice-1.1-devel/files/patch-sndfile+makefile.mk b/editors/openoffice-1.1-devel/files/patch-sndfile+makefile.mk
new file mode 100644
index 000000000000..3be2aa82cd99
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-sndfile+makefile.mk
@@ -0,0 +1,21 @@
+Issutracker : #iXXXXX#
+CWS         : N/A
+Author      : 
+Description : 
+
+--- sndfile/makefile.mk	Wed Jun  1 01:31:45 2005
++++ sndfile/makefile.mk	Fri Jul  1 09:17:49 2005
+@@ -81,8 +81,12 @@
+ CONFIGURE_DIR=
+ 
+ CONFIGURE_ACTION=./configure --with-pic
+-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
++.IF "$(COM)" == "GCC"
++.IF "$(OS)" != "MACOSX"
++.IF "$(OS)" != "FREEBSD"
+ CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
++.ENDIF
++.ENDIF
+ .ENDIF
+ 
+ BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/editors/openoffice-1.1-devel/files/patch-vcl+util+makefile.mk b/editors/openoffice-1.1-devel/files/patch-vcl+util+makefile.mk
deleted file mode 100644
index 42d341934719..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-vcl+util+makefile.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : another ENABLE_PASF issue, somehow strange though,
-only FreeBSD 4.11-RELEASE needs this patch(?)
-
-Index: vcl/util/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/util/makefile.mk,v
-retrieving revision 1.47.10.5
-diff -u -r1.47.10.5 makefile.mk
---- vcl/util/makefile.mk	29 Apr 2005 14:28:18 -0000	1.47.10.5
-+++ vcl/util/makefile.mk	13 May 2005 08:51:12 -0000
-@@ -310,7 +310,7 @@
- .ENDIF          # "$(OS)"=="SOLARIS"
- .ENDIF          # "$(GUIBASE)"=="unx"
- 
--.IF "$(ENABLE_PASF)" != ""
-+.IF "$(ENABLE_PASF)" == "YES"
- .IF "$(OS)"=="MACOSX"
- SHL1STDLIBS += -framework CoreAudio -framework AudioToolbox
- .ENDIF