fails to build against latest mpv changes (<mpv/qthelper.hpp>)

[ahjolinna]

it seems <mpv/qthelper.hpp> is not needed? with latest git changes of mpv

[   75s] g++ -c -pipe -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -g -Wall -O2 -O2 -std=gnu++11 -Wall -Wextra -D_REENTRANT -fPIC -DAPP_VERSION=\"v1.5.1rc+git~20190816-19.54\" -DAPP_NAME=\"Orion\" -DMPV_PLAYER -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_DBUS_LIB -DQT_CORE_LIB -I. -isystem /usr/include/qt5 -isystem /usr/include/qt5/QtQuick -isystem /usr/include/qt5/QtWidgets -isystem /usr/include/qt5/QtGui -isystem /usr/include/qt5/QtQmlModels -isystem /usr/include/qt5/QtQml -isystem /usr/include/qt5/QtNetwork -isystem /usr/include/qt5/QtDBus -isystem /usr/include/qt5/QtCore -I. -I/usr/lib64/qt5/mkspecs/linux-g++ -o game.o src/model/game.cpp
[   76s] In file included from src/player/mpvrenderer.h:5,
[   76s]                  from src/main.cpp:39:
[   76s] src/player/mpvobject.h:7:10: fatal error: mpv/qthelper.hpp: No such file or directory
[   76s]     7 | #include <mpv/qthelper.hpp>
[   76s]       |          ^~~~~~~~~~~~~~~~~~
[   76s] compilation terminated.
[   76s] make: *** [Makefile:795: main.o] Error 1
[   76s] make: *** Waiting for unfinished jobs....
[   77s] src/model/game.cpp: In copy constructor 'Game::Game(const Game&)':
[   77s] src/model/game.cpp:72:1: warning: base class 'class QObject' should be explicitly initialized in the copy constructor [-Wextra]
[   77s]    72 | Game::Game(const Game &other)
[   77s]       | ^~~~
[   77s] src/model/channel.cpp: In copy constructor 'Channel::Channel(const Channel&)':
[   77s] src/model/channel.cpp:67:1: warning: base class 'class QObject' should be explicitly initialized in the copy constructor [-Wextra]
[   77s]    67 | Channel::Channel(const Channel &channel){
[   77s]       | ^~~~~~~
[   77s] src/network/networkmanager.cpp: In function 'void addOfflineChannels(QList<Channel*>&, const QList<long long unsigned int>&)':
[   77s] src/network/networkmanager.cpp:957:67: warning: 'QSet<T> QList<T>::toSet() const [with T = long long unsigned int]' is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations]
[   77s]   957 |         QSet<quint64> unseenChannelIds = expectedChannelIds.toSet();
[   77s]       |                                                                   ^
[   77s] In file included from /usr/include/qt5/QtCore/qdebug.h:52,
[   77s]                  from /usr/include/qt5/QtNetwork/qabstractsocket.h:47,
[   77s]                  from /usr/include/qt5/QtNetwork/qtcpsocket.h:44,
[   77s]                  from /usr/include/qt5/QtNetwork/qsslsocket.h:49,
[   77s]                  from /usr/include/qt5/QtNetwork/qsslconfiguration.h:62,
[   77s]                  from /usr/include/qt5/QtNetwork/QSslConfiguration:1,
[   77s]                  from /usr/include/qt5/QtNetwork/qnetworkaccessmanager.h:49,
[   77s]                  from /usr/include/qt5/QtNetwork/QNetworkAccessManager:1,
[   77s]                  from src/network/networkmanager.h:19,
[   77s]                  from src/network/networkmanager.cpp:15:
[   77s] /usr/include/qt5/QtCore/qset.h:388:30: note: declared here
[   77s]   388 | Q_OUTOFLINE_TEMPLATE QSet<T> QList<T>::toSet() const
[   77s]       |                              ^~~~~~~~
[   78s] In file included from src/model/channelmanager.cpp:15:
[   78s] src/model/channelmanager.h: In constructor 'BitsImageProvider::BitsImageProvider(ChannelManager*, bool)':
[   78s] src/model/channelmanager.h:67:10: warning: 'BitsImageProvider::_hiDpi' will be initialized after [-Wreorder]
[   78s]    67 |     bool _hiDpi;
[   78s]       |          ^~~~~~
[   78s] src/model/channelmanager.h:66:9: warning:   'int BitsImageProvider::_channelId' [-Wreorder]
[   78s]    66 |     int _channelId;
[   78s]       |         ^~~~~~~~~~
[   78s] src/model/channelmanager.cpp:134:1: warning:   when initialized here [-Wreorder]
[   78s]   134 | BitsImageProvider::BitsImageProvider(ChannelManager * channelManager, bool hiDpi) : ImageProvider("bits", ".gif"), _channelManager(channelManager), _hiDpi(hiDpi), _channelId(-1) {
[   78s]       | ^~~~~~~~~~~~~~~~~
[   78s] src/model/channelmanager.cpp: In member function 'void ChannelManager::addBlockedUserResults(const QList<QString>&, quint32, quint32)':
[   78s] src/model/channelmanager.cpp:1236:62: warning: 'QSet<T> QList<T>::toSet() const [with T = QString]' is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations]
[   78s]  1236 |         emit blockedUsersLoaded(blockedUserListLoading.toSet());
[   78s]       |                                                              ^
[   78s] In file included from /usr/include/qt5/QtCore/qobject.h:49,
[   78s]                  from /usr/include/qt5/QtCore/qiodevice.h:45,
[   78s]                  from /usr/include/qt5/QtCore/qfiledevice.h:43,
[   78s]                  from /usr/include/qt5/QtCore/qfile.h:44,
[   78s]                  from /usr/include/qt5/QtCore/QFile:1,
[   78s]                  from src/model/../util/fileutils.h:24,
[   78s]                  from src/model/channel.h:18,
[   78s]                  from src/model/channelmanager.h:18,
[   78s]                  from src/model/channelmanager.cpp:15:
[   78s] /usr/include/qt5/QtCore/qlist.h:413:13: note: declared here
[   78s]   413 |     QSet<T> toSet() const;
[   78s]       |             ^~~~~
[   82s] error: Bad exit status from /var/tmp/rpm-tmp.B1NJlL (%build)
[   82s] 
[   82s] 
[   82s] RPM build errors:
[   82s]     Macro expanded in comment on line 97: %{_datadir}/metainfo/Orion.appdata.xml

[krop]

mpv no longer ships qthelper, see https://github.com/mpv-player/mpv/commit/575197ff

[ahjolinna]

I made a patch that should work, at least for me : LINK

[ahjolinna]

(my)fix is merged