GNOME.org
 

ooo-build r12671 - in branches/ooo-build-2-4-1: . patches/mono patches/src680

Author: pmladek
Date: Mon May 26 15:28:54 2008
New Revision: 12671
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12671&view=rev

Log:
2008-05-26  Petr Mladek  <pmladek suse cz>

	* patches/src680/vcl-dynamic-screens-fix.diff
	* patches/mono/cli_ure-mono-bridge.diff:
	* patches/mono/cli_ure-mono-bridge-m14.diff:
	* patches/mono/cli_ure-prj-build-lst.diff:
	* patches/mono/cli_ure-prj-build-lst-m15.diff:
	* patches/mono/mono-build.diff:
	* patches/mono/mono-build-m14.diff:
	* patches/src680/sfx2-remove-check-update-on-fileload.diff:
	* patches/src680/sfx2-remove-check-update-on-fileload-m14.diff:
	* patches/src680/svx-missing-initialization.diff:
	* patches/src680/svx-missing-initialization-m15.diff:
	* patches/src680/apply: support for ooh680-m16

	* patches/src680/vcl-dynamic-screens-fix.diff: add the set_soenv.in
	  part to really enable it (n#359955)



Added:
   branches/ooo-build-2-4-1/patches/mono/cli_ure-mono-bridge-m15.diff   (props changed)
      - copied unchanged from r12667, /branches/ooo-build-2-4-1/patches/mono/cli_ure-mono-bridge.diff
   branches/ooo-build-2-4-1/patches/mono/cli_ure-prj-build-lst-m15.diff   (props changed)
      - copied unchanged from r12667, /branches/ooo-build-2-4-1/patches/mono/cli_ure-prj-build-lst.diff
   branches/ooo-build-2-4-1/patches/mono/mono-build-m15.diff   (props changed)
      - copied unchanged from r12667, /branches/ooo-build-2-4-1/patches/mono/mono-build.diff
   branches/ooo-build-2-4-1/patches/src680/sfx2-remove-check-update-on-fileload-m15.diff   (props changed)
      - copied unchanged from r12667, /branches/ooo-build-2-4-1/patches/src680/sfx2-remove-check-update-on-fileload.diff
   branches/ooo-build-2-4-1/patches/src680/svx-missing-initialization-m15.diff   (props changed)
      - copied unchanged from r12667, /branches/ooo-build-2-4-1/patches/src680/svx-missing-initialization.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/mono/cli_ure-mono-bridge.diff
   branches/ooo-build-2-4-1/patches/mono/cli_ure-prj-build-lst.diff
   branches/ooo-build-2-4-1/patches/mono/mono-build.diff
   branches/ooo-build-2-4-1/patches/src680/apply
   branches/ooo-build-2-4-1/patches/src680/sfx2-remove-check-update-on-fileload.diff
   branches/ooo-build-2-4-1/patches/src680/svx-missing-initialization.diff
   branches/ooo-build-2-4-1/patches/src680/vcl-dynamic-screens-fix.diff

Modified: branches/ooo-build-2-4-1/patches/mono/cli_ure-mono-bridge.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/mono/cli_ure-mono-bridge.diff	(original)
+++ branches/ooo-build-2-4-1/patches/mono/cli_ure-mono-bridge.diff	Mon May 26 15:28:54 2008
@@ -4,7 +4,7 @@
 @@ -8,5 +8,6 @@
  ure	cli_ure\unotypes			nmake	-	w,vc7	ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
  ure	cli_ure\source\ure			nmake	-	w,vc7	ure_source_ure ure_source_version ure_source_source.w ure_unotypes.w ure_inc NULL
- ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_inc NULL
+ ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
 +ure	cli_ure\source\mono_bridge      nmake   -       u       ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
  ure	cli_ure\source\native		nmake	-	w,vc7	ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
  #ure	cli_ure\util			nmake	-	w,vc7	ure_util ure_source_ure.w ure_source_native.w NULL

Modified: branches/ooo-build-2-4-1/patches/mono/cli_ure-prj-build-lst.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/mono/cli_ure-prj-build-lst.diff	(original)
+++ branches/ooo-build-2-4-1/patches/mono/cli_ure-prj-build-lst.diff	Mon May 26 15:28:54 2008
@@ -11,6 +11,6 @@
  ure	cli_ure\unotypes                        nmake   -       all     ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
 -ure	cli_ure\source\ure                      nmake   -       all     ure_source_ure ure_source_version ure_source_source ure_unotypes ure_inc NULL
 +ure	cli_ure\source\ure                      nmake   -       all     ure_source_ure ure_source_bootstrap.u ure_source_version ure_source_source ure_unotypes ure_inc NULL
- ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_inc NULL
+ ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc NULL
  ure	cli_ure\source\mono_bridge      nmake   -       u       ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
  ure	cli_ure\source\native           nmake   -       w,vc7   ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL

Modified: branches/ooo-build-2-4-1/patches/mono/mono-build.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/mono/mono-build.diff	(original)
+++ branches/ooo-build-2-4-1/patches/mono/mono-build.diff	Mon May 26 15:28:54 2008
@@ -140,7 +140,7 @@
 -ure	cli_ure\source\climaker		nmake	-	w,vc7	ure_source_climaker ure_source_basetypes.w ure_inc NULL
 -ure	cli_ure\unotypes			nmake	-	w,vc7	ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
 -ure	cli_ure\source\ure			nmake	-	w,vc7	ure_source_ure ure_source_version ure_source_source.w ure_unotypes.w ure_inc NULL
--ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_inc NULL
+-ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
 -ure	cli_ure\source\mono_bridge      nmake   -       u       ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
 -ure	cli_ure\source\native		nmake	-	w,vc7	ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
 -#ure	cli_ure\util			nmake	-	w,vc7	ure_util ure_source_ure.w ure_source_native.w NULL
@@ -150,7 +150,7 @@
 +ure	cli_ure\source\climaker         nmake   -       all     ure_source_climaker ure_source_basetypes ure_inc NULL
 +ure	cli_ure\unotypes                        nmake   -       all     ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
 +ure	cli_ure\source\ure                      nmake   -       all     ure_source_ure ure_source_version ure_source_source ure_unotypes ure_inc NULL
-+ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_inc NULL
++ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc NULL
 +ure	cli_ure\source\mono_bridge      nmake   -       u       ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
 +ure	cli_ure\source\native           nmake   -       w,vc7   ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL
 +#ure	cli_ure\util                    nmake   -       w,vc7   ure_util ure_source_ure ure_source_native NULL

Modified: branches/ooo-build-2-4-1/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/apply	(original)
+++ branches/ooo-build-2-4-1/patches/src680/apply	Mon May 26 15:28:54 2008
@@ -486,9 +486,6 @@
 # make path detection look for VC2005er dlls, too
 config_office-msvc8-compat.diff, thorsten
 
-# init all members in svx's line geometry creator
-svx-missing-initialization.diff, i#86163, thorsten
-
 # init all members in VirDev's ctor
 vcl-virdev-missing-initialisation.diff, thorsten
 
@@ -508,6 +505,16 @@
 # fix by Caolan, already in OOo-3.0
 raise-annotation-priority-above-charproperties-i53885.diff, i#53885, pmladek
 
+[ Fixes > ooh680-m15 ]
+
+# init all members in svx's line geometry creator
+svx-missing-initialization.diff, i#86163, thorsten
+
+[ Fixes <= ooh680-m15 ]
+
+# init all members in svx's line geometry creator
+svx-missing-initialization-m15.diff, i#86163, thorsten
+
 [ RadioButtons ]
 # Add a GroupName property to RadioButtons so that RadioButtons don't need to
 # share the same name to be part of the same group.
@@ -850,10 +857,14 @@
 # prevent the registration dialog from showing up on startup.
 desktop-disable-startup-registration.diff, kohei
 
-[ PopupRemoval > ooh680-m14 ]
+[ PopupRemoval > ooh680-m15 ]
 # remove updater code that is only relevant for the upstream version.
 sfx2-remove-check-update-on-fileload.diff, kohei
 
+[ PopupRemoval == ooh680-m15 ]
+# remove updater code that is only relevant for the upstream version.
+sfx2-remove-check-update-on-fileload-m15.diff, kohei
+
 [ PopupRemoval <= ooh680-m14 ]
 # remove updater code that is only relevant for the upstream version.
 sfx2-remove-check-update-on-fileload-m14.diff, kohei
@@ -1421,9 +1432,12 @@
 #
 mono-scp2.diff
 
-[ Mono > ooh680-m14 ]
+[ Mono > ooh680-m15 ]
 cli_ure-mono-bridge.diff
 
+[ Mono == ooh680-m15 ]
+cli_ure-mono-bridge-m15.diff
+
 [ Mono <= ooh680-m14 ]
 cli_ure-mono-bridge-m14.diff
 
@@ -1435,10 +1449,14 @@
 mono-testtools.diff
 
 # The build
-[ Mono > ooh680-m14 ]
+[ Mono > ooh680-m15 ]
 mono-build.diff
 cli_ure-prj-build-lst.diff
 
+[ Mono == ooh680-m15 ]
+mono-build-m15.diff
+cli_ure-prj-build-lst-m15.diff
+
 [ Mono <= ooh680-m14 ]
 mono-build-m14.diff
 cli_ure-prj-build-lst-m14.diff

Modified: branches/ooo-build-2-4-1/patches/src680/sfx2-remove-check-update-on-fileload.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/sfx2-remove-check-update-on-fileload.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/sfx2-remove-check-update-on-fileload.diff	Mon May 26 15:28:54 2008
@@ -2,8 +2,8 @@
 --- sfx2.clean/source/dialog/newerverwarn.cxx	2008-05-06 23:56:41.000000000 -0400
 +++ sfx2/source/dialog/newerverwarn.cxx	2008-05-07 00:00:36.000000000 -0400
 @@ -58,6 +58,7 @@ namespace lang  = ::com::sun::star::lang
- namespace uno   = ::com::sun::star::uno;
- namespace util  = ::com::sun::star::util;
+ 
+ using namespace com::sun::star::system;
  
 +#if 0
  namespace sfx2
@@ -23,12 +23,12 @@
          }
  
 +#if 0
