1 |
commit: 0c47f2ef13d2bab6903e9be45e815d3a9fc8c2bf |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 27 22:00:05 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 27 22:00:38 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c47f2ef |
7 |
|
8 |
games-strategy/hedgewars: Fix patch Qt5-deps |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
.../files/hedgewars-0.9.22-rpath-fix.patch | 5 ++- |
13 |
.../hedgewars/files/hedgewars-0.9.23-qt5-1.patch | 10 ++---- |
14 |
.../hedgewars/files/hedgewars-0.9.23-qt5-2.patch | 38 +--------------------- |
15 |
3 files changed, 5 insertions(+), 48 deletions(-) |
16 |
|
17 |
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch |
18 |
index 332c0c3ce4a..881c0d3217d 100644 |
19 |
--- a/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch |
20 |
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch |
21 |
@@ -1,6 +1,5 @@ |
22 |
-diff -up hedgewars-src-0.9.22/cmake_modules/paths.cmake~ hedgewars-src-0.9.22/cmake_modules/paths.cmake |
23 |
---- hedgewars-src-0.9.22/cmake_modules/paths.cmake~ 2015-12-02 15:02:38.000000000 +0100 |
24 |
-+++ hedgewars-src-0.9.22/cmake_modules/paths.cmake 2015-12-02 15:15:24.729980850 +0100 |
25 |
+--- a/cmake_modules/paths.cmake 2015-12-02 15:02:38.000000000 +0100 |
26 |
++++ b/cmake_modules/paths.cmake 2015-12-02 15:15:24.729980850 +0100 |
27 |
@@ -67,5 +67,5 @@ else(APPLE AND NOT (${CMAKE_INSTALL_PREF |
28 |
# - the third one is the full path of the system dir |
29 |
#source http://www.cmake.org/pipermail/cmake/2008-January/019290.html |
30 |
|
31 |
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-1.patch b/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-1.patch |
32 |
index ec96bd8ef45..fdd15108b5d 100644 |
33 |
--- a/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-1.patch |
34 |
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-1.patch |
35 |
@@ -1,19 +1,14 @@ |
36 |
- |
37 |
-# HG changeset patch |
38 |
# User unc0rr |
39 |
-# Date 1516824334 -3600 |
40 |
# Node ID 8869b5256720f0378bf9d5edc68ecb7e1f376039 |
41 |
-# Parent 856570ddd409bec11645c90b5a92fb79c5f2a4e1 |
42 |
Configure for Qt5 |
43 |
|
44 |
-diff -r 856570ddd409 -r 8869b5256720 QTfrontend/CMakeLists.txt |
45 |
--- a/QTfrontend/CMakeLists.txt Mon Jan 15 12:15:56 2018 -0500 |
46 |
+++ b/QTfrontend/CMakeLists.txt Wed Jan 24 21:05:34 2018 +0100 |
47 |
@@ -1,24 +1,6 @@ |
48 |
-# Configure for Qt4 |
49 |
-set(QT_MIN_VERSION "4.7.0") |
50 |
-include(CheckLibraryExists) |
51 |
-+find_package(Qt5 COMPONENTS Core Gui Network Svg Xml OpenGL) |
52 |
++find_package(Qt5 COMPONENTS Core Gui Network Widgets) |
53 |
|
54 |
-set(QT_USE_QTCORE TRUE) |
55 |
-set(QT_USE_QTGUI TRUE) |
56 |
@@ -53,7 +48,7 @@ diff -r 856570ddd409 -r 8869b5256720 QTfrontend/CMakeLists.txt |
57 |
list(APPEND HW_LINK_LIBS |
58 |
physfs physlayer |
59 |
- ${QT_LIBRARIES} |
60 |
-+ Qt5::Core Qt5::Gui Qt5::Network Qt5::Svg Qt5::Xml Qt5::OpenGL |
61 |
++ Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets |
62 |
) |
63 |
|
64 |
list(APPEND HW_LINK_LIBS |
65 |
@@ -65,7 +60,6 @@ diff -r 856570ddd409 -r 8869b5256720 QTfrontend/CMakeLists.txt |
66 |
if(WIN32 AND NOT UNIX) |
67 |
if(NOT SDL2_LIBRARY) |
68 |
list(APPEND HW_LINK_LIBS SDL2) |
69 |
-diff -r 856570ddd409 -r 8869b5256720 share/hedgewars/Data/Locale/CMakeLists.txt |
70 |
--- a/share/hedgewars/Data/Locale/CMakeLists.txt Mon Jan 15 12:15:56 2018 -0500 |
71 |
+++ b/share/hedgewars/Data/Locale/CMakeLists.txt Wed Jan 24 21:05:34 2018 +0100 |
72 |
@@ -1,5 +1,4 @@ |
73 |
|
74 |
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-2.patch b/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-2.patch |
75 |
index eb4e465f009..f174cc15633 100644 |
76 |
--- a/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-2.patch |
77 |
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-2.patch |
78 |
@@ -1,23 +1,17 @@ |
79 |
- |
80 |
-# HG changeset patch |
81 |
# User unc0rr |
82 |
-# Date 1516828810 -3600 |
83 |
# Node ID fc47fc4af6bd6f399035923453cd85c8f50146f7 |
84 |
-# Parent 8869b5256720f0378bf9d5edc68ecb7e1f376039 |
85 |
Finish porting. Seems to work, but no thorough testing has been performed |
86 |
|
87 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/CMakeLists.txt |
88 |
--- a/QTfrontend/CMakeLists.txt Wed Jan 24 21:05:34 2018 +0100 |
89 |
+++ b/QTfrontend/CMakeLists.txt Wed Jan 24 22:20:10 2018 +0100 |
90 |
@@ -1,5 +1,7 @@ |
91 |
- find_package(Qt5 COMPONENTS Core Gui Network Svg Xml OpenGL) |
92 |
+ find_package(Qt5 COMPONENTS Core Gui Network Widgets) |
93 |
|
94 |
+include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) |
95 |
+ |
96 |
include(CheckLibraryExists) |
97 |
|
98 |
find_package(SDL2 REQUIRED) |
99 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/main.cpp |
100 |
--- a/QTfrontend/main.cpp Wed Jan 24 21:05:34 2018 +0100 |
101 |
+++ b/QTfrontend/main.cpp Wed Jan 24 22:20:10 2018 +0100 |
102 |
@@ -20,7 +20,6 @@ |
103 |
@@ -46,7 +40,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/main.cpp |
104 |
} |
105 |
|
106 |
// Load locale files into translators |
107 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/model/ammoSchemeModel.cpp |
108 |
--- a/QTfrontend/model/ammoSchemeModel.cpp Wed Jan 24 21:05:34 2018 +0100 |
109 |
+++ b/QTfrontend/model/ammoSchemeModel.cpp Wed Jan 24 22:20:10 2018 +0100 |
110 |
@@ -569,7 +569,7 @@ |
111 |
@@ -67,19 +60,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/model/ammoSchemeModel.cpp |
112 |
hedgeeditor |
113 |
<< predefSchemesNames[11] // name 0 |
114 |
<< QVariant(false) // fortsmode 1 |
115 |
-@@ -664,9 +664,9 @@ |
116 |
- << QVariant(0) // world edge 42 |
117 |
- << QVariant() // scriptparam 43 |
118 |
- ; |
119 |
-- |
120 |
-- |
121 |
-- |
122 |
-+ |
123 |
-+ |
124 |
-+ |
125 |
- schemes.append(defaultScheme); |
126 |
- schemes.append(proMode); |
127 |
- schemes.append(shoppa); |
128 |
@@ -896,10 +896,12 @@ |
129 |
return; |
130 |
} |
131 |
@@ -94,7 +74,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/model/ammoSchemeModel.cpp |
132 |
- reset(); |
133 |
+ endResetModel(); |
134 |
} |
135 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/model/playerslistmodel.cpp |
136 |
--- a/QTfrontend/model/playerslistmodel.cpp Wed Jan 24 21:05:34 2018 +0100 |
137 |
+++ b/QTfrontend/model/playerslistmodel.cpp Wed Jan 24 22:20:10 2018 +0100 |
138 |
@@ -309,10 +309,10 @@ |
139 |
@@ -110,7 +89,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/model/playerslistmodel.cpp |
140 |
else |
141 |
setData(index, QBrush(QColor(0xff, 0xcc, 0x00)), Qt::ForegroundRole); |
142 |
} |
143 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/net/hwmap.cpp |
144 |
--- a/QTfrontend/net/hwmap.cpp Wed Jan 24 21:05:34 2018 +0100 |
145 |
+++ b/QTfrontend/net/hwmap.cpp Wed Jan 24 22:20:10 2018 +0100 |
146 |
@@ -79,7 +79,7 @@ |
147 |
@@ -122,7 +100,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/net/hwmap.cpp |
148 |
|
149 |
QPixmap px(QSize(256, 128)); |
150 |
QPixmap pxres(px.size()); |
151 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/net/netudpwidget.cpp |
152 |
--- a/QTfrontend/net/netudpwidget.cpp Wed Jan 24 21:05:34 2018 +0100 |
153 |
+++ b/QTfrontend/net/netudpwidget.cpp Wed Jan 24 22:20:10 2018 +0100 |
154 |
@@ -33,15 +33,19 @@ |
155 |
@@ -157,7 +134,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/net/netudpwidget.cpp |
156 |
} |
157 |
|
158 |
QVariant HWNetUdpModel::data(const QModelIndex &index, |
159 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/net/newnetclient.cpp |
160 |
--- a/QTfrontend/net/newnetclient.cpp Wed Jan 24 21:05:34 2018 +0100 |
161 |
+++ b/QTfrontend/net/newnetclient.cpp Wed Jan 24 22:20:10 2018 +0100 |
162 |
@@ -242,7 +242,7 @@ |
163 |
@@ -239,7 +215,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/net/newnetclient.cpp |
164 |
.append("!hedgewars") |
165 |
, QCryptographicHash::Sha1).toHex(); |
166 |
|
167 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/net/proto.h |
168 |
--- a/QTfrontend/net/proto.h Wed Jan 24 21:05:34 2018 +0100 |
169 |
+++ b/QTfrontend/net/proto.h Wed Jan 24 22:20:10 2018 +0100 |
170 |
@@ -22,7 +22,7 @@ |
171 |
@@ -251,7 +226,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/net/proto.h |
172 |
|
173 |
class HWProto : public QObject |
174 |
{ |
175 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/dialog/upload_video.cpp |
176 |
--- a/QTfrontend/ui/dialog/upload_video.cpp Wed Jan 24 21:05:34 2018 +0100 |
177 |
+++ b/QTfrontend/ui/dialog/upload_video.cpp Wed Jan 24 22:20:10 2018 +0100 |
178 |
@@ -38,7 +38,7 @@ |
179 |
@@ -281,7 +255,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/dialog/upload_video.cpp |
180 |
|
181 |
// We have authenticated, now we can send metadata and start upload |
182 |
// Documentation is here: https://developers.google.com/youtube/2.0/developers_guide_protocol_resumable_uploads#Resumable_uploads |
183 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/page/pageadmin.cpp |
184 |
--- a/QTfrontend/ui/page/pageadmin.cpp Wed Jan 24 21:05:34 2018 +0100 |
185 |
+++ b/QTfrontend/ui/page/pageadmin.cpp Wed Jan 24 22:20:10 2018 +0100 |
186 |
@@ -98,7 +98,7 @@ |
187 |
@@ -293,7 +266,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/page/pageadmin.cpp |
188 |
twBans->setEditTriggers(QAbstractItemView::NoEditTriggers); |
189 |
twBans->setSelectionBehavior(QAbstractItemView::SelectRows); |
190 |
twBans->setSelectionMode(QAbstractItemView::SingleSelection); |
191 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/page/pagenet.cpp |
192 |
--- a/QTfrontend/ui/page/pagenet.cpp Wed Jan 24 21:05:34 2018 +0100 |
193 |
+++ b/QTfrontend/ui/page/pagenet.cpp Wed Jan 24 22:20:10 2018 +0100 |
194 |
@@ -99,7 +99,7 @@ |
195 |
@@ -305,7 +277,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/page/pagenet.cpp |
196 |
|
197 |
static_cast<HWNetServersModel *>(tvServersList->model())->updateList(); |
198 |
|
199 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/page/pageroomslist.cpp |
200 |
--- a/QTfrontend/ui/page/pageroomslist.cpp Wed Jan 24 21:05:34 2018 +0100 |
201 |
+++ b/QTfrontend/ui/page/pageroomslist.cpp Wed Jan 24 22:20:10 2018 +0100 |
202 |
@@ -154,7 +154,7 @@ |
203 |
@@ -326,7 +297,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/page/pageroomslist.cpp |
204 |
|
205 |
if (!restoreHeaderState()) |
206 |
{ |
207 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/page/pagevideos.cpp |
208 |
--- a/QTfrontend/ui/page/pagevideos.cpp Wed Jan 24 21:05:34 2018 +0100 |
209 |
+++ b/QTfrontend/ui/page/pagevideos.cpp Wed Jan 24 22:20:10 2018 +0100 |
210 |
@@ -133,8 +133,8 @@ |
211 |
@@ -349,7 +319,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/page/pagevideos.cpp |
212 |
for (int i = 0; i < array.size(); i++) |
213 |
array[i] = array[i] ^ 0xC4 ^ i; |
214 |
return QString::fromUtf8(array); |
215 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/about.cpp |
216 |
--- a/QTfrontend/ui/widget/about.cpp Wed Jan 24 21:05:34 2018 +0100 |
217 |
+++ b/QTfrontend/ui/widget/about.cpp Wed Jan 24 22:20:10 2018 +0100 |
218 |
@@ -26,6 +26,7 @@ |
219 |
@@ -360,7 +329,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/about.cpp |
220 |
#include "hwconsts.h" |
221 |
#include "SDLInteraction.h" |
222 |
#include "SDL.h" |
223 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/chatwidget.cpp |
224 |
--- a/QTfrontend/ui/widget/chatwidget.cpp Wed Jan 24 21:05:34 2018 +0100 |
225 |
+++ b/QTfrontend/ui/widget/chatwidget.cpp Wed Jan 24 22:20:10 2018 +0100 |
226 |
@@ -32,6 +32,7 @@ |
227 |
@@ -415,7 +383,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/chatwidget.cpp |
228 |
); |
229 |
} |
230 |
|
231 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/feedbackdialog.cpp |
232 |
--- a/QTfrontend/ui/widget/feedbackdialog.cpp Wed Jan 24 21:05:34 2018 +0100 |
233 |
+++ b/QTfrontend/ui/widget/feedbackdialog.cpp Wed Jan 24 22:20:10 2018 +0100 |
234 |
@@ -20,7 +20,7 @@ |
235 |
@@ -436,7 +403,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/feedbackdialog.cpp |
236 |
header.setRawHeader("Content-Type", "application/x-www-form-urlencoded"); |
237 |
|
238 |
nam->post(header, body); |
239 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/keybinder.cpp |
240 |
--- a/QTfrontend/ui/widget/keybinder.cpp Wed Jan 24 21:05:34 2018 +0100 |
241 |
+++ b/QTfrontend/ui/widget/keybinder.cpp Wed Jan 24 22:20:10 2018 +0100 |
242 |
@@ -154,7 +154,7 @@ |
243 |
@@ -448,7 +414,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/keybinder.cpp |
244 |
curTable->verticalHeader()->setDefaultSectionSize(rowHeight); |
245 |
curTable->setShowGrid(false); |
246 |
curTable->setStyleSheet("QTableWidget { border: none; } "); |
247 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/mapContainer.cpp |
248 |
--- a/QTfrontend/ui/widget/mapContainer.cpp Wed Jan 24 21:05:34 2018 +0100 |
249 |
+++ b/QTfrontend/ui/widget/mapContainer.cpp Wed Jan 24 22:20:10 2018 +0100 |
250 |
@@ -984,7 +984,7 @@ |
251 |
@@ -460,7 +425,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/mapContainer.cpp |
252 |
//QSize iconSize = icon.actualSize(QSize(65535, 65535)); |
253 |
//btnTheme->setFixedHeight(64); |
254 |
//btnTheme->setIconSize(iconSize); |
255 |
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/util/FileEngine.h |
256 |
--- a/QTfrontend/util/FileEngine.h Wed Jan 24 21:05:34 2018 +0100 |
257 |
+++ b/QTfrontend/util/FileEngine.h Wed Jan 24 22:20:10 2018 +0100 |
258 |
@@ -1,9 +1,7 @@ |