[libprojectM/f14/master] Fixed font patch (#698381).

Jameson Pugh imntreal at fedoraproject.org
Mon Apr 25 14:55:17 UTC 2011


commit 3605bb2c20e8ba5dd29c00c514eac8890a3b2aea
Author: imntreal <imntreal at gmail.com>
Date:   Mon Apr 25 10:55:05 2011 -0400

    Fixed font patch (#698381).

 libprojectM-fonts.patch |    8 ++++----
 libprojectM.spec        |    5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/libprojectM-fonts.patch b/libprojectM-fonts.patch
index f9482ad..09d5000 100644
--- a/libprojectM-fonts.patch
+++ b/libprojectM-fonts.patch
@@ -19,8 +19,8 @@ diff -rupN libprojectM-2.0.1.old/config.inp.in libprojectM-2.0.1/config.inp.in
  Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location
 -Title Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/Vera.ttf
 -Menu Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/VeraMono.ttf
-+Title Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/Vera.ttf
-+Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/VeraMono.ttf
++Title Font = @CMAKE_INSTALL_PREFIX@/share/fonts/dejavu/DejaVuSans.ttf
++Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/dejavu/DejaVuSansMono.ttf
   
 diff -rupN libprojectM-2.0.1.old/projectM.cpp libprojectM-2.0.1/projectM.cpp
 --- libprojectM-2.0.1.old/projectM.cpp	2009-12-05 20:42:51.000000000 -0500
@@ -30,10 +30,10 @@ diff -rupN libprojectM-2.0.1.old/projectM.cpp libprojectM-2.0.1/projectM.cpp
      #ifdef LINUX
      _settings.titleFontURL = config.read<string>
 -    ( "Title Font", CMAKE_INSTALL_PREFIX  "/share/projectM/fonts/Vera.ttf" );
-+    ( "Title Font", CMAKE_INSTALL_PREFIX  "/share/fonts/bitstream-vera/Vera.ttf" );
++    ( "Title Font", CMAKE_INSTALL_PREFIX  "/share/fonts/dejavu/DejaVuSans.ttf" );
      _settings.menuFontURL = config.read<string>
 -    ( "Menu Font", CMAKE_INSTALL_PREFIX  "/share/projectM/fonts/VeraMono.ttf" );
-+    ( "Menu Font", CMAKE_INSTALL_PREFIX  "/share/fonts/bitstream-vera/VeraMono.ttf" );
++    ( "Menu Font", CMAKE_INSTALL_PREFIX  "/share/fonts/dejavu/DejaVuSansMono.ttf" );
      #endif
  
      #ifdef WIN32
diff --git a/libprojectM.spec b/libprojectM.spec
index 3a85cb0..3ffa59d 100644
--- a/libprojectM.spec
+++ b/libprojectM.spec
@@ -1,6 +1,6 @@
 Name:		libprojectM
 Version:	2.0.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	The libraries for the projectM music visualization plugin
 Group:		Applications/Multimedia
 License:	LGPLv2+
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Apr 25 2011 Jameson Pugh <imntreal at gmail.com> - 2.0.1-10
+- Fixed fonts patch
+
 * Wed Mar 23 2011 Jameson Pugh <imntreal at gmail.com> - 2.0.1-9
 - Correct typo in requirements
 


More information about the scm-commits mailing list