ooo-build r13064 - in trunk: . bin/piece patches/dev300 scratch/split

From: michael svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13064 - in trunk: . bin/piece patches/dev300 scratch/split
Date: Fri, 4 Jul 2008 10:43:08 +0000 (UTC)
Author: michael
Date: Fri Jul  4 10:43:08 2008
New Revision: 13064
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13064&view=rev

Log:
2008-07-04  Michael Meeks  <michael meeks novell com>

        * cairocanvas-fix-after-win32-removeval.diff,
        * vcl-virdev-missing-initialisation.diff,
        drop for m22.

        * patches/dev300/lockfile-less-symbols.diff,
        * patches/dev300/cws-npower10.diff,
        * patches/dev300/apply: rotate & fix for m21,
        move vba-userform-activate-fix up and disable
        ObjectModule, vba-userform for m22 (for now).



Added:
   trunk/bin/piece/build-libs_gui   (contents, props changed)
   trunk/bin/piece/install-libs_gui   (contents, props changed)
   trunk/patches/dev300/cws-npower10-m21.diff
      - copied unchanged from r13063, /trunk/patches/dev300/cws-npower10.diff
   trunk/patches/dev300/lockfile-less-symbols-m21.diff   (props changed)
      - copied unchanged from r13063, /trunk/patches/dev300/lockfile-less-symbols.diff
   trunk/patches/dev300/psprint_config-no-orig-m21.diff
      - copied unchanged from r13063, /trunk/patches/dev300/psprint_config-no-orig.diff
   trunk/scratch/split/ooo3_libs_core.spec
   trunk/scratch/split/ooo3_libs_gui.spec
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/cws-npower10.diff
   trunk/patches/dev300/lockfile-less-symbols.diff
   trunk/patches/dev300/psprint_config-no-orig.diff
   trunk/scratch/split/ooo3_bootstrap.spec

Added: trunk/bin/piece/build-libs_gui
==============================================================================
--- (empty file)
+++ trunk/bin/piece/build-libs_gui	Fri Jul  4 10:43:08 2008
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# build script - invoked from a spec file to build the project
+
+for a in *; do
+	if test "$a" != "applied_patches"; then
+		cd $a || exit 1;
+		perl $SOLARENV/bin/build.pl --all $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+		perl $SOLARENV/bin/build.pl --deliver $EXTRA_BUILD_FLAGS $EXTRA_DMAKE_FLAGS || exit 1;
+		cd ..
+	fi
+done

