From b8229f7086523d06c5485520a5383947aea949e1 Mon Sep 17 00:00:00 2001 From: Jameson Pugh Date: Jul 17 2010 22:11:20 +0000 Subject: Updated fonts patch --- diff --git a/import.log b/import.log index 63e6e7a..91478ce 100644 --- a/import.log +++ b/import.log @@ -10,3 +10,4 @@ libprojectM-2_0_1-3_fc12:HEAD:libprojectM-2.0.1-3.fc12.src.rpm:1265639585 libprojectM-2_0_1-4_fc12:HEAD:libprojectM-2.0.1-4.fc12.src.rpm:1270914969 libprojectM-2_0_1-5_fc12:HEAD:libprojectM-2.0.1-5.fc12.src.rpm:1274545391 libprojectM-2_0_1-6_fc13:HEAD:libprojectM-2.0.1-6.fc13.src.rpm:1278798346 +libprojectM-2_0_1-7_fc13:HEAD:libprojectM-2.0.1-7.fc13.src.rpm:1279404649 diff --git a/libprojectM-fonts.patch b/libprojectM-fonts.patch index 1ead031..f9482ad 100644 --- a/libprojectM-fonts.patch +++ b/libprojectM-fonts.patch @@ -1,6 +1,7 @@ ---- libprojectM-1.2.0SVN12092008-orig/CMakeLists.txt 2008-12-09 00:39:53.000000000 -0500 -+++ libprojectM-1.2.0SVN12092008/CMakeLists.txt 2008-12-09 00:40:13.000000000 -0500 -@@ -169,8 +169,6 @@ +diff -rupN libprojectM-2.0.1.old/CMakeLists.txt libprojectM-2.0.1/CMakeLists.txt +--- libprojectM-2.0.1.old/CMakeLists.txt 2009-12-05 20:42:51.000000000 -0500 ++++ libprojectM-2.0.1/CMakeLists.txt 2010-07-17 11:41:28.000000000 -0400 +@@ -190,8 +190,6 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_D FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga") INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets) @@ -9,9 +10,10 @@ INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM) ---- libprojectM-2.0.1-orig/config.inp.in 2010-01-16 17:23:11.000000000 -0500 -+++ libprojectM-2.0.1/config.inp.in 2010-04-05 14:53:21.000000000 -0400 -@@ -17,6 +17,6 @@ +diff -rupN libprojectM-2.0.1.old/config.inp.in libprojectM-2.0.1/config.inp.in +--- libprojectM-2.0.1.old/config.inp.in 2009-12-05 20:42:51.000000000 -0500 ++++ libprojectM-2.0.1/config.inp.in 2010-07-17 11:41:28.000000000 -0400 +@@ -17,6 +17,6 @@ Hard Cut Sensitivity = 10 # Lower Aspect Correction = true # Custom Shape Aspect Correction Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location @@ -20,3 +22,18 @@ +Title Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/Vera.ttf +Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/VeraMono.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 ++++ libprojectM-2.0.1/projectM.cpp 2010-07-17 11:43:00.000000000 -0400 +@@ -200,9 +200,9 @@ void projectM::readConfig (const std::st + + #ifdef LINUX + _settings.titleFontURL = config.read +- ( "Title Font", CMAKE_INSTALL_PREFIX "/share/projectM/fonts/Vera.ttf" ); ++ ( "Title Font", CMAKE_INSTALL_PREFIX "/share/fonts/bitstream-vera/Vera.ttf" ); + _settings.menuFontURL = config.read +- ( "Menu Font", CMAKE_INSTALL_PREFIX "/share/projectM/fonts/VeraMono.ttf" ); ++ ( "Menu Font", CMAKE_INSTALL_PREFIX "/share/fonts/bitstream-vera/VeraMono.ttf" ); + #endif + + #ifdef WIN32 diff --git a/libprojectM.spec b/libprojectM.spec index 222dfd8..db7258c 100644 --- a/libprojectM.spec +++ b/libprojectM.spec @@ -1,6 +1,6 @@ Name: libprojectM Version: 2.0.1 -Release: 6%{?dist} +Release: 7%{?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 +* Sat Jul 17 2010 Jameson Pugh (imntreal@gmail.com) - 2.0.1-7 +- Updated font patch with Orcan's changes + * Sat Jul 10 2010 Jameson Pugh (imntreal@gmail.com) - 2.0.1-6 - Added patches so clementine can be built against it