ooo-build r11761 - in trunk: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Feb 29 14:33:31 2008
New Revision: 11761
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11761&view=rev

Log:
2008-02-29  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/apply: moved AutoCorrectCapsLock back to NovellBase.
	
	* patches/src680/autocorrect-accidental-caps-lock-solenv.diff: added
	new linker flag to other Unix platform makefiles.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/autocorrect-accidental-caps-lock-solenv.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Fri Feb 29 14:33:31 2008
@@ -28,7 +28,7 @@
               VBAUntested, ArkOnlyExperimental, SharedWorksheets, \
 	      UnUsedButNotYetRemovedFromSVN, \
 	      PostgreSQL, SELinux, VOSremoval, Glib2, \
-	      UnitExperimental, AutoCorrectCapsLock
+	      UnitExperimental
 # Binfilter patches: a special distro; applied only when building with binfilter
 Binfilter : BFBuildBits, BFFixes
 # System patches: a special distro; applied only when building with the system tarball unpacked
@@ -40,7 +40,7 @@
 # Novell
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
 	     NotDebian, Lockdown, CalcSolver, Split, Shrink, \
-	     CalcDataPilotDrillDown
+	     CalcDataPilotDrillDown, AutoCorrectCapsLock
 SUSE-9.1  : NovellBase
 SUSE-9.2  : NovellBase
 SUSE-9.3  : NovellBase

Modified: trunk/patches/src680/autocorrect-accidental-caps-lock-solenv.diff
==============================================================================
--- trunk/patches/src680/autocorrect-accidental-caps-lock-solenv.diff	(original)
+++ trunk/patches/src680/autocorrect-accidental-caps-lock-solenv.diff	Fri Feb 29 14:33:31 2008
@@ -1,3 +1,17 @@
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=solenv.vpj solenv.clean/inc/unxlngi4.mk solenv/inc/unxlngi4.mk
+--- solenv.clean/inc/unxlngi4.mk	2008-02-27 10:53:41.000000000 -0500
++++ solenv/inc/unxlngi4.mk	2008-02-29 09:27:10.000000000 -0500
+@@ -187,6 +187,10 @@ STDLIBCUIMT+=-ldl -lpthread -lm
+ STDSHLGUIMT+=-lX11 -lXext -ldl -lpthread -lm
+ STDSHLCUIMT+=-ldl -lpthread -lm
+ 
++# XTest - X11 extension
++STDLIBGUIMT+=-lXtst
++STDSHLGUIMT+=-lXtst
++
+ LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+ 
+ .IF "$(STLPORT_VER)" >= "500"
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=solenv.vpj solenv.clean/inc/unxlngi6.mk solenv/inc/unxlngi6.mk
 --- solenv.clean/inc/unxlngi6.mk	2008-02-27 10:53:41.000000000 -0500
 +++ solenv/inc/unxlngi6.mk	2008-02-28 13:04:07.000000000 -0500
@@ -12,3 +26,73 @@
  LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
  
  .IF "$(USE_STLP_DEBUG)" != ""
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=solenv.vpj solenv.clean/inc/unxlngppc4.mk solenv/inc/unxlngppc4.mk
+--- solenv.clean/inc/unxlngppc4.mk	2008-02-27 10:53:41.000000000 -0500
++++ solenv/inc/unxlngppc4.mk	2008-02-29 09:27:22.000000000 -0500
+@@ -181,6 +181,10 @@ STDLIBCUIMT=-ldl -lpthread -lm
+ STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm
+ STDSHLCUIMT=-ldl -lpthread -lm
+ 
++# XTest - X11 extension
++STDLIBGUIMT+=-lXtst
++STDSHLGUIMT+=-lXtst
++
+ .IF "$(STLPORT_VER)" >= "500"
+ LIBSTLPORT=$(DYNAMIC) -lstlport -lstdc++
+ LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=solenv.vpj solenv.clean/inc/unxlngppc.mk solenv/inc/unxlngppc.mk
+--- solenv.clean/inc/unxlngppc.mk	2008-02-27 10:53:41.000000000 -0500
++++ solenv/inc/unxlngppc.mk	2008-02-29 09:27:17.000000000 -0500
+@@ -182,6 +182,10 @@ STDLIBCUIMT=-ldl -lpthread -lm
+ STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm
+ STDSHLCUIMT=-ldl -lpthread -lm
+ 
++# XTest - X11 extension
++STDLIBGUIMT+=-lXtst
++STDSHLGUIMT+=-lXtst
++
+ .IF "$(STLPORT_VER)" >= "500"
+ LIBSTLPORT=$(DYNAMIC) -lstlport
+ LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=solenv.vpj solenv.clean/inc/unxlngx6.mk solenv/inc/unxlngx6.mk
+--- solenv.clean/inc/unxlngx6.mk	2008-02-27 10:53:41.000000000 -0500
++++ solenv/inc/unxlngx6.mk	2008-02-29 09:26:37.000000000 -0500
+@@ -203,6 +203,10 @@ STDLIBCUIMT+=-ldl -lpthread -lm
+ STDSHLGUIMT+=-lX11 -lXext -ldl -lpthread -lm
+ STDSHLCUIMT+=-ldl -lpthread -lm
+ 
++# XTest - X11 extension
++STDLIBGUIMT+=-lXtst
++STDSHLGUIMT+=-lXtst
++
+ LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+ 
+ .IF "$(USE_STLP_DEBUG)" != ""
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=solenv.vpj solenv.clean/inc/unxsoli4.mk solenv/inc/unxsoli4.mk
+--- solenv.clean/inc/unxsoli4.mk	2008-02-27 10:53:40.000000000 -0500
++++ solenv/inc/unxsoli4.mk	2008-02-29 09:28:01.000000000 -0500
+@@ -191,6 +191,10 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNT
+ STDLIBGUIMT+=-lX11 -ldl
+ STDSHLGUIMT+=-lX11 -ldl
+ 
++# XTest - X11 extension
++STDLIBGUIMT+=-lXtst
++STDSHLGUIMT+=-lXtst
++
+ # @@@ interposer needed for -Bdirect @@@
+ # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
+ LIBSALCPPRT=
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=solenv.vpj solenv.clean/inc/unxsols4.mk solenv/inc/unxsols4.mk
+--- solenv.clean/inc/unxsols4.mk	2008-02-27 10:53:40.000000000 -0500
++++ solenv/inc/unxsols4.mk	2008-02-29 09:27:57.000000000 -0500
+@@ -197,6 +197,10 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNT
+ STDLIBGUIMT+=-lX11 -ldl
+ STDSHLGUIMT+=-lX11 -ldl
+ 
++# XTest - X11 extension
++STDLIBGUIMT+=-lXtst
++STDSHLGUIMT+=-lXtst
++
+ # @@@ interposer needed for -Bdirect @@@
+ # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
+ LIBSALCPPRT=