diff options
| -rwxr-xr-x[-rw-r--r--] | .SRCINFO | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | .gitignore | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | PKGBUILD | 17 | ||||
| -rwxr-xr-x[-rw-r--r--] | doomseeker-launch-script.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | doomseeker.desktop | 0 | ||||
| -rw-r--r-- | doomseeker.qt5.11.patch | 47 |
6 files changed, 63 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO index 11a3bf04d8b4..cc05afd9942c 100644..100755 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = doomseeker pkgdesc = A cross-platform Doom server browser pkgver = 1.2 - pkgrel = 20180328 + pkgrel = 20180730 url = http://doomseeker.drdteam.org/ arch = i686 arch = x86_64 @@ -20,12 +20,14 @@ pkgbase = doomseeker optdepends = odamex: Classic client/server multiplayer fork optdepends = chocolate-doom: Doom source port accurately reproducing the original DOS versions of Doom optdepends = srb2: A 3D Sonic fan game based off of Doom Legacy (aka "Sonic Robo Blast 2") - source = hg+https://bitbucket.org/Doomseeker/doomseeker#revision=5aaddc0 + source = hg+https://bitbucket.org/Doomseeker/doomseeker#revision=c2c7f37 source = doomseeker.desktop source = doomseeker-launch-script.sh + source = doomseeker.qt5.11.patch sha256sums = SKIP sha256sums = 64004248a2dd3771292e63717a05e1859f1ffe6d6fd5f16ebfa1427b9a43533f sha256sums = 96fca72228a50d80b019adf3c82b8800a9d7f03994252e544513537541d011a4 + sha256sums = de43c3fe7557079f1937e6c5aef5c01fa3ce4c4bd561db73a0b2a1fe2193bcdb pkgname = doomseeker diff --git a/.gitignore b/.gitignore index a27588589c17..a27588589c17 100644..100755 --- a/.gitignore +++ b/.gitignore diff --git a/PKGBUILD b/PKGBUILD index 2ea91b7327c8..882a3463b0e4 100644..100755 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=doomseeker pkgver=1.2 -pkgrel=20180328 +pkgrel=20180730 pkgdesc="A cross-platform Doom server browser" arch=(i686 x86_64) url="http://doomseeker.drdteam.org/" @@ -17,20 +17,27 @@ optdepends=('qt4: A cross-platform application and UI framework' 'chocolate-doom: Doom source port accurately reproducing the original DOS versions of Doom' 'srb2: A 3D Sonic fan game based off of Doom Legacy (aka "Sonic Robo Blast 2")') -source=("hg+https://bitbucket.org/Doomseeker/doomseeker#revision=5aaddc0" +source=("hg+https://bitbucket.org/Doomseeker/doomseeker#revision=c2c7f37" "doomseeker.desktop" - "doomseeker-launch-script.sh") + "doomseeker-launch-script.sh" + "doomseeker.qt5.11.patch") sha256sums=('SKIP' '64004248a2dd3771292e63717a05e1859f1ffe6d6fd5f16ebfa1427b9a43533f' - '96fca72228a50d80b019adf3c82b8800a9d7f03994252e544513537541d011a4') + '96fca72228a50d80b019adf3c82b8800a9d7f03994252e544513537541d011a4' + 'de43c3fe7557079f1937e6c5aef5c01fa3ce4c4bd561db73a0b2a1fe2193bcdb') _bbdir=doomseeker +prepare() { + cd $srcdir/$pkgname + patch -p1 -i "${srcdir}/doomseeker.qt5.11.patch" +} + build() { cd $srcdir/$_bbdir mkdir -p build cd build - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=true -DCMAKE_INSTALL_PREFIX=/usr .. && \ + cmake -DCMAKE_BUILD_TYPE=Release .. && \ make -j$(nproc) } diff --git a/doomseeker-launch-script.sh b/doomseeker-launch-script.sh index 7d4aab37c40d..7d4aab37c40d 100644..100755 --- a/doomseeker-launch-script.sh +++ b/doomseeker-launch-script.sh diff --git a/doomseeker.desktop b/doomseeker.desktop index 6268fbfb2bc9..6268fbfb2bc9 100644..100755 --- a/doomseeker.desktop +++ b/doomseeker.desktop diff --git a/doomseeker.qt5.11.patch b/doomseeker.qt5.11.patch new file mode 100644 index 000000000000..1e6467df84ca --- /dev/null +++ b/doomseeker.qt5.11.patch @@ -0,0 +1,47 @@ +Només a doomseeker.new/src/core: gitinfo.h +diff -ura --color doomseeker.old/src/core/gui/irc/ircdock.cpp doomseeker.new/src/core/gui/irc/ircdock.cpp +--- doomseeker.old/src/core/gui/irc/ircdock.cpp 2018-07-30 12:17:23.853792053 +0200 ++++ doomseeker.new/src/core/gui/irc/ircdock.cpp 2018-07-30 12:06:14.852671501 +0200 +@@ -32,7 +32,7 @@ + #include <QInputDialog> + #include <QMessageBox> + #include <QToolBar> +- ++#include <QTabBar> + DClass<IRCDock> : public Ui::IRCDock + { + public: +diff -ura --color doomseeker.old/src/core/gui/logdock.cpp doomseeker.new/src/core/gui/logdock.cpp +--- doomseeker.old/src/core/gui/logdock.cpp 2018-07-30 12:17:23.863792171 +0200 ++++ doomseeker.new/src/core/gui/logdock.cpp 2018-07-30 12:11:00.743865873 +0200 +@@ -25,6 +25,7 @@ + #include "logdock.h" + #include "log.h" + #include "ui_logdock.h" ++#include "QAction" + + DClass<LogDock> : public Ui::LogDock + { +diff -ura --color doomseeker.old/src/core/gui/serverdetailsdock.cpp doomseeker.new/src/core/gui/serverdetailsdock.cpp +--- doomseeker.old/src/core/gui/serverdetailsdock.cpp 2018-07-30 12:17:23.850458680 +0200 ++++ doomseeker.new/src/core/gui/serverdetailsdock.cpp 2018-07-30 12:11:59.875219646 +0200 +@@ -30,6 +30,7 @@ + #include "serverapi/serverptr.h" + #include "serverapi/serverstructs.h" + #include "serverapi/tooltips/tooltipgenerator.h" ++#include "QAction" + + DClass<ServerDetailsDock> : public Ui::ServerDetailsDock + { +diff -ura --color doomseeker.old/src/core/gui/serverfilterdock.cpp doomseeker.new/src/core/gui/serverfilterdock.cpp +--- doomseeker.old/src/core/gui/serverfilterdock.cpp 2018-07-30 12:17:23.867125543 +0200 ++++ doomseeker.new/src/core/gui/serverfilterdock.cpp 2018-07-30 12:12:40.796071164 +0200 +@@ -25,7 +25,7 @@ + + #include "configuration/doomseekerconfig.h" + #include "gui/entity/serverlistfilterinfo.h" +- ++#include "QAction" + DClass<ServerFilterDock> : public Ui::ServerFilterDock + { + public: |