* [gentoo-commits] gentoo-x86 commit in games-strategy/wargus/files: wargus-2.2.6-underlinking.patch
@ 2012-06-01 20:21 Julian Ospald (hasufell)
0 siblings, 0 replies; 2+ messages in thread
From: Julian Ospald (hasufell) @ 2012-06-01 20:21 UTC (permalink / raw
To: gentoo-commits
hasufell 12/06/01 20:21:09
Added: wargus-2.2.6-underlinking.patch
Log:
revbump, fix underlinking, split wargus-data and fix sandbox violation wrt #418051 and #419143
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Revision Changes Path
1.1 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.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/wargus/files/wargus-2.2.6-underlinking.patch?rev=1.1&content-type=text/plain
Index: wargus-2.2.6-underlinking.patch
===================================================================
From: Julian Ospald <hasufell@gentoo.org>
Date: Fri Jun 1 20:15:57 UTC 2012
Subject: build system
fix underlinking
see: https://bugs.launchpad.net/wargus/+bug/1007586
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -157,7 +157,7 @@
if(NOT WIN32)
include_directories(${GTK2_INCLUDE_DIRS})
- set(wargus_LIBS ${wargus_LIBS} ${GTK2_LIBRARIES})
+ set(wargus_LIBS ${wargus_LIBS} ${GTK2_LIBRARIES} X11)
endif()
if (NOT WIN32 AND NOT MAEMO)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-strategy/wargus/files: wargus-2.2.6-underlinking.patch
@ 2012-06-01 21:14 Julian Ospald (hasufell)
0 siblings, 0 replies; 2+ messages in thread
From: Julian Ospald (hasufell) @ 2012-06-01 21:14 UTC (permalink / raw
To: gentoo-commits
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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-06-01 21:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-01 21:14 [gentoo-commits] gentoo-x86 commit in games-strategy/wargus/files: wargus-2.2.6-underlinking.patch Julian Ospald (hasufell)
-- strict thread matches above, loose matches on Subject: below --
2012-06-01 20:21 Julian Ospald (hasufell)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox