[arch-commits] Commit in pgadmin4/trunk (PKGBUILD python-3.8.patch)

[Evangelos Foutras]

    Date: Tuesday, November 5, 2019 @ 16:48:43
  Author: foutrelis
Revision: 524191

Python 3.8 rebuild

Added:
  pgadmin4/trunk/python-3.8.patch
Modified:
  pgadmin4/trunk/PKGBUILD

------------------+
 PKGBUILD         |    5 ++++-
 python-3.8.patch |   12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-05 12:29:45 UTC (rev 524190)
+++ PKGBUILD	2019-11-05 16:48:43 UTC (rev 524191)
@@ -3,7 +3,7 @@
 
 pkgname=pgadmin4
 pkgver=4.13
-pkgrel=1
+pkgrel=2
 pkgdesc='Comprehensive design and management interface for PostgreSQL'
 url='https://www.pgadmin.org/'
 arch=('x86_64')
@@ -26,6 +26,7 @@
         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) <packages at pgadmin.org>
 sha512sums=('7eca41047e41f7bdce2dfe992260e8c2ab40f985dd232eb240ea9c0024f551f011653717aa0d5e4ccdccd4ef4936102cde1f97a32852d8382dcc222fadce7707'
@@ -33,11 +34,13 @@
             'b19dda3331585010c759099eb09f4db288ce4cd3d36882b56748e1e3756dc7bee2899d7438d496280498ec6a60f6e1ba90309d49fc599403f1fdc7e8817b6645'
             '16d00dc2095904a6b12da7039458f632873829ad98d4d7653eac5804032ba92097ccae4488d56467d0ea9bd64e2654a3dead73eb7924c947ff1737ff6e3b4745'
             'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
+            'a1647d80dfbae6e1ef7cc6d59cd763e3b1e8c3208a7b4d6cac6ae9afe364359c3f675d6b368bf5a0fd845a2cbc11ec5a62e4236a674dce82a461c0fb9685e789'
             '70c8e589421ab50cf81753fbcfb5df65669b0feeefa3a57ee574b3785424fd107af720fc7007e52876798a46fae88f2c02dbf156aa096397afa0f85ac04fdb76')
 
 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}")')"

Added: python-3.8.patch
===================================================================
--- python-3.8.patch	                        (rev 0)
+++ python-3.8.patch	2019-11-05 16:48:43 UTC (rev 524191)
@@ -0,0 +1,12 @@
+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_LIBS=`$$PYTHON_CONFIG --libs --embed` || PYTHON_LIBS=`$$PYTHON_CONFIG --libs`; echo $PYTHON_LIBS)
+ 
+     contains( LIBS, -lpython2.* ) {
+        DEFINES += PYTHON2