commit: 0c47f2ef13d2bab6903e9be45e815d3a9fc8c2bf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 22:00:05 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 22:00:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c47f2ef
games-strategy/hedgewars: Fix patch Qt5-deps
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../files/hedgewars-0.9.22-rpath-fix.patch | 5 ++-
.../hedgewars/files/hedgewars-0.9.23-qt5-1.patch | 10 ++----
.../hedgewars/files/hedgewars-0.9.23-qt5-2.patch | 38 +---------------------
3 files changed, 5 insertions(+), 48 deletions(-)
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
index 332c0c3ce4a..881c0d3217d 100644
--- a/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
@@ -1,6 +1,5 @@
-diff -up hedgewars-src-0.9.22/cmake_modules/paths.cmake~
hedgewars-src-0.9.22/cmake_modules/paths.cmake
---- hedgewars-src-0.9.22/cmake_modules/paths.cmake~ 2015-12-02
15:02:38.000000000 +0100
-+++ hedgewars-src-0.9.22/cmake_modules/paths.cmake 2015-12-02
15:15:24.729980850 +0100
+--- a/cmake_modules/paths.cmake 2015-12-02 15:02:38.000000000 +0100
++++ b/cmake_modules/paths.cmake 2015-12-02 15:15:24.729980850 +0100
@@ -67,5 +67,5 @@ else(APPLE AND NOT (${CMAKE_INSTALL_PREF
# - the third one is the full path of the system dir
#source http://www.cmake.org/pipermail/cmake/2008-January/019290.html
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
index ec96bd8ef45..fdd15108b5d 100644
--- a/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-1.patch
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-1.patch
@@ -1,19 +1,14 @@
-
-# HG changeset patch
# User unc0rr
-# Date 1516824334 -3600
# Node ID 8869b5256720f0378bf9d5edc68ecb7e1f376039
-# Parent 856570ddd409bec11645c90b5a92fb79c5f2a4e1
Configure for Qt5
-diff -r 856570ddd409 -r 8869b5256720 QTfrontend/CMakeLists.txt
--- a/QTfrontend/CMakeLists.txt Mon Jan 15 12:15:56 2018 -0500
+++ b/QTfrontend/CMakeLists.txt Wed Jan 24 21:05:34 2018 +0100
@@ -1,24 +1,6 @@
-# Configure for Qt4
-set(QT_MIN_VERSION "4.7.0")
-include(CheckLibraryExists)
-+find_package(Qt5 COMPONENTS Core Gui Network Svg Xml OpenGL)
++find_package(Qt5 COMPONENTS Core Gui Network Widgets)
-set(QT_USE_QTCORE TRUE)
-set(QT_USE_QTGUI TRUE)
@@ -53,7 +48,7 @@ diff -r 856570ddd409 -r 8869b5256720 QTfrontend/CMakeLists.txt
list(APPEND HW_LINK_LIBS
physfs physlayer
- ${QT_LIBRARIES}
-+ Qt5::Core Qt5::Gui Qt5::Network Qt5::Svg Qt5::Xml Qt5::OpenGL
++ Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets
)
list(APPEND HW_LINK_LIBS
@@ -65,7 +60,6 @@ diff -r 856570ddd409 -r 8869b5256720 QTfrontend/CMakeLists.txt
if(WIN32 AND NOT UNIX)
if(NOT SDL2_LIBRARY)
list(APPEND HW_LINK_LIBS SDL2)
-diff -r 856570ddd409 -r 8869b5256720 share/hedgewars/Data/Locale/CMakeLists.txt
--- a/share/hedgewars/Data/Locale/CMakeLists.txt Mon Jan 15 12:15:56
2018 -0500
+++ b/share/hedgewars/Data/Locale/CMakeLists.txt Wed Jan 24 21:05:34
2018 +0100
@@ -1,5 +1,4 @@
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
index eb4e465f009..f174cc15633 100644
--- a/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-2.patch
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-2.patch
@@ -1,23 +1,17 @@
-
-# HG changeset patch
# User unc0rr
-# Date 1516828810 -3600
# Node ID fc47fc4af6bd6f399035923453cd85c8f50146f7
-# Parent 8869b5256720f0378bf9d5edc68ecb7e1f376039
Finish porting. Seems to work, but no thorough testing has been performed
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/CMakeLists.txt
--- a/QTfrontend/CMakeLists.txt Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/CMakeLists.txt Wed Jan 24 22:20:10 2018 +0100
@@ -1,5 +1,7 @@
- find_package(Qt5 COMPONENTS Core Gui Network Svg Xml OpenGL)
+ find_package(Qt5 COMPONENTS Core Gui Network Widgets)
+include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS})
+
include(CheckLibraryExists)
find_package(SDL2 REQUIRED)
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/main.cpp
--- a/QTfrontend/main.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/main.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -20,7 +20,6 @@
@@ -46,7 +40,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/main.cpp
}
// Load locale files into translators
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/model/ammoSchemeModel.cpp
--- a/QTfrontend/model/ammoSchemeModel.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/model/ammoSchemeModel.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -569,7 +569,7 @@
@@ -67,19 +60,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/model/ammoSchemeModel.cpp
hedgeeditor
<< predefSchemesNames[11] // name 0
<< QVariant(false) // fortsmode 1
-@@ -664,9 +664,9 @@
- << QVariant(0) // world edge 42
- << QVariant() // scriptparam 43
- ;
--
--
--
-+
-+
-+
- schemes.append(defaultScheme);
- schemes.append(proMode);
- schemes.append(shoppa);
@@ -896,10 +896,12 @@
return;
}
@@ -94,7 +74,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/model/ammoSchemeModel.cpp
- reset();
+ endResetModel();
}
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/model/playerslistmodel.cpp
--- a/QTfrontend/model/playerslistmodel.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/model/playerslistmodel.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -309,10 +309,10 @@
@@ -110,7 +89,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/model/playerslistmodel.cpp
else
setData(index, QBrush(QColor(0xff, 0xcc, 0x00)), Qt::ForegroundRole);
}
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/net/hwmap.cpp
--- a/QTfrontend/net/hwmap.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/net/hwmap.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -79,7 +79,7 @@
@@ -122,7 +100,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/net/hwmap.cpp
QPixmap px(QSize(256, 128));
QPixmap pxres(px.size());
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/net/netudpwidget.cpp
--- a/QTfrontend/net/netudpwidget.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/net/netudpwidget.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -33,15 +33,19 @@
@@ -157,7 +134,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/net/netudpwidget.cpp
}
QVariant HWNetUdpModel::data(const QModelIndex &index,
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/net/newnetclient.cpp
--- a/QTfrontend/net/newnetclient.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/net/newnetclient.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -242,7 +242,7 @@
@@ -239,7 +215,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/net/newnetclient.cpp
.append("!hedgewars")
, QCryptographicHash::Sha1).toHex();
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/net/proto.h
--- a/QTfrontend/net/proto.h Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/net/proto.h Wed Jan 24 22:20:10 2018 +0100
@@ -22,7 +22,7 @@
@@ -251,7 +226,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/net/proto.h
class HWProto : public QObject
{
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/dialog/upload_video.cpp
--- a/QTfrontend/ui/dialog/upload_video.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/ui/dialog/upload_video.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -38,7 +38,7 @@
@@ -281,7 +255,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/ui/dialog/upload_video.cpp
// We have authenticated, now we can send metadata and start upload
// Documentation is here:
https://developers.google.com/youtube/2.0/developers_guide_protocol_resumable_uploads#Resumable_uploads
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/page/pageadmin.cpp
--- a/QTfrontend/ui/page/pageadmin.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/ui/page/pageadmin.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -98,7 +98,7 @@
@@ -293,7 +266,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/ui/page/pageadmin.cpp
twBans->setEditTriggers(QAbstractItemView::NoEditTriggers);
twBans->setSelectionBehavior(QAbstractItemView::SelectRows);
twBans->setSelectionMode(QAbstractItemView::SingleSelection);
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/page/pagenet.cpp
--- a/QTfrontend/ui/page/pagenet.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/ui/page/pagenet.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -99,7 +99,7 @@
@@ -305,7 +277,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/ui/page/pagenet.cpp
static_cast<HWNetServersModel *>(tvServersList->model())->updateList();
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/page/pageroomslist.cpp
--- a/QTfrontend/ui/page/pageroomslist.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/ui/page/pageroomslist.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -154,7 +154,7 @@
@@ -326,7 +297,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/ui/page/pageroomslist.cpp
if (!restoreHeaderState())
{
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/page/pagevideos.cpp
--- a/QTfrontend/ui/page/pagevideos.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/ui/page/pagevideos.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -133,8 +133,8 @@
@@ -349,7 +319,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/ui/page/pagevideos.cpp
for (int i = 0; i < array.size(); i++)
array[i] = array[i] ^ 0xC4 ^ i;
return QString::fromUtf8(array);
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/about.cpp
--- a/QTfrontend/ui/widget/about.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/ui/widget/about.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -26,6 +26,7 @@
@@ -360,7 +329,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/ui/widget/about.cpp
#include "hwconsts.h"
#include "SDLInteraction.h"
#include "SDL.h"
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/chatwidget.cpp
--- a/QTfrontend/ui/widget/chatwidget.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/ui/widget/chatwidget.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -32,6 +32,7 @@
@@ -415,7 +383,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/ui/widget/chatwidget.cpp
);
}
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/feedbackdialog.cpp
--- a/QTfrontend/ui/widget/feedbackdialog.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/ui/widget/feedbackdialog.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -20,7 +20,7 @@
@@ -436,7 +403,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/ui/widget/feedbackdialog.cpp
header.setRawHeader("Content-Type", "application/x-www-form-urlencoded");
nam->post(header, body);
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/keybinder.cpp
--- a/QTfrontend/ui/widget/keybinder.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/ui/widget/keybinder.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -154,7 +154,7 @@
@@ -448,7 +414,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/ui/widget/keybinder.cpp
curTable->verticalHeader()->setDefaultSectionSize(rowHeight);
curTable->setShowGrid(false);
curTable->setStyleSheet("QTableWidget { border: none; } ");
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/ui/widget/mapContainer.cpp
--- a/QTfrontend/ui/widget/mapContainer.cpp Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/ui/widget/mapContainer.cpp Wed Jan 24 22:20:10 2018 +0100
@@ -984,7 +984,7 @@
@@ -460,7 +425,6 @@ diff -r 8869b5256720 -r fc47fc4af6bd
QTfrontend/ui/widget/mapContainer.cpp
//QSize iconSize = icon.actualSize(QSize(65535, 65535));
//btnTheme->setFixedHeight(64);
//btnTheme->setIconSize(iconSize);
-diff -r 8869b5256720 -r fc47fc4af6bd QTfrontend/util/FileEngine.h
--- a/QTfrontend/util/FileEngine.h Wed Jan 24 21:05:34 2018 +0100
+++ b/QTfrontend/util/FileEngine.h Wed Jan 24 22:20:10 2018 +0100
@@ -1,9 +1,7 @@
