summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPol_M2018-08-20 23:50:58 +0200
committerPol_M2018-08-20 23:50:58 +0200
commitf0121d4776ab0ecd15d06f416975647fc30f8628 (patch)
tree3c5ae1fe4de50fd03fb0dd66444b971f6cde36d6
parent329d287e6c409e3454e461e23b50c89aef8bb52e (diff)
downloadaur-f0121d4776ab0ecd15d06f416975647fc30f8628.tar.gz
Fixed bug were translations did not appear.
Changes to be committed: modified: .SRCINFO modified: PKGBUILD deleted: doomseeker-launch-script.sh deleted: doomseeker.desktop deleted: doomseeker.qt5.11.patch
-rwxr-xr-x.SRCINFO10
-rwxr-xr-xPKGBUILD37
-rwxr-xr-xdoomseeker-launch-script.sh4
-rwxr-xr-xdoomseeker.desktop10
-rw-r--r--doomseeker.qt5.11.patch47
5 files changed, 15 insertions, 93 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d2662597523..9846053be39 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = doomseeker
pkgdesc = A cross-platform Doom server browser
- pkgver = r2191+.c2c7f37b1afb+
+ pkgver = r2205.aafacb71daee
pkgrel = 1
epoch = 1
url = https://doomseeker.drdteam.org/
@@ -19,14 +19,8 @@ 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=c2c7f37
- source = doomseeker.desktop
- source = doomseeker-launch-script.sh
- source = doomseeker.qt5.11.patch
+ source = hg+https://bitbucket.org/Doomseeker/doomseeker#revision=aafacb7
sha256sums = SKIP
- sha256sums = 64004248a2dd3771292e63717a05e1859f1ffe6d6fd5f16ebfa1427b9a43533f
- sha256sums = 96fca72228a50d80b019adf3c82b8800a9d7f03994252e544513537541d011a4
- sha256sums = de43c3fe7557079f1937e6c5aef5c01fa3ce4c4bd561db73a0b2a1fe2193bcdb
pkgname = doomseeker
diff --git a/PKGBUILD b/PKGBUILD
index 2bcad056ace..6a9559ef9d5 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Reotip Sakuraga <reotipfur@gmail.com>
pkgname=doomseeker
-pkgver=r2191+.c2c7f37b1afb+
+pkgver=r2205.aafacb71daee
pkgrel=1
epoch=1
pkgdesc="A cross-platform Doom server browser"
@@ -18,43 +18,32 @@ 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=c2c7f37"
- "doomseeker.desktop"
- "doomseeker-launch-script.sh"
- "doomseeker.qt5.11.patch")
+source=("hg+https://bitbucket.org/Doomseeker/doomseeker#revision=aafacb7")
-sha256sums=('SKIP'
- '64004248a2dd3771292e63717a05e1859f1ffe6d6fd5f16ebfa1427b9a43533f'
- '96fca72228a50d80b019adf3c82b8800a9d7f03994252e544513537541d011a4'
- 'de43c3fe7557079f1937e6c5aef5c01fa3ce4c4bd561db73a0b2a1fe2193bcdb')
+sha256sums=('SKIP')
pkgver() {
cd "$pkgname"
printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
}
-prepare() {
- cd "$srcdir/$pkgname"
- patch -p1 -i "${srcdir}/doomseeker.qt5.11.patch"
-}
+# No longer needed. Patch was commited.
+#prepare() {
+# cd "$srcdir/$pkgname"
+# patch -p1 -i "${srcdir}/doomseeker.qt5.11.patch"
+#}
build() {
cd "$srcdir/$pkgname"
mkdir -p build
cd build
- cmake -DCMAKE_BUILD_TYPE=Release .. && \
+ cmake -DCMAKE_INSTALL_PREFIX=/usr ..
make
}
package() {
- mkdir -p "$pkgdir/usr/games/doomseeker/engines/"
- cd "$srcdir/$pkgname/build"
- install -Dm755 doomseeker "$pkgdir/usr/games/doomseeker"
- install -Dm755 -t "$pkgdir/usr/games/doomseeker/" libwadseeker.so*
- cd engines
- install -Dm755 -t "$pkgdir/usr/games/doomseeker/engines/" *.so
- cd ../../
- install -Dm644 "media/icon.png" "$pkgdir/usr/share/pixmaps/doomseeker.png"
- install -Dm755 "$srcdir/../doomseeker-launch-script.sh" "$pkgdir/usr/bin/doomseeker"
- install -Dm644 "$srcdir/../doomseeker.desktop" "$pkgdir/usr/share/applications/doomseeker.desktop"
+ cd "$srcdir/$pkgname/build/"
+ make DESTDIR=$pkgdir install
+ # lib64 is a symlink. We have to move stuff to lib
+ mv $pkgdir/usr/lib64 $pkgdir/usr/lib
}
diff --git a/doomseeker-launch-script.sh b/doomseeker-launch-script.sh
deleted file mode 100755
index 7d4aab37c40..00000000000
--- a/doomseeker-launch-script.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export LD_LIBRARY_PATH=/usr/games/doomseeker
-exec /usr/games/doomseeker/doomseeker "$@"
diff --git a/doomseeker.desktop b/doomseeker.desktop
deleted file mode 100755
index 6268fbfb2bc..00000000000
--- a/doomseeker.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.1
-Type=Application
-Name=Doomseeker
-GenericName=Cross-platform Doom server browser
-Icon=doomseeker
-Exec=doomseeker %F
-Terminal=false
-Categories=Utility;Game
diff --git a/doomseeker.qt5.11.patch b/doomseeker.qt5.11.patch
deleted file mode 100644
index 1e6467df84c..00000000000
--- a/doomseeker.qt5.11.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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: