[gentoo-commits] gentoo-x86 commit in games-strategy/wargus/files: wargus-2.2.6-underlinking.patch

[Julian Ospald (hasufell)]

hasufell    12/06/01 21:14:59

  Modified:             wargus-2.2.6-underlinking.patch
  Log:
  improve style of patch (merged from upstream)
  
  (Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  games-strategy/wargus/files/wargus-2.2.6-underlinking.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/wargus/files/wargus-2.2.6-underlinking.patch?rev=1.2&view=markup
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
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

Index: wargus-2.2.6-underlinking.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/wargus/files/wargus-2.2.6-underlinking.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wargus-2.2.6-underlinking.patch	1 Jun 2012 20:21:09 -0000	1.1
+++ wargus-2.2.6-underlinking.patch	1 Jun 2012 21:14:59 -0000	1.2
@@ -7,12 +7,22 @@
 
 --- 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)