doomseeker: 2018-03-03 -> 2018-03-05

also fix the build with qt 5.11 since it seems this package had broken
This commit is contained in:
Cray Elliott 2018-07-28 16:59:38 -07:00
parent a22797d356
commit 13df2522b4
2 changed files with 51 additions and 4 deletions

View File

@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "doomseeker-${version}";
version = "2018-03-03";
version = "2018-03-05";
src = fetchFromBitbucket {
owner = "Doomseeker";
repo = "doomseeker";
rev = "072110a8fe0643c4a72461e7768560813bb0a62b";
sha256 = "1w4g5f7yifqk2d054dqrmy8qj4n5hxdan7n59845m1xh2f2r8i0p";
rev = "c2c7f37b1afb";
sha256 = "17fna3a604miqsvply3klnmypps4ifz8axgd3pj96z46ybxs8akw";
};
patches = [ ./fix_paths.patch ];
patches = [ ./fix_paths.patch ./qt_build_fix.patch ];
buildInputs = [ qtbase qtmultimedia zlib bzip2 ];

View File

@ -0,0 +1,47 @@
diff -r c2c7f37b1afb src/core/gui/irc/ircdock.cpp
--- a/src/core/gui/irc/ircdock.cpp Tue Mar 06 00:14:23 2018 +0100
+++ b/src/core/gui/irc/ircdock.cpp Sat Jul 28 16:53:04 2018 -0700
@@ -32,6 +32,7 @@
#include <QInputDialog>
#include <QMessageBox>
#include <QToolBar>
+#include <QTabBar>
DClass<IRCDock> : public Ui::IRCDock
{
diff -r c2c7f37b1afb src/core/gui/logdock.cpp
--- a/src/core/gui/logdock.cpp Tue Mar 06 00:14:23 2018 +0100
+++ b/src/core/gui/logdock.cpp Sat Jul 28 16:53:04 2018 -0700
@@ -21,6 +21,8 @@
// Copyright (C) 2009 "Zalewa" <zalewapl@gmail.com>
//------------------------------------------------------------------------------
+#include <QAction>
+
#include "clipboard.h"
#include "logdock.h"
#include "log.h"
diff -r c2c7f37b1afb src/core/gui/serverdetailsdock.cpp
--- a/src/core/gui/serverdetailsdock.cpp Tue Mar 06 00:14:23 2018 +0100
+++ b/src/core/gui/serverdetailsdock.cpp Sat Jul 28 16:53:04 2018 -0700
@@ -21,6 +21,7 @@
// Copyright (C) 2014 Braden "Blzut3" Obrzut <admin@maniacsvault.net>
//------------------------------------------------------------------------------
+#include <QAction>
#include <QBoxLayout>
#include "serverdetailsdock.h"
diff -r c2c7f37b1afb src/core/gui/serverfilterdock.cpp
--- a/src/core/gui/serverfilterdock.cpp Tue Mar 06 00:14:23 2018 +0100
+++ b/src/core/gui/serverfilterdock.cpp Sat Jul 28 16:53:04 2018 -0700
@@ -20,6 +20,9 @@
//------------------------------------------------------------------------------
// Copyright (C) 2011 "Zalewa" <zalewapl@gmail.com>
//------------------------------------------------------------------------------
+
+#include <QAction>
+
#include "serverfilterdock.h"
#include "ui_serverfilterdock.h"