Package: pokerth / 1.1.2-1

fix-includes.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
Description: fix build failure due to including -isystem /usr/include before everything else
 (usr/include is already included by the compiler itself)
Author: Gianfranco Costamagna <locutusofborg@debian.org>
Last-Update: 2018-10-02

Index: pokerth-1.1.2/pokerth_dbofficial.pro
===================================================================
--- pokerth-1.1.2.orig/pokerth_dbofficial.pro
+++ pokerth-1.1.2/pokerth_dbofficial.pro
@@ -73,7 +73,7 @@
 !win32 { 
     # #### My release static build options
     # QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
-    INCLUDEPATH += /usr/include \
+    INCLUDEPATH += \
         /usr/include/mysql \
         /usr/include/mysql++
     INCLUDEPATH += /opt/boost/include
Index: pokerth-1.1.2/pokerth_lib.pro
===================================================================
--- pokerth-1.1.2.orig/pokerth_lib.pro
+++ pokerth-1.1.2/pokerth_lib.pro
@@ -268,7 +268,7 @@
 		src/dbofficial/asyncdbadminplayers.cpp \
 		src/dbofficial/asyncdbblockplayer.cpp \
 		src/dbofficial/dbidmanager.cpp
-    INCLUDEPATH += /usr/include \
+    INCLUDEPATH += \
         /usr/include/mysql \
         /usr/include/mysql++
 }
@@ -285,7 +285,7 @@
 !win32{
 	##### My release static build options
 	#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
-	INCLUDEPATH += $${PREFIX}/include /opt/gsasl/include
+	INCLUDEPATH += /opt/gsasl/include
 }
 
 mac{
Index: pokerth-1.1.2/pokerth_protocol.pro
===================================================================
--- pokerth-1.1.2.orig/pokerth_protocol.pro
+++ pokerth-1.1.2/pokerth_protocol.pro
@@ -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)
Index: pokerth-1.1.2/chatcleaner.pro
===================================================================
--- pokerth-1.1.2.orig/chatcleaner.pro
+++ pokerth-1.1.2/chatcleaner.pro
@@ -49,7 +49,6 @@
 !win32{
 	##### My release static build options
 	#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
-	INCLUDEPATH += $${PREFIX}/include
 }
 mac {
 	# make it x86_64 only
Index: pokerth-1.1.2/connectivity.pro
===================================================================
--- pokerth-1.1.2.orig/connectivity.pro
+++ pokerth-1.1.2/connectivity.pro
@@ -40,7 +40,6 @@
 	#QMAKE_LFLAGS += -Wl,--gc-sections
 
 	QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib
-	INCLUDEPATH += $${PREFIX}/include
 	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
 	BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
 	BOOST_SYS = boost_system boost_system-mt
Index: pokerth-1.1.2/load.pro
===================================================================
--- pokerth-1.1.2.orig/load.pro
+++ pokerth-1.1.2/load.pro
@@ -41,7 +41,6 @@
 	#QMAKE_LFLAGS += -Wl,--gc-sections
 
 	QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib
-	INCLUDEPATH += $${PREFIX}/include
 	LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system($$QMAKE_QMAKE -query QT_INSTALL_LIBS)
 	BOOST_THREAD = boost_thread boost_thread-mt
 	BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt
Index: pokerth-1.1.2/pokerth_db.pro
===================================================================
--- pokerth-1.1.2.orig/pokerth_db.pro
+++ pokerth-1.1.2/pokerth_db.pro
@@ -52,7 +52,6 @@
 !win32{
 	##### My release static build options
 	#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
-	INCLUDEPATH += $${PREFIX}/include
 }
 
 mac{
Index: pokerth-1.1.2/pokerth_game.pro
===================================================================
--- pokerth-1.1.2.orig/pokerth_game.pro
+++ pokerth-1.1.2/pokerth_game.pro
@@ -407,7 +407,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
Index: pokerth-1.1.2/pokerth_server.pro
===================================================================
--- pokerth-1.1.2.orig/pokerth_server.pro
+++ pokerth-1.1.2/pokerth_server.pro
@@ -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_QMAKE -query QT_INSTALL_LIBS)