Date: Saturday, June 13, 2020 @ 15:51:25 Author: anthraxx Revision: 642888
upgpkg: pgadmin4 4.22-1 Modified: pgadmin4/trunk/PKGBUILD pgadmin4/trunk/pgadmin4-python-de-vendor-venv-paths.patch Deleted: pgadmin4/trunk/python-3.8.patch --------------------------------------------+ PKGBUILD | 10 ++++------ pgadmin4-python-de-vendor-venv-paths.patch | 8 ++++---- python-3.8.patch | 12 ------------ 3 files changed, 8 insertions(+), 22 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-06-13 15:45:48 UTC (rev 642887) +++ PKGBUILD 2020-06-13 15:51:25 UTC (rev 642888) @@ -2,7 +2,7 @@ # Maintainer: Jerome Leclanche <[email protected]> pkgname=pgadmin4 -pkgver=4.21 +pkgver=4.22 pkgrel=1 pkgdesc='Comprehensive design and management interface for PostgreSQL' url='https://www.pgadmin.org/' @@ -26,21 +26,18 @@ pgAdmin4.desktop config_distro.py config_local.py - python-3.8.patch pgadmin4-python-de-vendor-venv-paths.patch) validpgpkeys=('E8697E2EEF76C02D3A6332778881B2A8210976F2') # Package Manager (Package Signing Key) <[email protected]> -sha512sums=('f552209237c3028d2cbcc04121639e0d997543ac7e7b83084a971e19e6cc080b2b7a8a5e433dc46bed8953bd1cf00418f5193f4d652a1f2ad83448d124c1fa2f' +sha512sums=('87ca94924bdfdac6307795acfb9218a667eea12ec0727a97aad90f4278567ae41bbfa85901efa372aa6a21701742ab59cda24efc0398e4222d04033ca111a18b' 'SKIP' 'b19dda3331585010c759099eb09f4db288ce4cd3d36882b56748e1e3756dc7bee2899d7438d496280498ec6a60f6e1ba90309d49fc599403f1fdc7e8817b6645' '16d00dc2095904a6b12da7039458f632873829ad98d4d7653eac5804032ba92097ccae4488d56467d0ea9bd64e2654a3dead73eb7924c947ff1737ff6e3b4745' 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e' - '9961c8e109baa25c1bd0a1a86262e5736a448e7fb19b0be992a29d95b2cba05d9427c063cd840b85262bacd93d9c65ccd40e3808166c7654972be203cbc72c03' - '70c8e589421ab50cf81753fbcfb5df65669b0feeefa3a57ee574b3785424fd107af720fc7007e52876798a46fae88f2c02dbf156aa096397afa0f85ac04fdb76') + 'a8c1a3762469b02b745da4e3b30f7534ad6bb94e91d43f7e63604fef24f638e09575e2c9336e753e5b6dbe167c55bb49fb6247a16431415318479eb3a3712adc') prepare() { cd ${pkgname}-${pkgver} - patch -Np1 < ../python-3.8.patch patch -Np1 < ../pgadmin4-python-de-vendor-venv-paths.patch local PYTHONVERSION="$(python -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')" @@ -92,6 +89,7 @@ build() { export LANG=en_US.UTF-8 export LC_ALL=en_US.UTF-8 + export PGADMIN_PYTHON_DIR=/usr cd ${pkgname}-${pkgver} convert +set date:create +set date:modify runtime/pgAdmin4.{ico,png} Modified: pgadmin4-python-de-vendor-venv-paths.patch =================================================================== --- pgadmin4-python-de-vendor-venv-paths.patch 2020-06-13 15:45:48 UTC (rev 642887) +++ pgadmin4-python-de-vendor-venv-paths.patch 2020-06-13 15:51:25 UTC (rev 642888) @@ -1,4 +1,4 @@ -From 8d3c335b578e7c33942a92194f01ad95c227809f Mon Sep 17 00:00:00 2001 +From 3edbde6534e3e819e47075c196c533d88cdbf786 Mon Sep 17 00:00:00 2001 From: anthraxx <[email protected]> Date: Wed, 19 Dec 2018 01:10:25 +0100 Subject: [PATCH] python: de-vendor venv paths @@ -8,10 +8,10 @@ 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/Server.cpp b/runtime/Server.cpp -index 15344c11..203fe1a9 100644 +index f053cbb00..fd120f36a 100644 --- a/runtime/Server.cpp +++ b/runtime/Server.cpp -@@ -135,11 +135,11 @@ Server::Server(quint16 port, QString key, QString logFileName) +@@ -131,11 +131,11 @@ Server::Server(quint16 port, QString key, QString logFileName) add_to_path(pythonHome, venvPath.canonicalFilePath()); #else // Build (and canonicalise) the virtual environment path @@ -29,5 +29,5 @@ // Prepend the bin directory to the path add_to_path(path_env, venvBinPath.canonicalFilePath(), true); -- -2.20.1 +2.27.0 Deleted: python-3.8.patch =================================================================== --- python-3.8.patch 2020-06-13 15:45:48 UTC (rev 642887) +++ python-3.8.patch 2020-06-13 15:51:25 UTC (rev 642888) @@ -1,12 +0,0 @@ -diff -uprb pgadmin4-4.13.orig/runtime/pgAdmin4.pro pgadmin4-4.13/runtime/pgAdmin4.pro ---- pgadmin4-4.13.orig/runtime/pgAdmin4.pro 2019-10-16 10:07:59.000000000 +0300 -+++ pgadmin4-4.13/runtime/pgAdmin4.pro 2019-11-05 18:33:18.524516120 +0200 -@@ -75,7 +75,7 @@ else { - - QMAKE_CXXFLAGS += $$system($$PYTHON_CONFIG --includes) - QMAKE_LFLAGS += $$system($$PYTHON_CONFIG --ldflags) -- LIBS += $$system($$PYTHON_CONFIG --libs) -+ LIBS += $$system($$PYTHON_CONFIG --libs --embed || $$PYTHON_CONFIG --libs) - - contains( LIBS, -lpython2.* ) { - DEFINES += PYTHON2
