| 1 |
hasufell 12/06/30 20:57:14 |
| 2 |
|
| 3 |
Added: mana-0.6.1-gentoo.patch |
| 4 |
Log: |
| 5 |
version bump wrt bug #423413 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-rpg/mana/files/mana-0.6.1-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/mana/files/mana-0.6.1-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/mana/files/mana-0.6.1-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: mana-0.6.1-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
From: Julian Ospald <hasufell@g.o> |
| 18 |
Date: Sat Jun 30 20:48:23 UTC 2012 |
| 19 |
Subject: build system |
| 20 |
|
| 21 |
use system fonts |
| 22 |
|
| 23 |
make datadir and bindir paths modifiable |
| 24 |
https://github.com/mana/mana/commit/02a7b2aa739cd0cf5a855f0a78b91d9fd5ad4385 |
| 25 |
don't overwrite system/environment CXXFLAGS |
| 26 |
https://github.com/mana/mana/commit/2305ca095bee6b32c930f71b99d4c1205ceb561b |
| 27 |
add option to use system enet headers |
| 28 |
https://github.com/mana/mana/commit/d754a64e3839b3888d489046546195792e4ecc34 |
| 29 |
|
| 30 |
--- data/CMakeLists.txt.old 2011-08-02 12:15:38.520030381 +0200 |
| 31 |
+++ data/CMakeLists.txt 2011-08-02 12:15:44.971029615 +0200 |
| 32 |
@@ -1,6 +1,5 @@ |
| 33 |
SET(DATA_DIR ${PKG_DATADIR}/data) |
| 34 |
|
| 35 |
-ADD_SUBDIRECTORY(fonts) |
| 36 |
ADD_SUBDIRECTORY(graphics) |
| 37 |
ADD_SUBDIRECTORY(help) |
| 38 |
ADD_SUBDIRECTORY(icons) |
| 39 |
--- CMakeLists.txt |
| 40 |
+++ CMakeLists.txt |
| 41 |
@@ -42,9 +42,9 @@ |
| 42 |
IF (NOT OSX AND NOT BEOS) |
| 43 |
OPTION(USE_X11 "Use X11 Clipboard functionality" ON) |
| 44 |
ENDIF () |
| 45 |
- SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/mana) |
| 46 |
+ SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/mana CACHE PATH "Mana datadir") |
| 47 |
SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) |
| 48 |
- SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin) |
| 49 |
+ SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "Mana bindir") |
| 50 |
ENDIF (WIN32) |
| 51 |
|
| 52 |
ADD_SUBDIRECTORY(data) |
| 53 |
--- src/CMakeLists.txt |
| 54 |
+++ src/CMakeLists.txt |
| 55 |
@@ -12,7 +12,7 @@ |
| 56 |
|
| 57 |
IF (CMAKE_COMPILER_IS_GNUCXX) |
| 58 |
# Help getting compilation warnings |
| 59 |
- SET(CMAKE_CXX_FLAGS "-Wall") |
| 60 |
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") |
| 61 |
IF (WIN32) |
| 62 |
# This includes enough debug information to get something useful |
| 63 |
# from Dr. Mingw while keeping binary size down. Almost useless |
| 64 |
--- libs/enet/CMakeLists.txt |
| 65 |
+++ libs/enet/CMakeLists.txt |
| 66 |
@@ -1,3 +1,7 @@ |
| 67 |
+INCLUDE(FindPkgConfig) |
| 68 |
+ |
| 69 |
+OPTION(WITH_BUNDLEDHEADERS "Use bundled enet headers" ON) |
| 70 |
+ |
| 71 |
INCLUDE(CheckFunctionExists) |
| 72 |
CHECK_FUNCTION_EXISTS(gethostbyaddr_r HAS_GETHOSTBYNAME_R) |
| 73 |
IF(HAS_GETHOSTBYNAME_R EQUAL 1) |
| 74 |
@@ -49,7 +53,12 @@ |
| 75 |
win32.c |
| 76 |
) |
| 77 |
|
| 78 |
-INCLUDE_DIRECTORIES("include") |
| 79 |
+IF (WITH_BUNDLEDHEADERS) |
| 80 |
+ INCLUDE_DIRECTORIES("include") |
| 81 |
+ELSE (WITH_BUNDLEDHEADERS) |
| 82 |
+ PKG_CHECK_MODULES(ENET REQUIRED libenet) |
| 83 |
+ INCLUDE_DIRECTORIES("${ENET_INCLUDEDIR}") |
| 84 |
+ENDIF() |
| 85 |
|
| 86 |
ADD_LIBRARY(enet STATIC ${SRCS}) |
| 87 |
IF (BEOS) |
Archives