| 1 |
bicatali 08/12/04 18:21:21 |
| 2 |
|
| 3 |
Added: root-5.20.00-as-needed.patch |
| 4 |
root-5.20.00-ftgl.patch |
| 5 |
Removed: xrootd-20071116-gcc43.patch |
| 6 |
root-5.18.00d-gcc43.patch |
| 7 |
root-5.18.00d-makefile.patch |
| 8 |
xrootd-20071116-checksymbol.patch root-pic.patch |
| 9 |
Log: |
| 10 |
Fixed flags propagation, fixed dependency for qt-4, fixed for forced as-needed (bug #248380), fixed for ftgl > 2.1.3_rc5 (bug #248789, thanks tao@××××.cz), removed unixODBC as a possible odbc implementation (bug #242150, thanks Benjamin Bennier), removed old version with big patches (closing bug #249009) |
| 11 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64) |
| 12 |
|
| 13 |
Revision Changes Path |
| 14 |
1.1 sci-physics/root/files/root-5.20.00-as-needed.patch |
| 15 |
|
| 16 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.20.00-as-needed.patch?rev=1.1&view=markup |
| 17 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.20.00-as-needed.patch?rev=1.1&content-type=text/plain |
| 18 |
|
| 19 |
Index: root-5.20.00-as-needed.patch |
| 20 |
=================================================================== |
| 21 |
--- root/cint/cint/Module.mk.orig 2008-06-25 07:24:00.000000000 +0100 |
| 22 |
+++ root/cint/cint/Module.mk 2008-12-04 17:42:38.000000000 +0000 |
| 23 |
@@ -188,6 +188,7 @@ |
| 24 |
CINTALLDEP += $(MODDIRS)/loadfile_tmp.d |
| 25 |
|
| 26 |
CINTLIB := $(LPATH)/libCint.$(SOEXT) |
| 27 |
+CINTLIBEXTRA := -ldl |
| 28 |
|
| 29 |
##### cint ##### |
| 30 |
CINTEXES := $(CINTDIRM)/cppmain.cxx |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
1.1 sci-physics/root/files/root-5.20.00-ftgl.patch |
| 35 |
|
| 36 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.20.00-ftgl.patch?rev=1.1&view=markup |
| 37 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.20.00-ftgl.patch?rev=1.1&content-type=text/plain |
| 38 |
|
| 39 |
Index: root-5.20.00-ftgl.patch |
| 40 |
=================================================================== |
| 41 |
diff -Naur graf3d/gl/src.original/TGLFontManager.cxx graf3d/gl/src/TGLFontManager.cxx |
| 42 |
--- graf3d/gl/src.original/TGLFontManager.cxx 2008-12-03 00:20:07.919338469 +0100 |
| 43 |
+++ graf3d/gl/src/TGLFontManager.cxx 2008-12-03 00:25:32.045668987 +0100 |
| 44 |
@@ -6,13 +6,14 @@ |
| 45 |
#include "TObjString.h" |
| 46 |
#include "TGLUtil.h" |
| 47 |
|
| 48 |
-#include "FTFont.h" |
| 49 |
+#include <FTGL/ftgl.h> |
| 50 |
#include "FTGLExtrdFont.h" |
| 51 |
#include "FTGLOutlineFont.h" |
| 52 |
#include "FTGLPolygonFont.h" |
| 53 |
#include "FTGLTextureFont.h" |
| 54 |
#include "FTGLPixmapFont.h" |
| 55 |
#include "FTGLBitmapFont.h" |
| 56 |
+#include <GL/gl.h> |
| 57 |
|
| 58 |
//______________________________________________________________________________ |
| 59 |
// TGLFont |
| 60 |
diff -Naur graf3d/gl/src.original/TGLText.cxx graf3d/gl/src/TGLText.cxx |
| 61 |
--- graf3d/gl/src.original/TGLText.cxx 2008-06-25 08:24:05.000000000 +0200 |
| 62 |
+++ graf3d/gl/src/TGLText.cxx 2008-12-03 00:25:13.532655432 +0100 |
| 63 |
@@ -18,12 +18,13 @@ |
| 64 |
#include "TSystem.h" |
| 65 |
#include "TEnv.h" |
| 66 |
|
| 67 |
-#include "FTGLExtrdFont.h" |
| 68 |
+#include <FTGL/ftgl.h> |
| 69 |
#include "FTGLOutlineFont.h" |
| 70 |
#include "FTGLPolygonFont.h" |
| 71 |
#include "FTGLTextureFont.h" |
| 72 |
#include "FTGLPixmapFont.h" |
| 73 |
#include "FTGLBitmapFont.h" |
| 74 |
+#include <GL/gl.h> |
| 75 |
|
| 76 |
#define FTGL_BITMAP 0 |
| 77 |
#define FTGL_PIXMAP 1 |
Archives