| 1 |
bicatali 08/01/10 00:08:24 |
| 2 |
|
| 3 |
Added: root-5.16.00-xft.patch root-5.16.00-flags.patch |
| 4 |
root-5.16.00-postgres.patch |
| 5 |
Log: |
| 6 |
Added various patches: one to respect flags in xrootd (needed for afs), one to properly handle -truetype without libXft (bug #204725) and last one for postgresql (bug #203015). Added pch use flag for faster compilation with g++ |
| 7 |
(Portage version: 2.1.4_rc14) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-physics/root/files/root-5.16.00-xft.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.16.00-xft.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.16.00-xft.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: root-5.16.00-xft.patch |
| 16 |
=================================================================== |
| 17 |
--- config/Makefile.in.orig 2007-12-12 22:41:28.000000000 +0000 |
| 18 |
+++ config/Makefile.in 2007-12-12 22:45:27.000000000 +0000 |
| 19 |
@@ -36,6 +36,7 @@ |
| 20 |
X11LIBDIR := @x11libdir@ |
| 21 |
XPMLIBDIR := @xpmlibdir@ |
| 22 |
XPMLIB := @xpmlib@ |
| 23 |
+XFTLIB := @enable_xft@ |
| 24 |
|
| 25 |
EXCEPTIONS := @exceptions@ |
| 26 |
EXPLICITLINK := @explicitlink@ |
| 27 |
--- x11ttf/Module.mk.orig 2008-01-09 01:13:23.000000000 +0000 |
| 28 |
+++ x11ttf/Module.mk 2008-01-09 10:20:00.000000000 +0000 |
| 29 |
@@ -31,9 +31,9 @@ |
| 30 |
ALLLIBS += $(X11TTFLIB) |
| 31 |
ALLMAPS += $(X11TTFMAP) |
| 32 |
|
| 33 |
-#ifeq ($(XFTLIB),yes) |
| 34 |
+ifeq ($(XFTLIB),yes) |
| 35 |
XLIBS += $(X11LIBDIR) -lXft |
| 36 |
-#endif |
| 37 |
+endif |
| 38 |
|
| 39 |
# include all dependency files |
| 40 |
INCLUDEFILES += $(X11TTFDEP) |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 sci-physics/root/files/root-5.16.00-flags.patch |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.16.00-flags.patch?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.16.00-flags.patch?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: root-5.16.00-flags.patch |
| 50 |
=================================================================== |
| 51 |
--- xrootd/config/GNUmake.env.in.orig 2007-12-13 09:23:25.041447494 +0000 |
| 52 |
+++ xrootd/config/GNUmake.env.in 2007-12-13 09:24:10.056012728 +0000 |
| 53 |
@@ -22,8 +22,8 @@ |
| 54 |
LIBDIR = ../../lib$(ARCHDIR) |
| 55 |
OBJDIR = ../../obj$(ARCHDIR) |
| 56 |
|
| 57 |
-CFLAGS = $(CF64) $(CFOP) -DXrdDEBUG=$(XrdDEBUG) |
| 58 |
-CFLAGS32 = $(CF32) $(CFOP) -DXrdDEBUG=$(XrdDEBUG) |
| 59 |
+CFLAGS = $(CF64) $(OPTFLAGS) $(CFOP) -DXrdDEBUG=$(XrdDEBUG) |
| 60 |
+CFLAGS32 = $(CF32) $(OPTFLAGS) $(CFOP) -DXrdDEBUG=$(XrdDEBUG) |
| 61 |
|
| 62 |
# Extra flags |
| 63 |
CFTRACE = @tracedbg@ |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
1.1 sci-physics/root/files/root-5.16.00-postgres.patch |
| 68 |
|
| 69 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.16.00-postgres.patch?rev=1.1&view=markup |
| 70 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-physics/root/files/root-5.16.00-postgres.patch?rev=1.1&content-type=text/plain |
| 71 |
|
| 72 |
Index: root-5.16.00-postgres.patch |
| 73 |
=================================================================== |
| 74 |
--- ./pgsql/src/TPgSQLServer.cxx~ 2007-06-08 18:45:02.000000000 +0900 |
| 75 |
+++ ./pgsql/src/TPgSQLServer.cxx 2007-12-22 22:41:25.000000000 +0900 |
| 76 |
@@ -344,16 +344,16 @@ |
| 77 |
SetError(-1, "cannot allocate PGSQL_STMT" , "Statement"); |
| 78 |
return 0; |
| 79 |
} |
| 80 |
- stmt->conn=fPgSQL; |
| 81 |
- stmt->res=PQprepare(fPgSQL,"", sql,0,(const Oid*)0); |
| 82 |
+ stmt->fConn=fPgSQL; |
| 83 |
+ stmt->fRes=PQprepare(fPgSQL,"", sql,0,(const Oid*)0); |
| 84 |
|
| 85 |
- ExecStatusType stat = PQresultStatus(stmt->res); |
| 86 |
+ ExecStatusType stat = PQresultStatus(stmt->fRes); |
| 87 |
if (pgsql_success(stat)) { |
| 88 |
fErrorOut=stat; |
| 89 |
return new TPgSQLStatement(stmt, fErrorOut); |
| 90 |
} else { |
| 91 |
- SetError(stat, PQresultErrorMessage(stmt->res), "Statement"); |
| 92 |
- stmt->conn = 0; |
| 93 |
+ SetError(stat, PQresultErrorMessage(stmt->fRes), "Statement"); |
| 94 |
+ stmt->fConn = 0; |
| 95 |
delete stmt; |
| 96 |
return 0; |
| 97 |
} |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
-- |
| 102 |
gentoo-commits@l.g.o mailing list |
Archives