Bump to 1.8.3

3 files changed, 44 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 058411966dbd..d15d614c18a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = drogon
 	pkgdesc = A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows
-	pkgver = 1.5.1
+	pkgver = 1.8.3
 	pkgrel = 1
 	url = https://github.com/an-tao/drogon
 	arch = x86_64
@@ -16,8 +16,10 @@ pkgbase = drogon
 	depends = mariadb-libs
 	depends = postgresql-libs
 	depends = sqlite
-	source = git+https://github.com/an-tao/drogon.git#tag=v1.5.1
+	depends = hiredis
+	source = drogon-1.8.3.tar.gz::https://github.com/an-tao/drogon/archive/v1.8.3.tar.gz
+	source = git+https://github.com/an-tao/trantor.git
+	sha256sums = db6d92a0c40ec52d5704fb4128860b9eecdc284653e8d85113b4219b96dc7129
 	sha256sums = SKIP
 
 pkgname = drogon
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..8ce4fc6fe88c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+# ArchLinuxPackages.gitignore:
+*.tar
+*.tar.*
+*.jar
+*.exe
+*.msi
+*.zip
+*.tgz
+*.log
+*.log.*
+*.sig
+
+pkg/
+src/
+drogon/
+trantor/
diff --git a/PKGBUILD b/PKGBUILD
index 235f65c659b6..0a1a3973e1ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,41 @@
-# Maintainer: Marat Moustafine <moustafine-@t-tuta-d.t-io>
+# Maintainer: otreblan <otreblain@gmail.com>
+# Contributor: Marat Moustafine <moustafine-@t-tuta-d.t-io>
 
 pkgname=drogon
-pkgver=1.5.1
+pkgver=1.8.3
 pkgrel=1
 pkgdesc='A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows'
 arch=('x86_64')
-url=https://github.com/an-tao/$pkgname
+url="https://github.com/an-tao/$pkgname"
 license=('MIT')
-depends=('brotli' 'c-ares' 'jsoncpp' 'mariadb-libs' 'postgresql-libs' 'sqlite' )
+depends=('brotli' 'c-ares' 'jsoncpp' 'mariadb-libs' 'postgresql-libs' 'sqlite' 'hiredis')
 makedepends=('cmake' 'git' 'mariadb' 'postgresql' 'util-linux')
-source=(git+$url.git#tag=v$pkgver)
-sha256sums=('SKIP')
+source=(
+	"$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+	"git+https://github.com/an-tao/trantor.git"
+)
+sha256sums=(
+	'db6d92a0c40ec52d5704fb4128860b9eecdc284653e8d85113b4219b96dc7129'
+	'SKIP'
+)
 
 prepare() {
-  cd $pkgname
-  git submodule update --init
+	mv -T trantor "$pkgname-$pkgver/trantor"
 }
 
 build() {
-  cd $pkgname
-  mkdir -p build
+	cmake -B build -S "$pkgname-$pkgver" \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_SHARED_LIBS=ON \
+		-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 
-  cd build
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    ..
-  make
+	cmake --build build
 }
 
 package() {
-  cd $pkgname
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+	install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
-  cd build
-  make DESTDIR=$pkgdir install
+	DESTDIR="$pkgdir" cmake --install build
 }