diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-06-01 21:14:59 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-06-01 21:14:59 +0000 |
| commit | 1e7b5703322ba2178ac43d052f7a5b5c004b2c1a (patch) | |
| tree | 7c726dcb167744cc26f3e33ed19e3778128a9938 | |
| parent | Version bump (diff) | |
| download | gentoo-2-1e7b5703322ba2178ac43d052f7a5b5c004b2c1a.tar.gz gentoo-2-1e7b5703322ba2178ac43d052f7a5b5c004b2c1a.tar.bz2 gentoo-2-1e7b5703322ba2178ac43d052f7a5b5c004b2c1a.zip | |
improve style of patch (merged from upstream)
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
| -rw-r--r-- | games-strategy/wargus/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/wargus/files/wargus-2.2.6-underlinking.patch | 16 |
2 files changed, 18 insertions, 4 deletions
diff --git a/games-strategy/wargus/ChangeLog b/games-strategy/wargus/ChangeLog index 45d3b4227d2f..9d37648649e8 100644 --- a/games-strategy/wargus/ChangeLog +++ b/games-strategy/wargus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/wargus # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.21 2012/06/01 20:24:32 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.22 2012/06/01 21:14:59 hasufell Exp $ + + 01 Jun 2012; Julian Ospald <hasufell@gentoo.org> + files/wargus-2.2.6-underlinking.patch: + improve style of patch (merged from upstream) 01 Jun 2012; Julian Ospald <hasufell@gentoo.org> wargus-2.2.5.5.ebuild: block games-strategy/wargus-data for wargus-2.2.5.5 diff --git a/games-strategy/wargus/files/wargus-2.2.6-underlinking.patch b/games-strategy/wargus/files/wargus-2.2.6-underlinking.patch index e3e11db165d1..bad54b0d1764 100644 --- a/games-strategy/wargus/files/wargus-2.2.6-underlinking.patch +++ b/games-strategy/wargus/files/wargus-2.2.6-underlinking.patch @@ -7,12 +7,22 @@ see: https://bugs.launchpad.net/wargus/+bug/1007586 --- CMakeLists.txt +++ CMakeLists.txt -@@ -157,7 +157,7 @@ +@@ -109,6 +109,7 @@ + endif() + + if(NOT WIN32) ++ find_package(X11 REQUIRED) + find_package(GTK2 REQUIRED gtk) + endif() + +@@ -149,8 +150,8 @@ + # Platform definitions if(NOT WIN32) - include_directories(${GTK2_INCLUDE_DIRS}) +- include_directories(${GTK2_INCLUDE_DIRS}) - set(wargus_LIBS ${wargus_LIBS} ${GTK2_LIBRARIES}) -+ set(wargus_LIBS ${wargus_LIBS} ${GTK2_LIBRARIES} X11) ++ include_directories(${X11_INCLUDE_DIR} ${GTK2_INCLUDE_DIRS}) ++ set(wargus_LIBS ${wargus_LIBS} ${X11_X11_LIB} ${GTK2_LIBRARIES}) endif() if (NOT WIN32 AND NOT MAEMO) |