r16059 - packages/trunk/pokerth/debian/patches

[Evgeni Golov]

Author: evgeni
Date: 2017-11-11 16:07:01 +0000 (Sat, 11 Nov 2017)
New Revision: 16059

Modified:
   packages/trunk/pokerth/debian/patches/qmake-gcc-6.patch
Log:
refresh qmake-gcc-6.patch


Modified: packages/trunk/pokerth/debian/patches/qmake-gcc-6.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/qmake-gcc-6.patch	2017-11-11 15:01:41 UTC (rev 16058)
+++ packages/trunk/pokerth/debian/patches/qmake-gcc-6.patch	2017-11-11 16:07:01 UTC (rev 16059)
@@ -11,11 +11,10 @@
  pokerth_server.pro   | 1 -
  6 files changed, 1 insertion(+), 6 deletions(-)
 
-diff --git a/chatcleaner.pro b/chatcleaner.pro
-index 6d63b4a..56070d8 100644
---- a/chatcleaner.pro
-+++ b/chatcleaner.pro
-@@ -49,7 +49,6 @@ win32 {
+diff -Nrwu pokerth-1.1.2-rc/chatcleaner.pro pokerth-1.1.2-rc.patched/chatcleaner.pro
+--- pokerth-1.1.2-rc/chatcleaner.pro	2017-08-16 14:24:03.000000000 +0200
++++ pokerth-1.1.2-rc.patched/chatcleaner.pro	2017-11-11 16:50:18.536756474 +0100
+@@ -49,7 +49,6 @@
  !win32{
  	##### My release static build options
  	#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
@@ -23,11 +22,10 @@
  }
  mac {
  	# make it x86_64 only
-diff --git a/pokerth_db.pro b/pokerth_db.pro
-index 7c2d142..c524ee3 100644
---- a/pokerth_db.pro
-+++ b/pokerth_db.pro
-@@ -49,7 +49,6 @@ win32{
+diff -Nrwu pokerth-1.1.2-rc/pokerth_db.pro pokerth-1.1.2-rc.patched/pokerth_db.pro
+--- pokerth-1.1.2-rc/pokerth_db.pro	2017-08-16 14:24:03.000000000 +0200
++++ pokerth-1.1.2-rc.patched/pokerth_db.pro	2017-11-11 16:50:18.536756474 +0100
+@@ -52,7 +52,6 @@
  !win32{
  	##### My release static build options
  	#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
@@ -35,11 +33,10 @@
  }
  
  mac{
-diff --git a/pokerth_game.pro b/pokerth_game.pro
-index e3ddb03..e0e8660 100644
---- a/pokerth_game.pro
-+++ b/pokerth_game.pro
-@@ -404,7 +404,6 @@ unix:!mac {
+diff -Nrwu pokerth-1.1.2-rc/pokerth_game.pro pokerth-1.1.2-rc.patched/pokerth_game.pro
+--- pokerth-1.1.2-rc/pokerth_game.pro	2017-08-16 14:24:03.000000000 +0200
++++ pokerth-1.1.2-rc.patched/pokerth_game.pro	2017-11-11 16:50:18.536756474 +0100
+@@ -405,7 +405,6 @@
  	# #### My release static build options
  	# QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
  	# QMAKE_LFLAGS += -Wl,--gc-sections
@@ -47,40 +44,37 @@
  	QMAKE_LIBDIR += lib
  	!android{
  		LIBPATH += $${PREFIX}/lib /opt/gsasl/lib
-diff --git a/pokerth_lib.pro b/pokerth_lib.pro
-index 6db489d..498d06e 100644
---- a/pokerth_lib.pro
-+++ b/pokerth_lib.pro
-@@ -243,7 +243,7 @@ win32{
+diff -Nrwu pokerth-1.1.2-rc/pokerth_lib.pro pokerth-1.1.2-rc.patched/pokerth_lib.pro
+--- pokerth-1.1.2-rc/pokerth_lib.pro	2017-08-16 14:24:03.000000000 +0200
++++ pokerth-1.1.2-rc.patched/pokerth_lib.pro	2017-11-11 16:50:18.536756474 +0100
+@@ -286,7 +286,7 @@
  !win32{
  	##### My release static build options
  	#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
 -	INCLUDEPATH += $${PREFIX}/include /opt/gsasl/include
 +	INCLUDEPATH += /opt/gsasl/include
  }
- 
+
  mac{
-diff --git a/pokerth_protocol.pro b/pokerth_protocol.pro
-index 7a331df..2ead0ec 100644
---- a/pokerth_protocol.pro
-+++ b/pokerth_protocol.pro
-@@ -33,7 +33,6 @@ win32 {
- 	DEFINES += _WIN32_WINNT=0x0501
+diff -Nrwu pokerth-1.1.2-rc/pokerth_protocol.pro pokerth-1.1.2-rc.patched/pokerth_protocol.pro
+--- pokerth-1.1.2-rc/pokerth_protocol.pro	2017-08-16 14:24:03.000000000 +0200
++++ pokerth-1.1.2-rc.patched/pokerth_protocol.pro	2017-11-11 16:50:18.536756474 +0100
+@@ -40,7 +40,6 @@
+ 	system(protoc pokerth.proto --java_out=tests/src)
  }
  unix : !mac {
 -        INCLUDEPATH += $${PREFIX}/include
  	system(protoc pokerth.proto --cpp_out=src/third_party/protobuf)
  	system(protoc chatcleaner.proto --cpp_out=src/third_party/protobuf)
  	system(protoc pokerth.proto --java_out=tests/src)
-diff --git a/pokerth_server.pro b/pokerth_server.pro
-index 706475f..43b30f3 100644
---- a/pokerth_server.pro
-+++ b/pokerth_server.pro
-@@ -174,7 +174,6 @@ unix : !mac {
+diff -Nrwu pokerth-1.1.2-rc/pokerth_server.pro pokerth-1.1.2-rc.patched/pokerth_server.pro
+--- pokerth-1.1.2-rc/pokerth_server.pro	2017-08-16 14:24:03.000000000 +0200
++++ pokerth-1.1.2-rc.patched/pokerth_server.pro	2017-11-11 16:50:32.532893943 +0100
+@@ -177,7 +177,6 @@
  	#QMAKE_LFLAGS += -Wl,--gc-sections
- 
+
  	LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib
 -	INCLUDEPATH += $${PREFIX}/include
+ 	# see issue https://github.com/pokerth/pokerth/issues/282
+ 	INCLUDEPATH += $${PREFIX}/include/libircclient
  	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