ooo-build r12609 - in trunk: . patches/dev300 patches/unittesting

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12609 - in trunk: . patches/dev300 patches/unittesting
Date: Tue, 20 May 2008 20:53:13 +0000 (UTC)
Author: rengelhard
Date: Tue May 20 20:53:12 2008
New Revision: 12609
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12609&view=rev

Log:
2008-05-20  Rene Engelhard  <rene debian org>

        * patches/dev300/debian-splash.diff: update for dev300-m13
        * patches/dev300/unittesting-basegfx.diff: move ...
        * patches/unittesting/unittesting-basegfx.diff: .. to here.
        * patches/dev300/presenterscreen-no-license-m12.diff,
          patches/dev300/presenterscreen-no-license.diff,
          patches/dev300/uses-vfs-m12.diff,
          patches/dev300/uses-vfs.diff,
          patches/unittesting/unittesting-ucb-m12.diff,
          patches/unittesting/unittesting-ucb.diff,
          patches/dev300/apply: first part of dev300-m13 support


Added:
   trunk/patches/dev300/presenterscreen-no-license-m12.diff
      - copied unchanged from r12608, /trunk/patches/dev300/presenterscreen-no-license.diff
   trunk/patches/dev300/uses-vfs-m12.diff
      - copied unchanged from r12608, /trunk/patches/dev300/uses-vfs.diff
   trunk/patches/unittesting/unittesting-basegfx.diff
      - copied unchanged from r12608, /trunk/patches/dev300/unittesting-basegfx.diff
   trunk/patches/unittesting/unittesting-ucb-m12.diff
      - copied unchanged from r12608, /trunk/patches/unittesting/unittesting-ucb.diff
Removed:
   trunk/patches/dev300/unittesting-basegfx.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/debian-splash.diff
   trunk/patches/dev300/presenterscreen-no-license.diff
   trunk/patches/dev300/uses-vfs.diff
   trunk/patches/unittesting/unittesting-ucb.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue May 20 20:53:12 2008
@@ -329,8 +329,12 @@
 vcl-menu-fixes.diff, i#67123, michael
 
 # Tell the desktop we support the VFS
+[ FixesNotForUpstream < dev300-m13 ]
+uses-vfs-m12.diff, i#43504, michael
+[ FixesNotForUpstream >= dev300-m13 ]
 uses-vfs.diff, i#43504, michael
 
+[ FixesNotForUpstream ]
 # add mozilla certificate dir detection to soffice
 soffice-detect-mozilla-certificates.diff
 
@@ -348,11 +352,14 @@
 reportdesigner-no-license.diff
 [ FixesNotForUpstream ]
 presentation-minimizer-no-license.diff
-presenterscreen-no-license.diff
 [ FixesNotForUpstream < dev300-m11 ]
 pdfimport-no-license-m10.diff
 [ FixesNotForUpstream >= dev300-m11 ]
 pdfimport-no-license.diff
+[ FixesNotForUpstream < dev300-m13 ]
+presenterscreen-no-license-m12.diff
+[ FixesNotForUpstream >= dev300-m13 ]
+presenterscreen-no-license.diff
 
 [ swextFixes ]
 wiki-publisher-no-license.diff
@@ -459,13 +466,14 @@
 # init all members in svx's line geometry creator
 svx-missing-initialization.diff, i#86163, thorsten
 
+[ Fixes < dev300-13 ]
+# only use value if initialized
+vcl-gcache-missing-initialisation.diff, i#88005, thorsten
+
 [ Fixes ]
 # init all members in VirDev's ctor
 vcl-virdev-missing-initialisation.diff, i#88535, thorsten
 
-# only use value if initialized
-vcl-gcache-missing-initialisation.diff, i#88005, thorsten
-
 # don't use freed memory in slidesorter
 sd-slidesorter-dead-ptr.diff, i#88002, thorsten
 
@@ -967,6 +975,7 @@
 # fix the --enable-reportdesign configure check to work
 buildfix-enable-reportdesign-check.diff, i#87518, pmladek
 
+[ BuildBits < dev300-m13 ]
 # double qulification
 buildfix-sdext-double-qualification.diff, i#88584
 
@@ -977,7 +986,7 @@
 # fix build with system-hunspell
 fix-system-hunspell.diff, i#87604
 
-[ BuildBits >= dev300-m12 ]
+[ BuildBits == dev300-m12 ]
 fixup-system-hyph.diff, i#89468
 
 [ NovellOnlyWin32 ]
@@ -2014,7 +2023,14 @@
 unittesting-testtools.diff
 unittesting-toolkit.diff
 unittesting-tools.diff
+
+[ UnitTesting < dev300-m13 ]
+unittesting-ucb-m12.diff
+
+[ UnitTesting >= dev300-m13 ]
 unittesting-ucb.diff
+
+[ UnitTesting ]
 unittesting-ucbhelper.diff
 unittesting-udkapi.diff
 unittesting-vcl.diff

Modified: trunk/patches/dev300/debian-splash.diff
==============================================================================
--- trunk/patches/dev300/debian-splash.diff	(original)
+++ trunk/patches/dev300/debian-splash.diff	Tue May 20 20:53:12 2008
@@ -1,11 +1,11 @@
 --- scp2/source/ooo/ooo_brand-old	2005-09-14 23:48:03.232375952 +0200
 +++ scp2/source/ooo/ooo_brand.scp	2005-09-14 23:48:32.327952752 +0200
