30d9d78de2
- Correct license tags for: cint, core and rootfit - Regenerate source tarball due to upstream retag (again)
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
diff -ur root-5.24.00b.orig/graf3d/gl/src/TGLFontManager.cxx root-5.24.00b/graf3d/gl/src/TGLFontManager.cxx
|
|
--- root-5.24.00b.orig/graf3d/gl/src/TGLFontManager.cxx 2009-10-11 22:39:43.000000000 +0200
|
|
+++ root-5.24.00b/graf3d/gl/src/TGLFontManager.cxx 2009-11-16 17:55:18.643028075 +0100
|
|
@@ -24,7 +24,13 @@
|
|
// Direct inclussion of FTGL headers is deprecated in ftgl-2.1.3 while
|
|
// ftgl-2.1.2 shipped with root requires manual inclusion.
|
|
#ifndef BUILTIN_FTGL
|
|
-# include <FTGL/ftgl.h>
|
|
+# include <FTGL/FTFont.h>
|
|
+# include <FTGL/FTGLExtrdFont.h>
|
|
+# include <FTGL/FTGLOutlineFont.h>
|
|
+# include <FTGL/FTGLPolygonFont.h>
|
|
+# include <FTGL/FTGLTextureFont.h>
|
|
+# include <FTGL/FTGLPixmapFont.h>
|
|
+# include <FTGL/FTGLBitmapFont.h>
|
|
#else
|
|
# include "FTFont.h"
|
|
# include "FTGLExtrdFont.h"
|
|
diff -ur root-5.24.00b.orig/graf3d/gl/src/TGLText.cxx root-5.24.00b/graf3d/gl/src/TGLText.cxx
|
|
--- root-5.24.00b.orig/graf3d/gl/src/TGLText.cxx 2009-10-11 22:39:43.000000000 +0200
|
|
+++ root-5.24.00b/graf3d/gl/src/TGLText.cxx 2009-11-16 17:56:09.971279053 +0100
|
|
@@ -23,7 +23,13 @@
|
|
// Direct inclussion of FTGL headers is deprecated in ftgl-2.1.3 while
|
|
// ftgl-2.1.2 shipped with root requires manual inclusion.
|
|
#ifndef BUILTIN_FTGL
|
|
-# include <FTGL/ftgl.h>
|
|
+# include <FTGL/FTFont.h>
|
|
+# include <FTGL/FTGLExtrdFont.h>
|
|
+# include <FTGL/FTGLOutlineFont.h>
|
|
+# include <FTGL/FTGLPolygonFont.h>
|
|
+# include <FTGL/FTGLTextureFont.h>
|
|
+# include <FTGL/FTGLPixmapFont.h>
|
|
+# include <FTGL/FTGLBitmapFont.h>
|
|
#else
|
|
# include "FTFont.h"
|
|
# include "FTGLExtrdFont.h"
|