From: | "Julian Ospald (hasufell)" <hasufell@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in games-strategy/wargus/files: wargus-2.2.6-underlinking.patch |
Date: | Fri, 01 Jun 2012 21:15:09 |
Message-Id: | 20120601211459.B765D2004C@flycatcher.gentoo.org |
1 | hasufell 12/06/01 21:14:59 |
2 | |
3 | Modified: wargus-2.2.6-underlinking.patch |
4 | Log: |
5 | improve style of patch (merged from upstream) |
6 | |
7 | (Portage version: 2.2.0_alpha108/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.2 games-strategy/wargus/files/wargus-2.2.6-underlinking.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/wargus/files/wargus-2.2.6-underlinking.patch?rev=1.2&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/wargus/files/wargus-2.2.6-underlinking.patch?rev=1.2&content-type=text/plain |
14 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/wargus/files/wargus-2.2.6-underlinking.patch?r1=1.1&r2=1.2 |
15 | |
16 | Index: wargus-2.2.6-underlinking.patch |
17 | =================================================================== |
18 | RCS file: /var/cvsroot/gentoo-x86/games-strategy/wargus/files/wargus-2.2.6-underlinking.patch,v |
19 | retrieving revision 1.1 |
20 | retrieving revision 1.2 |
21 | diff -u -r1.1 -r1.2 |
22 | --- wargus-2.2.6-underlinking.patch 1 Jun 2012 20:21:09 -0000 1.1 |
23 | +++ wargus-2.2.6-underlinking.patch 1 Jun 2012 21:14:59 -0000 1.2 |
24 | @@ -7,12 +7,22 @@ |
25 | |
26 | --- CMakeLists.txt |
27 | +++ CMakeLists.txt |
28 | -@@ -157,7 +157,7 @@ |
29 | +@@ -109,6 +109,7 @@ |
30 | + endif() |
31 | + |
32 | + if(NOT WIN32) |
33 | ++ find_package(X11 REQUIRED) |
34 | + find_package(GTK2 REQUIRED gtk) |
35 | + endif() |
36 | + |
37 | +@@ -149,8 +150,8 @@ |
38 | + # Platform definitions |
39 | |
40 | if(NOT WIN32) |
41 | - include_directories(${GTK2_INCLUDE_DIRS}) |
42 | +- include_directories(${GTK2_INCLUDE_DIRS}) |
43 | - set(wargus_LIBS ${wargus_LIBS} ${GTK2_LIBRARIES}) |
44 | -+ set(wargus_LIBS ${wargus_LIBS} ${GTK2_LIBRARIES} X11) |
45 | ++ include_directories(${X11_INCLUDE_DIR} ${GTK2_INCLUDE_DIRS}) |
46 | ++ set(wargus_LIBS ${wargus_LIBS} ${X11_X11_LIB} ${GTK2_LIBRARIES}) |
47 | endif() |
48 | |
49 | if (NOT WIN32 AND NOT MAEMO) |