9.10-1 -- upgrade to 9.10 and remove the portion of the patch that has been merged upstream (ref: pgadmin-org/pgadmin4#9240)

.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = pgadmin4-server
 	pkgdesc = The core server package 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.9
-	pkgrel = 2
+	pkgver = 9.10
+	pkgrel = 1
 	url = https://www.pgadmin.org/
 	arch = x86_64
 	license = PostgreSQL
@@ -23,9 +23,9 @@ pkgbase = pgadmin4-server
 	depends = krb5
 	depends = python-dbus
 	provides = pgadmin4-server
-	source = pgadmin4-9.9.tar.gz::https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v9.9/source/pgadmin4-9.9.tar.gz
+	source = pgadmin4-9.10.tar.gz::https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v9.10/source/pgadmin4-9.10.tar.gz
 	source = server.patch
-	sha256sums = 108e16272f82a87eb6483f401f54e46326da8c48e014ab2dd742640dc6f995f2
-	sha256sums = 94c19eb03718ff2002408a9159c1646102576911e4146d75d39f3bb2eb60fc27
+	sha256sums = 479b7b34b25be53b28174d3b688cebf91869204bec75752e06f7de1634c41507
+	sha256sums = d276423ab3eaa7abaf14e720c51f49cc18a528d2e1b6324d4d05257d5d58f556
 
 pkgname = pgadmin4-server

PKGBUILD

@@ -1,8 +1,8 @@
 # Maintainer: bko <aur at bil dot co dot ua>
 
 pkgname=pgadmin4-server
-pkgver=9.9
-pkgrel=2
+pkgver=9.10
+pkgrel=1
 pkgdesc='The core server package 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')
@@ -11,7 +11,7 @@ depends=('postgresql-libs' 'krb5' 'python-dbus')
 makedepends=("python" "python-pip" "postgresql-libs" "gcc" "nodejs" "corepack" "pkgconf" "cmake" "dbus" "npm" "wget" "unzip" "syft" "patch")
 provides=('pgadmin4-server')
 source=("pgadmin4-${pkgver}.tar.gz::https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${pkgver}/source/pgadmin4-${pkgver}.tar.gz" "server.patch")
-sha256sums=('108e16272f82a87eb6483f401f54e46326da8c48e014ab2dd742640dc6f995f2' '94c19eb03718ff2002408a9159c1646102576911e4146d75d39f3bb2eb60fc27')
+sha256sums=('479b7b34b25be53b28174d3b688cebf91869204bec75752e06f7de1634c41507' 'd276423ab3eaa7abaf14e720c51f49cc18a528d2e1b6324d4d05257d5d58f556')
 
 prepare() {
   cd "$srcdir/pgadmin4-${pkgver}"

server.patch

@@ -1,5 +1,5 @@
 diff --git a/pkg/linux/build-functions.sh b/pkg/linux/build-functions.sh
-index 7a4675689..17fcfa214 100644
+index b23b16f7a..2abdc27b0 100644
 --- a/pkg/linux/build-functions.sh
 +++ b/pkg/linux/build-functions.sh
 @@ -5,10 +5,7 @@ _setup_env() {
@@ -13,22 +13,7 @@ index 7a4675689..17fcfa214 100644
      DISTROOT=$(realpath "${WD}/../../dist")
      APP_RELEASE=$(grep "^APP_RELEASE" web/version.py | cut -d"=" -f2 | sed 's/ //g')
      APP_REVISION=$(grep "^APP_REVISION" web/version.py | cut -d"=" -f2 | sed 's/ //g')
-@@ -22,7 +19,13 @@ _setup_env() {
-     # Setting up the correct Python version for Ubuntu 18 and EL-8, which have
-     # new Python versions installed parallel to the old ones.
-     OS_VERSION=$(grep "^VERSION_ID=" /etc/os-release | awk -F "=" '{ print $2 }' | sed 's/"//g' | awk -F "." '{ print $1 }')
--    SYSTEM_PYTHON_PATH='/usr/bin/python3'
-+    if [ -n "$VIRTUAL_ENV" ]; then
-+        SYSTEM_PYTHON_PATH="$VIRTUAL_ENV/bin/python3"
-+        echo "Detected virtual environment: $VIRTUAL_ENV"
-+    else
-+        SYSTEM_PYTHON_PATH='/usr/bin/python3'
-+        echo "Not in a virtual environment, using system Python path."
-+    fi
-     PYTHON_BINARY=$("${SYSTEM_PYTHON_PATH}" -c "import sys; print('python%d.%.d' % (sys.version_info.major, sys.version_info.minor))")
-     PYTHON_BINARY_WITHOUT_DOTS='python3'
-     if [ "$2" == 'redhat' ] && [ "${OS_VERSION}" == "8" ]; then
-@@ -46,10 +49,7 @@ _cleanup() {
+@@ -52,10 +49,7 @@ _cleanup() {
  _setup_dirs() {
      echo "Creating output directories..."
      test -d "${BUILDROOT}" || mkdir "${BUILDROOT}"
@@ -39,18 +24,7 @@ index 7a4675689..17fcfa214 100644
      test -d "${DISTROOT}" || mkdir "${DISTROOT}"
  }
  
-@@ -203,9 +203,7 @@ _build_docs() {
-     cd "${SERVERROOT}" && mkdir -p "usr/${APP_NAME}/share/docs/en_US/html"
-     cd "${SOURCEDIR}/docs/en_US" || exit
-     python3 build_code_snippet.py
--    SYS_PYTHONPATH=$("${SYSTEM_PYTHON_PATH}" -c "import sys; print(':'.join([p for p in sys.path if p]))")
--    # shellcheck disable=SC2153
--    PYTHONPATH=$PYTHONPATH:${SYS_PYTHONPATH} python3 -msphinx . "${SERVERROOT}/usr/${APP_NAME}/share/docs/en_US/html"
-+    "${SYSTEM_PYTHON_PATH}" -msphinx . "${SERVERROOT}/usr/${APP_NAME}/share/docs/en_US/html"
- }
- 
- _copy_code() {
-@@ -240,10 +238,6 @@ _copy_code() {
+@@ -247,10 +241,6 @@ _copy_code() {
      # License files
      cp "${SOURCEDIR}/LICENSE" "${SERVERROOT}/usr/${APP_NAME}/"
  
@@ -61,7 +35,7 @@ index 7a4675689..17fcfa214 100644
      # Ensure our venv will use the correct Python interpreter, even if the
      # user has configured an alternative default.
      # DO THIS LAST!
-@@ -258,8 +252,5 @@ _copy_code() {
+@@ -265,8 +255,5 @@ _copy_code() {
  
  _generate_sbom() {
     echo "Generating SBOMs..."