summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO34
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD59
3 files changed, 64 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5f360db41217..f516693ec897 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cockatrice-client-git
pkgdesc = Open-source multiplatform supported program for playing tabletop card games over a network.
- pkgver = 2.8.1.beta.r3.gdb5f6e01
+ pkgver = 2.9.0.r29.gf5fe56c8
pkgrel = 1
url = https://cockatrice.github.io/
arch = i686
@@ -12,17 +12,29 @@ pkgbase = cockatrice-client-git
makedepends = git
makedepends = zlib
makedepends = xz
- depends = protobuf
- depends = qt5-svg
- depends = qt5-tools
- depends = qt5-multimedia
- depends = qt5-websockets
- optdepends = zlib: Support compressed MTGJSON
- optdepends = xz: Support compressed MTGJSON
- provides = cockatrice-client
- conflicts = cockatrice-client
- source = cockatrice-client-git::git+https://github.com/Cockatrice/Cockatrice
+ makedepends = mariadb-libs
+ makedepends = protobuf
+ makedepends = qt6-svg
+ makedepends = qt6-tools
+ makedepends = qt6-multimedia
+ makedepends = qt6-websockets
+ source = git+https://github.com/cockatrice/cockatrice
sha256sums = SKIP
pkgname = cockatrice-client-git
+ depends = protobuf
+ depends = qt6-multimedia
+ depends = qt6-websockets
+ depends = hicolor-icon-theme
+ optdepends = zlib: Support compressed MTGJSON in Oracle
+ optdepends = xz: Support compressed MTGJSON in Oracle
+ provides = cockatrice-client
+ conflicts = cockatrice-client
+pkgname = cockatrice-server-git
+ depends = protobuf
+ depends = qt6-websockets
+ depends = hicolor-icon-theme
+ optdepends = mariadb: database support
+ provides = cockatrice-server
+ conflicts = cockatrice-server
diff --git a/.gitignore b/.gitignore
index 3c8b8a8229a7..e77e2f054ccf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
Cockatrice/
+cockatrice/
cockatrice-client-git/
*.tar.xz
+*.tar.zst
*.swp
pkg/
src/
diff --git a/PKGBUILD b/PKGBUILD
index 17442e66b07d..b694ead649b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,42 +4,61 @@
# Contributor: Jorge Araya Navarro <elcorreo@deshackra.com>
# Contributor: Mikhail Burakov <mikhail.burakov@gmail.com>
-pkgname=cockatrice-client-git
-pkgver=2.8.1.beta.r3.gdb5f6e01
+# shellcheck shell=bash
+# shellcheck disable=SC2034
+
+_pkgbase=cockatrice
+pkgname=("cockatrice-client-git" "cockatrice-server-git")
+pkgver=2.9.0.r29.gf5fe56c8
pkgrel=1
pkgdesc='Open-source multiplatform supported program for playing tabletop card games over a network.'
arch=('i686' 'x86_64')
url='https://cockatrice.github.io/'
license=('GPL2')
-depends=('protobuf' 'qt5-svg' 'qt5-tools' 'qt5-multimedia' 'qt5-websockets')
-makedepends=('cmake' 'git' 'zlib' 'xz')
+makedepends=('cmake' 'git' 'zlib' 'xz' 'mariadb-libs' 'protobuf' 'qt6-svg' 'qt6-tools' 'qt6-multimedia' 'qt6-websockets')
checkdepends=('gtest' 'valgrind')
-optdepends=('zlib: Support compressed MTGJSON' 'xz: Support compressed MTGJSON')
-provides=('cockatrice-client')
-conflicts=('cockatrice-client')
-source=("$pkgname"::"git+https://github.com/Cockatrice/Cockatrice")
+source=("git+https://github.com/cockatrice/cockatrice")
sha256sums=('SKIP')
pkgver() {
- cd "$srcdir/$pkgname"
+ cd "${_pkgbase}" || exit 1
git describe --long --tags | cut -d- -f5- | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
}
+prepare() {
+ mkdir -p "${_pkgbase}/build"
+}
+
build() {
- cd "$srcdir/$pkgname"
- test -d build && rm -rf build
- mkdir build
- cd build
- cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DWITH_ORACLE=1 -DWITH_CLIENT=1 -DWITH_DBCONVERTER=1 -DWITH_SERVER=0 -DTEST=1 ..
- make
+ # Normally, CMake PKGBUILDS should override to set -O2 manually
+ # However, trice sets -O2 for Release builds, so we don't need to do this
+ # See the following:
+ # https://wiki.archlinux.org/title/CMake_package_guidelines#CMake_can_automatically_override_the_default_compiler_optimization_flag
+ # https://github.com/Cockatrice/Cockatrice/blob/master/CMakeLists.txt#L119
+ cmake -B "${_pkgbase}/build" -S "${_pkgbase}" -DCMAKE_INSTALL_PREFIX:PATH=/usr -DWITH_ORACLE=1 -DWITH_CLIENT=1 -DWITH_DBCONVERTER=1 -DWITH_SERVER=1 -DTEST=1
+ make -C "${_pkgbase}/build"
}
check() {
- cd "$srcdir/$pkgname/build"
- make test
+ make -C "${_pkgbase}/build" test
}
-package() {
- cd "$srcdir/$pkgname/build"
- make DESTDIR="$pkgdir/" install
+package_cockatrice-client-git() {
+ provides=('cockatrice-client')
+ conflicts=('cockatrice-client')
+ depends=('protobuf' 'qt6-multimedia' 'qt6-websockets' 'hicolor-icon-theme')
+ optdepends=('zlib: Support compressed MTGJSON in Oracle' 'xz: Support compressed MTGJSON in Oracle')
+
+ cmake -B "${_pkgbase}/build" -S "${_pkgbase}" -DCMAKE_INSTALL_PREFIX:PATH=/usr -DWITH_ORACLE=1 -DWITH_CLIENT=1 -DWITH_DBCONVERTER=1 -DWITH_SERVER=0 -DTEST=0
+ make -C "${_pkgbase}/build" DESTDIR="${pkgdir}/" install
+}
+
+package_cockatrice-server-git() {
+ provides=('cockatrice-server')
+ conflicts=('cockatrice-server')
+ depends=('protobuf' 'qt6-websockets' 'hicolor-icon-theme')
+ optdepends=('mariadb: database support')
+
+ cmake -B "${_pkgbase}/build" -S "${_pkgbase}" -DCMAKE_INSTALL_PREFIX:PATH=/usr -DWITH_ORACLE=0 -DWITH_CLIENT=0 -DWITH_DBCONVERTER=0 -DWITH_SERVER=1 -DTEST=0
+ make -C "${_pkgbase}/build" DESTDIR="${pkgdir}/" install
}