[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]
rpms/openoffice.org/FC-4 openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch, NONE, 1.1 workspace.atkbridge.patch, NONE, 1.1 openoffice.org.spec, 1.210, 1.211 openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.6, NONE openoffice.org-1.9.114.oooXXXXX.nostlport.patch, 1.2, NONE
- From: fedora-cvs-commits redhat com
- To: fedora-cvs-commits redhat com
- Subject: rpms/openoffice.org/FC-4 openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch, NONE, 1.1 workspace.atkbridge.patch, NONE, 1.1 openoffice.org.spec, 1.210, 1.211 openoffice.org-1.9.104-use-fontconfig-everywhere.patch, 1.6, NONE openoffice.org-1.9.114.oooXXXXX.nostlport.patch, 1.2, NONE
- Date: Sun, 2 Oct 2005 06:24:33 -0400
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv6129
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch
workspace.atkbridge.patch
Removed Files:
openoffice.org-1.9.104-use-fontconfig-everywhere.patch
openoffice.org-1.9.114.oooXXXXX.nostlport.patch
Log Message:
closer
openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch:
debian/makefile.mk | 2 +-
mandriva/makefile.mk | 2 +-
redhat/makefile.mk | 2 +-
suse/makefile.mk | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch ---
diff -ru SRC680_m130/sysui.orig/desktop/debian/makefile.mk SRC680_m130/sysui/desktop/debian/makefile.mk
--- SRC680_m130/sysui.orig/desktop/debian/makefile.mk 2005-09-30 11:26:58.000000000 +0100
+++ SRC680_m130/sysui/desktop/debian/makefile.mk 2005-09-30 11:28:16.000000000 +0100
@@ -165,7 +165,7 @@
%.desktop :
@$(MKDIRHIER) $(@:d)
- @ln -s -f $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
+ @ln -sf $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
%/Office :
@$(MKDIRHIER) $@
diff -ru SRC680_m130/sysui.orig/desktop/mandriva/makefile.mk SRC680_m130/sysui/desktop/mandriva/makefile.mk
--- SRC680_m130/sysui.orig/desktop/mandriva/makefile.mk 2005-09-30 11:26:58.000000000 +0100
+++ SRC680_m130/sysui/desktop/mandriva/makefile.mk 2005-09-30 11:28:02.000000000 +0100
@@ -156,7 +156,7 @@
%.desktop :
@$(MKDIRHIER) $(@:d)
- @ln -s $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
+ @ln -sf $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
# --- icons --------------------------------------------------------
diff -ru SRC680_m130/sysui.orig/desktop/redhat/makefile.mk SRC680_m130/sysui/desktop/redhat/makefile.mk
--- SRC680_m130/sysui.orig/desktop/redhat/makefile.mk 2005-09-30 11:26:58.000000000 +0100
+++ SRC680_m130/sysui/desktop/redhat/makefile.mk 2005-09-30 11:28:30.000000000 +0100
@@ -159,7 +159,7 @@
%.desktop :
@$(MKDIRHIER) $(@:d)
- @ln -s -f $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
+ @ln -sf $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
# --- icons --------------------------------------------------------
diff -ru SRC680_m130/sysui.orig/desktop/suse/makefile.mk SRC680_m130/sysui/desktop/suse/makefile.mk
--- SRC680_m130/sysui.orig/desktop/suse/makefile.mk 2005-09-30 11:26:58.000000000 +0100
+++ SRC680_m130/sysui/desktop/suse/makefile.mk 2005-09-30 11:28:22.000000000 +0100
@@ -157,7 +157,7 @@
%.desktop :
@$(MKDIRHIER) $(@:d)
- @ln -s -f $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
+ @ln -sf $(subst,$(UNIXFILENAME)-, /etc/$(UNIXFILENAME)/share/xdg/$(@:f)) $@
# --- icons --------------------------------------------------------
workspace.atkbridge.patch:
SRC680_m130/desktop/scripts/soffice.sh | 3
comphelper/source/misc/accessiblewrapper.cxx | 5
openoffice.org/vcl/unx/gtk/a11y/TODO | 49 +
openoffice.org/vcl/unx/gtk/a11y/atkaction.cxx | 93 ++
openoffice.org/vcl/unx/gtk/a11y/atkcomponent.cxx | 206 +++++
openoffice.org/vcl/unx/gtk/a11y/atkeditabletext.cxx | 96 ++
openoffice.org/vcl/unx/gtk/a11y/atkfactory.cxx | 203 +++++
openoffice.org/vcl/unx/gtk/a11y/atkhypertext.cxx | 230 ++++++
openoffice.org/vcl/unx/gtk/a11y/atkimage.cxx | 59 +
openoffice.org/vcl/unx/gtk/a11y/atklistener.cxx | 387 ++++++++++
openoffice.org/vcl/unx/gtk/a11y/atklistener.hxx | 88 ++
openoffice.org/vcl/unx/gtk/a11y/atkselection.cxx | 120 +++
openoffice.org/vcl/unx/gtk/a11y/atktable.cxx | 331 ++++++++
openoffice.org/vcl/unx/gtk/a11y/atktext.cxx | 226 ++++++
openoffice.org/vcl/unx/gtk/a11y/atkutil.cxx | 425 +++++++++++
openoffice.org/vcl/unx/gtk/a11y/atkutil.hxx | 45 +
openoffice.org/vcl/unx/gtk/a11y/atkvalue.cxx | 69 +
openoffice.org/vcl/unx/gtk/a11y/atkwrapper.cxx | 676 ++++++++++++++++++
openoffice.org/vcl/unx/gtk/a11y/atkwrapper.hxx | 84 ++
openoffice.org/vcl/unx/gtk/a11y/makefile.mk | 108 ++
openoffice.org/vcl/unx/inc/plugins/gtk/atkfactory.hxx | 51 +
vcl/prj/build.lst | 3
vcl/source/app/svapp.cxx | 10
vcl/source/window/menu.cxx | 9
vcl/unx/gtk/app/gtkinst.cxx | 1
vcl/unx/gtk/window/gtkframe.cxx | 193 +++++
vcl/unx/inc/plugins/gtk/gtkframe.hxx | 8
vcl/util/makefile.mk | 1
28 files changed, 3764 insertions(+), 15 deletions(-)
--- NEW FILE workspace.atkbridge.patch ---
Index: source/misc/accessiblewrapper.cxx
===================================================================
RCS file: /cvs/util/comphelper/source/misc/accessiblewrapper.cxx,v
retrieving revision 1.9
retrieving revision 1.8.156.2
diff -u -p -r1.9 -r1.8.156.2
--- openoffice.org.orig/comphelper/source/misc/accessiblewrapper.cxx 8 Sep 2005 02:48:04 -0000 1.9
+++ openoffice.org/comphelper/source/misc/accessiblewrapper.cxx 21 Sep 2005 05:53:29 -0000 1.8.156.2
@@ -150,6 +150,11 @@ namespace comphelper
const Reference< XAccessible >& _rxKey, sal_Bool _bCreate )
{
Reference< XAccessible > xValue;
+
+ if( !_rxKey.is() )
+ {
+ return xValue;
+ }
// do we have this child in the cahce?
AccessibleMap::const_iterator aPos = m_aChildrenMap.find( _rxKey );
Index: prj/build.lst
===================================================================
RCS file: /cvs/gsl/vcl/prj/build.lst,v
retrieving revision 1.42
retrieving revision 1.41.72.2
diff -u -p -r1.42 -r1.41.72.2
--- openoffice.org.orig/vcl/prj/build.lst 30 Aug 2005 09:37:21 -0000 1.42
+++ openoffice.org/vcl/prj/build.lst 21 Sep 2005 07:13:26 -0000 1.41.72.2
@@ -18,6 +18,7 @@ vc vcl\unx\source\gdi nmake - u vc_
vc vcl\unx\source\window nmake - u vc__winu vc_unot NULL
vc vcl\unx\source\src nmake - u vc__srcu vc_unot NULL
vc vcl\unx\dummy nmake - u vc__du vc_unot NULL
+vc vcl\unx\gtk\a11y nmake - u vc__gtky vc_unot NULL
vc vcl\unx\gtk\app nmake - u vc__gtka vc_unot NULL
vc vcl\unx\gtk\window nmake - u vc__gtkw vc_unot NULL
vc vcl\unx\gtk\gdi nmake - u vc__gtkg vc_unot NULL
@@ -30,5 +31,5 @@ vc vcl\mac\source\app nmake - m vc_
vc vcl\mac\source\gdi nmake - m vc__gdim vc_unot NULL
vc vcl\mac\source\window nmake - m vc__winm vc_unot NULL
vc vcl\mac\source\src nmake - m vc__srcm vc_unot NULL
-vc vcl\util nmake - all vc_util vc__plug.u vc__appa.u vc__appm.m vc__appu.u vc__appw.w vc__gdim.m vc__gdiu.u vc__gdiw.w vc__srcm.m vc__srcu.u vc__srcw.w vc__wina.u vc__winm.m vc__winu.u vc__winw.w vc__du.u vc__gtka.u vc__gtkw.u vc__gtkg.u vc__kde.u vc_app vc_ctrl vc_gdi vc_hlp vc_src vc_win vc_glyphs NULL
+vc vcl\util nmake - all vc_util vc__plug.u vc__appa.u vc__appm.m vc__appu.u vc__appw.w vc__gdim.m vc__gdiu.u vc__gdiw.w vc__srcm.m vc__srcu.u vc__srcw.w vc__wina.u vc__winm.m vc__winu.u vc__winw.w vc__du.u vc__gtka.u vc__gtky.u vc__gtkw.u vc__gtkg.u vc__kde.u vc_app vc_ctrl vc_gdi vc_hlp vc_src vc_win vc_glyphs NULL
vc vcl\workben nmake - all vc_wrkb vc_util NULL
Index: source/app/svapp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/app/svapp.cxx,v
retrieving revision 1.58
retrieving revision 1.58.10.1
diff -u -p -r1.58 -r1.58.10.1
--- openoffice.org.orig/vcl/source/app/svapp.cxx 9 Sep 2005 11:42:50 -0000 1.58
+++ openoffice.org/vcl/source/app/svapp.cxx 22 Sep 2005 08:47:37 -0000 1.58.10.1
@@ -1224,7 +1224,7 @@ long Application::GetTopWindowCount()
{
long nRet = 0;
ImplSVData* pSVData = ImplGetSVData();
- Window *pWin = pSVData->maWinData.mpFirstFrame;
+ Window *pWin = pSVData ? pSVData->maWinData.mpFirstFrame : NULL;
while( pWin )
{
if( pWin->ImplGetWindow()->IsTopWindow() )
@@ -1240,7 +1240,7 @@ Window* Application::GetTopWindow( long
{
long nIdx = 0;
ImplSVData* pSVData = ImplGetSVData();
- Window *pWin = pSVData->maWinData.mpFirstFrame;
+ Window *pWin = pSVData ? pSVData->maWinData.mpFirstFrame : NULL;
while( pWin )
{
if( pWin->ImplGetWindow()->IsTopWindow() )
@@ -1854,10 +1854,12 @@ BOOL Application::IsAccessibilityEnabled
BOOL InitAccessBridge( BOOL bShowCancel, BOOL &rCancelled )
{
- BOOL bRet = ImplInitAccessBridge( bShowCancel, rCancelled );
+ BOOL bRet = true;
-// There is no GUI to re-enable accessibility on Unix ..
+// Disable Java bridge on UNIX
#ifndef UNX
+ bRet = ImplInitAccessBridge( bShowCancel, rCancelled );
+
if( !bRet && bShowCancel && !rCancelled )
{
// disable accessibility if the user chooses to continue
Index: source/window/menu.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/window/menu.cxx,v
retrieving revision 1.127
retrieving revision 1.127.12.1
diff -u -p -r1.127 -r1.127.12.1
--- openoffice.org.orig/vcl/source/window/menu.cxx 9 Sep 2005 12:27:26 -0000 1.127
+++ openoffice.org/vcl/source/window/menu.cxx 28 Sep 2005 07:24:08 -0000 1.127.12.1
@@ -489,7 +489,6 @@ public:
USHORT GetPosInParent() const { return nPosInParent; }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
- BOOL IsTopmostApplicationMenu();
};
// To get the transparent mouse-over look, the closer is actually a toolbox
@@ -4514,16 +4513,10 @@ void MenuFloatingWindow::Command( const
{
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc;
- if ( pMenu )
+ if ( pMenu && !pMenu->pStartedFrom )
xAcc = pMenu->GetAccessible();
return xAcc;
-}
-
-
-BOOL MenuFloatingWindow::IsTopmostApplicationMenu()
-{
- return (!pMenu->pStartedFrom) ? TRUE : FALSE;
}
MenuBarWindow::MenuBarWindow( Window* pParent ) :
Index: unx/gtk/a11y/TODO
===================================================================
RCS file: unx/gtk/a11y/TODO
diff -N unx/gtk/a11y/TODO
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openoffice.org/vcl/unx/gtk/a11y/TODO 31 May 2005 14:08:21 -0000 1.1.2.6
@@ -0,0 +1,49 @@
+cws 'atkbridge'
+#Issue number: i#47890#
+Submitted by: mmeeks
+
+Hacked up prototype of atk bridge
+
+
+Serious problems
+ + Threading/locking:
+ + incoming CORBA calls & the GDK lock
+ + how are these being processed & on what thread ?
+ + are we holding the GDK_THREADS lock ?
+ + can we even do that ?
+ + is it really necessary to be thread safe ?
+ + how does this work in combination with the (unsafe) GAIL code ?
+ + what should incoming CORBA calls be doing ?
+ + esp. since we can't tell if they're coming from
+ in-proc or not either [ though this is unlikely ]
+
+
+Test:
+ + in-line text editing, does the TEXT_CHANGED signal get it right,
+ + why not copy/paste/delete etc. ?
+ + check vs. writer & other bits ...
+ + AtkSelection
+ + AtkHyper*
+
+* At-poke
+ + implement non-gui mode - for to-console event logging
+ + logging
+ + more detail from remaining events
+ + add a Tree navigation thing instead (?)
+ + poke a sub-child (?)
+ + embed a tree widget inside the tree view ?
+ + AtkHyperText testing (?)
+
+
+Known bugs:
+ + AtkText
+ + selection interface - multiple selections ?
+ + word boundary issues
+ + copy AccessibleTextImpl.java's getAfterIndex eg.
+ + the 'getFoo' methods need to use UNO_QUERY_THROW &
+ throw an exception to avoid null pointer dereferences.
+ + AtkAttributeSet (etc.)
+ + AtkEditableText
+ + finish/test AtkTable
+ + HyperLink 'link_activated', HyperText 'link_selected' (?)
+ + tooltips create new toplevels with broken roles.
Index: unx/gtk/a11y/atkaction.cxx
===================================================================
RCS file: unx/gtk/a11y/atkaction.cxx
diff -N unx/gtk/a11y/atkaction.cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openoffice.org/vcl/unx/gtk/a11y/atkaction.cxx 21 Apr 2005 14:59:22 -0000 1.1.2.1
@@ -0,0 +1,93 @@
+#include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
+
+static uno::Reference< accessibility::XAccessibleAction >
+ getAction( AtkAction *pAction )
+{
+ AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pAction );
+ uno::Reference< accessibility::XAccessibleAction > xAction;
+ xAction = uno::Reference< accessibility::XAccessibleAction >(
+ pWrap->mpContext, uno::UNO_QUERY );
+ if( !xAction.is() )
+ g_error( "%p claimed to have action, but now does not",
+ pWrap->mpContext );
+ return xAction;
+}
+
+static gboolean
+action_wrapper_do_action (AtkAction *action,
+ gint i)
[...3729 lines suppressed...]
+ role = ATK_ROLE_FRAME;
+ break;
+
+ // Ignore window objects for sub-menus, which are exposed
+ // as children of their parent menu
+ case accessibility::AccessibleRole::WINDOW:
+ {
+ Window *pChild = pWindow->GetChild( 0 );
+ if( pChild )
+ {
+ uno::Reference< accessibility::XAccessible > xAccessible( pChild->GetAccessible( true ) );
+ if( xAccessible.is() )
+ role = ATK_ROLE_WINDOW;
+ }
+ }
+ break;
+
+ default:
+ role = ATK_ROLE_WINDOW;
+ break;
+ }
+ }
+ }
+
+ return role;
+}
+
+
+// FIXME: rename as appropriate
+uno::Reference< accessibility::XAccessible >
+GtkSalFrame::getAccessible( bool bCreate )
+{
+ // Yes - this is a hack - but: this abstraction seems totally useless to me
+ Window *pWindow = static_cast<Window *>(GetInstance());
+ if( pWindow )
+ {
+ // Compress/adjust the hierarchy for VCL WorkWindow(s) ..
+ if( pWindow->GetType() == WINDOW_WORKWINDOW )
+ {
+ Window *pChild = pWindow->GetChild( 1 );
+ if( pChild )
+ return pChild->GetAccessible( bCreate );
+ }
+ // and popup menus
+ // FIXME: handle this internally
+ else if( pWindow->GetAccessibleRole() == accessibility::AccessibleRole::WINDOW )
+ {
+ Window *pChild = pWindow->GetChild( 0 );
+ if( pChild )
+ {
+ uno::Reference< accessibility::XAccessible > xAccessible(pChild->GetAccessible( bCreate ));
+ if( xAccessible.is() )
+ {
+// uno::Reference< accessibility::XAccessibleContext > xContext(xAccessible->getAccessibleContext());
+// if( xContext.is() &&
+// xContext->getAccessibleRole() == accessibility::AccessibleRole::POPUP_MENU )
+// {
+ return xAccessible;
+// }
+ }
+ }
+ }
+ else
+ {
+ return pWindow->GetAccessible( bCreate );
+ }
+ }
+
+ return uno::Reference< accessibility::XAccessible >();
+}
+
void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
{
if( nStyle & SAL_FRAME_STYLE_DEFAULT ) // ensure default style
@@ -473,7 +665,8 @@ void GtkSalFrame::Init( SalFrame* pParen
nStyle &= ~SAL_FRAME_STYLE_FLOAT;
}
- m_pWindow = GTK_WINDOW( gtk_widget_new( GTK_TYPE_WINDOW, "type", ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL, "visible", FALSE, NULL ) );
+ m_pWindow = createWindow( this, nStyle );
+
m_pParent = static_cast<GtkSalFrame*>(pParent);
m_pForeignParent = NULL;
m_aForeignParentWindow = None;
Index: unx/inc/plugins/gtk/atkfactory.hxx
===================================================================
RCS file: unx/inc/plugins/gtk/atkfactory.hxx
diff -N unx/inc/plugins/gtk/atkfactory.hxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openoffice.org/vcl/unx/inc/plugins/gtk/atkfactory.hxx 28 Sep 2005 07:24:17 -0000 1.1.2.2
@@ -0,0 +1,51 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: atkfactory.hxx,v $
+ *
+ * $Revision: 1.1.2.2 $
+ *
+ * last change: $Author: obr $ $Date: 2005/09/28 07:24:17 $
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+
+#ifndef __ATK_FACTORY_HXX__
+#define __ATK_FACTORY_HXX__
+
+#include <atk/atk.h>
+
+void RegisterAtkFactory( GType nWindowType );
+
+extern "C" {
+
+#define GAIL_WINDOW_WRAPPER_FACTORY_TYPE (gail_window_wrapper_factory_get_type())
+
+ GType gail_window_wrapper_factory_get_type (void);
+
+}; // extern "C"
+
+#endif
Index: unx/inc/plugins/gtk/gtkframe.hxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx,v
retrieving revision 1.17
retrieving revision 1.14.22.5
diff -u -p -r1.17 -r1.14.22.5
--- openoffice.org.orig/vcl/unx/inc/plugins/gtk/gtkframe.hxx 9 Sep 2005 12:51:27 -0000 1.17
+++ openoffice.org/vcl/unx/inc/plugins/gtk/gtkframe.hxx 28 Sep 2005 07:24:18 -0000 1.14.22.5
@@ -43,6 +43,9 @@
#include <gdk/gdkkeysyms.h>
#include <postx.h>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/accessibility/XAccessible.hdl>
+
#ifndef _SV_SALFRAME_HXX
#include <salframe.hxx>
#endif
@@ -351,6 +354,11 @@ public:
virtual bool SetPluginParent( SystemParentData* pNewParent );
virtual void SetBackgroundBitmap( SalBitmap* );
+
+ static GtkSalFrame *getFromWindow( GtkWindow *pWindow );
+ ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getAccessible( bool bCreate = true );
+
+ static AtkRole GetAtkRole( GtkWindow* window );
};
Index: util/makefile.mk
===================================================================
RCS file: /cvs/gsl/vcl/util/makefile.mk,v
retrieving revision 1.74
retrieving revision 1.65.110.6
diff -u -p -r1.74 -r1.65.110.6
--- openoffice.org.orig/vcl/util/makefile.mk 9 Sep 2005 13:53:03 -0000 1.74
+++ openoffice.org/vcl/util/makefile.mk 21 Sep 2005 09:56:00 -0000 1.65.110.6
@@ -352,6 +352,7 @@ PKGCONFIG_MODULES=gtk+-2.0 gthread-2.0
LIB4TARGET=$(SLB)$/igtk_plug_
LIB4FILES=\
+ $(SLB)$/gtka11y.lib\
$(SLB)$/gtkapp.lib\
$(SLB)$/gtkgdi.lib\
$(SLB)$/gtkwin.lib
--- SRC680_m130/desktop/scripts/soffice.gail.sh 2005-09-30 15:34:21.000000000 +0100
+++ SRC680_m130/desktop/scripts/soffice.sh 2005-09-30 15:34:56.000000000 +0100
@@ -35,6 +35,9 @@
#*************************************************************************
if [ -z $SAL_USE_VCLPLUGIN ]; then export SAL_USE_VCLPLUGIN=gtk; fi
+if [ true == `gconftool-2 -g "/desktop/gnome/interface/accessibility"` ]; then
+export GTK_MODULES="gail:atk-bridge $GTK_MODULES"
+fi
#
# STAR_PROFILE_LOCKING_DISABLED=1
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- openoffice.org.spec 28 Sep 2005 13:24:05 -0000 1.210
+++ openoffice.org.spec 2 Oct 2005 10:24:31 -0000 1.211
@@ -1,5 +1,5 @@
%define ooo2ver 1
-%define ooo_rpm_release 0.cmc1
+%define ooo_rpm_release 2.cmc1
%define build_fc5 0
%define build_fc4 1
%define build_rhel4 0
@@ -208,6 +208,8 @@
Patch58: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
Patch59: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
Patch60: workspace.cmcfixes19.patch
+Patch61: workspace.atkbridge.patch
+Patch62: openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -242,7 +244,7 @@
Requires: libbluecurve.so, libcrux-engine.so
Requires: %{libgcj} >= 4.0.0, java-1.4.2-gcj-compat
%if ! %{internaljavabits}
-Requires: hsqldb >= 1.80.1, bsh >= 1.3.0
+Requires: hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2, xerces-j2
%endif
PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.4.8
Obsoletes: openoffice.org
@@ -349,9 +351,6 @@
Summary: extra xsltfilter module for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-%if ! %{internaljavabits}
-Requires: xalan-j2, xerces-j2
-%endif
%description xsltfilter
xsltfilter module for %{name}, provides additional docbook and xhtml export transforms. Install this to enable docbook export.
@@ -886,6 +885,8 @@
%endif
%patch59 -p1 -b .ooo54959.negativeindent.sw.patch
%patch60 -p1 -b .workspace.cmcfixes19.patch
+%patch61 -p1 -b .workspace.atkbridge.patch
+%patch62 -p1 -b .oooXXXXX.sysui.linkforce.patch
%if %{includingexternals}
#start ludicrous workaround
@@ -3240,6 +3241,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Thu Sep 29 2005 Caolan McNamara <caolanm redhat com> - 1:2.0.0-1.2
+- add mmeeks workspace.atkbridge for rh#169323# acessibility
+
* Mon Sep 26 2005 Caolan McNamara <caolanm redhat com> - 1:2.0.0-1.1
- release candidate 1
--- openoffice.org-1.9.104-use-fontconfig-everywhere.patch DELETED ---
--- openoffice.org-1.9.114.oooXXXXX.nostlport.patch DELETED ---
[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]