rpms/openoffice.org/devel workspace.cairo06.patch, NONE, 1.1 openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 1.20, 1.21 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.47, 1.48 openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch, 1.4, 1.5 openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch, 1.1, 1.2 openoffice.org.spec, 1.1549, 1.1550 openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch, 1.1, NONE pseudoworkspace.valgrind1.patch, 1.35, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Jul 2 14:26:20 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18350
Modified Files:
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
openoffice.org.spec
Added Files:
workspace.cairo06.patch
Removed Files:
openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
pseudoworkspace.valgrind1.patch
Log Message:
try this out
workspace.cairo06.patch:
--- NEW FILE workspace.cairo06.patch ---
Index: source/cairo/cairo_xlib_cairo.cxx
===================================================================
RCS file: /cvs/gsl/canvas/source/cairo/cairo_xlib_cairo.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org.orig/canvas/source/cairo/cairo_xlib_cairo.cxx 11 Apr 2008 09:39:12 -0000 1.3
+++ openoffice.org/canvas/source/cairo/cairo_xlib_cairo.cxx 30 Jun 2008 12:59:53 -0000 1.4
@@ -7,7 +7,6 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile$
- *
* $Revision$
*
* This file is part of OpenOffice.org.
@@ -29,292 +28,328 @@
*
************************************************************************/
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_canvas.hxx"
-// NOTE: (when needed) #if defined QUARTZ has to be before UNX.
-// since Mac OS X can have both X11 and QUARTZ versions
-// of cairo libraries at the same time.
-#if defined (UNX) && !defined (QUARTZ)
-
-/************************************************************************
- * XLib/Xrender surface backend for OpenOffice.org Cairo Canvas *
- ************************************************************************/
-
#include <prex.h>
#include <X11/extensions/Xrender.h>
#include <X11/Xlib.h>
#include <postx.h>
-#include <osl/diagnose.h>
-
-#include "cairo_cairo.hxx"
+#include "cairo_xlib_cairo.hxx"
-#ifdef CAIRO_HAS_XLIB_SURFACE
+#include <vcl/sysdata.hxx>
+#include <vcl/bitmap.hxx>
+#include <vcl/virdev.hxx>
+#include <basegfx/vector/b2isize.hxx>
-#ifdef USE_CAIRO10_APIS
-#include "cairo_xlib_helper.hxx"
-#endif
+namespace cairo
+{
#include <cairo-xlib.h>
#include <cairo-xlib-xrender.h>
-namespace cairo
-{
+ // TODO(F3): svp headless case!
-bool HasXRender( const void* pSysData )
-{
- Display *pDisplay = (Display*) ((const SystemEnvData*) pSysData)->pDisplay;
- int nDummy;
- return XQueryExtension( pDisplay, "RENDER", &nDummy, &nDummy, &nDummy );
-}
+ bool IsCairoWorking( OutputDevice* pOutDev )
+ {
+ if( !pOutDev )
+ return false;
+
+ Display* pDisplay = (Display*)pOutDev->GetSystemGfxData().pDisplay;
+ int nDummy;
+ return XQueryExtension( pDisplay, "RENDER", &nDummy, &nDummy, &nDummy );
+ }
+ X11SysData::X11SysData() :
+ pDisplay(NULL),
+ hDrawable(0),
+ pVisual(NULL),
+ nScreen(0),
+ nDepth(-1),
+ aColormap(-1),
+ pRenderFormat(NULL)
+ {}
+
+ X11SysData::X11SysData( const SystemGraphicsData* pSysDat ) :
+ pDisplay(pSysDat->pDisplay),
+ hDrawable(pSysDat->hDrawable),
+ pVisual(pSysDat->pVisual),
+ nScreen(pSysDat->nScreen),
+ nDepth(pSysDat->nDepth),
+ aColormap(pSysDat->aColormap),
+ pRenderFormat(pSysDat->pRenderFormat)
+ {}
+
+ X11SysData::X11SysData( const SystemEnvData* pSysDat ) :
+ pDisplay(pSysDat->pDisplay),
+ hDrawable(pSysDat->aWindow),
+ pVisual(pSysDat->pVisual),
+ nScreen(pSysDat->nScreen),
+ nDepth(pSysDat->nDepth),
+ aColormap(pSysDat->aColormap),
+ pRenderFormat(NULL)
+ {}
-#ifdef USE_CAIRO10_APIS
- Surface::Surface( const void* pSysData, void* pDisplay, long hDrawable, void* pRenderFormat, cairo_surface_t* pSurface )
- : mnRefCount( 1 ),
- mpSysData( pSysData ),
- mpDisplay( pDisplay ),
- mhDrawable( hDrawable ),
- mpRenderFormat( pRenderFormat ),
- mbFreePixmap( true ),
- mpSurface( pSurface )
+ X11Pixmap::~X11Pixmap()
{
+ if( mpDisplay && mhDrawable )
+ XFreePixmap( (Display*)mpDisplay, mhDrawable );
}
-#endif
+ /**
+ * Surface::Surface: Create Canvas surface with existing data
+ * @param pSysData Platform native system environment data (struct SystemEnvData in vcl/inc/sysdata.hxx)
+ * @param pSurface Cairo surface
+ *
+ * pSysData contains the platform native Drawable reference
+ * This constructor only stores data, it does no processing.
+ * It is used by e.g. Surface::getSimilar()
+ *
+ * Set the mpSurface as pSurface
+ **/
+ X11Surface::X11Surface( const X11SysData& rSysData,
+ const X11PixmapSharedPtr& rPixmap,
+ const CairoSurfaceSharedPtr& pSurface ) :
+ maSysData(rSysData),
+ mpPixmap(rPixmap),
+ mpSurface(pSurface)
+ {}
+
+ /**
+ * Surface::Surface: Create generic Canvas surface using given Cairo Surface
+ *
+ * @param pSurface Cairo Surface
+ *
+ * This constructor only stores data, it does no processing.
+ * It is used with e.g. cairo_image_surface_create_for_data()
+ * Unlike other constructors, mpSysData is set to NULL
+ *
+ * Set the mpSurface as pSurface
+ **/
+ X11Surface::X11Surface( const CairoSurfaceSharedPtr& pSurface ) :
+ maSysData(),
+ mpPixmap(),
+ mpSurface(pSurface)
+ {}
+
+ /**
+ * Surface::Surface: Create Canvas surface from Window reference.
+ * @param pSysData Platform native system environment data (struct SystemEnvData in vcl/inc/sysdata.hxx)
+ * @param x horizontal location of the new surface
+ * @param y vertical location of the new surface
+ * @param width width of the new surface
+ * @param height height of the new surface
+ *
+ * pSysData contains the platform native Window reference.
+ *
+ * pSysData is used to create a surface on the Window
+ *
+ * Set the mpSurface to the new surface or NULL
+ **/
+ X11Surface::X11Surface( const X11SysData& rSysData, int x, int y, int width, int height ) :
+ maSysData(rSysData),
+ mpPixmap(),
+ mpSurface(
+ cairo_xlib_surface_create( (Display*)rSysData.pDisplay,
+ rSysData.hDrawable,
+ (Visual*)rSysData.pVisual,
+ width + x, height + y ),
+ &cairo_surface_destroy)
+ {
+ cairo_surface_set_device_offset(mpSurface.get(), x, y );
+ }
+ /**
+ * Surface::Surface: Create platfrom native Canvas surface from BitmapSystemData
+ * @param pSysData Platform native system environment data (struct SystemEnvData in vcl/inc/sysdata.hxx)
+ * @param pBmpData Platform native image data (struct BitmapSystemData in vcl/inc/bitmap.hxx)
+ * @param width width of the new surface
+ * @param height height of the new surface
+ *
+ * The pBmpData provides the imagedata that the created surface should contain.
+ *
+ * Set the mpSurface to the new surface or NULL
+ **/
+ X11Surface::X11Surface( const X11SysData& rSysData,
+ const BitmapSystemData& rData ) :
+ maSysData( rSysData ),
+ mpPixmap(),
+ mpSurface(
+ cairo_xlib_surface_create( (Display*)rSysData.pDisplay,
+ (Drawable)rData.aPixmap,
+ (Visual*) rSysData.pVisual,
+ rData.mnWidth, rData.mnHeight ),
+ &cairo_surface_destroy)
+ {
+ }
- /**
- * Surface::Surface: Create generic Canvas surface using given Cairo Surface
- *
- * @param pSurface Cairo Surface
- *
- * This constructor only stores data, it does no processing.
- * It is used with e.g. cairo_image_surface_create_for_data()
- * and Surface::getSimilar()
- *
- * Set the mpSurface to the new surface or NULL
- **/
- Surface::Surface( cairo_surface_t* pSurface )
- : mnRefCount( 1 ),
-#ifdef USE_CAIRO10_APIS
- mpSysData( NULL ),
- mpDisplay( NULL ),
- mhDrawable( 0 ),
- mpRenderFormat( NULL ),
- mbFreePixmap( false ),
-#endif
- mpSurface( pSurface )
+ /**
+ * Surface::getCairo: Create Cairo (drawing object) for the Canvas surface
+ *
+ * @return new Cairo or NULL
+ **/
+ CairoSharedPtr X11Surface::getCairo() const
{
+ return CairoSharedPtr( cairo_create(mpSurface.get()),
+ &cairo_destroy );
}
+ /**
+ * Surface::getSimilar: Create new similar Canvas surface
+ * @param aContent format of the new surface (cairo_content_t from cairo/src/cairo.h)
+ * @param width width of the new surface
+ * @param height height of the new surface
+ *
+ * Creates a new Canvas surface. This normally creates platform native surface, even though
+ * generic function is used.
+ *
+ * Cairo surface from aContent (cairo_content_t)
+ *
+ * @return new surface or NULL
+ **/
+ SurfaceSharedPtr X11Surface::getSimilar( Content aContent, int width, int height ) const
+ {
+ Pixmap hPixmap;
+ if( maSysData.pDisplay && maSysData.hDrawable )
+ {
+ XRenderPictFormat* pFormat;
+ int nFormat;
- /**
- * Surface::Surface: Create Canvas surface from Window reference.
- * @param pSysData Platform native system environment data (struct SystemEnvData in vcl/inc/sysdata.hxx)
- * @param x horizontal location of the new surface
- * @param y vertical location of the new surface
- * @param width width of the new surface
- * @param height height of the new surface
- *
- * pSysData contains the platform native Window reference.
- * pSysData is used to create a surface on the Window
- *
- * Set the mpSurface to the new surface or NULL
- **/
- Surface::Surface( const SystemEnvData* pSysData, int x, int y, int width, int height )
- : mnRefCount( 1 ),
-#ifdef USE_CAIRO10_APIS
- mpSysData( pSysData ),
- mpDisplay( NULL ),
- mhDrawable( 0 ),
- mpRenderFormat( NULL ),
- mbFreePixmap( false ),
-#endif
- mpSurface( NULL )
- {
-#ifdef USE_CAIRO10_APIS
- mpSurface = (cairo_surface_t*) cairoHelperGetSurface( pSysData, x, y, width, height );
- mpDisplay = (Display*) cairoHelperGetDisplay( pSysData );
- mhDrawable = cairoHelperGetWindow( pSysData );
-#else
- mpSurface = cairo_xlib_surface_create( (Display*) pSysData->pDisplay,
- pSysData->aWindow,
- (Visual*) pSysData->pVisual,
- width + x, height + y );
- cairo_surface_set_device_offset( mpSurface, x, y );
- // XSynchronize( (Display*) pSysData->pDisplay, TRUE );
-#endif
- }
+ switch (aContent)
+ {
+ case CAIRO_CONTENT_ALPHA:
+ nFormat = PictStandardA8;
+ break;
+ case CAIRO_CONTENT_COLOR:
+ nFormat = PictStandardRGB24;
+ break;
+ case CAIRO_CONTENT_COLOR_ALPHA:
+ default:
+ nFormat = PictStandardARGB32;
+ break;
+ }
+ pFormat = XRenderFindStandardFormat( (Display*)maSysData.pDisplay, nFormat );
+ hPixmap = XCreatePixmap( (Display*)maSysData.pDisplay, maSysData.hDrawable,
+ width > 0 ? width : 1, height > 0 ? height : 1,
+ pFormat->depth );
- /**
- * Surface::Surface: Create platfrom native Canvas surface from BitmapSystemData
- * @param pSysData Platform native system environment data (struct SystemEnvData in vcl/inc/sysdata.hxx)
- * @param pBmpData Platform native image data (struct BitmapSystemData in vcl/inc/bitmap.hxx)
- * @param width width of the new surface
- * @param height height of the new surface
- *
- * Create a surface based on image data on pBmpData
- *
- * Set the mpSurface to the new surface or NULL
- **/
- Surface::Surface( const SystemEnvData* pSysData, const BitmapSystemData* pBmpData, int width, int height )
- : mnRefCount( 1 ),
-#ifdef USE_CAIRO10_APIS
- mpSysData( pSysData ),
- mpDisplay( NULL ),
- mhDrawable( 0 ),
- mpRenderFormat( NULL ),
- mbFreePixmap( false ),
-#endif
- mpSurface( NULL )
- {
-#ifdef USE_CAIRO10_APIS
- mpSurface = (cairo_surface_t*) cairoHelperGetSurface( pSysData, pBmpData, width, height );
- mpDisplay = (Display*) cairoHelperGetDisplay( pSysData );
- mhDrawable = cairoHelperGetWindow( pSysData );
-#else
- OSL_ASSERT (pBmpData->mnWidth == width && pBmpData->mnHeight == height);
-
- mpSurface = cairo_xlib_surface_create( (Display*) pSysData->pDisplay,
- (Drawable) pBmpData->aPixmap,
- (Visual*) pSysData->pVisual,
- width, height );
-#endif
+ X11SysData aSysData(maSysData);
+ aSysData.pRenderFormat = pFormat;
+ return SurfaceSharedPtr(
+ new X11Surface( aSysData,
+ X11PixmapSharedPtr(
+ new X11Pixmap(hPixmap, maSysData.pDisplay)),
+ CairoSurfaceSharedPtr(
+ cairo_xlib_surface_create_with_xrender_format(
+ (Display*)maSysData.pDisplay,
+ hPixmap,
+ ScreenOfDisplay((Display *)maSysData.pDisplay, maSysData.nScreen),
+ pFormat, width, height ),
+ &cairo_surface_destroy) ));
+ }
+ else
+ return SurfaceSharedPtr(
+ new X11Surface( maSysData,
+ X11PixmapSharedPtr(),
+ CairoSurfaceSharedPtr(
+ cairo_surface_create_similar( mpSurface.get(), aContent, width, height ),
+ &cairo_surface_destroy )));
}
-#if defined USE_CAIRO10_APIS
- /**
- * Surface::~Surface: Destroy the Canvas surface
- *
- * Also free any image data and other references related to the Canvas.
- *
- **/
- Surface::~Surface()
- {
- if( mpSurface )
- {
- cairo_surface_destroy( mpSurface );
- mpSurface = NULL;
- }
- mpSysData = NULL;
-
-// In cairo API < 1.2, explicit freeing is needed
- if( mbFreePixmap && mhDrawable )
- XFreePixmap( (Display*) mpDisplay, mhDrawable );
- }
-#endif
+ boost::shared_ptr<VirtualDevice> X11Surface::createVirtualDevice() const
+ {
+ SystemGraphicsData aSystemGraphicsData;
+ aSystemGraphicsData.nSize = sizeof(SystemGraphicsData);
+ aSystemGraphicsData.hDrawable = getDrawable();
+ aSystemGraphicsData.pRenderFormat = getRenderFormat();
+
+ return boost::shared_ptr<VirtualDevice>(
+ new VirtualDevice( &aSystemGraphicsData, getDepth() ));
+ }
- /**
- * Surface::Resize: Resizes the Canvas surface.
- * @param width new width of the surface
- * @param height new height of the surface
- *
- * Only used on X11.
- *
- * @return The new surface or NULL
- **/
- void
- Surface::Resize( int width, int height )
+ /**
+ * Surface::Resize: Resizes the Canvas surface.
+ * @param width new width of the surface
+ * @param height new height of the surface
+ *
+ * Only used on X11.
+ *
+ * @return The new surface or NULL
+ **/
+ void X11Surface::Resize( int width, int height )
{
- cairo_xlib_surface_set_size( mpSurface, width, height );
+ cairo_xlib_surface_set_size( mpSurface.get(), width, height );
}
+ void X11Surface::flush() const
+ {
+ XSync( (Display*)maSysData.pDisplay, false );
+ }
- /**
- * Surface::getDepth: Get the color depth of the Canvas surface.
- *
- * @return color depth
- **/
- int
- Surface::getDepth()
+ /**
+ * Surface::getDepth: Get the color depth of the Canvas surface.
+ *
+ * @return color depth
+ **/
+ int X11Surface::getDepth() const
{
-#ifdef USE_CAIRO10_APIS
- if( mpRenderFormat )
- return ( ( XRenderPictFormat * ) mpRenderFormat )->depth;
-#else
- // TODO: verify that this works correctly
- return cairo_xlib_surface_get_depth( mpSurface );
-#endif
+ if( maSysData.pRenderFormat )
+ return ((XRenderPictFormat*) maSysData.pRenderFormat)->depth;
+
return -1;
}
-#ifdef USE_CAIRO10_APIS
-// This function is platform dependent on Cairo < 1.2 API only.
- Surface* Surface::getSimilar( Content aContent, int width, int height )
- {
- Pixmap hPixmap;
-
- if( mpSysData && mpDisplay && mhDrawable ) {
- XRenderPictFormat *pFormat;
+ SurfaceSharedPtr createSurface( const CairoSurfaceSharedPtr& rSurface )
+ {
+ return SurfaceSharedPtr(new X11Surface(rSurface));
+ }
- pFormat = XRenderFindStandardFormat( (Display*) mpDisplay, getXFormat(aContent) );
- hPixmap = XCreatePixmap( (Display*) mpDisplay, cairoHelperGetWindow( mpSysData ),
- width > 0 ? width : 1, height > 0 ? height : 1,
- pFormat->depth );
+ static X11SysData getSysData( const Window& rWindow )
+ {
+ const SystemEnvData* pSysData = GetSysData(&rWindow);
- return new Surface( mpSysData, mpDisplay, (long) hPixmap, pFormat,
- cairo_xlib_surface_create_with_xrender_format( (Display*) mpDisplay, hPixmap,
- DefaultScreenOfDisplay( (Display *) mpDisplay ),
- pFormat, width, height ) );
- } else
- return new Surface( mpSysData, mpDisplay, 0, NULL, cairo_surface_create_similar( mpSurface, aContent, width, height ) );
- }
-#endif // USE_CAIRO10_APIS
+ if( !pSysData )
+ return X11SysData();
+ else
+ return X11SysData(pSysData);
+ }
- /**
- * Surface::fillSystemGraphicsData: Fill SystemGraphicsData with native surface data
- * @param aSystemGraphicsData Platform native system graphics data (struct SystemGraphicsData in vcl/inc/sysdata.hxx)
- *
- */
- void Surface::fillSystemGraphicsData( SystemGraphicsData& aSystemGraphicsData)
+ static X11SysData getSysData( const VirtualDevice& rVirDev )
{
- #ifdef USE_CAIRO10_APIS
- // Backward compatibility for Cairo 1.0
- aSystemGraphicsData.hDrawable = mhDrawable;
- aSystemGraphicsData.pRenderFormat = mpRenderFormat;
- #else
- aSystemGraphicsData.hDrawable = cairo_xlib_surface_get_drawable( mpSurface );
- aSystemGraphicsData.pRenderFormat = XRenderFindStandardFormat( cairo_xlib_surface_get_display (mpSurface),
- getXFormat(cairo_surface_get_content(mpSurface)) );
- #endif //USE_CAIRO10_APIS
+ return X11SysData( &rVirDev.GetSystemGfxData() );
}
+ SurfaceSharedPtr createSurface( const OutputDevice& rRefDevice,
+ int x, int y, int width, int height )
+ {
+ if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW )
+ return SurfaceSharedPtr(new X11Surface(getSysData((const Window&)rRefDevice),
+ x,y,width,height));
+ else if( rRefDevice.GetOutDevType() == OUTDEV_VIRDEV )
+ return SurfaceSharedPtr(new X11Surface(getSysData((const VirtualDevice&)rRefDevice),
+ x,y,width,height));
+ else
+ return SurfaceSharedPtr();
+ }
- int Surface::getXFormat(Content aContent)
+ SurfaceSharedPtr createBitmapSurface( const OutputDevice& rRefDevice,
+ const BitmapSystemData& rData,
+ const Size& rSize )
{
- switch(aContent)
+ OSL_TRACE( "requested size: %d x %d available size: %d x %d",
+ rSize.Width(), rSize.Height(), rData.mnWidth, rData.mnHeight );
+ if ( rData.mnWidth == rSize.Width() && rData.mnHeight == rSize.Height() )
{
- case CAIRO_CONTENT_ALPHA: return PictStandardA8; break;
- case CAIRO_CONTENT_COLOR: return PictStandardRGB24; break;
- case CAIRO_CONTENT_COLOR_ALPHA:
- default: return PictStandardARGB32; break;
+ if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW )
+ return SurfaceSharedPtr(new X11Surface(getSysData((const Window&)rRefDevice), rData ));
+ else if( rRefDevice.GetOutDevType() == OUTDEV_VIRDEV )
+ return SurfaceSharedPtr(new X11Surface(getSysData((const VirtualDevice&)rRefDevice), rData ));
}
- }
-
- /** Surface::flush Flush the platform native window
- *
- * @param pSysData Platform native system environment data (struct SystemEnvData in vcl/inc/sysdata.hxx)
- *
- **/
- void Surface::flush(const SystemEnvData* pSysData)
- {
-#ifdef USE_CAIRO10_APIS
- cairoHelperFlush( pSysData );
-#else
- XSync( (Display*) pSysData->pDisplay, false );
-#endif
+ return SurfaceSharedPtr();
}
-
-
-} // namespace cairo
-
-#endif // CAIRO_HAS_XLIB_SURFACE
-
-#endif // defined (UNX) && !defined (QUARTZ)
+}
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 30 May 2008 09:58:24 -0000 1.20
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 2 Jul 2008 14:25:19 -0000 1.21
@@ -842,10 +842,10 @@
diff -u -r1.5 svpgdi.hxx
--- openoffice.org.orig/vcl/unx/headless/svpgdi.hxx 11 Apr 2008 09:29:03 -0000 1.5
+++ openoffice.org/vcl/unx/headless/svpgdi.hxx 30 May 2008 09:30:54 -0000
-@@ -164,6 +164,8 @@
- virtual void invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
-
+@@ -169,6 +169,8 @@
virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+
+ virtual SystemGraphicsData GetGraphicsData() const;
+
+ virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
};
@@ -858,7 +858,7 @@
diff -u -r1.5 svppspgraphics.cxx
--- openoffice.org.orig/vcl/unx/headless/svppspgraphics.cxx 11 Apr 2008 09:30:23 -0000 1.5
+++ openoffice.org/vcl/unx/headless/svppspgraphics.cxx 30 May 2008 09:30:56 -0000
-@@ -1175,32 +1175,6 @@
+@@ -1194,32 +1194,6 @@
aDFA.mePitch = ToFontPitch (rInfo.m_ePitch);
aDFA.mbSymbolFlag = (rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL);
@@ -888,11 +888,11 @@
- break;
- }
-
- // special case for the ghostscript fonts
- if( aDFA.maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
- aDFA.maName = aDFA.maName.Copy( 4 );
-@@ -1386,3 +1360,7 @@
- return bRet && m_bSwallowFaxNo;
+ switch( rInfo.m_eType )
+ {
+ case psp::fonttype::Builtin:
+@@ -1410,3 +1384,7 @@
+ return aRes;
}
+void PspGraphics::GetFontHints( const ImplFontAttributes& , int , ImplFontHints& ) const
@@ -906,10 +906,10 @@
diff -u -r1.5 svppspgraphics.hxx
--- openoffice.org.orig/vcl/unx/headless/svppspgraphics.hxx 11 Apr 2008 09:30:40 -0000 1.5
+++ openoffice.org/vcl/unx/headless/svppspgraphics.hxx 30 May 2008 09:30:56 -0000
-@@ -193,6 +193,7 @@
-
+@@ -197,6 +197,7 @@
virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
+ virtual SystemGraphicsData GetGraphicsData() const;
+ virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
};
@@ -951,7 +951,7 @@
diff -u -r1.29 pspgraphics.cxx
--- openoffice.org.orig/vcl/unx/source/gdi/pspgraphics.cxx 11 Apr 2008 09:53:14 -0000 1.29
+++ openoffice.org/vcl/unx/source/gdi/pspgraphics.cxx 30 May 2008 09:31:10 -0000
-@@ -847,6 +847,10 @@
+@@ -866,6 +866,10 @@
}
}
@@ -962,7 +962,7 @@
void PspGraphics::GetFontMetric( ImplFontMetricData *pMetric )
{
const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
-@@ -1259,32 +1263,6 @@
+@@ -1278,32 +1282,6 @@
aDFA.mePitch = ToFontPitch (rInfo.m_ePitch);
aDFA.mbSymbolFlag = (rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL);
@@ -992,9 +992,9 @@
- break;
- }
-
- // special case for the ghostscript fonts
- if( aDFA.maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
- aDFA.maName = aDFA.maName.Copy( 4 );
+ switch( rInfo.m_eType )
+ {
+ case psp::fonttype::Builtin:
Index: unx/source/gdi/salgdi3.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/salgdi3.cxx,v
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 3 Jun 2008 09:06:07 -0000 1.47
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 2 Jul 2008 14:25:19 -0000 1.48
@@ -215,15 +215,15 @@
diff -u -r1.24 ppdparser.cxx
--- openoffice.org.orig/psprint/source/helper/ppdparser.cxx 25 Jan 2007 11:20:15 -0000 1.24
+++ openoffice.org/psprint/source/helper/ppdparser.cxx 4 Oct 2007 11:25:31 -0000
-@@ -53,6 +53,7 @@
- #include <osl/thread.h>
- #include <rtl/strbuf.hxx>
- #include <rtl/ustrbuf.hxx>
+@@ -49,6 +49,7 @@
+ #include "osl/thread.h"
+ #include "rtl/strbuf.hxx"
+ #include "rtl/ustrbuf.hxx"
+#include <algorithm>
- #define PRINTER_PPDDIR "driver"
-
-@@ -486,6 +487,23 @@
+ using namespace psp;
+ using namespace rtl;
+@@ -662,6 +663,23 @@
delete it->second;
}
@@ -247,7 +247,7 @@
void PPDParser::insertKey( const String& rKey, PPDKey* pKey )
{
m_aKeys[ rKey ] = pKey;
-@@ -1238,6 +1256,7 @@
+@@ -1414,6 +1432,7 @@
m_pDefaultValue( NULL ),
m_bQueryValue( false ),
m_bUIOption( false ),
openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch:
Index: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 14 Feb 2008 11:05:57 -0000 1.4
+++ openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 2 Jul 2008 14:25:19 -0000 1.5
@@ -217,7 +217,7 @@
diff -u -r1.6.84.1 unopkg_app.cxx
--- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_app.cxx 10 Aug 2007 15:03:53 -0000 1.6.84.1
+++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_app.cxx 22 Nov 2007 14:46:24 -0000
-@@ -91,6 +91,9 @@
+@@ -86,6 +86,9 @@
" -V, --version version information\n"
" -v, --verbose verbose output to stdout\n"
" -f, --force force overwriting existing extensions\n"
@@ -227,7 +227,7 @@
" --log-file <file> custom log file; default: <cache-dir>/log.txt\n"
" --shared expert feature: operate on shared installation\n"
" deployment context;\n"
-@@ -108,6 +111,9 @@
+@@ -103,6 +106,9 @@
{ RTL_CONSTASCII_STRINGPARAM("version"), 'V', false },
{ RTL_CONSTASCII_STRINGPARAM("verbose"), 'v', false },
{ RTL_CONSTASCII_STRINGPARAM("force"), 'f', false },
@@ -237,15 +237,15 @@
{ RTL_CONSTASCII_STRINGPARAM("log-file"), '\0', true },
{ RTL_CONSTASCII_STRINGPARAM("shared"), '\0', false },
{ RTL_CONSTASCII_STRINGPARAM("deployment-context"), '\0', true },
-@@ -212,6 +218,7 @@
+@@ -210,6 +216,7 @@
OUString subCommand;
bool option_shared = false;
bool option_force = false;
+ bool option_link = false;
bool option_verbose = false;
+ bool option_bundled = false;
bool subcmd_add = false;
- bool subcmd_gui = false;
-@@ -219,11 +226,13 @@
+@@ -218,11 +225,13 @@
OUString deploymentContext;
OUString cmdArg;
::std::vector<OUString> cmdPackages;
@@ -260,23 +260,14 @@
OptionInfo const * info_verbose = getOptionInfo(
s_option_infos, OUSTR("verbose") );
OptionInfo const * info_log = getOptionInfo(
-@@ -270,6 +279,7 @@
- else if (!readOption( &option_verbose, info_verbose, &nPos ) &&
+@@ -276,6 +285,7 @@
!readOption( &option_shared, info_shared, &nPos ) &&
!readOption( &option_force, info_force, &nPos ) &&
+ !readOption( &option_bundled, info_bundled, &nPos ) &&
+ !readOption( &option_link, info_link, &nPos ) &&
!readArgument( &deploymentContext, info_context, &nPos ) &&
!isBootstrapVariable(&nPos))
{
-@@ -331,7 +341,7 @@
-
- Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv(
- createCmdEnv( xComponentContext, logFile,
-- option_force, option_verbose) );
-+ option_force, option_link, option_verbose) );
-
- if (subcmd_add ||
- subCommand.equalsAsciiL(
Index: source/pkgchk/unopkg/unopkg_cmdenv.cxx
===================================================================
RCS file: /cvs/framework/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx,v
@@ -284,7 +275,7 @@
diff -u -r1.8 unopkg_cmdenv.cxx
--- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx 26 Jun 2007 11:13:26 -0000 1.8
+++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx 22 Nov 2007 14:46:24 -0000
-@@ -49,6 +49,7 @@
+@@ -46,6 +46,7 @@
#include "com/sun/star/task/XInteractionAbort.hpp"
#include "com/sun/star/task/XInteractionApprove.hpp"
#include "com/sun/star/deployment/InstallException.hpp"
@@ -292,43 +283,44 @@
#include "com/sun/star/container/ElementExistException.hpp"
#include "com/sun/star/deployment/LicenseException.hpp"
#include "com/sun/star/deployment/VersionException.hpp"
-@@ -100,6 +101,7 @@
+@@ -98,6 +99,7 @@
{
sal_Int32 m_logLevel;
bool m_option_force_overwrite;
+ bool m_option_link;
bool m_option_verbose;
+ bool m_option_bundled;
Reference< XComponentContext > m_xComponentContext;
- Reference< XProgressHandler > m_xLogFile;
-@@ -113,6 +115,7 @@
+@@ -112,6 +114,7 @@
Reference<XComponentContext> const & xComponentContext,
OUString const & log_file,
bool option_force_overwrite,
+ bool option_link,
- bool option_verbose);
+ bool option_verbose,
+ bool option_bundled);
- // XCommandEnvironment
-@@ -137,9 +140,11 @@
+@@ -137,10 +140,12 @@
Reference<XComponentContext> const & xComponentContext,
OUString const & log_file,
bool option_force_overwrite,
+ bool option_link,
- bool option_verbose)
+ bool option_verbose,
+ bool option_bundled)
: m_logLevel(0),
m_option_force_overwrite( option_force_overwrite ),
+ m_option_link( option_link ),
m_option_verbose( option_verbose ),
+ m_option_bundled( option_bundled),
m_xComponentContext(xComponentContext)
- {
-@@ -268,6 +273,7 @@
+@@ -270,6 +275,7 @@
lang::WrappedTargetException wtExc;
deployment::LicenseException licExc;
deployment::InstallException instExc;
+ deployment::LinkException linkExc;
deployment::LicenseIndividualAgreementException licAgreementExc;
-
- bool bLicenseException = false;
-@@ -313,6 +319,10 @@
+ deployment::PlatformException platExc;
+ deployment::VersionException verExc;
+@@ -318,6 +324,10 @@
bLicenseException = true;
printLicense(licExc.Text, approve, abort);
}
@@ -339,16 +331,17 @@
else if (request >>= instExc)
{
//Only if the unopgk was started with gui + extension then we user is asked.
-@@ -445,10 +455,11 @@
+@@ -457,11 +467,12 @@
Reference< XComponentContext > const & xContext,
OUString const & logFile,
bool option_force_overwrite,
+ bool option_link,
- bool option_verbose)
+ bool option_verbose,
+ bool option_bundled)
{
return new CommandEnvironmentImpl(
-- xContext, logFile, option_force_overwrite, option_verbose);
-+ xContext, logFile, option_force_overwrite, option_link, option_verbose);
+- xContext, logFile, option_force_overwrite, option_verbose, option_bundled);
++ xContext, logFile, option_force_overwrite, option_link, option_verbose, option_bundled);
}
} // unopkg
@@ -359,11 +352,11 @@
diff -u -r1.2.130.1 unopkg_shared.h
--- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_shared.h 10 Aug 2007 15:04:16 -0000 1.2.130.1
+++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_shared.h 22 Nov 2007 14:46:24 -0000
-@@ -145,6 +145,7 @@
+@@ -131,6 +131,7 @@
css::uno::Reference<css::uno::XComponentContext> const & xContext,
::rtl::OUString const & logFile,
bool option_force_overwrite,
+ bool option_link,
- bool option_verbose);
+ bool option_verbose,
+ bool option_bundled);
- //==============================================================================
openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch:
Index: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch 15 Apr 2008 15:58:21 -0000 1.1
+++ openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch 2 Jul 2008 14:25:19 -0000 1.2
@@ -15,15 +15,15 @@
diff -ru vcl/inc/vcl/settings.hxx vcl/inc/vcl/settings.hxx
--- openoffice.org.orig/vcl/inc/vcl/settings.hxx 2008-04-15 08:44:37.000000000 +0100
+++ openoffice.org/vcl/inc/vcl/settings.hxx 2008-04-15 08:47:15.000000000 +0100
-@@ -449,6 +449,7 @@
- ULONG mnSymbolsStyle;
+@@ -432,6 +432,7 @@
ULONG mnPreferredSymbolsStyle;
USHORT mnSkipDisabledInMenus;
+ Wallpaper maWorkspaceGradient;
+ const void* mpFontOptions;
};
- // -----------------
-@@ -746,6 +747,11 @@
+ #define DEFAULT_WORKSPACE_GRADIENT_START_COLOR Color( 0xa3, 0xae, 0xb8 )
+@@ -734,6 +735,11 @@
BOOL GetSkipDisabledInMenus() const
{ return (BOOL) mpData->mnSkipDisabledInMenus; }
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1549
retrieving revision 1.1550
diff -u -r1.1549 -r1.1550
--- openoffice.org.spec 26 Jun 2008 08:02:09 -0000 1.1549
+++ openoffice.org.spec 2 Jul 2008 14:25:19 -0000 1.1550
@@ -1,5 +1,5 @@
%define oootag DEV300
-%define ooomilestone 20
+%define ooomilestone 22
%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
@@ -78,49 +78,48 @@
Patch8: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
Patch9: openoffice.org-2.0.2.rh188467.printingdefaults.patch
Patch10: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch11: pseudoworkspace.valgrind1.patch
-Patch12: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch13: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch14: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch15: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch16: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch17: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch18: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch19: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch20: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch21: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch22: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch23: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-Patch24: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch25: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch26: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch27: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch28: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch29: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch30: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch31: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch32: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch33: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch34: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch35: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch36: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch37: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch38: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-Patch39: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-Patch40: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch41: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch42: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
-Patch43: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
-Patch44: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
-Patch45: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
-Patch46: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
-Patch47: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
-Patch48: openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
-Patch49: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
-Patch50: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
-Patch51: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
-Patch52: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
-Patch53: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
+Patch11: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch12: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch13: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch14: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch15: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch16: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch17: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch18: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch19: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch20: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch21: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
+Patch22: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch23: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch24: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch25: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch26: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch27: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch28: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch29: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch30: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch31: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch32: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch33: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch34: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch35: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch36: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+Patch37: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+Patch38: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch39: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch40: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
+Patch41: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
+Patch42: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
+Patch43: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
+Patch44: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
+Patch45: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
+Patch46: openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
+Patch47: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
+Patch48: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
+Patch49: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
+Patch50: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
+Patch51: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
+Patch52: workspace.cairo06.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -523,7 +522,7 @@
Summary: Arabic language pack for %{name}
Group: Applications/Productivity
Requires: hunspell-ar
-Requires: fonts-arabic
+Requires: dejavu-fonts
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-ar
@@ -547,7 +546,7 @@
Summary: Bengali language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-bengali
+Requires: lohit-fonts-bengali
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org-langpack-bn_IN
Obsoletes: openoffice.org2-langpack-bn
@@ -721,7 +720,7 @@
Summary: Gujarati language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-gujarati
+Requires: lohit-fonts-gujarati
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-gu_IN
@@ -732,7 +731,7 @@
Summary: Punjabi language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-punjabi, hunspell-pa
+Requires: lohit-fonts-punjabi, hunspell-pa
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-pa_IN
@@ -744,7 +743,7 @@
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: hunspell-he
-Requires: fonts-hebrew
+Requires: dejavu-fonts
Obsoletes: openoffice.org-langpack-he
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-he_IL
@@ -756,7 +755,7 @@
Summary: Hindi language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-hindi, hunspell-hi
+Requires: lohit-fonts-hindi, hunspell-hi
Obsoletes: openoffice.org-langpack-hi-IN
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-hi_IN
@@ -803,7 +802,7 @@
Summary: Japanese language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-japanese
+Requires: VLGothic-fonts
Obsoletes: openoffice.org-langpack-ja
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-ja_JP
@@ -815,7 +814,7 @@
Summary: Korean language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-korean
+Requires: baekmuk-ttf-fonts-gulim
Obsoletes: openoffice.org-langpack-ko
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-ko_KR
@@ -1002,7 +1001,7 @@
Summary: Tamil language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-tamil, hunspell-ta
+Requires: lohit-fonts-tamil, hunspell-ta
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-ta_IN
@@ -1013,7 +1012,7 @@
Summary: Thai language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-th
+Requires: thaifonts-scalable, hunspell-th
Obsoletes: openoffice.org-langpack-th
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-th_TH
@@ -1081,7 +1080,7 @@
Summary: Simplified Chinese language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-chinese
+Requires: cjkunifonts-uming
Obsoletes: openoffice.org-langpack-zh-CN
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-zh_CN
@@ -1093,7 +1092,7 @@
Summary: Traditional Chinese language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-chinese
+Requires: cjkunifonts-uming
Obsoletes: openoffice.org-langpack-zh-TW
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-zh_TW
@@ -1117,7 +1116,7 @@
Summary: Assamese language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-bengali
+Requires: lohit-fonts-bengali
Obsoletes: openoffice.org2-langpack-as_IN
%description langpack-as_IN
@@ -1127,7 +1126,7 @@
Summary: Marathi language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-hindi, hunspell-mr
+Requires: lohit-fonts-hindi, hunspell-mr
Obsoletes: openoffice.org2-langpack-mr_IN
%description langpack-mr_IN
@@ -1137,7 +1136,7 @@
Summary: Malayalam language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-malayalam
+Requires: lohit-fonts-malayalam
Requires: hunspell-ml
Obsoletes: openoffice.org2-langpack-ml_IN
@@ -1148,7 +1147,7 @@
Summary: Oriya language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-oriya, hunspell-or
+Requires: lohit-fonts-oriya, hunspell-or
Obsoletes: openoffice.org2-langpack-or_IN
%description langpack-or_IN
@@ -1158,7 +1157,7 @@
Summary: Telugu language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-telugu
+Requires: lohit-fonts-telugu
Obsoletes: openoffice.org2-langpack-te_IN
%description langpack-te_IN
@@ -1168,7 +1167,7 @@
Summary: Urdu language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-arabic
+Requires: paktype-fonts
Obsoletes: openoffice.org2-langpack-ur
%description langpack-ur
@@ -1178,7 +1177,7 @@
Summary: Kannada language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-kannada
+Requires: lohit-fonts-kannada
Obsoletes: openoffice.org2-langpack-kn_IN
%description langpack-kn_IN
@@ -1224,49 +1223,48 @@
%patch8 -p1 -b .ooo58606.sw.pre-edit.patch
%patch9 -p1
%patch10 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch11 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch12 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch13 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch14 -p1 -b .ooo65491.psprint.enablenups.patch
-cat %{PATCH15} >> svtools/source/dialogs/localize.sdf
-%patch16 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch17 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch18 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch19 -p0 -b .ooo68717.gstreamer.video.patch
-%patch20 -p1 -b .ooo63159.sal.dtype.patch
-%patch21 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch22 -p1 -b .ooo80816.selinux.bridges.patch
-%patch23 -p1 -b .ooo7065.sw.titlepagedialog.patch
-%patch24 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH25}
-%patch26 -p1 -b .ooo76649.httpencoding.patch
-%patch27 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch28 -p1
-%patch29 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch30 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch31 -p1 -b .ooo85448.emptyrpath.patch
-%patch32 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch33 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch34 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch35 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch36 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch37 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch38 -p1 -b .ooo6087.sc.sheetnames.patch
-%patch39 -p1 -b .ooo89002.vcl.symbolfonts.patch
-%patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch41 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch42 -p1 -b .ooo90055.swext.allowadmin.patch
-%patch43 -p1 -b .oooXXXXX.odk.3layer.patch
-%patch44 -p1 -b .ooo90037.vcl.cairotransforms.patch
-%patch45 -p1 -b .ooo90178.tools.fixmacro.patch
-%patch46 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
-%patch47 -p1 -b .ooo82545.np_sdk.x86_64.patch
-%patch48 -p1 -b .ooo90612.sd.insertpasswordedfile.patch
-%patch49 -p1 -b .ooo90306.sw.wrongprotection.patch
-%patch50 -p1 -b .ooo48400.svx.fixspelling.patch
-%patch51 -p1 -b .ooo90697.sd.a11ycrash.patch
-%patch52 -p1 -b .ooo90876.connectivity.evoab2.patch
-%patch53 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch
+%patch11 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch12 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch13 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH14} >> svtools/source/dialogs/localize.sdf
+%patch15 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch16 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch17 -p0 -b .ooo68717.gstreamer.video.patch
+%patch18 -p1 -b .ooo63159.sal.dtype.patch
+%patch19 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch20 -p1 -b .ooo80816.selinux.bridges.patch
+%patch21 -p1 -b .ooo7065.sw.titlepagedialog.patch
+%patch22 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH23}
+%patch24 -p1 -b .ooo76649.httpencoding.patch
+%patch25 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch26 -p1
+%patch27 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch28 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch29 -p1 -b .ooo85448.emptyrpath.patch
+%patch30 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch31 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch32 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch33 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch34 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch35 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch36 -p1 -b .ooo6087.sc.sheetnames.patch
+%patch37 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch38 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch39 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch40 -p1 -b .ooo90055.swext.allowadmin.patch
+%patch41 -p1 -b .oooXXXXX.odk.3layer.patch
+%patch42 -p1 -b .ooo90037.vcl.cairotransforms.patch
+%patch43 -p1 -b .ooo90178.tools.fixmacro.patch
+%patch44 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
+%patch45 -p1 -b .ooo82545.np_sdk.x86_64.patch
+%patch46 -p1 -b .ooo90612.sd.insertpasswordedfile.patch
+%patch47 -p1 -b .ooo90306.sw.wrongprotection.patch
+%patch48 -p1 -b .ooo48400.svx.fixspelling.patch
+%patch49 -p1 -b .ooo90697.sd.a11ycrash.patch
+%patch50 -p1 -b .ooo90876.connectivity.evoab2.patch
+%patch51 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch
+%patch52 -p1 -b .workspace.cairo06.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3480,6 +3478,13 @@
%{python_py_sitearch}/unohelper.py*
%changelog
+* Tue Jul 01 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.22-1
+- next version
+- drop integrated pseudoworkspace.valgrind1.patch
+- drop integrated openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+- add workspace.cairo06.patch
+- Resolves: rhbz#453487 some font packages now gone
+
* Thu Jun 26 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.20-1
- next version
- Resolves: rhbz#450661 openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
--- openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch DELETED ---
--- pseudoworkspace.valgrind1.patch DELETED ---
More information about the fedora-extras-commits
mailing list