Use sed instead of patch

This commit is contained in:
Janne Veteläinen 2023-02-15 20:00:56 +02:00
parent 0f186809c0
commit a32b08a8bc
4 changed files with 24 additions and 37 deletions

View file

@ -1,9 +1,9 @@
pkgbase = vmangos-git
pkgdesc = World of Warcraft Vanilla server emulator
pkgver = r5189.4cf93a964
pkgver = r5193.859f627e3
pkgrel = 1
url = https://github.com/vmangos/
install = vmangos.install
install = vmangos-git.install
arch = x86_64
license = GPL2
makedepends = gcc
@ -21,14 +21,13 @@ pkgbase = vmangos-git
conflicts = vmangos
backup = etc/vmangos/mangosd.conf
backup = etc/vmangos/realmd.conf
source = vmangos::git+https://github.com/vmangos/core.git
source = vmangos-git::git+https://github.com/vmangos/core.git
source = worlddb::git+https://github.com/brotalnia/database.git
source = user.conf
source = tmpfile.conf
source = vmangos-realmd.service
source = vmangos-mangosd.service
source = vmangos-mangosd.socket
source = mangosd.conf.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = 8061858ce3617c236cd09e72ab9ccdb39afd1b0f76659fdeead6861d247d5832
@ -36,6 +35,5 @@ pkgbase = vmangos-git
sha256sums = f7306b4d4ff7ed563ce2ccbdee38c9c0cdce009d4a91feee7e0a6b7940b1ea83
sha256sums = aade06747e04a22878203a5b2bddc577eff50addde231b9adbac5356ccd054d1
sha256sums = c3cee4cb049545cb9c0857f8977120d219d8afcf5c1cb0531546d38ecde98783
sha256sums = c200dd10b5f53d24746b3f734f6e03e7414ef7703d1a2db33d3fddfb99620be4
pkgname = vmangos-git

View file

