diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-02 18:01:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-02 18:01:05 +0000 |
commit | 31135daf485709c22c7c64f6cddfd436731cb590 (patch) | |
tree | 1e1e859b59a4c8948db34d42439b5599fdba6d3e /pkgs/games/doom-ports | |
parent | 7e5eff56a35b2d87cb2bd2802a3aea9d0f761d0a (diff) | |
parent | 4c704748b3f2dc351cfb7168793edd84837064a6 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/games/doom-ports')
-rw-r--r-- | pkgs/games/doom-ports/doomseeker/qt_build_fix.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch b/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch deleted file mode 100644 index e21b53b3cc536..0000000000000 --- a/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -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" - |