diff options
| -rwxr-xr-x | .SRCINFO | 9 | ||||
| -rwxr-xr-x | .gitignore | 1 | ||||
| -rwxr-xr-x | PKGBUILD | 31 |
3 files changed, 11 insertions, 30 deletions
@@ -1,6 +1,6 @@ pkgbase = doomseeker pkgdesc = A cross-platform Doom server browser - pkgver = r2212.3e1cbeb2dba8 + pkgver = 1.4.1.r0.g973e20aa pkgrel = 1 epoch = 1 url = https://doomseeker.drdteam.org/ @@ -8,19 +8,16 @@ pkgbase = doomseeker arch = x86_64 license = LGPL makedepends = cmake - makedepends = mercurial + makedepends = git depends = zlib depends = bzip2 depends = qt5-tools depends = qt5-base depends = qt5-multimedia - optdepends = qt4: A cross-platform application and UI framework optdepends = zandronum: GZDoom fork supporting client/server multiplayer 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=3e1cbeb + source = doomseeker::git+https://bitbucket.org/Doomseeker/doomseeker#tag=1.4.1 sha256sums = SKIP pkgname = doomseeker - diff --git a/.gitignore b/.gitignore index 6f93a32495f3..4d44951956a0 100755 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /*.tar.gz /*.tar.bz2 /*.tar.xz +/*.tar.zst /*.zip /*.7z /*.pkg.tar @@ -1,7 +1,7 @@ # Maintainer Pol Marcet Sardà <polmarcetsarda@gmail.com> pkgname=doomseeker -pkgver=r2338.ae7c4d5e7e5b +pkgver=1.4.1.r0.g973e20aa pkgrel=1 epoch=1 pkgdesc="A cross-platform Doom server browser" @@ -10,40 +10,25 @@ url="https://doomseeker.drdteam.org/" license=("LGPL") depends=('zlib' 'bzip2' 'qt5-tools' 'qt5-base' 'qt5-multimedia') -makedepends=('cmake' 'mercurial') -optdepends=('qt4: A cross-platform application and UI framework' - 'zandronum: GZDoom fork supporting client/server multiplayer' +makedepends=('cmake' 'git') +optdepends=('zandronum: GZDoom fork supporting client/server multiplayer' 'odamex: Classic client/server multiplayer fork' - '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")') + 'chocolate-doom: Doom source port accurately reproducing the original DOS versions of Doom') -# 1.2 Release -source=("hg+https://bitbucket.org/Doomseeker/doomseeker#tag=1.2" - "hg+https://bitbucket.org/Doomseeker/doomseeker-blobs#revision=450d81d") - -sha256sums=('SKIP' - 'SKIP') +source=('doomseeker::git+https://bitbucket.org/Doomseeker/doomseeker#tag=1.4.1') +sha256sums=('SKIP') pkgver() { cd "$pkgname" - printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)" + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } -# No longer needed. Patch was commited. -#prepare() { -# cd "$srcdir/$pkgname" -# patch -p1 -i "${srcdir}/doomseeker.qt5.11.patch" -#} - build() { - cd "$srcdir/$pkgname-blobs" - python3 geolite2_conv.py geo/GeoLite2-Country-Blocks-IPv4.csv geo/GeoLite2-Country-Locations-en.csv "$srcdir/$pkgname/src/core/IpToCountry.dat" cd "$srcdir/$pkgname" mkdir -p build cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DDOOMSEEKER_IP2C_DAT:FILEPATH="IpToCountry.dat" \ .. make } @@ -51,6 +36,4 @@ build() { package() { cd "$srcdir/$pkgname/build/" make DESTDIR=$pkgdir install - # lib64 is a symlink of lib. We have to move stuff to lib - mv $pkgdir/usr/lib64 $pkgdir/usr/lib } |