rpms/openoffice.org/devel openoffice.org.spec, 1.278, 1.279 workspace.vcl39.patch, 1.4, 1.5
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jul 7 12:58:55 UTC 2005
- Previous message (by thread): rpms/selinux-policy-targeted/devel policy-20050706.patch, 1.4, 1.5 policy-20050502.patch, 1.10, NONE policy-20050516.patch, 1.8, NONE policy-20050525.patch, 1.5, NONE
- Next message (by thread): rpms/openoffice.org/devel openoffice.org.spec, 1.279, 1.280 openoffice.org-1.9.114.ooo50745.cruxcrash.vcl.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28868
Modified Files:
openoffice.org.spec workspace.vcl39.patch
Log Message:
drop integrated parts of workspace
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- openoffice.org.spec 7 Jul 2005 12:28:57 -0000 1.278
+++ openoffice.org.spec 7 Jul 2005 12:58:52 -0000 1.279
@@ -743,6 +743,7 @@
%patch46 -p1 -b .ooo43430.cvskk.np_sdk.patch
%patch47 -p1 -b .ooo51385.bridges.stack.patch
%patch48 -p1 -b .oooXXXXX.rpath.patch
+%patch49 -p1 -b .rh161886.rpath.desktop.patch
%patch50 -p1 -b .ooo50745.cruxcrash.vcl.patch
%patch51 -p1 -b .ooo51637.solenv.pyuno.patch
%patch52 -p1 -b .ooo51638.mailmerge.patch
workspace.vcl39.patch:
padmin/source/fontentry.cxx | 6
psprint/inc/psprint/fontmanager.hxx | 2
psprint/source/fontmanager/fontcache.cxx | 40 --
psprint/source/fontmanager/fontconfig.cxx | 7
psprint/source/fontmanager/fontmanager.cxx | 17 -
psprint/source/fontsubset/sft.c | 8
psprint/source/fontsubset/sft.h | 2
toolkit/source/awt/vclxtoolkit.cxx | 5
vcl/inc/salframe.hxx | 2
vcl/inc/sallayout.hxx | 10
vcl/inc/scrbar.hxx | 1
vcl/inc/window.hxx | 2
vcl/source/app/stdtext.cxx | 5
vcl/source/app/svapp.cxx | 5
vcl/source/app/svdata.cxx | 41 +-
vcl/source/control/button.cxx | 52 ++-
vcl/source/control/edit.cxx | 6
vcl/source/control/ilstbox.cxx | 29 -
vcl/source/control/scrbar.cxx | 88 +++--
vcl/source/gdi/bmpfast.cxx | 34 +-
vcl/source/gdi/sallayout.cxx | 49 ++
vcl/source/window/brdwin.cxx | 7
vcl/source/window/menu.cxx | 63 ++-
vcl/source/window/msgbox.cxx | 23 +
vcl/source/window/scrwnd.cxx | 11
vcl/source/window/splitwin.cxx | 15
vcl/source/window/window.cxx | 5
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 33 -
vcl/unx/gtk/window/gtkframe.cxx | 92 +++--
vcl/unx/inc/plugins/gtk/gtkframe.hxx | 1
vcl/unx/inc/salframe.h | 1
vcl/unx/inc/wmadaptor.hxx | 21 +
vcl/unx/source/app/soicon.cxx | 3
vcl/unx/source/app/wmadaptor.cxx | 179 +++++++---
vcl/unx/source/gdi/pspgraphics.cxx | 2
vcl/unx/source/gdi/xfont.cxx | 5
vcl/unx/source/window/salframe.cxx | 37 ++
vcl/win/inc/salgdi.h | 1
vcl/win/source/gdi/salgdi.cxx | 2
vcl/win/source/gdi/salgdi3.cxx | 274 ++++++++++++----
vcl/win/source/gdi/winlayout.cxx | 492 ++++++++++++++++++-----------
vcl/win/source/window/salframe.cxx | 15
42 files changed, 1157 insertions(+), 536 deletions(-)
Index: workspace.vcl39.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.vcl39.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workspace.vcl39.patch 4 Jul 2005 10:25:50 -0000 1.4
+++ workspace.vcl39.patch 7 Jul 2005 12:58:52 -0000 1.5
@@ -1300,42 +1300,6 @@
SalFrame* pParentFrame = NULL;
if ( pParent )
-Index: unx/gtk/app/gtkdata.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkdata.cxx,v
-retrieving revision 1.17
-retrieving revision 1.17.14.1
-diff -u -p -u -r1.17 -r1.17.14.1
---- openoffice.org.orig/vcl/unx/gtk/app/gtkdata.cxx 22 Apr 2005 11:32:22 -0000 1.17
-+++ openoffice.org/vcl/unx/gtk/app/gtkdata.cxx 10 May 2005 17:01:13 -0000 1.17.14.1
-@@ -687,18 +687,18 @@ void GtkXLib::Yield( BOOL bWait )
- */
-
- bool bDispatchThread = false;
-- if( osl_tryToAcquireMutex( m_aDispatchMutex ) )
-- {
-- // we are the dispatch thread
-- osl_resetCondition( m_aDispatchCondition );
-- bDispatchThread = true;
-- }
-- else if( ! bWait )
-- return; // someone else is waiting already, return
--
- {
- // release YieldMutex (and re-acquire at block end)
- YieldMutexReleaser aReleaser;
-+ if( osl_tryToAcquireMutex( m_aDispatchMutex ) )
-+ {
-+ // we are the dispatch thread
-+ osl_resetCondition( m_aDispatchCondition );
-+ bDispatchThread = true;
-+ }
-+ else if( ! bWait )
-+ return; // someone else is waiting already, return
-+
-
- if( bDispatchThread )
- g_main_context_iteration( NULL, bWait );
Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
@@ -1654,32 +1618,6 @@
bool m_bFullscreen;
bool m_bSingleAltPress;
bool m_bDefaultPos;
-Index: unx/source/app/sm.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/app/sm.cxx,v
-retrieving revision 1.22
-retrieving revision 1.21.18.2
-diff -u -p -u -r1.22 -r1.21.18.2
---- openoffice.org.orig/vcl/unx/source/app/sm.cxx 31 May 2005 17:05:13 -0000 1.22
-+++ openoffice.org/vcl/unx/source/app/sm.cxx 6 Jun 2005 08:18:24 -0000 1.21.18.2
-@@ -355,6 +355,17 @@ void SessionManagerClient::SaveYourselfP
- BuildSmPropertyList();
- #ifdef USE_SM_EXTENSION
- bDocSaveDone = false;
-+ /* #i49875# some session managers send a "die" message if the
-+ * saveDone does not come early enough for their convenience
-+ * this can occasionally happen on startup, especially the first
-+ * startup. So shortcut the "not shutting down" case since the
-+ * upper layers are currently not interested in that event anyway.
-+ */
-+ if( ! shutdown )
-+ {
-+ SessionManagerClient::saveDone();
-+ return;
-+ }
- Application::PostUserEvent( STATIC_LINK( (void*)(shutdown ? 0xffffffff : 0x0), SessionManagerClient, SaveYourselfHdl ) );
- SMprintf( "waiting for save yourself event to be processed\n" );
- #endif
Index: unx/source/app/soicon.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/soicon.cxx,v
- Previous message (by thread): rpms/selinux-policy-targeted/devel policy-20050706.patch, 1.4, 1.5 policy-20050502.patch, 1.10, NONE policy-20050516.patch, 1.8, NONE policy-20050525.patch, 1.5, NONE
- Next message (by thread): rpms/openoffice.org/devel openoffice.org.spec, 1.279, 1.280 openoffice.org-1.9.114.ooo50745.cruxcrash.vcl.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list