ooo-build r11763 - in trunk: . patches/src680
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11763 - in trunk: . patches/src680
- Date: Fri, 29 Feb 2008 14:55:14 +0000 (GMT)
Author: kyoshida
Date: Fri Feb 29 14:55:14 2008
New Revision: 11763
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11763&view=rev
Log:
2008-02-29 Kohei Yoshida <kyoshida novell com>
* patches/src680/autocorrect-accidental-caps-lock-solenv.diff: added
XTest linker flag for FreeBSD as well. But I can't verify this myself
unfortunately...
* patches/src680/autocorrect-accidental-caps-lock-vcl.diff: enabled the
XTest extension for SOLARIS and FREEBSD.
Modified:
trunk/ChangeLog
trunk/patches/src680/autocorrect-accidental-caps-lock-solenv.diff
trunk/patches/src680/autocorrect-accidental-caps-lock-vcl.diff
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:55:14 2008
@@ -1,3 +1,17 @@
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=solenv.vpj solenv.clean/inc/unxfbsd.mk solenv/inc/unxfbsd.mk
+--- solenv.clean/inc/unxfbsd.mk 2008-02-27 10:53:40.000000000 -0500
++++ solenv/inc/unxfbsd.mk 2008-02-29 09:50:43.000000000 -0500
+@@ -189,6 +189,10 @@ STDLIBCUIMT=$(PTHREAD_LIBS) -lm
+ STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
+ STDSHLCUIMT=$(PTHREAD_LIBS) -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/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
Modified: trunk/patches/src680/autocorrect-accidental-caps-lock-vcl.diff
==============================================================================
--- trunk/patches/src680/autocorrect-accidental-caps-lock-vcl.diff (original)
+++ trunk/patches/src680/autocorrect-accidental-caps-lock-vcl.diff Fri Feb 29 14:55:14 2008
@@ -255,12 +255,12 @@
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/unx/inc/prex.h vcl/unx/inc/prex.h
--- vcl.clean/unx/inc/prex.h 2007-04-26 06:40:23.000000000 -0400
-+++ vcl/unx/inc/prex.h 2008-02-28 12:35:39.000000000 -0500
++++ vcl/unx/inc/prex.h 2008-02-29 09:50:58.000000000 -0500
@@ -64,6 +64,12 @@ extern "C" {
#define __XKeyboardExtension__ 0
#endif
-+#if defined(LINUX)
++#if defined(LINUX) || defined(SOLARIS) || defined(FREEBSD)
+#define __XTestExtension__ 1
+#else
+#define __XTestExtension__ 0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]