rpms/openoffice.org/devel openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch, NONE, 1.1 openoffice.org.spec, 1.797, 1.798 openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jul 27 12:29:33 UTC 2006
- Previous message (by thread): rpms/setup/devel .cvsignore, 1.34, 1.35 setup.spec, 1.39, 1.40 sources, 1.35, 1.36
- Next message (by thread): rpms/kernel/devel linux-2.6-crash-driver-xen.patch, NONE, 1.1 linux-2.6-debug-sysfs-crash-debugging-xen.patch, NONE, 1.1 linux-2.6-xen-tux.patch, NONE, 1.1 kernel-2.6.spec, 1.2460, 1.2461 linux-2.6-compile-fixes.patch, 1.94, 1.95 linux-2.6-devmem-xen.patch, 1.3, 1.4 linux-2.6-xen.patch, 1.45, 1.46 linux-2.6-xen_remap_vma_flags.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-serv24147
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
Removed Files:
openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
Log Message:
update font require
openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch:
dtrans/source/X11/X11_selection.cxx | 35 +++++++++++++++++++++++++----------
source/X11/X11_selection.cxx | 0
2 files changed, 25 insertions(+), 10 deletions(-)
--- NEW FILE openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch ---
Index: source/X11/X11_selection.cxx
===================================================================
RCS file: /cvs/gsl/dtrans/source/X11/X11_selection.cxx,v
retrieving revision 1.77
diff -u -r1.77 X11_selection.cxx
--- openoffice.org.orig/dtrans/source/X11/X11_selection.cxx 6 Apr 2006 15:31:43 -0000 1.77
+++ openoffice.org/dtrans/source/X11/X11_selection.cxx 27 Jul 2006 10:29:10 -0000
@@ -98,7 +98,7 @@
using namespace x11;
-static const int nXdndProtocolRevision = 5;
+static const long nXdndProtocolRevision = 5;
// mapping between mime types (or what the office thinks of mime types)
// and X convention types
@@ -1297,7 +1297,7 @@
std::vector< Atom > aNativeTypes;
if( aAtoms.getLength() )
{
- int nAtoms = aAtoms.getLength() / 4;
+ sal_Int32 nAtoms = aAtoms.getLength() / sizeof(Atom);
Atom* pAtoms = (Atom*)aAtoms.getArray();
rTypes.realloc( nAtoms );
aNativeTypes.resize( nAtoms );
@@ -1416,6 +1416,12 @@
return it->second->m_pPixmap;
}
+static sal_Size GetTrueFormatSize(int nFormat)
+{
+ // http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html
+ return nFormat == 32 ? sizeof(long) : nFormat/8;
+}
+
bool SelectionManager::sendData( SelectionAdaptor* pAdaptor,
Window requestor,
Atom target,
@@ -1551,13 +1557,15 @@
rInc.m_nTransferStartTime = time( NULL );
// use incr protocol, signal start to requestor
- int nMinSize = m_nIncrementalThreshold;
+ long nMinSize = m_nIncrementalThreshold;
XSelectInput( m_pDisplay, requestor, PropertyChangeMask );
XChangeProperty( m_pDisplay, requestor, property,
m_nINCRAtom, 32, PropModeReplace, (unsigned char*)&nMinSize, 1 );
XFlush( m_pDisplay );
}
else
+ {
+ sal_Size nUnitSize = GetTrueFormatSize(nFormat);
XChangeProperty( m_pDisplay,
requestor,
property,
@@ -1565,7 +1573,8 @@
nFormat,
PropModeReplace,
(const unsigned char*)aData.getConstArray(),
- aData.getLength()/(nFormat/8) );
+ aData.getLength()/nUnitSize );
+ }
}
#if OSL_DEBUG_LEVEL > 1
else
@@ -1633,7 +1642,7 @@
}
else if( rRequest.target == m_nTIMESTAMPAtom )
{
- sal_uInt32 nTimeStamp = (sal_uInt32)m_aSelections[rRequest.selection]->m_nOrigTimestamp;
+ long nTimeStamp = (long)m_aSelections[rRequest.selection]->m_nOrigTimestamp;
XChangeProperty( m_pDisplay, rRequest.requestor, rRequest.property,
XA_INTEGER, 32, PropModeReplace, (const unsigned char*)&nTimeStamp, 1 );
aNotify.xselection.property = rRequest.property;
@@ -1863,11 +1872,14 @@
OUStringToOString( getString( nType ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
nFormat, nBytes );
#endif
+
+ sal_Size nUnitSize = GetTrueFormatSize(nFormat);
+
if( it->second->m_eState == Selection::WaitingForData ||
it->second->m_eState == Selection::WaitingForResponse )
{
// copy data
- it->second->m_aData = Sequence< sal_Int8 >( (sal_Int8*)pData, nItems*nFormat/8 );
+ it->second->m_aData = Sequence< sal_Int8 >( (sal_Int8*)pData, nItems*nUnitSize );
it->second->m_eState = Selection::Inactive;
it->second->m_aDataArrived.set();
}
@@ -1876,9 +1888,9 @@
if( nItems )
{
// append data
- Sequence< sal_Int8 > aData( it->second->m_aData.getLength() + nItems*nFormat/8 );
+ Sequence< sal_Int8 > aData( it->second->m_aData.getLength() + nItems*nUnitSize );
memcpy( aData.getArray(), it->second->m_aData.getArray(), it->second->m_aData.getLength() );
- memcpy( aData.getArray() + it->second->m_aData.getLength(), pData, nItems*nFormat/8 );
+ memcpy( aData.getArray() + it->second->m_aData.getLength(), pData, nItems*nUnitSize );
it->second->m_aData = aData;
}
else
@@ -1964,6 +1976,8 @@
nBytes, nBytes > 32 ? 32 : nBytes,
(const unsigned char*)rInc.m_aData.getConstArray()+rInc.m_nBufferPos );
#endif
+
+ sal_Size nUnitSize = GetTrueFormatSize(rInc.m_nFormat);
XChangeProperty( m_pDisplay,
rInc.m_aRequestor,
@@ -1972,7 +1986,7 @@
rInc.m_nFormat,
PropModeReplace,
(const unsigned char*)rInc.m_aData.getConstArray()+rInc.m_nBufferPos,
- nBytes/(rInc.m_nFormat/8) );
+ nBytes/nUnitSize );
rInc.m_nBufferPos += nBytes;
rInc.m_nTransferStartTime = nCurrentTime;
@@ -2059,7 +2073,8 @@
&pData );
}
it->second->m_eState = Selection::Inactive;
- it->second->m_aData = Sequence< sal_Int8 >((sal_Int8*)pData, nFormat/8 * nItems );
+ sal_Size nUnitSize = GetTrueFormatSize(nFormat);
+ it->second->m_aData = Sequence< sal_Int8 >((sal_Int8*)pData, nItems * nUnitSize);
it->second->m_aDataArrived.set();
if( pData )
XFree( pData );
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.797
retrieving revision 1.798
diff -u -r1.797 -r1.798
--- openoffice.org.spec 26 Jul 2006 12:07:53 -0000 1.797
+++ openoffice.org.spec 27 Jul 2006 12:29:30 -0000 1.798
@@ -111,20 +111,19 @@
Patch45: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
Patch46: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
Patch47: ooobuild.VBAObjects.patch
-Patch48: openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
-Patch49: openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
-Patch50: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
-Patch51: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch52: openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
-Patch53: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch54: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch55: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch56: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch57: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch58: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
-Patch59: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch60: openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
-Patch61: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch48: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
+Patch49: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch50: openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
+Patch51: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch52: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch53: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch54: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch55: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch56: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
+Patch57: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch58: openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
+Patch59: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch60: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -149,7 +148,7 @@
%package core
Summary: core modules for %{name}
Group: Applications/Productivity
-Requires: bitstream-vera-fonts
+Requires: dejavu-lgc-fonts
Requires: urw-fonts
%ifarch %{ppc}
# Ensure we have 32-bit theme libs in 64-bit multilib environments.
@@ -863,20 +862,19 @@
%patch45 -p1 -b .rh187919.gtkunderkde.patch
%patch46 -p1 -b .ooo67186.sw.eventisULONG.patch
%patch47 -p0 -b .ooobuild.VBAObjects.patch
-%patch48 -p1 -b .oooXXXXX.all.ODR.anonymousmembers.patch
-%patch49 -p1 -b .oooXXXXX.sal.importvisibilityasexported.patch
-%patch50 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
-%patch51 -p1 -b .ooo67644.sw.spacing.patch
-%patch52 -p1 -b .ooo67656.vcl.tabdialogsminimize.patch
-%patch53 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch54 -p1 -b .ooo67716.svx.overflow.patch
-%patch55 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch56 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch57 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch58 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
-%patch59 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch60 -p1 -b .ooo67779.svx.toolbarcrash.patch
-%patch61 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch48 -p1 -b .oooXXXXX.jvmfwk.futureproof.patch
+%patch49 -p1 -b .ooo67644.sw.spacing.patch
+%patch50 -p1 -b .ooo67656.vcl.tabdialogsminimize.patch
+%patch51 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch52 -p1 -b .ooo67716.svx.overflow.patch
+%patch53 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch54 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch55 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch56 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
+%patch57 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch58 -p1 -b .ooo67779.svx.toolbarcrash.patch
+%patch59 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch69 -p1 -b .ooo67829.dtrans.64bitpaste.patch
tar xzf %{SOURCE1}
@@ -3356,6 +3354,10 @@
* Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
- rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
- rh#200194# -> openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+- rh#199056# -> openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+- drop openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
+- drop openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
+- require dejavu-lgc-fonts, Greek coverage problems begone
* Thu Jul 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
- rh#199535# presentation templates duplicated in zh-CN
--- openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch DELETED ---
- Previous message (by thread): rpms/setup/devel .cvsignore, 1.34, 1.35 setup.spec, 1.39, 1.40 sources, 1.35, 1.36
- Next message (by thread): rpms/kernel/devel linux-2.6-crash-driver-xen.patch, NONE, 1.1 linux-2.6-debug-sysfs-crash-debugging-xen.patch, NONE, 1.1 linux-2.6-xen-tux.patch, NONE, 1.1 kernel-2.6.spec, 1.2460, 1.2461 linux-2.6-compile-fixes.patch, 1.94, 1.95 linux-2.6-devmem-xen.patch, 1.3, 1.4 linux-2.6-xen.patch, 1.45, 1.46 linux-2.6-xen_remap_vma_flags.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list