rpms/openoffice.org/devel workspace.vcl111.patch, NONE, 1.1 openoffice.org.spec, 1.2200, 1.2201

[David Tardon]

Author: dtardon

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl111.patch 
Log Message:
Resolves: rhbz#578082 [or_IN, pa_IN][openoffice.org] - Default font not taking lohit-*

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	Wed Apr 14 10:05:00 2010 +0200
+++ b/vcl/util/makefile.mk	Wed Apr 14 10:10:08 2010 +0200
@@ -299,6 +299,7 @@
 SHL2STDLIBS=\
 			$(VCLLIB)\
             $(I18NPAPERLIB)     \
+            $(I18NISOLANGLIB)     \
             $(TOOLSLIB)         \
             $(VOSLIB)           \
             $(BASEGFXLIB)	\


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2200
retrieving revision 1.2201
diff -u -p -r1.2200 -r1.2201
--- openoffice.org.spec	27 Apr 2010 11:59:18 -0000	1.2200
+++ openoffice.org.spec	27 Apr 2010 12:27:54 -0000	1.2201
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 16
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -132,6 +132,8 @@ Patch61: workspace.odfmetadata4.patch
 Patch62: workspace.tl80.patch
 Patch63: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
 Patch64: openoffice.org-3.3.0.ooo111152.i18npool.viramacursor.patch
+Patch65: 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}
@@ -1677,6 +1679,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch62 -p1 -b .workspace.tl80.patch
 %patch63 -p0 -b .ooo110142.svx.safercolornames.patch
 %patch64 -p1 -b .ooo111152.i18npool.viramacursor.patch
+%patch65 -p1 -b .workspace.vcl111.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4160,6 +4163,10 @@ fi
 %endif
 
 %changelog
+* Tue Apr 27 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-16.2
+- Resolves: rhbz#578082 [or_IN, pa_IN][openoffice.org] - Default font
+  not taking lohit-* (dtardon)
+
 * Tue Apr 27 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-16.1
 - latest version
 - drop integrated workspace.fwk140.patch