[fontmatrix] Fix FTBFS on ARM.

Jon Ciesla limb at fedoraproject.org
Thu Sep 20 12:37:01 UTC 2012


commit 77d22172038a8a9d005bace8418b8a235286affa
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Sep 20 07:36:44 2012 -0500

    Fix FTBFS on ARM.

 fontmatrix-0.9.99-arm.patch |   11 +++++++++++
 fontmatrix.spec             |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/fontmatrix-0.9.99-arm.patch b/fontmatrix-0.9.99-arm.patch
new file mode 100644
index 0000000..68a1ff1
--- /dev/null
+++ b/fontmatrix-0.9.99-arm.patch
@@ -0,0 +1,11 @@
+--- src/fminfodisplay.cpp.orig	2011-10-03 01:02:54.000000000 -0500
++++ src/fminfodisplay.cpp	2012-09-19 10:12:48.887735375 -0500
+@@ -151,7 +151,7 @@
+ 				GlyphToSVGHelper gtsh ( gpi->path(), tf );
+ 				svg += gtsh.getSVGPath() + "\n";
+ 				horOffset += gpi->data(GLYPH_DATA_HADVANCE).toDouble() * scaleFactor;
+-				maxHeight = qMax ( gtsh.getRect().height(), maxHeight );
++				maxHeight = qMax ( (double) gtsh.getRect().height(), maxHeight );
+ 				tf.translate( gpi->data(GLYPH_DATA_HADVANCE).toDouble()  * scaleFactor,0 );
+ 				delete gpi;
+ 			}
diff --git a/fontmatrix.spec b/fontmatrix.spec
index 05bf4fa..f4bce0d 100644
--- a/fontmatrix.spec
+++ b/fontmatrix.spec
@@ -3,7 +3,7 @@
 Name: fontmatrix
 Summary: A fonts manager
 Version: 0.9.99
-Release: 6.r%{svnrev}%{?dist}
+Release: 7.r%{svnrev}%{?dist}
 License: GPLv2+
 Group: User Interface/X
 ##### svn checkout HOWTO #####
@@ -19,6 +19,7 @@ Group: User Interface/X
 ## 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: fontmatrix-0.9.99-arm.patch
 BuildRequires: qt-devel freetype-devel qt-webkit-devel
 BuildRequires: desktop-file-utils cmake python-devel
 BuildRequires: openssl-devel podofo-devel libicu-devel
@@ -31,6 +32,7 @@ A powerful and well designed fonts manager
 %prep
 %setup -q -n  %{name}-%{version}-Source
 %patch0 -p0
+%patch1 -p0
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -76,6 +78,9 @@ fi
 
 
 %changelog
+* Wed Sep 19 2012 Jon Ciesla <limburgher at gmail.com> - 0.9.99-7.r1218
+- Fix FTBFS on ARM.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.99-6.r1218
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the fonts-bugs mailing list