[SCM] projectm/master: Fix small mistake in userfonts patch
ximion-guest at users.alioth.debian.org
ximion-guest at users.alioth.debian.org
Tue Sep 28 17:16:17 UTC 2010
The following commit has been merged in the master branch:
commit 353d9446f0077a3d8becf3576c5adfb8c3daf3c0
Author: Matthias Klumpp <matthias at nlinux.org>
Date: Tue Sep 28 19:16:05 2010 +0200
Fix small mistake in userfonts patch
* Forgot to remove an "!" in the last refresh
* Made the code a little smaller
diff --git a/debian/patches/10_lprojectm_userfonts.patch b/debian/patches/10_lprojectm_userfonts.patch
index 7db5ed8..85f0b9b 100644
--- a/debian/patches/10_lprojectm_userfonts.patch
+++ b/debian/patches/10_lprojectm_userfonts.patch
@@ -28,23 +28,20 @@ Last-Update: 2010-09-25
#include <cassert>
#include "omptl/omptl"
#include "omptl/omptl_algorithm"
-@@ -45,7 +46,21 @@
+@@ -45,7 +46,18 @@
this->beatDetect = beatDetect;
#ifdef USE_FTGL
- /**f Load the standard fonts */
+ /**f Load the standard fonts if they do exist */
+
-+ struct stat stFileInfo;
-+ int intStat;
-+
-+ intStat = stat(title_fontURL.c_str(),&stFileInfo);
-+ if(intStat != 0) {
++ struct stat buffer;
++
++ if (stat( title_fontURL.c_str(), &buffer )) {
+ std::cout << "Could not open font file: " << title_fontURL << std::endl;
+ exit(1);
+ }
-+ intStat = stat(menu_fontURL.c_str(),&stFileInfo);
-+ if(!intStat != 0) {
++ if (stat( menu_fontURL.c_str(), &buffer )) {
+ std::cout << "Could not open font file: " << menu_fontURL << std::endl;
+ exit(1);
+ }
--
projectm packaging
More information about the pkg-multimedia-commits
mailing list