Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/files/
Date: Thu, 05 Apr 2018 15:36:37
Message-Id: 1522942481.1877d5a5c48dc99aa54ed3d08a747a91cf023793.bman@gentoo
1 commit: 1877d5a5c48dc99aa54ed3d08a747a91cf023793
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Thu Apr 5 10:48:33 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 5 15:34:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1877d5a5
7
8 sci-physics/root: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/7825
11
12 sci-physics/root/files/root-5.32.00-afs.patch | 33 -------------
13 sci-physics/root/files/root-6.00.01-dotfont.patch | 58 -----------------------
14 2 files changed, 91 deletions(-)
15
16 diff --git a/sci-physics/root/files/root-5.32.00-afs.patch b/sci-physics/root/files/root-5.32.00-afs.patch
17 deleted file mode 100644
18 index 2bf31798e6e..00000000000
19 --- a/sci-physics/root/files/root-5.32.00-afs.patch
20 +++ /dev/null
21 @@ -1,33 +0,0 @@
22 ---- root/net/auth/src/TAFS.cxx.orig 2011-12-04 00:56:29.405007770 +0400
23 -+++ root/net/auth/src/TAFS.cxx 2011-12-04 00:56:35.534709259 +0400
24 -@@ -138,7 +138,7 @@
25 - } else {
26 - if (isatty(0) != 0 && isatty(1) != 0) {
27 - Gl_config("noecho", 1);
28 -- pw = Getline((char *) prompt.Data());
29 -+ pw = const_cast<char *>( Getline((char *) prompt.Data()) );
30 - Gl_config("noecho", 0);
31 - } else {
32 - Warning("TAFS", "not tty: cannot prompt for passwd: failure");
33 ---- root/core/clib/src/strlcat.c.orig 2011-12-04 01:49:26.495179487 +0400
34 -+++ root/core/clib/src/strlcat.c 2011-12-04 01:50:41.407524763 +0400
35 -@@ -38,7 +38,7 @@
36 - * Returns strlen(src) + MIN(siz, strlen(initial dst)).
37 - * If retval >= siz, truncation occurred.
38 - */
39 --size_t
40 -+size_t __attribute__((weak))
41 - strlcat(char *dst, const char *src, size_t siz)
42 - {
43 - register char *d = dst;
44 ---- root/core/clib/src/strlcpy.c.orig 2011-12-04 01:49:34.329797251 +0400
45 -+++ root/core/clib/src/strlcpy.c 2011-12-04 01:50:49.051151843 +0400
46 -@@ -36,7 +36,7 @@
47 - * will be copied. Always NUL terminates (unless siz == 0).
48 - * Returns strlen(src); if retval >= siz, truncation occurred.
49 - */
50 --size_t
51 -+size_t __attribute__((weak))
52 - strlcpy(char *dst, const char *src, size_t siz)
53 - {
54 - register char *d = dst;
55
56 diff --git a/sci-physics/root/files/root-6.00.01-dotfont.patch b/sci-physics/root/files/root-6.00.01-dotfont.patch
57 deleted file mode 100644
58 index 6c765f75a50..00000000000
59 --- a/sci-physics/root/files/root-6.00.01-dotfont.patch
60 +++ /dev/null
61 @@ -1,58 +0,0 @@
62 ---- root/html/src/TClassDocOutput.cxx.orig 2012-06-08 02:13:51.000000000 +0400
63 -+++ root/html/src/TClassDocOutput.cxx 2012-06-08 02:34:45.705436577 +0400
64 -@@ -625,7 +625,7 @@
65 - << "size=\"8,10\";" << std::endl
66 - << "ratio=auto;" << std::endl
67 - << "margin=0;" << std::endl
68 -- << "node [shape=plaintext,fontsize=40,width=4,height=0.75];" << std::endl
69 -+ << "node [shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\"DejaVu Serif\"];" << std::endl
70 - << "\"" << fCurrentClass->GetName() << "\" [shape=ellipse];" << std::endl;
71 -
72 - std::stringstream ssDep;
73 -@@ -704,7 +704,7 @@
74 - outdot << ";" << std::endl;
75 - } else if (writeAndMoreFor) {
76 - outdot << " \"...andmore" << writeAndMoreFor->GetName()
77 -- << "\" [label=\"...and more\",fontname=\"Times-Italic\",fillcolor=lightgrey,style=filled];" << std::endl;
78 -+ << "\" [label=\"...and more\",fontname=\"DejaVu Serif Italic\",fillcolor=lightgrey,style=filled];" << std::endl;
79 - }
80 - }
81 - if (!levelExists) break;
82 -@@ -733,7 +733,7 @@
83 - << "ranksep=0.1;" << std::endl
84 - << "nodesep=0;" << std::endl
85 - << "margin=0;" << std::endl;
86 -- outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << std::endl;
87 -+ outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\"DejaVu Serif\"];" << std::endl;
88 -
89 - std::stringstream ssDep;
90 - const int numColumns = 3;
91 -@@ -939,7 +939,7 @@
92 - << "ranksep=0;" << std::endl
93 - << "nodesep=0;" << std::endl
94 - << "size=\"8,10\";" << std::endl
95 -- << "node [fontsize=20,shape=plaintext];" << std::endl;
96 -+ << "node [fontsize=20,shape=plaintext,fontname=\"DejaVu Serif\"];" << std::endl;
97 -
98 - for (std::list<std::string>::iterator iFile = listFilesToParse.begin();
99 - iFile != listFilesToParse.end(); ++iFile) {
100 -@@ -999,7 +999,8 @@
101 - << "ranksep=0.7;" << std::endl
102 - << "nodesep=0.3;" << std::endl
103 - << "size=\"8,8\";" << std::endl
104 -- << "ratio=compress;" << std::endl;
105 -+ << "ratio=compress;" << std::endl
106 -+ << "node [fontname=\"DejaVu Serif\"];" << std::endl;
107 -
108 - TString libs(fCurrentClass->GetSharedLibs());
109 - outdot << "\"All Libraries\" [URL=\"LibraryDependencies.html\",shape=box,rank=max,fillcolor=lightgray,style=filled];" << std::endl;
110 -@@ -1109,7 +1110,8 @@
111 -
112 - dotout << "digraph G {" << std::endl
113 - << "ratio=auto;" << std::endl
114 -- << "rankdir=RL;" << std::endl;
115 -+ << "rankdir=RL;" << std::endl
116 -+ << "node [fontname=\"DejaVu Serif\"];" << std::endl;
117 -
118 - // loop on all classes
119 - TClassDocInfo* cdi = 0;