-         // --> PB 2007-11-20 #i83653# Give warning if document contains features from new ODF version
-         // Online Update Check enabled?
-         sal_Bool bOnlineUpdateEnabled = sal_False;
+         if ( pMedium->GetInteractionHandler().is() && !SFX_APP()->Get_Impl()->bODFVersionWarningLater )
+         {
+             // scan the generator string (within meta.xml)
 @@ -1122,16 +1122,17 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedi
                          // ODF version greater than 1.1 - added some decimal places to be safe against floating point conversion errors (hack)
-                         sfx2::NewerVersionWarningDialog aDlg( NULL );
+                         sfx2::NewerVersionWarningDialog aDlg( NULL, sVersion );
                          aDlg.Execute();
                      }
                  }

Modified: branches/ooo-build-2-4-1/patches/src680/svx-missing-initialization.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/svx-missing-initialization.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/svx-missing-initialization.diff	Mon May 26 15:28:54 2008
@@ -35,15 +35,3 @@
  	pHeaderFooterEntry		( NULL ),
  	pSolverContainer		( NULL ),
 
---- svx/source/inc/svdoimp.hxx	26 Nov 2007 14:51:11 -0000	1.11
-+++ svx/source/inc/svdoimp.hxx	28 Mar 2008 19:15:52 -0000
-@@ -258,7 +258,8 @@ public:
- 		basegfx::B2DPolyPolygon& rPoLi)
- 	:	mrLineAttr(rAttr),
- 		maAreaPolyPolygon(rPoPo),
--		maLinePolyPolygon(rPoLi)
-+		maLinePolyPolygon(rPoLi),
-+       mbLineDraft(false)
- 	{
- 	}
- 

