ooo-build r15397 - in trunk: . patches/dev300 patches/vba

[hmth svn gnome org]

Author: hmth
Date: Sun Feb 22 11:54:35 2009
New Revision: 15397
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15397&view=rev

Log:
2009-02-22  Hanno Meyer-Thurow  <h mth web de>

	* patches/dev300/config_office-XINC-XLIB-defaults.diff: fix apply
	* patches/dev300/apply: (GentooExperimental) change sandbox.diff to
	gentoo-sandbox.diff
	* patches/vba/vba-word-support.diff: (sw/prj/build.lst) add sw_vba to
	sw/source/ui buildlist to fix two process build


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/config_office-XINC-XLIB-defaults.diff
   trunk/patches/vba/vba-word-support.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sun Feb 22 11:54:35 2009
@@ -1490,7 +1490,7 @@
 # jemalloc, FreeBSD 7 allocator
 jemalloc.diff
 # Sandbox problem with wrong path
-sandbox.diff
+gentoo-sandbox.diff
 
 [ GentooOnly ]
 SectionOwner => aprosky

Modified: trunk/patches/dev300/config_office-XINC-XLIB-defaults.diff
==============================================================================
--- trunk/patches/dev300/config_office-XINC-XLIB-defaults.diff	(original)
+++ trunk/patches/dev300/config_office-XINC-XLIB-defaults.diff	Sun Feb 22 11:54:35 2009
@@ -1,6 +1,6 @@
---- configure.in.orig	2007-07-24 20:03:51.000000000 +0200
-+++ configure.in	2007-07-24 21:18:11.000000000 +0200
-@@ -4143,17 +4143,9 @@
+--- configure.in.orig	2009-02-20 15:35:35.000000000 +0100
++++ configure.in	2009-02-20 15:37:24.000000000 +0100
+@@ -4536,20 +4536,9 @@
  if test -z "$x_libraries"; then
     x_libraries="no_x_libraries"
  fi
@@ -13,14 +13,17 @@
 +XLIB="$x_libraries"
  AC_SUBST(XINC)
 -if test "$x_libraries" = "default_x_libraries"; then
--   XLIB="/usr/lib"
+-   XLIB=`$PKG_CONFIG --variable=libdir x11`
+-   if test "x$XLIB" = x; then
+-         XLIB="/usr/lib"
+-   fi
 -else
 -   XLIB="$x_libraries"
 -fi
  AC_SUBST(XLIB)
- AC_SUBST(DISABLE_XAW)
  AC_SUBST(XAU_LIBS)
-@@ -5477,6 +5469,9 @@
+ 
+@@ -6200,6 +6189,9 @@
     XINERAMA_LINK=dynamic
     AC_MSG_RESULT([yes])
  elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
@@ -28,5 +31,5 @@
 +      XLIB="/usr/lib"
 +   fi
     if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
-       # we have both versions, let the user decide but use the static one
+       # we have both versions, let the user decide but use the dynamic one
        # per default

Modified: trunk/patches/vba/vba-word-support.diff
==============================================================================
--- trunk/patches/vba/vba-word-support.diff	(original)
+++ trunk/patches/vba/vba-word-support.diff	Sun Feb 22 11:54:35 2009
@@ -16042,6 +16042,15 @@
  sw	sw\source\ui\utlui						nmake	-	all	sw_utlui sw_inc NULL
  sw	sw\source\ui\web						nmake	-	all	sw_web sw_uinc sw_sdi sw_inc NULL
  sw	sw\source\ui\wrtsh						nmake	-	all	sw_wrtsh sw_inc NULL
+@@ -69,7 +70,7 @@
+ sw      sw\source\filter\ww1                nmake   -       all     sw_ww1 sw_inc NULL
+ sw      sw\source\filter\ww8                nmake   -       all     sw_ww8 sw_inc NULL
+ sw      sw\source\filter\xml                nmake   -       all     sw_xml sw_inc NULL
+-sw      sw\source\ui                        nmake   -       all     sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu NULL
++sw      sw\source\ui                        nmake   -       all     sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu sw_vba NULL
+ sw      sw\source\core                      nmake   -       all     sw_core sw_attr sw_bast sw_crsr sw_dcnd sw_doc sw_draw sw_edit sw_excpt sw_fld sw_frmed sw_grph sw_layo sw_ole sw_para sw_sw3io sw_swg sw_text sw_tox sw_txtnd sw_uco sw_undo sw_view sw_acc sw_objpos sw_NumberTree sw_tablecore NULL
+ sw      sw\source\filter                    nmake   -       all     sw_flt sw_ascii sw_bsflt sw_html sw_rtf sw_wrtr sw_ww1 sw_ww8 sw_xml NULL
+ sw      sw\util                             nmake   -       all     sw_util sw_core sw_flt sw_sdi sw_ui NULL
 diff --git sw/prj/d.lst sw/prj/d.lst
 index 09c417c..958771d 100644
 --- sw/prj/d.lst