From ae61461baa8a71559fe3e25b8307187972daecad Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Sat, 28 Feb 2026 10:35:37 +0100
Subject: [PATCH] fix(dawarich): add missing build deps and handle seed failure

- Add missing system dependencies from upstream Dockerfile:
  libgeos++-dev, libxml2-dev, libxslt-dev, libjemalloc-dev
- Sort dependency list alphabetically
- Split db:prepare into db:create + db:schema:load + db:seed
  to handle upstream rgeo-geojson 2.2.0 seed bug gracefully

Fixes #12395
---
 ct/dawarich.sh              |  2 ++
 install/dawarich-install.sh | 31 ++++++++++++++++++-------------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/ct/dawarich.sh b/ct/dawarich.sh
index 7b94cf233..d2d260998 100644
--- a/ct/dawarich.sh
+++ b/ct/dawarich.sh
@@ -29,6 +29,8 @@ function update_script() {
     exit
   fi
 
+  ensure_dependencies libgeos++-dev libxml2-dev libxslt-dev libjemalloc-dev
+
   if check_for_gh_release "dawarich" "Freika/dawarich"; then
     msg_info "Stopping Services"
     systemctl stop dawarich-web dawarich-worker
diff --git a/install/dawarich-install.sh b/install/dawarich-install.sh
index 9bb2fb30f..9edf3a296 100644
--- a/install/dawarich-install.sh
+++ b/install/dawarich-install.sh
@@ -16,19 +16,23 @@ update_os
 msg_info "Installing Dependencies"
 $STD apt install -y \
   build-essential \
-  git \
-  libpq-dev \
-  libgeos-dev \
-  libyaml-dev \
-  libffi-dev \
-  libssl-dev \
-  libjemalloc2 \
-  imagemagick \
-  libmagickwand-dev \
-  libvips-dev \
   cmake \
-  redis-server \
-  nginx
+  git \
+  imagemagick \
+  libffi-dev \
+  libgeos-dev \
+  libgeos++-dev \
+  libjemalloc2 \
+  libjemalloc-dev \
+  libmagickwand-dev \
+  libpq-dev \
+  libssl-dev \
+  libvips-dev \
+  libxml2-dev \
+  libxslt-dev \
+  libyaml-dev \
+  nginx \
+  redis-server
 msg_ok "Installed Dependencies"
 
 PG_VERSION="17" PG_MODULES="postgis-3" setup_postgresql
@@ -82,7 +86,8 @@ elif [[ -f /opt/dawarich/app/package.json ]]; then
   $STD npm install
 fi
 $STD bundle exec rake assets:precompile
-$STD bundle exec rails db:prepare
+$STD bundle exec rails db:schema:load
+$STD bundle exec rails db:seed || msg_warn "Database seed failed (upstream rgeo-geojson issue), app will still work"
 $STD bundle exec rake data:migrate
 msg_ok "Installed Dawarich"