[arch-commits] Commit in pokerth/trunk (PKGBUILD pokerth-gcc6.patch)

[Antonio Rojas]

    Date: Thursday, May 12, 2016 @ 23:17:22
  Author: arojas
Revision: 175087

Fix build with GCC 6, use C++98

Added:
  pokerth/trunk/pokerth-gcc6.patch
Modified:
  pokerth/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   13 +++++++++----
 pokerth-gcc6.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-12 20:39:08 UTC (rev 175086)
+++ PKGBUILD	2016-05-12 21:17:22 UTC (rev 175087)
@@ -18,10 +18,12 @@
 makedepends=('boost')
 source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2"
         '0001-Qt-5.5.0-patch-for-qtsingleapplication.patch'
-        'pokerth-1.1.1-Qualify-std-ifstream-and-std-ofstream.patch')
+        'pokerth-1.1.1-Qualify-std-ifstream-and-std-ofstream.patch'
+        'pokerth-gcc6.patch')
 md5sums=('a7f76f95782099f966e5f2b6809f502a'
          'f4ecab0a6435f1b3b0654145b75d6e7c'
-         '26b02c7e5c50484485570ace9b63be5b')
+         '26b02c7e5c50484485570ace9b63be5b'
+         '39070e7d656ae654e54ec9e25f9eea83')
 
 prepare() {
   cd "$srcdir/$_realname-$pkgver-src"
@@ -31,12 +33,15 @@
 
   # https://github.com/pokerth/pokerth/commit/69f820bb3
   patch -p1 -i ../pokerth-1.1.1-Qualify-std-ifstream-and-std-ofstream.patch
+
+  # Fix build with GCC 6
+  patch -p1 -i ../pokerth-gcc6.patch
 }
 
 build() {
   cd "$srcdir/$_realname-$pkgver-src"
-
-  qmake-qt5 "$pkgname.pro"
+  
+  qmake-qt5 "$pkgname.pro" QMAKE_CXXFLAGS+="-std=gnu++98"
   make
 }
 

Added: pokerth-gcc6.patch
===================================================================
--- pokerth-gcc6.patch	                        (rev 0)
+++ pokerth-gcc6.patch	2016-05-12 21:17:22 UTC (rev 175087)
@@ -0,0 +1,41 @@
+--- PokerTH-1.1.1-src/pokerth_db.pro.orig	2016-05-12 20:20:57.336018308 +0000
++++ PokerTH-1.1.1-src/pokerth_db.pro	2016-05-12 20:21:14.335959204 +0000
+@@ -49,7 +49,6 @@
+ !win32{
+ 	##### My release static build options
+ 	#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+-	INCLUDEPATH += $${PREFIX}/include
+ }
+ 
+ mac{
+--- PokerTH-1.1.1-src/pokerth_lib.pro.orig	2016-05-12 20:24:53.581864921 +0000
++++ PokerTH-1.1.1-src/pokerth_lib.pro	2016-05-12 20:25:20.441771862 +0000
+@@ -243,7 +243,7 @@
+ !win32{
+ 	##### My release static build options
+ 	#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+-	INCLUDEPATH += $${PREFIX}/include /opt/gsasl/include
++	INCLUDEPATH += /opt/gsasl/include
+ }
+ 
+ mac{
+--- PokerTH-1.1.1-src/pokerth_game.pro.orig	2016-05-12 21:02:08.527791266 +0000
++++ PokerTH-1.1.1-src/pokerth_game.pro	2016-05-12 21:02:19.027758386 +0000
+@@ -402,7 +402,6 @@
+ 	# #### My release static build options
+ 	# QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+ 	# QMAKE_LFLAGS += -Wl,--gc-sections
+-	INCLUDEPATH += $${PREFIX}/include
+ 	QMAKE_LIBDIR += lib
+ 	!android{
+ 		LIBPATH += $${PREFIX}/lib /opt/gsasl/lib
+--- PokerTH-1.1.1-src/pokerth_server.pro.orig	2016-05-12 21:10:02.469679181 +0000
++++ PokerTH-1.1.1-src/pokerth_server.pro	2016-05-12 21:10:34.106251260 +0000
+@@ -174,7 +174,6 @@
+ 	#QMAKE_LFLAGS += -Wl,--gc-sections
+ 
+ 	LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib
+-	INCLUDEPATH += $${PREFIX}/include
+ 	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
+ 	BOOST_FS = boost_filesystem boost_filesystem-mt
+ 	BOOST_THREAD = boost_thread boost_thread-mt