GNOME.org
 

ooo-build r13819 - in branches/ooo-build-3-0: . patches/dev300 test/mono

Author: rengelhard
Date: Sat Sep  6 14:01:44 2008
New Revision: 13819
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13819&view=rev

Log:
2008-09-06  Rene Engelhard  <rene debian .org>

        * patches/dev300/pyuno-rpath-ooodir.diff: update for 3-layer OOo
        * patches/dev300/debian-system-jfreereport.diff: update for new
          reportbuilder module
        * configure.in: ooo300-m5 == rc1
        * patches/dev300/apply:
          cppuhelper-findsofficepath-realpath-buffer-size.diff is in m5/m31
        * patches/dev300/uses-vfs.diff,
          patches/dev300/uses-vfs-m30.diff,
          patches/dev300/apply: ooo300-m5 update


Added:
   branches/ooo-build-3-0/patches/dev300/uses-vfs-m30.diff
      - copied unchanged from r13812, /branches/ooo-build-3-0/patches/dev300/uses-vfs.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/configure.in
   branches/ooo-build-3-0/patches/dev300/apply
   branches/ooo-build-3-0/patches/dev300/debian-system-jfreereport.diff
   branches/ooo-build-3-0/patches/dev300/pyuno-rpath-ooodir.diff
   branches/ooo-build-3-0/patches/dev300/uses-vfs.diff
   branches/ooo-build-3-0/test/mono/Makefile

Modified: branches/ooo-build-3-0/configure.in
==============================================================================
--- branches/ooo-build-3-0/configure.in	(original)
+++ branches/ooo-build-3-0/configure.in	Sat Sep  6 14:01:44 2008
@@ -1213,10 +1213,10 @@
    UPSTREAM_VERSION=2.3.1
 elif test "$with_tag" = "OOH680_m12" ; then
    UPSTREAM_VERSION=2.4.0
-elif test "$with_tag" = "BEB300_m2" ; then
-   UPSTREAM_VERSION=3.0.0beta2rc1
 elif test "$with_tag" = "BEB300_m3" ; then
    UPSTREAM_VERSION=3.0.0beta2
+elif test "$with_tag" = "OOO300_m4" ; then
+   UPSTREAM_VERSION=3.0.0
 fi
 if test -n "$UPSTREAM_VERSION"; then
    UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Sat Sep  6 14:01:44 2008
@@ -339,6 +339,10 @@
 # make menu layout prettier
 vcl-menu-fixes.diff, i#67123, michael
 
+[ FixesNotForUpstream < dev300-m31 < ooo300-m5 ]
+# Tell the desktop we support the VFS
+uses-vfs-m30.diff, i#43504, michael
+[ FixesNotForUpstream >= dev300-m31 >= ooo300-m5 ]
 # Tell the desktop we support the VFS
 uses-vfs.diff, i#43504, michael
 
@@ -496,6 +500,7 @@
 # such directories if they exist on the server's host system.
 win32-invalid-names.diff, n#277603, tml
 
+[ Fixes < dev300-m31 < ooo300-m5 ]
 # fixes the realpath buffer size to avoid crash when detecting soffice path
 cppuhelper-findsofficepath-realpath-buffer-size.diff, i#93393, pmladek
 

Modified: branches/ooo-build-3-0/patches/dev300/debian-system-jfreereport.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/debian-system-jfreereport.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/debian-system-jfreereport.diff	Sat Sep  6 14:01:44 2008
@@ -3,8 +3,8 @@
 RCS file: /cvs/dba/reportdesign/java/com/sun/star/report/pentaho/Manifest.mf,v
 retrieving revision 1.2.68.1
 diff -u -u -r1.2.68.1 Manifest.mf
