rpms/openoffice.org/F-13 workspace.vcl111.patch, NONE, 1.1 openoffice.org.spec, 1.2183, 1.2184

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32568

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl111.patch 
Log Message:
Resolves: rhbz#589889 don't require exact zh fonts

workspace.vcl111.patch:
 source/gdi/outdev3.cxx     |    1 +
 unx/source/gdi/salgdi3.cxx |    2 +-
 util/makefile.mk           |    1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE workspace.vcl111.patch ---
# HG changeset patch
# Parent 2042f9e3d9493aeef14b1c6ee7f5023b6957e72e
#i110722# use language in glyph fallback lookup through fontconfig

diff -r 2042f9e3d949 vcl/source/gdi/outdev3.cxx
--- a/vcl/source/gdi/outdev3.cxx	Wed Apr 14 10:05:00 2010 +0200
+++ b/vcl/source/gdi/outdev3.cxx	Wed Apr 14 10:10:08 2010 +0200
@@ -579,6 +579,7 @@
     {
         aFont.SetHeight( nDefaultHeight );
         aFont.SetWeight( WEIGHT_NORMAL );
+        aFont.SetLanguage( eLang );
 
 		if ( aFont.GetCharSet() == RTL_TEXTENCODING_DONTKNOW )
             aFont.SetCharSet( gsl_getSystemTextEncoding() );
diff -r 2042f9e3d949 vcl/unx/source/gdi/salgdi3.cxx
--- a/vcl/unx/source/gdi/salgdi3.cxx	Wed Apr 14 10:05:00 2010 +0200
+++ b/vcl/unx/source/gdi/salgdi3.cxx	Wed Apr 14 10:10:08 2010 +0200
@@ -2025,7 +2025,7 @@
 {
     ImplFontSelectData aRet(rFontSelData);
 
-    const rtl::OString aLangAttrib; //TODO: = MsLangId::convertLanguageToIsoByteString( rFontSelData.meLanguage );
+    const rtl::OString aLangAttrib = MsLangId::convertLanguageToIsoByteString( rFontSelData.meLanguage );
 
     psp::italic::type eItalic = psp::italic::Unknown;
     if( rFontSelData.GetSlant() != ITALIC_DONTKNOW )
diff -r 2042f9e3d949 vcl/util/makefile.mk
--- a/vcl/util/makefile.mk	2010-04-27 20:18:37.000000000 +0100
+++ b/vcl/util/makefile.mk	2010-04-27 20:19:25.000000000 +0100
@@ -300,6 +300,7 @@
 			$(VCLLIB)\
             $(I18NUTILLIB)      \
             $(I18NPAPERLIB)     \
+            $(I18NISOLANGLIB)     \
             $(TOOLSLIB)         \
             $(VOSLIB)           \
             $(BASEGFXLIB)	\


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-13/openoffice.org.spec,v
retrieving revision 1.2183
retrieving revision 1.2184
diff -u -p -r1.2183 -r1.2184
--- openoffice.org.spec	7 May 2010 11:00:41 -0000	1.2183
+++ openoffice.org.spec	7 May 2010 12:55:06 -0000	1.2184
@@ -146,6 +146,7 @@ Patch75: openoffice.org-3.2.0.ooo101131.
 Patch76: openoffice.org-3.3.0.ooo93818.sw.postitprint.patch
 Patch77: openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch
 Patch78: openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch
+Patch79: workspace.vcl111.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1251,8 +1252,7 @@ Provides additional Xhosa translations a
 Summary: Simplified Chinese language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: autocorr-zh
-Requires: cjkuni-uming-fonts
+Requires: font(:lang=zh-cn), autocorr-zh
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-zh-CN < 1:2.0.3
 Obsoletes: openoffice.org2-langpack-zh_CN < 1:3.0.0
@@ -1265,8 +1265,7 @@ OpenOffice.org.
 Summary: Traditional Chinese language pack for OpenOffice.org
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: autocorr-zh
-Requires: cjkuni-uming-fonts
+Requires: font(:lang=zh-tw), autocorr-zh
 Obsoletes: openoffice.org-i18n < 1.9.0
 Obsoletes: openoffice.org-langpack-zh-TW < 1:2.0.3
 Obsoletes: openoffice.org2-langpack-zh_TW < 1:3.0.0
@@ -1724,6 +1723,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch76 -p1 -b .ooo93818.sw.postitprint.patch
 %patch77 -p1 -b .ooo111286.sw.ignore-null-hint.patch
 %patch78 -p0 -b .ooo111446.writerfilter.avoidcrash.patch
+%patch79 -p1 -b .workspace.vcl111.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4211,6 +4211,7 @@ fi
 %changelog
 * Fri May 07 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.21
 - Resolves: rhbz#589861 [abrt] crash in DomainMapper_Impl::finishParagraph
+- Resolves: rhbz#589889 don't require exact zh fonts
 
 * Thu May 06 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.20
 - Related: rhbz#587419 copy attributes correctly (dtardon)