make into split package with cockatrice-server-git

3 files changed, 42 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c56f471483a..9854bb191ee3 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.r33.g10628943
+	pkgver = 2.8.1.beta.2.r4.gda922292
 	pkgrel = 1
 	url = https://cockatrice.github.io/
 	arch = i686
@@ -26,4 +26,3 @@ pkgbase = cockatrice-client-git
 	sha256sums = SKIP
 
 pkgname = cockatrice-client-git
-
diff --git a/.gitignore b/.gitignore
index 15f9245e5bd2..e77e2f054ccf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 Cockatrice/
+cockatrice/
 cockatrice-client-git/
 *.tar.xz
 *.tar.zst
diff --git a/PKGBUILD b/PKGBUILD
index cb70e88066fe..d828bce5b04c 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.r33.g10628943
+# shellcheck shell=bash
+# shellcheck disable=SC2034
+
+pkgbase=cockatrice
+pkgname=("cockatrice-client-git" "cockatrice-server-git")
+pkgver=2.8.1.beta.10.r16.g5854a635
 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')
-checkdepends=('gtest' 'gmock' 'valgrind')
-optdepends=('zlib: Support compressed MTGJSON' 'xz: Support compressed MTGJSON')
-provides=('cockatrice-client')
-conflicts=('cockatrice-client')
-source=("$pkgname"::"git+https://github.com/Cockatrice/Cockatrice")
+makedepends=('cmake' 'git' 'zlib' 'xz' 'mariadb-libs' 'protobuf' 'qt6-svg' 'qt6-tools' 'qt6-multimedia' 'qt6-websockets')
+checkdepends=('gtest' 'valgrind')
+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
 }