---- reportdesign/java/com/sun/star/report/pentaho/Manifest.mf        11 Jan 2008 08:20:34 -0000      1.2.68.1
-+++ reportdesign/java/com/sun/star/report/pentaho/Manifest.mf        15 Jan 2008 01:33:52 -0000
+--- reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf        11 Jan 2008 08:20:34 -0000      1.2.68.1
++++ reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf        15 Jan 2008 01:33:52 -0000
 @@ -1,7 +1,14 @@
  RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory
  Class-Path: reportbuilderwizard.jar
@@ -29,8 +29,8 @@
 RCS file: /cvs/dba/reportdesign/util/makefile.mk,v
 retrieving revision 1.20
 diff -u -r1.20 makefile.mk
---- reportdesign/util/makefile.mk	25 Jul 2008 07:38:25 -0000	1.20
-+++ reportdesign/util/makefile.mk	25 Jul 2008 23:21:46 -0000
+--- reportbuilder/util/makefile.mk	25 Jul 2008 07:38:25 -0000	1.20
++++ reportbuilder/util/makefile.mk	25 Jul 2008 23:21:46 -0000
 @@ -225,17 +225,6 @@
  
  # .jar files from solver

Modified: branches/ooo-build-3-0/patches/dev300/pyuno-rpath-ooodir.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/pyuno-rpath-ooodir.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/pyuno-rpath-ooodir.diff	Sat Sep  6 14:01:44 2008
@@ -10,7 +10,7 @@
  $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
  .IF "$(OS)" == "LINUX"
 -	@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
-+	@echo $(LINK) -Wl,-z,combreloc $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) -Wl,-rpath,/usr/lib/openoffice/program $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
++	@echo $(LINK) -Wl,-z,combreloc $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) -Wl,-rpath,/usr/lib/openoffice/basis-link/program $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
  .ELIF "$(OS)" == "SOLARIS"
  	@echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
  .ELIF "$(OS)" == "FREEBSD"

Modified: branches/ooo-build-3-0/patches/dev300/uses-vfs.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/uses-vfs.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/uses-vfs.diff	Sat Sep  6 14:01:44 2008
@@ -1,10 +1,5 @@
-Index: sysui/desktop/mimetypes/openoffice.applications
-===================================================================
-RCS file: /cvs/gsl/sysui/desktop/mimetypes/openoffice.applications,v
-retrieving revision 1.5
-diff -u -p -u -r1.5 openoffice.applications
---- sysui/desktop/mimetypes/openoffice.applications	21 Jan 2005 11:18:09 -0000	1.5
-+++ sysui/desktop/mimetypes/openoffice.applications	24 Feb 2005 20:57:29 -0000
+--- sysui/desktop/mimetypes/openoffice.applications-old	2008-09-06 15:37:02.000000000 +0200
++++ sysui/desktop/mimetypes/openoffice.applications	2008-09-06 15:37:48.000000000 +0200
 @@ -3,7 +3,7 @@
  	name=%PRODUCTNAME
  	can_open_multiple_files=true
@@ -12,5 +7,5 @@
 +	uses_gnomevfs=true
  	requires_terminal=false
 -	supported_uri_schemes=file,http,https,smb
- 	mime_types=application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.text-web,application/vnd.oasis.opendocument.text-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,app
 lication/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.openofficeorg.extension;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd
 .ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
+ 	mime_types=application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.text-web,application/vnd.oasis.opendocument.text-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,app
 lication/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.openofficeorg.extension;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd
 .ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;
  

Modified: branches/ooo-build-3-0/test/mono/Makefile
==============================================================================
--- branches/ooo-build-3-0/test/mono/Makefile	(original)
+++ branches/ooo-build-3-0/test/mono/Makefile	Sat Sep  6 14:01:44 2008
@@ -10,7 +10,7 @@
 
 SpreadsheetSample.exe: ${SOURCES}
 	mcs -debug SpreadsheetSample.cs SpreadsheetDocHelper.cs \
-	    `pkg-config --libs mono-ooo-3.0`
+	    `pkg-config --libs mono-openoffice`
 
 clean:
 	rm -f SpreadsheetSample.exe
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]