Modified: branches/ooo-build-2-4-1/patches/src680/vcl-dynamic-screens-fix.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/vcl-dynamic-screens-fix.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/vcl-dynamic-screens-fix.diff	Mon May 26 15:28:54 2008
@@ -114,6 +114,16 @@
  dnl ===================================================================
  if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then
 
+--- config_office/set_soenv.in.old	2008-05-26 12:32:20.000000000 +0200
++++ config_office/set_soenv.in	2008-05-26 13:45:46.000000000 +0200
+@@ -1949,6 +1949,7 @@ ToFile( "LFS_CFLAGS",        "@LFS_CFLAG
+ ToFile( "ENABLE_CRASHDUMP",  "@ENABLE_CRASHDUMP@",  "e" );
+ ToFile( "ENABLE_CUPS",       "@ENABLE_CUPS@",       "e" );
+ ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
++ToFile( "ENABLE_RANDR",      "@ENABLE_RANDR@",      "e" );
+ ToFile( "ENABLE_DIRECTX",    "@ENABLE_DIRECTX@",    "e" );
+ ToFile( "ENABLE_LAYOUT",     "@ENABLE_LAYOUT@",     "e" );
+ ToFile( "ENABLE_PCH",        "@ENABLE_PCH@",       "e" );
 --- vcl/unx/source/app/saldisp.cxx	29 Jan 2008 16:22:34 -0000	1.93
 +++ vcl/unx/source/app/saldisp.cxx	31 Mar 2008 16:44:44 -0000	1.93.16.2
 @@ -70,7 +70,7 @@
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]