Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-action/btanks/files: btanks-0.8.7479-scons-blows.patch btanks-0.8.7479-build.patch
Date: Mon, 04 Aug 2008 20:47:12
Message-Id: E1KQ6xS-0007Qa-8r@stork.gentoo.org
1 mr_bones_ 08/08/04 20:47:10
2
3 Added: btanks-0.8.7479-scons-blows.patch
4 btanks-0.8.7479-build.patch
5 Log:
6 version bump - ebuild submitted by Aleksandr Yakimov via bug #233461
7 (Portage version: 2.1.4.4)
8
9 Revision Changes Path
10 1.1 games-action/btanks/files/btanks-0.8.7479-scons-blows.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/btanks/files/btanks-0.8.7479-scons-blows.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/btanks/files/btanks-0.8.7479-scons-blows.patch?rev=1.1&content-type=text/plain
14
15 Index: btanks-0.8.7479-scons-blows.patch
16 ===================================================================
17 Don't force crappy flags.
18
19 --- SConstruct.orig 2008-08-04 11:10:58.000000000 -0400
20 +++ SConstruct 2008-08-04 12:37:10.000000000 -0400
21 @@ -90,18 +90,8 @@
22 #env.Append(CPPDEFINES = ['NDEBUG'])
23
24 else:
25 - if env['gcc_visibility']:
26 - env.Append(CCFLAGS=['-fvisibility=hidden']);
27 - env.Append(CXXFLAGS=['-fvisibility-inlines-hidden', '-fvisibility=hidden']);
28 - if debug:
29 - env.Append(CCFLAGS=['-ggdb'])
30 - env.Append(CPPFLAGS=['-ggdb'])
31 - else:
32 - env.Append(CCFLAGS=['-O3'])
33 - env.Append(CPPFLAGS=['-O3'])
34 -
35 - env.Append(CPPFLAGS=['-Wall', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
36 - env.Append(CCFLAGS=['-Wall', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
37 + env.Append(CPPFLAGS=['-Wall', '-pedantic', '-Wno-long-long', '-pthread'])
38 + env.Append(CCFLAGS=['-Wall', '-pedantic', '-Wno-long-long', '-pthread'])
39
40
41 conf_env = env.Clone()
42
43
44
45 1.1 games-action/btanks/files/btanks-0.8.7479-build.patch
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/btanks/files/btanks-0.8.7479-build.patch?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/btanks/files/btanks-0.8.7479-build.patch?rev=1.1&content-type=text/plain
49
50 Index: btanks-0.8.7479-build.patch
51 ===================================================================
52 diff -urN btanks-0.8.7479-orig/engine/src/finder.cpp btanks-0.8.7479/engine/src/finder.cpp
53 --- btanks-0.8.7479-orig/engine/src/finder.cpp 2008-06-08 13:02:39.000000000 +0400
54 +++ btanks-0.8.7479/engine/src/finder.cpp 2008-07-30 15:57:31.000000000 +0400
55 @@ -102,14 +102,14 @@
56 //LOG_DEBUG(("data_dir = %s", dname.c_str()));
57 path.push_back(dname.c_str());
58 #ifdef PLUGINS_DIR
59 - path.push_back(PLUGINS_DIR + "/" + dname); //plugins loaded from path ../bt_objects.
60 + path.push_back(std::string(PLUGINS_DIR) + "/" + std::string(dname)); //plugins loaded from path ../bt_objects.
61 #endif
62 }
63 } CATCH("scan", )
64 }
65 #ifdef RESOURCES_DIR
66 std::string dname = RESOURCES_DIR "/data";
67 - std::string rname = RESOURCES_DIR + "/resources.dat";
68 + std::string rname = std::string(RESOURCES_DIR) + "/resources.dat";
69 #else
70 std::string dname = "data";
71 std::string rname = "resources.dat";
72 diff -urN btanks-0.8.7479-orig/mrt/fs_node.cpp btanks-0.8.7479/mrt/fs_node.cpp
73 --- btanks-0.8.7479-orig/mrt/fs_node.cpp 2008-06-08 13:02:39.000000000 +0400
74 +++ btanks-0.8.7479/mrt/fs_node.cpp 2008-07-30 15:57:31.000000000 +0400
75 @@ -129,7 +129,8 @@
76 }
77 r.push_back(p[i]);
78 }
79 - mrt::join(path, r, "/");
80 +// Commented because strip leading symbol '/'
81 +// mrt::join(path, r, "/");
82 return path;
83 }