r5716 - packages/trunk/pokerth/debian/patches

[Evgeni Golov]

Author: sargentd-guest
Date: 2008-02-11 00:35:51 +0000 (Mon, 11 Feb 2008)
New Revision: 5716

Added:
   packages/trunk/pokerth/debian/patches/06_server.pro_svn-r1397.dpatch
Modified:
   packages/trunk/pokerth/debian/patches/00list
Log:
not only patch the server, but also link the new stuff correctly
and hell, windows linefeeds in patches are evil


Modified: packages/trunk/pokerth/debian/patches/00list
===================================================================
--- packages/trunk/pokerth/debian/patches/00list	2008-02-10 22:52:37 UTC (rev 5715)
+++ packages/trunk/pokerth/debian/patches/00list	2008-02-11 00:35:51 UTC (rev 5716)
@@ -3,3 +3,4 @@
 03_fix_gcc43_ftbfs
 04_sane_server_defaults
 05_server_options_svn-r1393
+06_server.pro_svn-r1397

Added: packages/trunk/pokerth/debian/patches/06_server.pro_svn-r1397.dpatch
===================================================================
--- packages/trunk/pokerth/debian/patches/06_server.pro_svn-r1397.dpatch	                        (rev 0)
+++ packages/trunk/pokerth/debian/patches/06_server.pro_svn-r1397.dpatch	2008-02-11 00:35:51 UTC (rev 5716)
@@ -0,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_server.pro_svn-r1397.dpatch by Evgeni Golov <sargentd at die-welt.net>
+##
+## DP: Add boost_program_options to LIBS
+## DP: Adopted from upstream svn r1397
+
+ at DPATCH@
+
+Index: pokerth_server.pro
+===================================================================
+--- pokerth.orig/pokerth_server.pro	(revision 1392)
++++ pokerth/pokerth_server.pro	(working copy)
+@@ -133,6 +133,7 @@
+ 		LIBS += -lssl
+ 		LIBS += -lboost_thread-mgw34-mt-1_34_1
+ 		LIBS += -lboost_filesystem-mgw34-mt-1_34_1
++		LIBS += -lboost_program_options-mgw34-mt-1_34_1
+ 	}
+ 
+     LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 -lws2_32 -ladvapi32
+@@ -189,7 +190,28 @@
+ 			LIBS += -lboost_filesystem
+ 		}
+ 	}
+-	
++
++	exists( /usr/lib/libboost_program_options-mt.so ){
++		message("Found libboost_program_options-mt")
++		LIBS += -lboost_program_options-mt
++	}
++	exists( /usr/lib64/libboost_program_options-mt.so ){
++		message("Found libboost_program_options-mt")
++		LIBS += -lboost_program_options-mt
++	}
++	!exists( /usr/lib/libboost_program_options-mt.so ){
++		exists( /usr/lib/libboost_program_options.so ){
++			message("Found libboost_program_options")
++			LIBS += -lboost_program_options
++		}
++	}
++	!exists( /usr/lib64/liblibboost_program_options-mt.so ){
++		exists( /usr/lib64/libboost_program_options.so ){
++			message("Found libboost_program_options")
++			LIBS += -lboost_program_options
++		}
++	}
++
+ 	LIBS += -lcrypto
+ 	TARGETDEPS += ./lib/libpokerth_lib.a
+ 
+@@ -213,6 +235,7 @@
+ 	# make sure you have a universal version of boost
+ 	LIBS += /usr/local/lib/libboost_thread-mt-1_34_1.a
+ 	LIBS += /usr/local/lib/libboost_filesystem-mt-1_34_1.a
++	LIBS += /usr/local/lib/libboost_program_options-mt-1_34_1.a
+ 	# libraries installed on every mac
+ 	LIBS += -lcrypto -liconv
+ 	# set the application icon