Added: trunk/bin/piece/install-libs_gui
==============================================================================
--- (empty file)
+++ trunk/bin/piece/install-libs_gui	Fri Jul  4 10:43:08 2008
@@ -0,0 +1,4 @@
+SRCDIR="$SOLARVER/$INPATH"
+DEST="$OO_SOLVERDIR/solver"
+mkdir -p $DEST
+cp -R $SRCDIR/* $DEST

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jul  4 10:43:08 2008
@@ -244,15 +244,16 @@
 # this hack make sure that the object lives a bit longer
 sc-cellsuno-avoid-early-destruction.diff, i#90076, pmladek
 
-# fix build in cairo
-cairocanvas-fix-after-win32-removeval.diff, rodo
-
 # don't lstat() that much while creating absolute URLs
 speed-sal-fewer-lstats.diff, i#89730, jholesov
 
 # flatten the structure of the 3 layer OOo a bit
 scp2-3layer-nicer-paths.diff, i#90430, jholesov
 
+# fix build in cairo
+[ TemporaryHacks < dev300-m22 >= beb300-m1 ]
+cairocanvas-fix-after-win32-removeval.diff, rodo
+
 [ CJK ]
 #set default CJK font fontsize as 10.5pt
 sw-default-cjk-fontsize.diff i#72010, jianhua
@@ -265,9 +266,6 @@
 cjk-character-units-fix-376788.diff, i#376788, Amelia Wang
 cjk-character-units-in-pggrid-fix.diff, Amelia Wang
 
-# text layout enhancement for better CJK support
-cjk-punctuation-compress.diff, Amelia Wang
-
 # insert Chinese forbidden characters at start or end of line into i18npool module
 cjk-insert-forbidden-characters-into-i18npool.diff, Amelia Wang
 
@@ -282,6 +280,10 @@
 # for mixed font set
 #FIXME src680: font_list_box_cjk.diff, i#73003, Fong Lin
 
+[ CJK < dev300-m22 >= beb300-m1 ]
+# FIXME - it looks like this went up-stream, but no issue !
+# text layout enhancement for better CJK support
+cjk-punctuation-compress.diff, Amelia Wang
 
 [ CWSBackports ]
 # MS Works import filter (following patches depend on each other) Fridrich
@@ -305,7 +307,11 @@
 cws-webdavandgvfslocking1-unotools.diff
 
 #basic runtime fixes
+[ CWSBackports >= dev300-m22 < beb300-m0 ]
 cws-npower10.diff
+[ CWSBackports < dev300-m22 >= beb300-m1 ]
+cws-npower10-m21.diff
+[ CWSBackports ]
 cws-pflin10.diff
 #api changes
 cws-npower11.diff
@@ -475,9 +481,6 @@
 # prevent some array out of bounds in ww8 exporter
 sw-source-filter-ww8-wrtw8nds-out_of_bounds.diff, n#391197, fridrich
 
-# init all members in VirDev's ctor
-vcl-virdev-missing-initialisation.diff, i#88535, thorsten
-
 # don't use freed memory in slidesorter
 sd-slidesorter-dead-ptr.diff, i#88002, thorsten
 
@@ -525,6 +528,8 @@
 # explicitely convert cwsid to integer
 # otherwise, cws-extract does not work with perl-5.10 on openSUSE-11.0
 solenv-cwsid.diff, i#90853, pmladek
+# init all members in VirDev's ctor
+vcl-virdev-missing-initialisation.diff, i#88535, thorsten
 
 [ RadioButtons ]
 # Add a GroupName property to RadioButtons so that RadioButtons don't need to
@@ -1074,9 +1079,6 @@
 # add missing #include <stdio.h> in autodoc, breaks when building with STLport5
 #autodoc-add-missing-stdio-h.diff, rengelha
 
-# do not pack any potential .orig files with ppds
-psprint_config-no-orig.diff, jholesov
-
 # changes the SDK gid module name to gid_Module_Root_SDK, so the generated list
 # of files does not conflict with the main package, i#64802
 sdk-gid-module-name.diff, pmladek, i#64802
@@ -1084,6 +1086,12 @@
 # Workaround for compile failure with glibc 2.4's langinfo.h
 i18nutil-glibc-braindamage-workaround.diff, brosenk
 
+# do not pack any potential .orig files with ppds
+[ CWSBackports >= dev300-m22 < beb300-m0 ]
+psprint_config-no-orig.diff, jholesov
+[ CWSBackports < dev300-m22 >= beb300-m1 ]
+psprint_config-no-orig-m21.diff, jholesov
+
 [ DebianOnly ]
 seamonkey-is-iceape.diff
 
@@ -1179,6 +1187,7 @@
 # enable vcl to load bitmaps when height it negative
 vcl-bitmap2-negative-height.diff
 
+[ VCL < dev300-m22 >= beb300-m1 ]
 # fixes non-usage of xinerama on 64bit
 vcl-xinerama-64bit-fix.diff, n#359955, rodo
 
@@ -1427,8 +1436,11 @@
 # sc-insert-sheet-codename.diff, i#80869, jianhua
 
 # patch from Andreas Bregas
+[ VBAObjects < dev300-m22 >= beb300-m1 ]
 vba-brackets-array-of-array.diff, i#75443, noelpwer
 
+[ VBAObjects ]
+
 # NOT parameter without brackets
 vba-not-param-withoutbrackets.diff, n#397325, Fong
 
@@ -1493,10 +1505,18 @@
 #make properties available for non class modules
 #also allow paramaters to be supported for Get properties
 vba-support-properties-inmodules.diff
+
+
+# FIXME: disabled now (mmeeks) - needs porting to m22.
+[ VBAObjects < dev300-m22 >= beb300-m1 ]
 # object module support... getting there
 ObjectModule.diff
 # userform ( depends on ObjectModule.diff )
 vba-userform.diff
+# fix userform activate event re-compute
+vba-userform-activate-fix.diff, Jianhua
+
+[ VBAObjects ]
 # another bug with event bindings for dialogs ( awaiting iz id from andreas )
 vba-dialogs-fixsmoketest.diff
 
@@ -1519,14 +1539,13 @@
 vba-spin-button.diff, n#405308, Jianhua
 # erro compile switch
 vba-scroll-bar-idl-switch.diff, Jianhua
-# fix userform activate event re-compute
-vba-userform-activate-fix.diff, Jianhua
 # Add HPageBreaks object
 vba-pagebreak-object.diff, n#405312, Fong
 # Add Worksheet.EnableSelection
 vba-worksheet-enableselection.diff, n#405312, Fong
 # Add to support Application.Union
 vba-application-union.diff, n#405313, Fong
+
 [ VBAUntested ]
 SectionOwner => noelpwer
 vba-basic-null.diff i#85349, jjiao
@@ -2258,13 +2277,6 @@
 # after applying the patch, set SAL_NO_MOUSEGRABS in your env
 #vcl-disable-mouse-grab.diff
 
-# don't do dns lookup on startup
-# TODO file up-stream
-lockfile-dont-do-dns-lookup.diff, n#389257, jholesov
-# and don't expose unnecessary symbols
-# TODO file up-stream
-lockfile-less-symbols.diff, jholesov
-
 # adhere to
 # http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html
 sal-xdg-config-dir.diff, i#91247, thorsten
@@ -2276,6 +2288,16 @@
 
 xmloff_dis26300_conformance.diff, n#396280, flr
 
+# don't do dns lookup on startup
+# TODO file up-stream
+lockfile-dont-do-dns-lookup.diff, n#389257, jholesov
+# and don't expose unnecessary symbols
+# TODO file up-stream
+[ Fixes >= dev300-m22 < beb300-m0 ]
+lockfile-less-symbols.diff, jholesov
+[ Fixes < dev300-m22 >= beb300-m1 ]
+lockfile-less-symbols-m21.diff, jholesov
+
 [ InternalMesaHeaders ]
 internal-mesa-headers-config_office.diff, fridrich
 internal-mesa-headers-slideshow.diff, fridrich

Modified: trunk/patches/dev300/cws-npower10.diff
==============================================================================
--- trunk/patches/dev300/cws-npower10.diff	(original)
+++ trunk/patches/dev300/cws-npower10.diff	Fri Jul  4 10:43:08 2008
@@ -544,7 +544,7 @@
      (void)pBasic;
      (void)bWrite;
 -    (void)rPar;
-     
+ 
 -	DBG_ASSERT(0,"StrConv:Not implemented");
 -//	if ( rPar.Count() != 3 )
 -//	{
@@ -880,7 +880,7 @@
 -	( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nNotFound, BOOL bLocal )
 +	( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nNotFound, BOOL bLocal, BOOL bStatic )
  {
- 	bool bIsVBAInterOp = SbiRuntime::isVBAEnabled(); 
+ 	bool bIsVBAInterOp = SbiRuntime::isVBAEnabled();
  	if( bIsVBAInterOp )
 @@ -149,9 +149,17 @@ SbxVariable* SbiRuntime::FindElement
  			nOp1 = nOp1 | 0x8000; // indicate params are present
@@ -966,7 +966,7 @@
  // Laden eines Objekt-Elements (+StringID+Typ)
  // Das Objekt liegt auf TOS
  
-@@ -1213,19 +1236,27 @@ void SbiRuntime::StepFIND_G( UINT32 nOp1
+@@ -1213,18 +1236,29 @@ void SbiRuntime::StepFIND_G( UINT32 nOp1
  }
  
  
@@ -988,7 +988,7 @@
 +    return p;
 +}
  // Einrichten einer statischen Variablen (+StringID+Typ)
--
+ 
  void SbiRuntime::StepSTATIC( UINT32 nOp1, UINT32 nOp2 )
  {
 -    (void)nOp1;
@@ -1003,8 +1003,8 @@
 -	*/
 +    StepSTATIC_Impl( aName, t );
  }
