[packages/pokerth] - fixed building on x32 - rel 6

baggins baggins at pld-linux.org
Sat Jun 27 11:02:18 CEST 2015


commit d89f689266a2754cd1eb06afe2f5da98cb07980d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jun 27 11:02:01 2015 +0200

    - fixed building on x32
    - rel 6

 pokerth.spec |  4 +++-
 x32.patch    | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
---
diff --git a/pokerth.spec b/pokerth.spec
index 4fab455..d390b66 100644
--- a/pokerth.spec
+++ b/pokerth.spec
@@ -2,12 +2,13 @@ Summary:	The Open Source Texas-Holdem Poker Engine
 Summary(pl.UTF-8):	Silnik gry Texas-Holdem poker
 Name:		pokerth
 Version:	1.1
-Release:	5
+Release:	6
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	http://downloads.sourceforge.net/pokerth/PokerTH-%{version}-src.tar.bz2
 # Source0-md5:	7f577fdb04c697ac7227c1a0d4311ffc
 Patch0:		qt.patch
+Patch1:		x32.patch
 URL:		http://www.pokerth.net/
 BuildRequires:	QtCore-devel >= 4.3.1
 BuildRequires:	QtGui-devel >= 4.3.1
@@ -42,6 +43,7 @@ Silnik gry dostępny jest na platformy Linux, Windows oraz MacOS X.
 %prep
 %setup -q -n PokerTH-%{version}-src
 %patch0 -p1
+%patch1 -p1
 
 %build
 qmake-qt4 pokerth.pro \
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..378a50d
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,43 @@
+--- PokerTH-1.1-src/pokerth_game.pro~	2013-12-22 17:58:01.000000000 +0100
++++ PokerTH-1.1-src/pokerth_game.pro	2015-06-27 10:48:03.818795259 +0200
+@@ -408,6 +408,7 @@
+ 		LIBPATH += $${PREFIX}/lib /opt/gsasl/lib
+ 		LIB_DIRS = $${PREFIX}/lib \
+ 			$${PREFIX}/lib64 \
++			$${PREFIX}/libx32 \
+ 			$$system(qmake -query QT_INSTALL_LIBS)
+ 	}
+ 	android{
+--- PokerTH-1.1-src/connectivity.pro~	2013-12-22 17:58:01.000000000 +0100
++++ PokerTH-1.1-src/connectivity.pro	2015-06-27 10:48:51.073035818 +0200
+@@ -41,7 +41,7 @@
+ 
+ 	QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib
+ 	INCLUDEPATH += $${PREFIX}/include
+-	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
++	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $${PREFIX}/libx32 $$system(qmake -query QT_INSTALL_LIBS)
+ 	BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
+ 	BOOST_SYS = boost_system boost_system-mt
+ 
+--- PokerTH-1.1-src/load.pro~	2013-12-22 17:58:01.000000000 +0100
++++ PokerTH-1.1-src/load.pro	2015-06-27 10:49:15.413504240 +0200
+@@ -42,7 +42,7 @@
+ 
+ 	QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib
+ 	INCLUDEPATH += $${PREFIX}/include
+-	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
++	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $${PREFIX}/libx32 $$system(qmake -query QT_INSTALL_LIBS)
+ 	BOOST_THREAD = boost_thread boost_thread-mt
+ 	BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
+ 	BOOST_SYS = boost_system boost_system-mt
+--- PokerTH-1.1-src/pokerth_server.pro~	2013-12-22 17:58:01.000000000 +0100
++++ PokerTH-1.1-src/pokerth_server.pro	2015-06-27 10:49:32.887174260 +0200
+@@ -175,7 +175,7 @@
+ 
+ 	LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib
+ 	INCLUDEPATH += $${PREFIX}/include
+-	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
++	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $${PREFIX}/libx32 $$system(qmake -query QT_INSTALL_LIBS)
+ 	BOOST_FS = boost_filesystem boost_filesystem-mt
+ 	BOOST_THREAD = boost_thread boost_thread-mt
+ 	BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pokerth.git/commitdiff/d89f689266a2754cd1eb06afe2f5da98cb07980d



More information about the pld-cvs-commit mailing list