@ -1,9 +1,8 @@
# Maintainer: Janne Veteläinen <janne.p.w.vetelainen@gmail.com>
_pkgname=vmangos
pkgname=${_pkgname}-git
pkgver=r5189.4cf93a964
pkgrel=2
pkgname=vmangos-git
pkgver=r5193.859f627e3
pkgrel=1
pkgdesc="World of Warcraft Vanilla server emulator"
arch=('x86_64')
url="https://github.com/vmangos/"
@ -22,24 +21,22 @@ makedepends=(
'git'
'p7zip'
)
optdepends=(
'vmangos-setupdb: Pacman hook to (insecurely) set up MariaDB')
optdepends=('vmangos-setupdb: Pacman hook to (insecurely) set up MariaDB')
backup=(
'etc/vmangos/mangosd.conf'
'etc/vmangos/realmd.conf'
)
install="${_pkgname}.install"
install="${pkgname}.install"
provides=('vmangos')
conflicts=('vmangos')
source=(
"${_pkgname}::git+https://github.com/vmangos/core.git"
"${pkgname}::git+https://github.com/vmangos/core.git"
"worlddb::git+https://github.com/brotalnia/database.git"
"user.conf"
"tmpfile.conf"
"vmangos-realmd.service"
"vmangos-mangosd.service"
"vmangos-mangosd.socket"
"mangosd.conf.patch"
)
sha256sums=(
'SKIP'
@ -49,11 +46,10 @@ sha256sums=(
'f7306b4d4ff7ed563ce2ccbdee38c9c0cdce009d4a91feee7e0a6b7940b1ea83'
'aade06747e04a22878203a5b2bddc577eff50addde231b9adbac5356ccd054d1'
'c3cee4cb049545cb9c0857f8977120d219d8afcf5c1cb0531546d38ecde98783'
'c200dd10b5f53d24746b3f734f6e03e7414ef7703d1a2db33d3fddfb99620be4'
)
pkgver() {
cd ${srcdir}/${_pkgname}
cd ${srcdir}/${pkgname}
printf "r%s.%s" $(git rev-list --count HEAD) $(git rev-parse --short HEAD)
}
@ -61,13 +57,13 @@ prepare() {
cd ${srcdir}/worlddb
7z e ${srcdir}/worlddb/world_full_14_june_2021.7z
cd ${srcdir}/${_pkgname}/sql/migrations
cd ${srcdir}/${pkgname}/sql/migrations
./merge.sh
}
build() {
cmake -B build -S "${_pkgname}" \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
export PATH="/usr/lib/ccache/bin/:$PATH"
cmake -B build -S "${pkgname}" \
-DSUPPORTED_CLIENT_BUILD=5875 \
-DUSE_EXTRACTORS=1 \
-DCMAKE_INSTALL_PREFIX='/usr' \
@ -84,6 +80,8 @@ package() {
mv ${pkgdir}/etc/vmangos/mangosd.conf.dist ${pkgdir}/etc/vmangos/mangosd.conf
# Edit default directories in mangosd.conf
sed -i -E 's/(DataDir.+").+(")/\1\/var\/lib\/vmangos\2/' ${pkgdir}/etc/vmangos/mangosd.conf
sed -i -E 's/(LogsDir.+").+(")/\1\/var\/log\/vmangos\2/' ${pkgdir}/etc/vmangos/mangosd.conf
patch -u ${pkgdir}/etc/vmangos/mangosd.conf -i ${srcdir}/mangosd.conf.patch
# Install vmangos sysuser and systemd service
@ -95,17 +93,17 @@ package() {
install -Dm644 ${srcdir}/tmpfile.conf ${pkgdir}/usr/lib/tmpfiles.d/vmangos.conf
# Install extractor related files
install -Dm644 ${srcdir}/${_pkgname}/contrib/mmap/offmesh.txt -t ${pkgdir}/usr/share/vmangos/extractors/mmap
install -Dm644 ${srcdir}/${_pkgname}/contrib/mmap/config.json -t ${pkgdir}/usr/share/vmangos/extractors/mmap
install -Dm644 ${srcdir}/${pkgname}/contrib/mmap/offmesh.txt -t ${pkgdir}/usr/share/vmangos/extractors/mmap
install -Dm644 ${srcdir}/${pkgname}/contrib/mmap/config.json -t ${pkgdir}/usr/share/vmangos/extractors/mmap
# Install sql scripts
install -Dm644 ${srcdir}/${_pkgname}/sql/logon.sql -T ${pkgdir}/usr/share/vmangos/sql/build/realmd.sql
install -Dm644 ${srcdir}/${pkgname}/sql/logon.sql -T ${pkgdir}/usr/share/vmangos/sql/build/realmd.sql
install -Dm644 ${srcdir}/worlddb/world_full_14_june_2021.sql -T ${pkgdir}/usr/share/vmangos/sql/build/mangos.sql
install -Dm644 ${srcdir}/${_pkgname}/sql/characters.sql -t ${pkgdir}/usr/share/vmangos/sql/build
install -Dm644 ${srcdir}/${_pkgname}/sql/logs.sql -t ${pkgdir}/usr/share/vmangos/sql/build
install -Dm644 ${srcdir}/${pkgname}/sql/characters.sql -t ${pkgdir}/usr/share/vmangos/sql/build
install -Dm644 ${srcdir}/${pkgname}/sql/logs.sql -t ${pkgdir}/usr/share/vmangos/sql/build
install -Dm644 ${srcdir}/${_pkgname}/sql/migrations/logon_db_updates.sql -T ${pkgdir}/usr/share/vmangos/sql/migrations/realmd_db_updates.sql
install -Dm644 ${srcdir}/${_pkgname}/sql/migrations/world_db_updates.sql -T ${pkgdir}/usr/share/vmangos/sql/migrations/mangos_db_updates.sql
install -Dm644 ${srcdir}/${_pkgname}/sql/migrations/characters_db_updates.sql -t ${pkgdir}/usr/share/vmangos/sql/migrations
install -Dm644 ${srcdir}/${_pkgname}/sql/migrations/logs_db_updates.sql -t ${pkgdir}/usr/share/vmangos/sql/migrations
install -Dm644 ${srcdir}/${pkgname}/sql/migrations/logon_db_updates.sql -T ${pkgdir}/usr/share/vmangos/sql/migrations/realmd_db_updates.sql
install -Dm644 ${srcdir}/${pkgname}/sql/migrations/world_db_updates.sql -T ${pkgdir}/usr/share/vmangos/sql/migrations/mangos_db_updates.sql
install -Dm644 ${srcdir}/${pkgname}/sql/migrations/characters_db_updates.sql -t ${pkgdir}/usr/share/vmangos/sql/migrations
install -Dm644 ${srcdir}/${pkgname}/sql/migrations/logs_db_updates.sql -t ${pkgdir}/usr/share/vmangos/sql/migrations
}

View file

@ -1,9 +0,0 @@
--- mangosd.conf 2023-02-06 23:08:36.350337959 +0200
+++ mangosd.conf.new 2023-02-07 00:15:59.207088335 +0200
@@ -72,4 +72,4 @@
RealmID = 1
-DataDir = "."
-LogsDir = ""
+DataDir = "/var/lib/vmangos"
+LogsDir = "/var/log/vmangos"
HonorDir = ""