ooo-build r11783 - trunk/patches/src680
- From: strba svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11783 - trunk/patches/src680
- Date: Mon, 3 Mar 2008 15:30:46 +0000 (GMT)
Author: strba
Date: Mon Mar 3 15:30:46 2008
New Revision: 11783
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11783&view=rev
Log:
fixing _rene_'s broken patch
Modified:
trunk/patches/src680/autocorrect-accidental-caps-lock-vcl.diff
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 Mon Mar 3 15:30:46 2008
@@ -352,7 +352,6 @@
virtual void SetParent( SalFrame* pNewParent );
virtual bool SetPluginParent( SystemParentData* pNewParent );
virtual void SetBackgroundBitmap( SalBitmap* );
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/win/source/window/salframe.cxx vcl/win/source/window/salframe.cxx
--- vcl.clean/win/source/window/salframe.cxx 2008-01-15 08:25:15.000000000 -0500
+++ vcl/win/source/window/salframe.cxx 2008-03-01 21:12:23.000000000 -0500
@@ -3177,6 +3177,41 @@ SalFrame::SalPointerState WinSalFrame::G
@@ -397,38 +396,6 @@
void WinSalFrame::SetBackgroundBitmap( SalBitmap* )
{
}
-Only in vcl/win/source/window: salframe.cxx.orig
-[?25l[J[J[J[J[J[J[?12l[?25h[?1049h[?1h=[1;24r[?12;25h[?12l[?25h[27m[m[H[2J[?25l[24;1H"vcl-missing-lXtst.diff"
"vcl-missing-lXtst.diff" 16L, 523C[1;1HIndex: makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/util/makefile.mk,v
-retrieving revision 1.104
-diff -u -u -r1.104 makefile.mk
---- vcl/util/makefile.mk[8C29 Jan 2008 16:23:55 -0000 1.104
-+++ vcl/util/makefile.mk[8C3 Mar 2008 15:06:27 -0000
-@@ -323,7 +323,7 @@
-
- .IF "$(GUIBASE)"=="unx"
-
--SHL2STDLIBS += -lXext -lSM -lICE -lX11
-+SHL2STDLIBS += -lXext -lXtst -lSM -lICE -lX11
- .IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
- # needed by salprnpsp.cxx
- SHL2STDLIBS+= -ldl
-[1m[34m~ [18;1H~ [19;1H~ [20;1H~ [21;1H~ [22;1H~ [23;1H~ ]2;vcl-missing-lXtst.diff (~/Debia....0/ooo-build/patches/src680) - VIM]1;vcl-missing-lXtst.diff[1;1H[?12l[?25h
-[?25l[m[24;1HBitte :quit<Enter> eingeben um Vim zu verlassen[2;1H[?12l[?25h[?25l[24;1HBitte :quit<Enter> eingeben um Vim zu verlassen[2;1H[?12l[?25h[?25l[24;1HBitte :quit<Enter> eingeben um Vim zu verlassen[2;1H[?12l[?25h[?25l[24;1HBitte :quit<Enter> eingeben um Vim zu verlassen[2;1H[?12l[?25h
-
-
-
-
-
-
-[24;1H[?1l>[?1049lVim: Fehler beim Lesen der Eingabe, Abbruch...
-Vim: Beendet.
-[24;1H]2;rene frodo: ~/Debian/Pakete/OpenOffice.org/openoffice.org-2.4.0/ooo-build/patches/src680]1;rene frodo: ~/Debian/Pakete/OpenOffice.org/openoffice.org-2.4.0/ooo-build/patches/src680Index: makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/util/makefile.mk,v
-retrieving revision 1.104
-diff -u -u -r1.104 makefile.mk
--- vcl/util/makefile.mk 29 Jan 2008 16:23:55 -0000 1.104
+++ vcl/util/makefile.mk 3 Mar 2008 15:06:27 -0000
@@ -323,7 +323,7 @@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]