rpms/openoffice.org/devel openoffice.org.spec, 1.1411, 1.1412 workspace.cairotext01.patch, 1.1, 1.2 openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch, 1.1, NONE openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch, 1.13, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Fri Feb 1 08:58:23 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29866
Modified Files:
openoffice.org.spec workspace.cairotext01.patch
Removed Files:
openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch
openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
Log Message:
remove openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch now that gcc 4.3.0 is available
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1411
retrieving revision 1.1412
diff -u -r1.1411 -r1.1412
--- openoffice.org.spec 29 Jan 2008 11:59:58 -0000 1.1411
+++ openoffice.org.spec 1 Feb 2008 08:57:45 -0000 1.1412
@@ -91,54 +91,52 @@
Patch17: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
Patch18: openoffice.org-2.0.2.rh188467.printingdefaults.patch
Patch19: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch20: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch21: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch22: pseudoworkspace.valgrind1.patch
-Patch23: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch24: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch25: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch26: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch27: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch28: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
-Patch29: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch30: workspace.tl37.patch
-Patch31: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch32: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch33: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch34: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch35: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch36: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch37: openoffice.org-2.2.0.rh232389.tango.patch
-Patch38: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch39: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch40: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch41: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch42: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch43: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch44: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch45: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch46: workspace.unifysound01.patch
-Patch47: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch48: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
-Patch49: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch50: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
-Patch51: openoffice.org-2.3.1.ooo81307.sw.word2.patch
-Patch52: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch53: workspace.notes2.patch
-Patch54: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch55: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch56: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
-Patch57: openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch
-Patch58: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
-Patch59: openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch
-Patch60: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch61: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch62: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch63: openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch
-Patch64: openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch
-Patch65: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch66: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch67: workspace.cairotext01.patch
+Patch20: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch21: pseudoworkspace.valgrind1.patch
+Patch22: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch23: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch24: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch25: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch26: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch27: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
+Patch28: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch29: workspace.tl37.patch
+Patch30: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch31: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch32: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch33: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch34: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch35: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch36: openoffice.org-2.2.0.rh232389.tango.patch
+Patch37: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch38: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch39: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch40: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch41: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch42: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch43: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch44: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch45: workspace.unifysound01.patch
+Patch46: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch47: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
+Patch48: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch49: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
+Patch50: openoffice.org-2.3.1.ooo81307.sw.word2.patch
+Patch51: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch52: workspace.notes2.patch
+Patch53: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch54: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch55: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
+Patch56: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
+Patch57: openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch
+Patch58: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch59: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch60: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch61: openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch
+Patch62: openoffice.org-2.4.0.ooo85321.vcl.pixmapleak.patch
+Patch63: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch64: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch65: workspace.cairotext01.patch
%define instdir %{_libdir}/openoffice.org
@@ -1044,54 +1042,52 @@
%patch17 -p1 -b .ooo58606.sw.pre-edit.patch
%patch18 -p1
%patch19 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch20 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch21 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch22 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch23 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch24 -p1 -b .rh217065.syncbackspace.patch
-%patch25 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch26 -p1 -b .ooo65491.psprint.enablenups.patch
-cat %{PATCH27} >> svtools/source/dialogs/localize.sdf
-%patch28 -p1 -b .oooXXXXX.lingucomponent.systemdicts.patch
-%patch29 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch30 -p1 -b .tl37.patch
-%patch31 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch32 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch33 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch34 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch35 -p0 -b .ooo68717.gstreamer.video.patch
-%patch36 -p1 -b .ooo63159.sal.dtype.patch
-%patch37 -p1 -b .rh232389.tango.patch
-%patch38 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch39 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%patch40 -p1 -b .ooo80816.selinux.bridges.patch
-%patch41 -p1 -b .ooo78971.xmloff.outofrange.patch
-%patch42 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch43 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch44 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH45}
-%patch46 -p1 -b .workspace.unifysound01.patch
-%patch47 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch48 -p1 -b .ooo81321.cppu.silencewarnings.patch
-%patch49 -p1 -b .ooo76649.httpencoding.patc
-%patch50 -p1 -b .ooo82966.svx.missing3d.patch
-%patch51 -p1 -b .ooo81307.sw.word2.patch
-%patch52 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch53 -p1 -b .workspace.notes2.patch
-%patch54 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch55 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch56 -p1 -b .ooo84770.svx.eventsmismatch.patch
-%patch57 -p1 -b .ooo84684.vcl.fixfontconfig.patch
-%patch58 -p1 -b .ooo85054.stlport.noorigs.patch
-%patch59 -p1 -b .oooXXXXX.config_office.xpcomasxul.patch
-%patch60 -p1 -b .ooo85097.desktop.pagein.patch
-%patch61 -p1
-%patch62 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch63 -p1 -b .ooo85385.svtools.a11ycrash.patch
-%patch64 -p1 -b .ooo85321.vcl.pixmapleak.patch
-%patch65 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch66 -p1 -b .ooo85448.emptyrpath.patch
-%patch67 -p1 -b .workspace.cairotext01.patch
+%patch20 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch21 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch22 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch23 -p1 -b .rh217065.syncbackspace.patch
+%patch24 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch25 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH26} >> svtools/source/dialogs/localize.sdf
+%patch27 -p1 -b .oooXXXXX.lingucomponent.systemdicts.patch
+%patch28 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch29 -p1 -b .tl37.patch
+%patch30 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch31 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch32 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch33 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch34 -p0 -b .ooo68717.gstreamer.video.patch
+%patch35 -p1 -b .ooo63159.sal.dtype.patch
+%patch36 -p1 -b .rh232389.tango.patch
+%patch37 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch38 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch39 -p1 -b .ooo80816.selinux.bridges.patch
+%patch40 -p1 -b .ooo78971.xmloff.outofrange.patch
+%patch41 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch42 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch43 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH44}
+%patch45 -p1 -b .workspace.unifysound01.patch
+%patch46 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch47 -p1 -b .ooo81321.cppu.silencewarnings.patch
+%patch48 -p1 -b .ooo76649.httpencoding.patc
+%patch40 -p1 -b .ooo82966.svx.missing3d.patch
+%patch50 -p1 -b .ooo81307.sw.word2.patch
+%patch51 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch52 -p1 -b .workspace.notes2.patch
+%patch53 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch54 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch55 -p1 -b .ooo84770.svx.eventsmismatch.patch
+%patch56 -p1 -b .ooo85054.stlport.noorigs.patch
+%patch57 -p1 -b .oooXXXXX.config_office.xpcomasxul.patch
+%patch58 -p1 -b .ooo85097.desktop.pagein.patch
+%patch59 -p1
+%patch60 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch61 -p1 -b .ooo85385.svtools.a11ycrash.patch
+%patch62 -p1 -b .ooo85321.vcl.pixmapleak.patch
+%patch63 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch64 -p1 -b .ooo85448.emptyrpath.patch
+%patch65 -p1 -b .workspace.cairotext01.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2858,9 +2854,12 @@
%changelog
-* Tue Jan 29 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-5.2
+* Fri Feb 01 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-5.2
- Resolves: rhbz#422661 support n-up printing of rotated landscape
slides in a human-expectation direction
+- drop integrated openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch
+- drop openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+ now that we have gcc 4.3.0
* Mon Jan 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-5.1
- next milestone
workspace.cairotext01.patch:
Index: workspace.cairotext01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cairotext01.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.cairotext01.patch 28 Jan 2008 09:33:20 -0000 1.1
+++ workspace.cairotext01.patch 1 Feb 2008 08:57:46 -0000 1.2
@@ -80,9 +80,9 @@
void freeResources();
public:
Index: gsl/vcl/unx/source/gdi/salgdi3.cxx
-diff -u gsl/vcl/unx/source/gdi/salgdi3.cxx:1.149 gsl/vcl/unx/source/gdi/salgdi3.cxx:1.149.66.3
+diff -u gsl/vcl/unx/source/gdi/salgdi3.cxx:1.149 gsl/vcl/unx/source/gdi/salgdi3.cxx:1.149.66.4
--- gsl/vcl/unx/source/gdi/salgdi3.cxx:1.149 Wed Dec 12 05:21:50 2007
-+++ gsl/vcl/unx/source/gdi/salgdi3.cxx Mon Jan 28 00:53:49 2008
++++ gsl/vcl/unx/source/gdi/salgdi3.cxx Wed Jan 30 01:08:40 2008
@@ -123,6 +123,32 @@
#include <hash_set>
@@ -116,7 +116,7 @@
using namespace rtl;
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-@@ -734,6 +760,282 @@
+@@ -734,6 +760,288 @@
}
//--------------------------------------------------------------------------
@@ -125,8 +125,8 @@
+class CairoWrapper
+{
+private:
-+ bool mbIsValid;
-+
++ oslModule mpCairoLib;
++
+ cairo_surface_t* (*mp_xlib_surface_create)(Display *, Drawable , Visual *, int , int );
+ void (*mp_surface_destroy)(cairo_surface_t *);
+ cairo_t* (*mp_create)(cairo_surface_t *);
@@ -148,7 +148,7 @@
+ CairoWrapper();
+public:
+ static CairoWrapper& get();
-+ bool isValid() const { return mbIsValid; }
++ bool isValid() const { return (mpCairoLib != NULL); }
+ bool isCairoRenderable(const ServerFont& rFont);
+
+ cairo_surface_t* xlib_surface_create(Display *pDisplay, Drawable drawable, Visual *pVisual, int width, int height)
@@ -188,45 +188,50 @@
+ return *pCairoInstance;
+}
+
-+CairoWrapper::CairoWrapper() : mbIsValid(false)
++CairoWrapper::CairoWrapper()
++: mpCairoLib( NULL )
+{
+ static const char* pDisableCairoText = getenv( "SAL_DISABLE_CAIROTEXT" );
+ if( pDisableCairoText && (pDisableCairoText[0] == '1') )
+ return;
+
++ OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( "libcairo.so.2" ));
++ mpCairoLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT );
++ if( !mpCairoLib )
++ return;
++
+ mp_xlib_surface_create = (cairo_surface_t* (*)(Display *, Drawable , Visual *, int , int ))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_xlib_surface_create" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_xlib_surface_create" );
+ mp_surface_destroy = (void(*)(cairo_surface_t*))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_surface_destroy" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_surface_destroy" );
+ mp_create = (cairo_t*(*)(cairo_surface_t*))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_create" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_create" );
+ mp_destroy = (void(*)(cairo_t*))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_destroy" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_destroy" );
+ mp_clip = (void(*)(cairo_t*))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_clip" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_clip" );
+ mp_rectangle = (void(*)(cairo_t*, double, double, double, double))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_rectangle" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_rectangle" );
+ mp_ft_font_face_create_for_ft_face = (cairo_font_face_t * (*)(FT_Face, int))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_ft_font_face_create_for_ft_face" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_ft_font_face_create_for_ft_face" );
+ mp_set_font_face = (void (*)(cairo_t *, cairo_font_face_t *))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_set_font_face" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_set_font_face" );
+ mp_font_face_destroy = (void (*)(cairo_font_face_t *))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_font_face_destroy" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_font_face_destroy" );
+ mp_matrix_init_identity = (void (*)(cairo_matrix_t *))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_matrix_init_identity" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_matrix_init_identity" );
+ mp_matrix_scale = (void (*)(cairo_matrix_t *, double, double))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_matrix_scale" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_matrix_scale" );
+ mp_matrix_rotate = (void (*)(cairo_matrix_t *, double))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_matrix_rotate" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_matrix_rotate" );
+ mp_set_font_matrix = (void (*)(cairo_t *, const cairo_matrix_t *))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_set_font_matrix" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_set_font_matrix" );
+ mp_show_glyphs = (void (*)(cairo_t *, const cairo_glyph_t *, int ))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_show_glyphs" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_show_glyphs" );
+ mp_set_source_rgb = (void (*)(cairo_t *, double , double , double ))
-+ osl_getAsciiFunctionSymbol(NULL, "cairo_set_source_rgb" );
++ osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_set_source_rgb" );
+
-+ mbIsValid =
-+ (
++ if( !(
+ mp_xlib_surface_create &&
+ mp_surface_destroy &&
+ mp_create &&
@@ -242,9 +247,10 @@
+ mp_set_font_matrix &&
+ mp_show_glyphs &&
+ mp_set_source_rgb
-+ );
-+ if (!mbIsValid)
++ ) )
+ {
++ osl_unloadModule( mpCairoLib );
++ mpCairoLib = NULL;
+#if OSL_DEBUG_LEVEL > 1
+ fprintf( stderr, "not all needed symbols were found\n" );
+#endif
@@ -399,7 +405,7 @@
void X11SalGraphics::DrawServerAAFontString( const ServerFontLayout& rLayout )
{
-@@ -1111,15 +1413,20 @@
+@@ -1111,15 +1419,20 @@
// draw complex text
ServerFont& rFont = rLayout.GetServerFont();
--- openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch DELETED ---
--- openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch DELETED ---
More information about the fedora-extras-commits
mailing list