From fdbd2d145a2643c997187dbfbd2072bb2d235497 Mon Sep 17 00:00:00 2001 From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com> Date: Mon, 16 Feb 2026 17:33:25 +0100 Subject: [PATCH] s --- ct/gramps-web.sh | 16 +++++++++++++++- install/gramps-web-install.sh | 9 +++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ct/gramps-web.sh b/ct/gramps-web.sh index 4621d3c2..fe3d29ec 100644 --- a/ct/gramps-web.sh +++ b/ct/gramps-web.sh @@ -55,8 +55,22 @@ function update_script() { systemctl stop gramps-web msg_ok "Stopped Service" + if apt-cache show libgirepository1.0-dev >/dev/null 2>&1; then + GI_DEV_PACKAGE="libgirepository1.0-dev" + elif apt-cache show libgirepository-2.0-dev >/dev/null 2>&1; then + GI_DEV_PACKAGE="libgirepository-2.0-dev" + else + msg_error "No supported girepository development package found!" + exit + fi + msg_info "Ensuring Build Dependencies" - $STD apt install -y libcairo2-dev pkg-config + $STD apt install -y \ + gobject-introspection \ + libcairo2-dev \ + libglib2.0-dev \ + pkg-config \ + "$GI_DEV_PACKAGE" msg_ok "Ensured Build Dependencies" CLEAN_INSTALL=1 fetch_and_deploy_gh_release "gramps-web-api" "gramps-project/gramps-web-api" "tarball" "latest" "/opt/gramps-web-api" diff --git a/install/gramps-web-install.sh b/install/gramps-web-install.sh index ae0d81bb..dde88634 100644 --- a/install/gramps-web-install.sh +++ b/install/gramps-web-install.sh @@ -13,10 +13,13 @@ setting_up_container network_check update_os -if apt-cache show libgirepository-2.0-dev >/dev/null 2>&1; then +if apt-cache show libgirepository1.0-dev >/dev/null 2>&1; then + GI_DEV_PACKAGE="libgirepository1.0-dev" +elif apt-cache show libgirepository-2.0-dev >/dev/null 2>&1; then GI_DEV_PACKAGE="libgirepository-2.0-dev" else - GI_DEV_PACKAGE="libgirepository1.0-dev" + msg_error "No supported girepository development package found!" + exit fi msg_info "Installing Dependencies" @@ -25,6 +28,7 @@ $STD apt install -y \ build-essential \ ffmpeg \ gettext \ + gobject-introspection \ gir1.2-gexiv2-0.10 \ gir1.2-gtk-3.0 \ gir1.2-osmgpsmap-1.0 \ @@ -32,6 +36,7 @@ $STD apt install -y \ git \ graphviz \ libcairo2-dev \ + libglib2.0-dev \ libicu-dev \ libopencv-dev \ pkg-config \