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

[Evgeni Golov]

Author: evgeni
Date: 2011-01-07 12:19:21 +0000 (Fri, 07 Jan 2011)
New Revision: 11636

Added:
   packages/trunk/pokerth/debian/patches/05_disable_gnu++0x.patch
Modified:
   packages/trunk/pokerth/debian/changelog
   packages/trunk/pokerth/debian/patches/series
Log:
Add 05_disable_gnu++0x.patch to fix FTBFS on Ubuntu

Modified: packages/trunk/pokerth/debian/changelog
===================================================================
--- packages/trunk/pokerth/debian/changelog	2011-01-07 12:16:00 UTC (rev 11635)
+++ packages/trunk/pokerth/debian/changelog	2011-01-07 12:19:21 UTC (rev 11636)
@@ -1,3 +1,9 @@
+pokerth (0.8.2-2) UNRELEASED; urgency=low
+
+  * Add 05_disable_gnu++0x.patch to fix FTBFS on Ubuntu.
+
+ -- Evgeni Golov <evgeni at debian.org>  Fri, 07 Jan 2011 13:18:35 +0100
+
 pokerth (0.8.2-1) experimental; urgency=low
 
   * New upstream bugfix release.

Added: packages/trunk/pokerth/debian/patches/05_disable_gnu++0x.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/05_disable_gnu++0x.patch	                        (rev 0)
+++ packages/trunk/pokerth/debian/patches/05_disable_gnu++0x.patch	2011-01-07 12:19:21 UTC (rev 11636)
@@ -0,0 +1,67 @@
+Description: Fix FTBFS with a combination of boost 1.42, gcc 4.5 and gnu++0x mode.
+
+diff --git a/chatcleaner.pro b/chatcleaner.pro
+index ed5d370..0e6ec3a 100644
+--- a/chatcleaner.pro
++++ b/chatcleaner.pro
+@@ -4,7 +4,7 @@
+ CODECFORSRC = UTF-8
+ QT += network
+ QT -= gui
+-QMAKE_CXXFLAGS += -std=gnu++0x
++#QMAKE_CXXFLAGS += -std=gnu++0x
+ TARGET = chatcleaner
+ CONFIG += console
+ CONFIG -= app_bundle
+diff --git a/pokerth_db.pro b/pokerth_db.pro
+index 2048e84..8986c61 100644
+--- a/pokerth_db.pro
++++ b/pokerth_db.pro
+@@ -14,7 +14,7 @@ MOC_DIR = mocs
+ OBJECTS_DIR = obj
+ DEFINES += ENABLE_IPV6
+ QT -= core gui
+-QMAKE_CXXFLAGS += -std=gnu++0x
++#QMAKE_CXXFLAGS += -std=gnu++0x
+ #PRECOMPILED_HEADER = src/pch_lib.h
+ 
+ INCLUDEPATH += . \
+diff --git a/pokerth_game.pro b/pokerth_game.pro
+index 38d8023..701ebe0 100644
+--- a/pokerth_game.pro
++++ b/pokerth_game.pro
+@@ -15,7 +15,7 @@ CONFIG += qt \
+ 	warn_on
+ include(src/third_party/qtsingleapplication/qtsingleapplication.pri)
+ QT += sql
+-QMAKE_CXXFLAGS += -std=gnu++0x
++#QMAKE_CXXFLAGS += -std=gnu++0x
+ UI_DIR = uics
+ MOC_DIR = mocs
+ OBJECTS_DIR = obj
+diff --git a/pokerth_lib.pro b/pokerth_lib.pro
+index 74d9f1d..24108c3 100644
+--- a/pokerth_lib.pro
++++ b/pokerth_lib.pro
+@@ -14,7 +14,7 @@ MOC_DIR = mocs
+ OBJECTS_DIR = obj
+ DEFINES += ENABLE_IPV6
+ QT -= core gui
+-QMAKE_CXXFLAGS += -std=gnu++0x
++#QMAKE_CXXFLAGS += -std=gnu++0x
+ #PRECOMPILED_HEADER = src/pch_lib.h
+ 
+ INCLUDEPATH += . \
+diff --git a/pokerth_server.pro b/pokerth_server.pro
+index a63bbaa..56de840 100644
+--- a/pokerth_server.pro
++++ b/pokerth_server.pro
+@@ -17,7 +17,7 @@ DEFINES += POKERTH_DEDICATED_SERVER
+ DEFINES += ENABLE_IPV6
+ DEFINES += PREFIX=\"$${PREFIX}\"
+ QT -= core gui
+-QMAKE_CXXFLAGS += -std=gnu++0x
++#QMAKE_CXXFLAGS += -std=gnu++0x
+ #PRECOMPILED_HEADER = src/pch_lib.h
+ 
+ INCLUDEPATH += . \

Modified: packages/trunk/pokerth/debian/patches/series
===================================================================
--- packages/trunk/pokerth/debian/patches/series	2011-01-07 12:16:00 UTC (rev 11635)
+++ packages/trunk/pokerth/debian/patches/series	2011-01-07 12:19:21 UTC (rev 11636)
@@ -2,3 +2,4 @@
 02_use_dejavu_fonts.patch
 #03_use_--as-needed.patch
 04_fix_build_no_add_neded.patch
+05_disable_gnu++0x.patch