pgadmin4 add to repo

This commit is contained in:
idriskalp
2020-03-25 18:28:42 +03:00
parent d5488a6aac
commit 29c036b174
13 changed files with 287 additions and 163 deletions
@@ -0,0 +1,2 @@
SERVER_MODE = False
HELP_PATH = "/usr/lib/pgadmin4/docs/en_US/_build/html/"
@@ -0,0 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
Name=pgAdmin 4
Exec=/usr/lib/pgadmin4/runtime/pgAdmin4
Icon=pgAdmin4
Type=Application
Categories=Application;Development;Database;
MimeType=text/html
DocPath=/usr/lib/pgadmin4/docs/en_US/_build/html/index.html
Comment=PostgreSQL Tools
Keywords=database;db;sql;query;administration;development;
+3
View File
@@ -0,0 +1,3 @@
#!/bin/sh
cd /usr/lib/pgadmin4
exec runtime/pgAdmin4 "\$@""
@@ -0,0 +1,33 @@
From 8d3c335b578e7c33942a92194f01ad95c227809f Mon Sep 17 00:00:00 2001
From: anthraxx <levente@leventepolyak.net>
Date: Wed, 19 Dec 2018 01:10:25 +0100
Subject: [PATCH] python: de-vendor venv paths
---
runtime/Server.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/runtime/Server.cpp b/runtime/Server.cpp
index 15344c11..203fe1a9 100644
--- a/runtime/Server.cpp
+++ b/runtime/Server.cpp
@@ -135,11 +135,11 @@ Server::Server(quint16 port, QString key, QString logFileName)
add_to_path(pythonHome, venvPath.canonicalFilePath());
#else
// Build (and canonicalise) the virtual environment path
- QFileInfo venvBinPath(app_dir + "/../venv/bin");
- QFileInfo venvLibPath(app_dir + "/../venv/lib/python");
- QFileInfo venvDynLibPath(app_dir + "/../venv/lib/python/lib-dynload");
- QFileInfo venvSitePackagesPath(app_dir + "/../venv/lib/python/site-packages");
- QFileInfo venvPath(app_dir + "/../venv");
+ QFileInfo venvBinPath("/usr/bin");
+ QFileInfo venvLibPath("/usr/lib/python##PYTHONVERSION##");
+ QFileInfo venvDynLibPath("/usr/lib/python##PYTHONVERSION##/lib-dynload");
+ QFileInfo venvSitePackagesPath("/usr/lib/python##PYTHONVERSION##/site-packages");
+ QFileInfo venvPath("/usr/lib/python##PYTHONVERSION##");
// Prepend the bin directory to the path
add_to_path(path_env, venvBinPath.canonicalFilePath(), true);
--
2.20.1
@@ -0,0 +1,3 @@
#!/bin/sh
cd /usr/lib/pgadmin4
python web/pgAdmin4.py "\$@"
@@ -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