Update to DEV300_m52.

Funded by: OpenOffice.org community

5 files changed, 127 insertions, 44 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index c7b700dd46b9..ab1701179051 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -69,11 +69,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		51
+MILESTONE?=		52
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090630
+SNAPDATE=		20090711
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index f7b55646fde1..6c0f1cb19eeb 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m51_source.tar.bz2) = 7edb79cbb34f5701e3fd20709dfd6651
-SHA256 (openoffice.org3/OOo_DEV300_m51_source.tar.bz2) = 14f3b00cfcb8b495a7275999ba9412a0ddeca458bcf17f4441eba23b8ca71393
-SIZE (openoffice.org3/OOo_DEV300_m51_source.tar.bz2) = 420077068
+MD5 (openoffice.org3/OOo_DEV300_m52_source.tar.bz2) = 9787fa04e7f19d86f10fe5c65eb0b803
+SHA256 (openoffice.org3/OOo_DEV300_m52_source.tar.bz2) = 107cc5e8e9eeef37cf72acb74218a6d134f30ea6d07e6fbbe08bcd9951565710
+SIZE (openoffice.org3/OOo_DEV300_m52_source.tar.bz2) = 419940049
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-i102183 b/editors/openoffice-3-devel/files/patch-i102183
index 51e0e9183166..e5293feef0ce 100644
--- a/editors/openoffice-3-devel/files/patch-i102183
+++ b/editors/openoffice-3-devel/files/patch-i102183
@@ -1,6 +1,6 @@
---- redland/rasqal-0.9.15.patch	2009-05-24 16:12:11.000000000 +0900
-+++ redland/rasqal-0.9.15.patch	2009-05-24 16:12:20.000000000 +0900
-@@ -240,7 +240,7 @@
+--- redland/raptor/raptor-1.4.18.patch.autotools	2009-07-11 13:49:32.000000000 +0900
++++ redland/raptor/raptor-1.4.18.patch.autotools	2009-07-11 13:52:31.000000000 +0900
+@@ -40,7 +40,7 @@
  -	  major=".$current"
  -	  versuffix=".$current";
  +	  major=.`expr $current - $age`
@@ -9,9 +9,11 @@
   	  ;;
   
   	irix | nonstopux)
---- redland/raptor-1.4.17.patch	2009-05-24 16:15:47.000000000 +0900
-+++ redland/raptor-1.4.17.patch	2009-05-24 16:08:28.000000000 +0900
-@@ -284,7 +284,7 @@
+
+
+--- redland/rasqal/rasqal-0.9.16.patch.autotools	2009-07-11 13:49:32.000000000 +0900
++++ redland/rasqal/rasqal-0.9.16.patch.autotools	2009-07-11 13:52:09.000000000 +0900
+@@ -32,7 +32,7 @@
  -	  major=".$current"
  -	  versuffix=".$current";
  +	  major=.`expr $current - $age`
@@ -20,9 +22,10 @@
   	  ;;
   
   	irix | nonstopux)
---- redland/redland-1.0.7.patch	2009-05-04 12:28:07.000000000 +0900
-+++ redland/redland-1.0.7.patch	2009-05-24 16:13:23.000000000 +0900
-@@ -734,7 +734,7 @@
+
+--- redlan_/redland/redland-1.0.8.patch.autotools	2009-07-11 13:49:32.000000000 +0900
++++ redland/redland/redland-1.0.8.patch.autotools	2009-07-11 13:49:54.000000000 +0900
+@@ -52,7 +52,7 @@
  -	  major=".$current"
  -	  versuffix=".$current";
  +	  major=.`expr $current - $age`
