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-server/cyphesis/files: cyphesis-0.5.24-gentoo.patch cyphesis-0.5.24-python27.patch cyphesis-0.5.24-gcc45.patch
Date: Tue, 31 Aug 2010 06:45:42
Message-Id: 20100831064538.5566B20051@flycatcher.gentoo.org
1 mr_bones_ 10/08/31 06:45:38
2
3 Added: cyphesis-0.5.24-gentoo.patch
4 cyphesis-0.5.24-python27.patch
5 cyphesis-0.5.24-gcc45.patch
6 Log:
7 version bump
8 (Portage version: 2.1.8.3/cvs/Linux i686)
9
10 Revision Changes Path
11 1.1 games-server/cyphesis/files/cyphesis-0.5.24-gentoo.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-server/cyphesis/files/cyphesis-0.5.24-gentoo.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-server/cyphesis/files/cyphesis-0.5.24-gentoo.patch?rev=1.1&content-type=text/plain
15
16 Index: cyphesis-0.5.24-gentoo.patch
17 ===================================================================
18 diff -ur cyphesis-0.5.20.orig/configure.ac cyphesis-0.5.20/configure.ac
19 --- cyphesis-0.5.20.orig/configure.ac 2009-05-11 15:23:20.000000000 +0300
20 +++ cyphesis-0.5.20/configure.ac 2009-08-15 12:33:01.000000000 +0300
21 @@ -342,26 +342,6 @@
22 libraries required and where to obtain them.])
23 ])
24
25 -PKG_CHECK_MODULES(AVAHI, avahi-client,
26 - [
27 - CPPFLAGS="$CPPFLAGS $AVAHI_CFLAGS"
28 - MDNS_LIBS="$MDNS_LIBS $AVAHI_LIBS"
29 - AC_DEFINE(HAVE_AVAHI, 1, [Define to 1 if you have avahi libs.])
30 - ],
31 - [
32 - AC_MSG_RESULT([no])
33 - PKG_CHECK_MODULES(HOWL, howl,
34 - [
35 - CPPFLAGS="$CPPFLAGS $HOWL_CFLAGS"
36 - MDNS_LIBS="$MDNS_LIBS $HOWL_LIBS"
37 - AC_DEFINE(HAVE_LIBHOWL, 1, [Define to 1 if you have howl libs.])
38 - ],
39 - [
40 - AC_MSG_RESULT([no])
41 - AC_MSG_NOTICE([Ommiting DNS-SD functionality.])
42 - ])
43 - ])
44 -
45 AM_PATH_PSQL(7.1.0,
46 [
47 if test "$PG_CFLAGS" != "-I/usr/include"; then
48 diff -ur cyphesis-0.5.20.orig/Makefile.am cyphesis-0.5.20/Makefile.am
49 --- cyphesis-0.5.20.orig/Makefile.am 2009-05-11 15:23:20.000000000 +0300
50 +++ cyphesis-0.5.20/Makefile.am 2009-08-15 12:33:45.000000000 +0300
51 @@ -3,7 +3,6 @@
52 tools tests man dox
53
54 docdir = $(datadir)/doc/cyphesis-$(VERSION)
55 -dist_doc_DATA = README COPYING AUTHORS THANKS NEWS FIXME
56
57 rulesetdir = $(datadir)/cyphesis/rulesets
58
59
60
61
62 1.1 games-server/cyphesis/files/cyphesis-0.5.24-python27.patch
63
64 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-server/cyphesis/files/cyphesis-0.5.24-python27.patch?rev=1.1&view=markup
65 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-server/cyphesis/files/cyphesis-0.5.24-python27.patch?rev=1.1&content-type=text/plain
66
67 Index: cyphesis-0.5.24-python27.patch
68 ===================================================================
69 --- configure.ac.orig 2010-08-31 00:02:13.261828627 -0400
70 +++ configure.ac 2010-08-31 00:03:30.094023860 -0400
71 @@ -162,6 +162,11 @@
72 dnl if found define HAVE_PYTHON_H
73 dnl
74
75 +AC_CHECK_HEADER(python2.7/Python.h,
76 +[
77 + python_include_path=-I${python_prefix}/include/python2.7
78 + python_version=2.7
79 +],[
80 AC_CHECK_HEADER(python2.6/Python.h,
81 [
82 python_include_path=-I${python_prefix}/include/python2.6
83 @@ -197,6 +202,7 @@
84 ])
85 ])
86 ])
87 +])
88
89 PYTHON_VERSION=${python_version}
90 PYTHON_INCLUDES=${python_include_path}
91
92
93
94 1.1 games-server/cyphesis/files/cyphesis-0.5.24-gcc45.patch
95
96 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-server/cyphesis/files/cyphesis-0.5.24-gcc45.patch?rev=1.1&view=markup
97 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-server/cyphesis/files/cyphesis-0.5.24-gcc45.patch?rev=1.1&content-type=text/plain
98
99 Index: cyphesis-0.5.24-gcc45.patch
100 ===================================================================
101 --- physics/Collision.h.old 2010-05-19 14:31:30.000000000 +0200
102 +++ physics/Collision.h 2010-05-19 14:31:44.000000000 +0200
103 @@ -22,6 +22,7 @@
104
105 #include "physics/Vector3D.h"
106
107 +#include <wfmath/point.h>
108 #include <wfmath/axisbox.h>
109
110 #include <map>