rpms/openoffice.org/devel openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch, NONE, 1.1 openoffice.org.spec, 1.2251, 1.2252

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4209/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch 
Log Message:
Resolves: rhbz#606021 openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch

openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch:
 gcach_ftyp.cxx |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch ---
diff -ru vcl.orig/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
--- vcl.orig/source/glyphs/gcach_ftyp.cxx	2010-06-21 09:44:48.000000000 +0100
+++ vcl/source/glyphs/gcach_ftyp.cxx	2010-06-21 10:45:25.000000000 +0100
@@ -892,6 +909,9 @@
        }
     }
 #endif
+
+    if( mnPrioEmbedded <= 0 )
+        mnLoadFlags |= FT_LOAD_NO_BITMAP;
 }
 
 // -----------------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2251
retrieving revision 1.2252
diff -u -p -r1.2251 -r1.2252
--- openoffice.org.spec	21 Jun 2010 08:42:17 -0000	1.2251
+++ openoffice.org.spec	21 Jun 2010 09:59:38 -0000	1.2252
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 19
-%define rh_rpm_release 16
+%define rh_rpm_release 17
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -153,6 +153,7 @@ Patch82: openoffice.org-3.3.0.ooo112384.
 Patch83: workspace.gtkfpicker9.patch
 Patch84: workspace.gtk3.patch
 Patch85: openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch
+Patch86: openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1719,6 +1720,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch83 -p0 -b .workspace.gtkfpicker9.patch
 %patch84 -p0 -b .workspace.gtk3.patch
 %patch85 -p0 -b .ooo112516.sw.avoid.divbyzero.patch
+%patch86 -p0 -b .ooo112567.vcl.embeddedbitmaps.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4212,6 +4214,9 @@ fi
 %endif
 
 %changelog
+* Mon Jun 21 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.17
+- Resolves: rhbz#606021 openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch
+
 * Mon Jun 21 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.16
 - Build against gtk3