r9508 - in packages/trunk/pokerth/debian: . patches

[Evgeni Golov]

Author: sargentd-guest
Date: 2009-04-08 21:14:43 +0000 (Wed, 08 Apr 2009)
New Revision: 9508

Added:
   packages/trunk/pokerth/debian/patches/04_link-gnutls-on-kfreebsd.patch
Modified:
   packages/trunk/pokerth/debian/changelog
   packages/trunk/pokerth/debian/patches/series
Log:
Add a patch to link with GnuTLS instead of OpenSSL on Debian/kFreeBSD.
This prevents a FTBFS on kfreebsd-{i386,amd64}.



Modified: packages/trunk/pokerth/debian/changelog
===================================================================
--- packages/trunk/pokerth/debian/changelog	2009-04-08 19:16:16 UTC (rev 9507)
+++ packages/trunk/pokerth/debian/changelog	2009-04-08 21:14:43 UTC (rev 9508)
@@ -1,3 +1,11 @@
+pokerth (0.6.4-2) unstable; urgency=low
+
+  * debian/patches/04_link-gnutls-on-kfreebsd.patch:
+    + Add a patch to link with GnuTLS instead of OpenSSL on Debian/kFreeBSD.
+      This prevents a FTBFS on kfreebsd-{i386,amd64}.
+
+ -- Evgeni Golov <sargentd at die-welt.net>  Wed, 08 Apr 2009 23:13:10 +0200
+
 pokerth (0.6.4-1) unstable; urgency=low
 
   [ Evgeni Golov ]

Added: packages/trunk/pokerth/debian/patches/04_link-gnutls-on-kfreebsd.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/04_link-gnutls-on-kfreebsd.patch	                        (rev 0)
+++ packages/trunk/pokerth/debian/patches/04_link-gnutls-on-kfreebsd.patch	2009-04-08 21:14:43 UTC (rev 9508)
@@ -0,0 +1,45 @@
+From: Evgeni Golov <sargentd at die-welt.net>
+Date: 2009-04-09 00:32
+Subject: Fix building on Debian/kFreeBSD
+
+For some reason, upstream links with OpenSSL instead of GnuTLS on *BSD.
+That's IMHO wrong and leads to an FTBFS on Debian/kFreeBSD as libssl-dev
+is not installed. So add an exception and link with GnuTLS on
+Debian/kFreeBSD.
+
+Index: pokerth-0.6.4/pokerth_game.pro
+===================================================================
+--- pokerth-0.6.4.orig/pokerth_game.pro	2009-04-09 00:32:08.000000000 +0200
++++ pokerth-0.6.4/pokerth_game.pro	2009-04-09 00:36:49.000000000 +0200
+@@ -368,11 +368,12 @@
+ 
+         UNAME = $$system(uname -s)
+         BSD = $$find(UNAME, "BSD")
++        kFreeBSD = $$find(UNAME, "kFreeBSD")
+ 
+         LIBS += -lpokerth_lib
+         LIBS += $$BOOST_LIBS
+         LIBS += -lSDL_mixer -lcurl
+-        !isEmpty( BSD ){
++        !isEmpty( BSD ) && isEmpty( kFreeBSD ){
+             LIBS += -lcrypto
+         }        else {
+             LIBS += -lgnutls-openssl -lgcrypt
+Index: pokerth-0.6.4/pokerth_server.pro
+===================================================================
+--- pokerth-0.6.4.orig/pokerth_server.pro	2009-04-09 00:37:16.000000000 +0200
++++ pokerth-0.6.4/pokerth_server.pro	2009-04-09 00:38:35.000000000 +0200
+@@ -214,11 +214,12 @@
+ 
+         UNAME = $$system(uname -s)
+         BSD = $$find(UNAME, "BSD")
++        kFreeBSD = $$find(UNAME, "kFreeBSD")
+ 
+         LIBS += -lpokerth_lib
+         LIBS += $$BOOST_LIBS
+         LIBS += -lcurl
+-        !isEmpty( BSD ){
++        !isEmpty( BSD ) && isEmpty( kFreeBSD ){
+             LIBS += -lcrypto -liconv
+         }        else {
+             LIBS += -lgnutls-openssl -lgcrypt

Modified: packages/trunk/pokerth/debian/patches/series
===================================================================
--- packages/trunk/pokerth/debian/patches/series	2009-04-08 19:16:16 UTC (rev 9507)
+++ packages/trunk/pokerth/debian/patches/series	2009-04-08 21:14:43 UTC (rev 9508)
@@ -1,3 +1,4 @@
 01_clean_libpokerth.patch
 02_use_dejavu_fonts.patch
 #03_use_--as-needed.patch
+04_link-gnutls-on-kfreebsd.patch