--
--
+ 
+
 Index: basic/source/sbx/sbxconv.hxx
 ===================================================================
 RCS file: /cvs/script/basic/source/sbx/sbxconv.hxx,v

Modified: trunk/patches/dev300/lockfile-less-symbols.diff
==============================================================================
--- trunk/patches/dev300/lockfile-less-symbols.diff	(original)
+++ trunk/patches/dev300/lockfile-less-symbols.diff	Fri Jul  4 10:43:08 2008
@@ -30,7 +30,7 @@
 @@ -114,7 +96,7 @@ namespace desktop {
  		// build the file-url to use for the lock
  		OUString aUserPath;
- 		Bootstrap::locateUserInstallation( aUserPath );
+         utl::Bootstrap::locateUserInstallation( aUserPath );
 -		m_aLockname = aUserPath + Suffix();
 +		m_aLockname = aUserPath + LOCKFILE_SUFFIX;
  

Modified: trunk/patches/dev300/psprint_config-no-orig.diff
==============================================================================
--- trunk/patches/dev300/psprint_config-no-orig.diff	(original)
+++ trunk/patches/dev300/psprint_config-no-orig.diff	Fri Jul  4 10:43:08 2008
@@ -1,11 +1,11 @@
 --- psprint_config/configuration/ppds/makefile.mk
 +++ psprint_config/configuration/ppds/makefile.mk
 @@ -44,7 +44,7 @@
- .ENDIF
- 
- ZIP1TARGET      = fontunxppds
+ .IF "$(WITH_SYSTEM_PPD_DIR)" != ""
+ ZIP1LIST = SGENPRT.PS SGENT42.PS GENERIC.PS
+ .ELSE
 -ZIP1LIST        = * -x makefile.* -x delzip
 +ZIP1LIST        = * -x makefile.* -x delzip -x *.orig
+ .ENDIF
  
  .INCLUDE : target.mk
- 

Modified: trunk/scratch/split/ooo3_bootstrap.spec
==============================================================================
--- trunk/scratch/split/ooo3_bootstrap.spec	(original)
+++ trunk/scratch/split/ooo3_bootstrap.spec	Fri Jul  4 10:43:08 2008
@@ -216,9 +216,11 @@
 %endif
 %endif
 %if %prepare_build != 0
+# FIXME: disabled mono for now (piece-wise build) - lots of cli breakage !
 ./configure $PARALLEL_BUILD \
 	--with-split \
 	--with-piece=bootstrap \
+	--disable-mono \
 	--libdir=%{_libdir} \
 	--prefix=%{_prefix} \
 	--mandir=%{_mandir} \

Added: trunk/scratch/split/ooo3_libs_core.spec
==============================================================================
--- (empty file)
+++ trunk/scratch/split/ooo3_libs_core.spec	Fri Jul  4 10:43:08 2008
@@ -0,0 +1,79 @@
+#
+# spec file for package OpenOffice_org (Version 2.4.1.7)
+#
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+%define         piece      libs_core
+Name:           ooo3_%piece
+BuildRequires:  ooo3_bootstrap-devel
+%define	      ooo_prefix	%_libdir
+%define	      ooo_home		ooo-3
+%define	      ooo_build_tag     dev300-m22
+License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
+Group:          Productivity/Office/Suite
+Version:        3
+Release:        3
+AutoReqProv:    on
+Summary:        A Free Office Suite (Framework)
+Url:            http://www.openoffice.org/
+Source:         %ooo_build_tag-libs-core.tar.bz2
+
+%description
+ure
+
+%package devel
+License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
+Summary:        A Free Office Suite (Framework)
+Group:          Productivity/Office/Suite
+AutoReqProv:    off
+
+%description devel
+devel package
+
+%prep
+%setup -q -n %ooo_build_tag
+
+%build
+
+#setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_SOLVERDIR=$OO_INSTDIR/solver
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+
+$OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE --distro=Piece `pwd` 
+source $OO_TOOLSDIR/piece/sys-setup
+$OO_TOOLSDIR/piece/build-%piece
+
+%install
+
+#setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_SOLVERDIR=$OO_INSTDIR/solver
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+
+source $OO_TOOLSDIR/piece/sys-setup
+$OO_TOOLSDIR/piece/install-%piece
+
+%clean
+%post
+%post devel
+
+%files
+%defattr(-,root,root)
+# FIXME - should have the actual files in it ! ;-)
+# except we have ~none here - just a devel package (?)
+# is there anything we absolutely need here ?
+
+%files devel
+%defattr(-,root,root)
+%dir %ooo_prefix/%ooo_home/solver
+%ooo_prefix/%ooo_home/solver/*
+
+%changelog

Added: trunk/scratch/split/ooo3_libs_gui.spec
==============================================================================
--- (empty file)
+++ trunk/scratch/split/ooo3_libs_gui.spec	Fri Jul  4 10:43:08 2008
@@ -0,0 +1,79 @@
+#
+# spec file for package OpenOffice_org (Version 2.4.1.7)
+#
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+%define         piece      libs_gui
+Name:           ooo3_%piece
+BuildRequires:  ooo3_bootstrap-devel
+%define	      ooo_prefix	%_libdir
+%define	      ooo_home		ooo-3
+%define	      ooo_build_tag     dev300-m22
+License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
+Group:          Productivity/Office/Suite
+Version:        3
+Release:        3
+AutoReqProv:    on
+Summary:        A Free Office Suite (Framework)
+Url:            http://www.openoffice.org/
+Source:         %ooo_build_tag-libs-gui.tar.bz2
+
+%description
+ure
+
+%package devel
+License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
+Summary:        A Free Office Suite (Framework)
+Group:          Productivity/Office/Suite
+AutoReqProv:    off
+
+%description devel
+devel package
+
+%prep
+%setup -q -n %ooo_build_tag
+
+%build
+
+#setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_SOLVERDIR=$OO_INSTDIR/solver
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+
+$OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE --distro=Piece `pwd` 
+source $OO_TOOLSDIR/piece/sys-setup
+$OO_TOOLSDIR/piece/build-%piece
+
+%install
+
+#setup env.
+export OO_INSTDIR=%{_libdir}/%ooo_home
+export OO_SOLVERDIR=$OO_INSTDIR/solver
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+
+source $OO_TOOLSDIR/piece/sys-setup
+$OO_TOOLSDIR/piece/install-%piece
+
+%clean
+%post
+%post devel
+
+%files
+%defattr(-,root,root)
+# FIXME - should have the actual files in it ! ;-)
+# except we have ~none here - just a devel package (?)
+# is there anything we absolutely need here ?
+
+%files devel
+%defattr(-,root,root)
+%dir %ooo_prefix/%ooo_home/solver
+%ooo_prefix/%ooo_home/solver/*
+
+%changelog
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]