From 5d86c4518e7d548fae8036b7cfd301b77ad92f82 Mon Sep 17 00:00:00 2001 From: lzx3in Date: Sat, 6 Dec 2025 15:24:37 +0800 Subject: [PATCH] 9.10-2 -- switch to source build and update dependencies --- .SRCINFO | 15 +++++++++++---- PKGBUILD | 34 +++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c5e85fe3db7f..ae364a67e5cc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,15 +1,22 @@ pkgbase = pgadmin4-desktop pkgdesc = The desktop user interface for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world. pkgver = 9.10 - pkgrel = 1 + pkgrel = 2 url = https://www.pgadmin.org/ arch = x86_64 license = PostgreSQL - depends = pgadmin4-server + makedepends = nodejs + makedepends = corepack + makedepends = npm + makedepends = wget + makedepends = unzip + makedepends = syft + makedepends = patch + depends = pgadmin4-server>=9.10-1 depends = xdg-utils depends = python-dbus provides = pgadmin4-desktop - source = pgadmin4-desktop-9.10-x86_64.deb::https://ftp.postgresql.org/pub/pgadmin/pgadmin4/apt/plucky/dists/pgadmin4/main/binary-amd64/pgadmin4-desktop_9.10-1.plucky_amd64.deb - sha256sums = 1fc103aaf1e7dd2ea73d9fc93b4354df0a054441ae7a72343f9dca43d1a5d622 + source = pgadmin4-9.10.tar.gz::https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v9.10/source/pgadmin4-9.10.tar.gz + sha256sums = 479b7b34b25be53b28174d3b688cebf91869204bec75752e06f7de1634c41507 pkgname = pgadmin4-desktop diff --git a/PKGBUILD b/PKGBUILD index e186e417976e..e29ada1b7cd1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,18 +2,38 @@ pkgname=pgadmin4-desktop pkgver=9.10 -_realver=9.10-1.plucky -pkgrel=1 +pkgrel=2 pkgdesc='The desktop user interface for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.' arch=('x86_64') license=('PostgreSQL') url='https://www.pgadmin.org/' -depends=("pgadmin4-server" 'xdg-utils' 'python-dbus') +depends=("pgadmin4-server>=${pkgver}-1" 'xdg-utils' 'python-dbus') +makedepends=("nodejs" "corepack" "npm" "wget" "unzip" "syft") provides=('pgadmin4-desktop') -source=(${pkgname}-${pkgver}-x86_64.deb::"https://ftp.postgresql.org/pub/pgadmin/pgadmin4/apt/plucky/dists/pgadmin4/main/binary-amd64/${pkgname}_${_realver}_amd64.deb") -sha256sums=('1fc103aaf1e7dd2ea73d9fc93b4354df0a054441ae7a72343f9dca43d1a5d622') +source=("pgadmin4-${pkgver}.tar.gz::https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${pkgver}/source/pgadmin4-${pkgver}.tar.gz") +sha256sums=('479b7b34b25be53b28174d3b688cebf91869204bec75752e06f7de1634c41507') + +build() { + cd "$srcdir/pgadmin4-${pkgver}" + + export COREPACK_HOME="$srcdir/corepack_home" + mkdir -p "$COREPACK_HOME/bin" + corepack enable --install-directory "$COREPACK_HOME/bin" + export PATH="$COREPACK_HOME/bin:$PATH" + export COREPACK_ENABLE_DOWNLOAD_PROMPT=0 + corepack prepare yarn@stable --activate + + source pkg/linux/build-functions.sh + + _setup_env "${PWD}/pkg/linux/DUMMY" "arch" + _cleanup "pkg.tar.zst" + _setup_dirs + _build_runtime + syft "${DESKTOPROOT}/" -o cyclonedx-json > "${DESKTOPROOT}/usr/${APP_NAME}/sbom-desktop.json" +} package() { - # Extract package data - tar -x --zstd -f data.tar.zst -C "${pkgdir}" + cp -r "${srcdir}/pgadmin4-${pkgver}/arch-build/desktop/usr" "${pkgdir}/" + + # no need to install the license, since pgadmin4-server has already done it }