rpms/fontmatrix/F-13 bug_604793_ms-symbol.patch, NONE, 1.1 fontmatrix.spec, 1.23, 1.24

[pnemade]

Author: pnemade

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

Modified Files:
	fontmatrix.spec 
Added Files:
	bug_604793_ms-symbol.patch 
Log Message:
* Jun 18 2010 Parag <pnemade AT redhat.com> - 0.6.99-6.r1073
- Resolves:rh#604793:-[PATCH] Correct Font Information for MS Symbol encoding


bug_604793_ms-symbol.patch:
 fontitem.cpp |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE bug_604793_ms-symbol.patch ---
--- src/fontitem.cpp.orig	2009-12-06 12:35:39.000000000 +0000
+++ src/fontitem.cpp	2009-12-06 13:14:51.000000000 +0000
@@ -2667,9 +2667,11 @@
 			QTextCodec *codec = QTextCodec::codecForName ( "UTF-16BE" );
 			avalue = codec->toUnicode ( array );
 		}
-		else if ( tname.platform_id ==TT_PLATFORM_MICROSOFT && tname.encoding_id == TT_MS_ID_SYMBOL_CS ) // Corresponds to Microsoft symbol encoding. PM - don(t understand what it does here? seen in StandardSym.ttf
+		else if ( tname.platform_id ==TT_PLATFORM_MICROSOFT && tname.encoding_id == TT_MS_ID_SYMBOL_CS ) // Corresponds to Microsoft symbol encoding. 
 		{
-			avalue = "Here, imagine some nice symbols!";
+			QByteArray array ( ( const char* ) tname.string, tname.string_len );
+			QTextCodec *codec = QTextCodec::codecForName ( "UTF-16BE" );
+			avalue = codec->toUnicode ( array );
 		}
 		else if ( tname.platform_id == TT_PLATFORM_MACINTOSH  && tname.encoding_id == TT_APPLE_ID_DEFAULT ) // Unicode version 1.0
 		{


Index: fontmatrix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontmatrix/F-13/fontmatrix.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- fontmatrix.spec	19 Feb 2010 05:45:43 -0000	1.23
+++ fontmatrix.spec	18 Jun 2010 06:41:27 -0000	1.24
@@ -3,7 +3,7 @@
 Name: fontmatrix
 Summary: A fonts manager
 Version: 0.6.99
-Release: 5.r%{svnrev}%{?dist}
+Release: 6.r%{svnrev}%{?dist}
 License: GPLv2+
 Group: User Interface/X
 ##### svn checkout HOWTO #####
@@ -16,6 +16,9 @@ URL: http://www.fontmatrix.net/
 ## Official stable releases can be downloaded from http://www.fontmatrix.net/archives/
 Source0: %{name}-%{version}-Source.tar.gz
 Patch0: bug_564904_fix-missing-DSO-icuuc.patch 
+Patch1: bug_561044_532882_remove-broken-fontmatrix-shaper.patch
+Patch2: bug_604793_ms-symbol.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: qt-devel freetype-devel 
 BuildRequires: desktop-file-utils cmake python-devel
@@ -29,6 +32,8 @@ A powerful and well designed fonts manag
 %prep
 %setup -q -n  %{name}-%{version}-Source
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -80,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 18 2010 Parag <pnemade AT redhat.com> - 0.6.99-6.r1073
+- Resolves:rh#604793:-[PATCH] Correct Font Information for MS Symbol encoding
+
 * Tue Feb 18 2010 Parag <pnemade AT redhat.com> - 0.6.99-5.r1073
 - Attempt to fix broken shaper is not working
 - Revert back changes from previous patch.