upgpkg: duckdb 0.3.2-1

* New upstream release.
* Skip amalgamation build.

2 files changed, 43 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cfe91e752744..7fc0c5304fd6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = duckdb
 	pkgdesc = A high-performance analytical database system
-	pkgver = 0.3.1
-	pkgrel = 2
+	pkgver = 0.3.2
+	pkgrel = 1
 	url = https://duckdb.org
 	arch = x86_64
 	license = MIT
@@ -17,7 +17,7 @@ pkgbase = duckdb
 	makedepends = python-setuptools-scm
 	depends = gcc-libs
 	depends = openssl
-	source = duckdb::git+https://github.com/duckdb/duckdb.git#commit=88aa81c6b1b851c538145e6431ea766a6e0ef435
+	source = duckdb::git+https://github.com/duckdb/duckdb.git#commit=5aebf7dac8378ac4fb31badadf24de0499d86381
 	b2sums = SKIP
 
 pkgname = duckdb
@@ -26,6 +26,7 @@ pkgname = duckdb
 pkgname = python-duckdb
 	pkgdesc = A high-performance analytical database system (Python API)
 	depends = python
+	depends = gcc-libs
 	optdepends = python-numpy
 	optdepends = python-pandas
 	conflicts = python-duckdb-git
diff --git a/PKGBUILD b/PKGBUILD
index 1f11a7e1dcd2..ef844a59131e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,46 @@
 # Maintainer: George Rawlinson <grawlinson@archlinux.org>
 
 pkgbase=duckdb
-pkgname=('duckdb' 'python-duckdb')
-pkgver=0.3.1
-pkgrel=2
+pkgname=(
+  'duckdb'
+  'python-duckdb'
+)
+pkgver=0.3.2
+pkgrel=1
 pkgdesc="A high-performance analytical database system"
 arch=('x86_64')
 url="https://duckdb.org"
 license=('MIT')
-depends=('gcc-libs' 'openssl')
-makedepends=('git' 'cmake' 'python-setuptools' 'pybind11' 'python-numpy' 'python-pandas' 'libutf8proc' 'python-pip' 'python-wheel' 'python-setuptools-scm')
-_commit='88aa81c6b1b851c538145e6431ea766a6e0ef435'
+depends=(
+  'gcc-libs'
+  'openssl'
+)
+makedepends=(
+  'git'
+  'cmake'
+  'python-setuptools'
+  'pybind11'
+  'python-numpy'
+  'python-pandas'
+  'libutf8proc'
+  'python-pip'
+  'python-wheel'
+  'python-setuptools-scm'
+)
+_commit='5aebf7dac8378ac4fb31badadf24de0499d86381'
 source=("$pkgbase::git+https://github.com/duckdb/duckdb.git#commit=$_commit")
 b2sums=('SKIP')
 
 pkgver() {
   cd "$pkgbase"
-  git describe --tags | sed 's/^[vV]//;s/-/+/g'
+
+  git describe --tags | sed 's/^v//'
 }
 
 prepare() {
-  cd "$pkgbase"
-
-  python "scripts/amalgamation.py" --extended
-
-  cmake -S . -B "$srcdir/build" \
+  cmake \
+    -S "$pkgbase" \
+    -B build \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBUILD_VISUALIZER_EXTENSION=1 \
@@ -34,15 +50,13 @@ prepare() {
     -DBUILD_FTS_EXTENSION=1 \
     -DBUILD_HTTPFS_EXTENSION=1 \
     -DBUILD_PARQUET_EXTENSION=1 \
-    -DBUILD_BENCHMARKS=1 \
-    -DBUILD_REST=1 \
-    -DAMALGAMATION_BUILD=1
+    -DBUILD_REST=1
 }
 
 build() {
-  cmake --build "$srcdir/build"
+  cmake --build build
 
-  python "$srcdir/$pkgbase/tools/pythonpkg/setup.py" build
+  python "$pkgbase/tools/pythonpkg/setup.py" build
 }
 
 package_duckdb() {
@@ -61,8 +75,14 @@ package_duckdb() {
 
 package_python-duckdb() {
   pkgdesc+=" (Python API)"
-  depends=('python')
-  optdepends=('python-numpy' 'python-pandas')
+  depends=(
+    'python'
+    'gcc-libs'
+  )
+  optdepends=(
+    'python-numpy'
+    'python-pandas'
+  )
   conflicts=('python-duckdb-git')
 
   # library