-@@ -66,7 +66,7 @@
+@@ -61,7 +61,7 @@
      Section = "Bootstrap";
      Order = 2;
      Key = "ProgressBarColor";
--    Value = "0,0,128";
+-    Value = "4,68,155";
 +    Value = "215,7,81";
  End
  
- ProfileItem gid_Brand_Profileitem_Soffice_ProgressSize
+ ProfileItem gid_Brand_Profileitem_Soffice_ProgressFrameColor

Modified: trunk/patches/dev300/presenterscreen-no-license.diff
==============================================================================
--- trunk/patches/dev300/presenterscreen-no-license.diff	(original)
+++ trunk/patches/dev300/presenterscreen-no-license.diff	Tue May 20 20:53:12 2008
@@ -5,18 +5,19 @@
 diff -u -u -r1.1.2.3 description.xml
 --- sdext/source/presenter/description.xml	7 Jan 2008 14:13:37 -0000	1.1.2.3
 +++ sdext/source/presenter/description.xml	3 Apr 2008 10:41:58 -0000
-@@ -9,11 +9,5 @@
-     <OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/>
+@@ -13,12 +13,6 @@
+     <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
    </dependencies>
      
 -  <registration>
--      <simple-license accept-by="admin" default-license-id="lic-en-US">
--        <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
--      </simple-license>
+-    <simple-license accept-by="admin" default-license-id="lic-en-US">
+-      <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
+-    </simple-license>
 -  </registration>
 -
-   <version value="0.1"/>
- </description>
+   <version value="1.0" />
+ 
+   <platform value="UPDATED_PLATFORM" />
 Index: makefile.mk
 ===================================================================
 RCS file: /cvs/graphics/sdext/source/presenter/Attic/makefile.mk,v
@@ -24,31 +25,32 @@
 diff -u -u -r1.1.2.13 makefile.mk
 --- sdext/source/presenter/makefile.mk	2 Apr 2008 15:07:13 -0000	1.1.2.13
 +++ sdext/source/presenter/makefile.mk	3 Apr 2008 10:41:59 -0000
-@@ -103,13 +103,6 @@
+@@ -123,14 +123,6 @@
  
- DESCRIPTION:=$(MISC)$/$(TARGET)$/description.xml
+ DESCRIPTION:=$(ZIP1DIR)$/description.xml
  
 -.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
--PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/$(TARGET)$/registry$/license_$i)
+-PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/license_$i)
 -.ELSE
--PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/$(TARGET)$/registry$/LICENSE_$i)
+-PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/LICENSE_$i)
 -.ENDIF
 -
 -
- # --- Library -----------------------------------
- 
- SHL1TARGET=		$(TARGET).uno
-@@ -187,7 +180,6 @@
- 	$(MISC)$/$(TARGET)$/$(TARGET).uno$(DLLPOST)
+-
+ COMPONENT_FILES=								\
+     $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/Jobs.xcu		\
+ 	$(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/Addons.xcu		\
+@@ -242,7 +234,6 @@
+ 	$(ZIP1DIR)$/$(TARGET).uno$(DLLPOST)
  
  ZIP1DEPS=					\
 -	$(PACKLICS) 			\
  	$(DESCRIPTION)			\
  	$(COMPONENT_MANIFEST)	\
  	$(COMPONENT_FILES)		\
-@@ -219,16 +211,6 @@
- 	@-$(MKDIRHIER) $(@:d)
-     +$(COPY) $< $@
+@@ -306,16 +297,6 @@
+ .ENDIF
+ 
  
 -.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
 -$(PACKLICS) : $(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e).txt
@@ -60,6 +62,6 @@
 -	$(GNUCOPY) $< $@
 -.ENDIF
 -
- .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
- .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
- PHONYDESC=.PHONY
+ $(ZIP1DIR)/%.xcu : %.xcu
+ 	@@-$(MKDIRHIER) $(@:d)
+ 	$(GNUCOPY) $< $@

Modified: trunk/patches/dev300/uses-vfs.diff
==============================================================================
--- trunk/patches/dev300/uses-vfs.diff	(original)
+++ trunk/patches/dev300/uses-vfs.diff	Tue May 20 20:53:12 2008
@@ -5,13 +5,12 @@
 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
-@@ -3,8 +3,8 @@ openoffice
+@@ -3,7 +3,7 @@
  	name=%PRODUCTNAME
  	can_open_multiple_files=true
  	expects_uris=true
 +	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
+ 	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
  
- unopkg

Modified: trunk/patches/unittesting/unittesting-ucb.diff
==============================================================================
--- trunk/patches/unittesting/unittesting-ucb.diff	(original)
+++ trunk/patches/unittesting/unittesting-ucb.diff	Tue May 20 20:53:12 2008
@@ -1,8 +1,8 @@
 --- ucb/prj/build.lst	2007-06-19 18:10:23.000000000 +0200
 +++ ucb/prj/build.lst	2007-09-07 11:52:29.000000000 +0200
 @@ -1,4 +1,4 @@
--uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper vcl NULL
-+uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper vcl tools NULL
+-uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper NULL
++uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper tools NULL
  uc	ucb							usr1	-	all	uc_mkout NULL
  uc	ucb\inc					    nmake	-	all	uc_inc NULL
  uc	ucb\source\regexp		    nmake	-	all	uc_regexp uc_inc NULL
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]