diff --git a/editors/openoffice-3-devel/files/patch-i102679 b/editors/openoffice-3-devel/files/patch-i102679
deleted file mode 100644
index bfeb707f2e02..000000000000
--- a/editors/openoffice-3-devel/files/patch-i102679
+++ /dev/null
@@ -1,30 +0,0 @@
-will be fixed in OOO310_m14
-
---- sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx.orig	2009-06-11 18:24:02.000000000 +0100
-+++ sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx	2009-06-11 18:24:13.000000000 +0100
-@@ -30,7 +30,11 @@
- 
- #include "pnghelper.hxx"
- 
--#include "zlib/zlib.h"
-+#ifdef SYSTEM_ZLIB
-+#include "zlib.h"
-+#else
-+#include <zlib/zlib.h>
-+#endif
- 
- using namespace pdfi;
- 
---- sdext/source/pdfimport/xpdfwrapper/makefile.mk.orig	2009-06-11 18:24:29.000000000 +0100
-+++ sdext/source/pdfimport/xpdfwrapper/makefile.mk	2009-06-11 18:24:46.000000000 +0100
-@@ -41,6 +41,10 @@
- 
- .INCLUDE: settings.mk
- 
-+.IF "$(SYSTEM_ZLIB)" == "YES"
-+CFLAGS+=-DSYSTEM_ZLIB
-+.ENDIF
-+
- .IF "$(ENABLE_PDFIMPORT)" == "NO"
- @all:
- 	@echo "PDF Import extension disabled."
diff --git a/editors/openoffice-3-devel/files/patch-i103467 b/editors/openoffice-3-devel/files/patch-i103467
new file mode 100644
index 000000000000..55c2ae7f3f0a
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i103467
@@ -0,0 +1,110 @@
+Index: source/drivers/mozab/makefile.mk
+===================================================================
+--- connectivity/source/drivers/mozab/makefile.mk	(revision 273857)
++++ connectivity/source/drivers/mozab/makefile.mk	(working copy)
+@@ -83,6 +83,11 @@
+ ENABLE_EXCEPTIONS=TRUE
+ VISIBILITY_HIDDEN=TRUE
+ 
++.IF "$(OS)"!="WNT" 
++COMPONENT_CONFIG_DATA=$(TARGET)2.xcu
++COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
++.ENDIF
++
+ # --- Settings ----------------------------------
+ 
+ .IF "$(DBGUTIL_OJ)"!=""
+@@ -94,24 +99,10 @@
+ .INCLUDE :  $(PRJ)$/version.mk
+ 
+ # --- Files -------------------------------------
+-# redefine because win and linux differ
+-.IF "$(OS)"=="WNT" 
+-LOCALIZEDFILES= \
+-    $(TARGET).xcu
+-.ELSE
+-LOCALIZEDFILES= \
+-    $(TARGET)2.xcu
+-.ENDIF
+ 
+-XCUFILES= \
+-    $(LOCALIZEDFILES) \
+-
+-
+-
+ SLOFILES=\
+ 		$(SLO)$/MDriver.obj						\
+ 		$(SLO)$/MServices.obj
+-
+ 			
+ # --- MOZAB BASE Library -----------------------------------
+ 
+@@ -201,17 +192,6 @@
+ 
+ .INCLUDE : $(PRJ)$/target.pmk
+ 
+-.IF "$(GUI)"=="WNT" 
+-.ELSE
+-ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET)2.xcs" "$(PWD)$/$(MISC)$/registry$/data$/$(PACKAGEDIR)$/$(TARGET).xcu"
+-"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET)2.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
+-    @@-$(MKDIRHIER) $(@:d)
+-    $(COPY) $< $@
+-"$(PWD)$/$(MISC)$/registry$/data$/$(PACKAGEDIR)$/$(TARGET).xcu" : "$(PWD)$/$(MISC)$/registry$/data$/$(PACKAGEDIR)$/$(TARGET)2.xcu" 
+-    @@-$(MKDIRHIER) $(@:d)
+-    $(COPY) $< $@
+-.ENDIF
+-
+ # --- filter file ------------------------------
+ 
+ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
+Index: makefile.pmk
+===================================================================
+--- connectivity/makefile.pmk	(revision 273857)
++++ connectivity/makefile.pmk	(working copy)
+@@ -55,8 +55,10 @@
+ PACKAGE=org.openoffice.Office.DataAccess
+ .INCLUDE :  settings.mk
+ 
++COMPONENT_CONFIG_DATA*=$(TARGET).xcu
++
+ LOCALIZEDFILES= \
+-    $(TARGET).xcu
++    $(COMPONENT_CONFIG_DATA)
+ 
+ XCUFILES= \
+     $(LOCALIZEDFILES) \
+Index: target.pmk
+===================================================================
+--- connectivity/target.pmk	(revision 273857)
++++ connectivity/target.pmk	(working copy)
+@@ -31,7 +31,10 @@
+ 
+ .INCLUDE : target.mk
+ 
+-ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET).xcs"
+-"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET).xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
++COMPONENT_CONFIG_SCHEMA*=$(TARGET).xcs
++
++ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)"
++"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
+     @@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
++
+
+
+Index: source/ooo/file_library_ooo.scp
+===================================================================
+--- scp2/source/ooo/file_library_ooo.scp	(revision 273857)
++++ scp2/source/ooo/file_library_ooo.scp	(working copy)
+@@ -958,7 +958,11 @@
+     TXT_FILE_BODY;
+     Styles = (PACKED);
+     Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
++#ifdef WNT
+     Name = "/registry/spool/DataAccess/mozab.xcu";
++#else
++    Name = "/registry/spool/DataAccess/mozab2.xcu";
++#endif
+ End
+ 
+ STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab)