[pokerth/f15/master] Fix build.
Jussi Lehtola
jussilehtola at fedoraproject.org
Tue Feb 22 00:11:35 UTC 2011
commit d4b52f4a8724011bb3cedee4236050bc55a0f852
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date: Tue Feb 22 02:11:34 2011 +0200
Fix build.
pokerth-0.8.3-filesystem.patch | 36 ++++++++++++++++++++++++++++++++++++
pokerth-libs.patch | 12 ------------
pokerth.spec | 10 +++++++++-
3 files changed, 45 insertions(+), 13 deletions(-)
---
diff --git a/pokerth-0.8.3-filesystem.patch b/pokerth-0.8.3-filesystem.patch
new file mode 100644
index 0000000..f50db1b
--- /dev/null
+++ b/pokerth-0.8.3-filesystem.patch
@@ -0,0 +1,36 @@
+diff -up PokerTH-0.8.3-src/pokerth_game.pro.orig PokerTH-0.8.3-src/pokerth_game.pro
+--- PokerTH-0.8.3-src/pokerth_game.pro.orig 2011-01-16 21:37:12.000000000 +0200
++++ PokerTH-0.8.3-src/pokerth_game.pro 2011-02-21 21:57:13.348491747 +0200
+@@ -19,7 +19,7 @@ QMAKE_CXXFLAGS += -std=gnu++0x
+ UI_DIR = uics
+ MOC_DIR = mocs
+ OBJECTS_DIR = obj
+-DEFINES += ENABLE_IPV6
++DEFINES += ENABLE_IPV6 BOOST_FILESYSTEM_VERSION=2
+ DEFINES += PREFIX=\"$${PREFIX}\"
+ TARGET = pokerth
+
+diff -up PokerTH-0.8.3-src/pokerth_lib.pro.orig PokerTH-0.8.3-src/pokerth_lib.pro
+--- PokerTH-0.8.3-src/pokerth_lib.pro.orig 2011-01-16 21:37:12.000000000 +0200
++++ PokerTH-0.8.3-src/pokerth_lib.pro 2011-02-21 21:57:13.350491836 +0200
+@@ -12,7 +12,7 @@ UI_DIR = uics
+ TARGET = lib/pokerth_lib
+ MOC_DIR = mocs
+ OBJECTS_DIR = obj
+-DEFINES += ENABLE_IPV6
++DEFINES += ENABLE_IPV6 BOOST_FILESYSTEM_VERSION=2
+ QT -= core gui
+ QMAKE_CXXFLAGS += -std=gnu++0x
+ #PRECOMPILED_HEADER = src/pch_lib.h
+diff -up PokerTH-0.8.3-src/pokerth_server.pro.orig PokerTH-0.8.3-src/pokerth_server.pro
+--- PokerTH-0.8.3-src/pokerth_server.pro.orig 2011-01-16 21:37:12.000000000 +0200
++++ PokerTH-0.8.3-src/pokerth_server.pro 2011-02-21 21:57:13.353491970 +0200
+@@ -14,7 +14,7 @@ TARGET = bin/pokerth_server
+ MOC_DIR = mocs
+ OBJECTS_DIR = obj
+ DEFINES += POKERTH_DEDICATED_SERVER
+-DEFINES += ENABLE_IPV6
++DEFINES += ENABLE_IPV6 BOOST_FILESYSTEM_VERSION=2
+ DEFINES += PREFIX=\"$${PREFIX}\"
+ QT -= core gui
+ QMAKE_CXXFLAGS += -std=gnu++0x
diff --git a/pokerth.spec b/pokerth.spec
index a2107b6..034bf84 100644
--- a/pokerth.spec
+++ b/pokerth.spec
@@ -1,11 +1,14 @@
Name: pokerth
Version: 0.8.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A Texas-Holdem poker game
Group: Amusements/Games
License: GPLv2+
URL: http://www.pokerth.net
Source0: http://downloads.sourceforge.net/%{name}/PokerTH-%{version}-src.tar.bz2
+# Patch to fix build against newer versions of Boost. Already reported and
+# fixed upstream.
+Patch0: pokerth-0.8.3-filesystem.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: desktop-file-utils
@@ -30,6 +33,7 @@ is available for Linux, Windows, and MacOSX.
%prep
%setup -q -n PokerTH-%{version}-src
+%patch0 -p1
# Fix permissions
chmod 644 ChangeLog
@@ -42,6 +46,7 @@ for file in *.pro; do
done
%build
+export CXXFLAGS="%{optflags} -DBOOST_FILESYSTEM_VERSION=2"
%{_qt4_qmake} pokerth.pro
make %{?_smp_mflags}
@@ -76,6 +81,9 @@ rm -rf %{buildroot}
%{_datadir}/pixmaps/%{name}.png
%changelog
+* Sun Feb 20 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.8.3-x
+- Fix build against new boost.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list