From: mustaqimM <mustaqimM@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: pgadmin4-4.26
Date: Mon, 05 Oct 2020 09:51:47 +0200 [thread overview]
Message-ID: <20201005075147.Df5ly4s_Nt87GN6uelgHpaW9NRhg6eBiRSEjP_9ksp8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23201@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 492 bytes --]
There is an updated pull request by mustaqimM against master on the void-packages repository
https://github.com/mustaqimM/void-packages update_pgadmin
https://github.com/void-linux/void-packages/pull/23201
New package: pgadmin4-4.26
I haven't as yet used it extensively but it seems to work. The executable is used only to launch the python backend; should I rename the package to just: `pgadmin4`?
A patch file from https://github.com/void-linux/void-packages/pull/23201.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_pgadmin-23201.patch --]
[-- Type: text/x-diff, Size: 15108 bytes --]
From 18f61645bc226d90765460fa1720e39525edccb2 Mon Sep 17 00:00:00 2001
From: mustaqim <git@mustaqim.ml>
Date: Mon, 5 Oct 2020 05:56:13 +0200
Subject: [PATCH 01/10] New package: pgadmin4-4.26
---
srcpkgs/pgadmin4/files/pgadmin4.desktop | 11 +++++
.../patches/hardcode-py-lib-location.patch | 30 +++++++++++++
srcpkgs/pgadmin4/template | 42 +++++++++++++++++++
3 files changed, 83 insertions(+)
create mode 100644 srcpkgs/pgadmin4/files/pgadmin4.desktop
create mode 100644 srcpkgs/pgadmin4/patches/hardcode-py-lib-location.patch
create mode 100644 srcpkgs/pgadmin4/template
diff --git a/srcpkgs/pgadmin4/files/pgadmin4.desktop b/srcpkgs/pgadmin4/files/pgadmin4.desktop
new file mode 100644
index 00000000000..03d6845ddb1
--- /dev/null
+++ b/srcpkgs/pgadmin4/files/pgadmin4.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=pgAdmin4
+Exec=/usr/bin/pgAdmin4
+Icon=/usr/share/icons/pgAdmin4.png
+Type=Application
+Categories=Application;Development;
+MimeType=text/html
+GenericName=Management tool for PostgreSQL
+Comment=Management tools for PostgreSQL
+Keywords=database;db;sql;query;administration;development;
diff --git a/srcpkgs/pgadmin4/patches/hardcode-py-lib-location.patch b/srcpkgs/pgadmin4/patches/hardcode-py-lib-location.patch
new file mode 100644
index 00000000000..4d8cdc86706
--- /dev/null
+++ b/srcpkgs/pgadmin4/patches/hardcode-py-lib-location.patch
@@ -0,0 +1,30 @@
+diff --git a/runtime/Server.cpp b/runtime/Server.cpp
+index 62f4a27f7..ba2783f0e 100644
+--- a/runtime/Server.cpp
++++ b/runtime/Server.cpp
+@@ -127,11 +127,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/python3.8");
++ QFileInfo venvDynLibPath("/usr/lib/python3.8/lib-dynload");
++ QFileInfo venvSitePackagesPath("/usr/lib/python3.8/site-packages");
++ QFileInfo venvPath("/usr/lib/python3.8");
+
+ // Prepend the bin directory to the path
+ add_to_path(path_env, venvBinPath.canonicalFilePath(), true);
+@@ -265,7 +265,7 @@ bool Server::Init()
+
+ // Find the webapp
+ QStringList paths;
+- paths.append("../web/"); // Linux source tree
++ paths.append("/usr/lib/pgadmin4/web/"); // Linux source tree
+ paths.append("../../web/"); // Windows source tree
+ paths.append("../../../../web/"); // Mac source tree (in a dev env)
+ #ifdef Q_OS_MAC
diff --git a/srcpkgs/pgadmin4/template b/srcpkgs/pgadmin4/template
new file mode 100644
index 00000000000..33a3bb8b22a
--- /dev/null
+++ b/srcpkgs/pgadmin4/template
@@ -0,0 +1,42 @@
+# Template file for 'pgadmin4'
+pkgname=pgadmin4
+version=4.26
+revision=1
+wrksrc="pgadmin4-${version}"
+hostmakedepends="qt5-qmake python3-devel qt5-host-tools qt5-devel"
+depends="python3-Flask python3-Flask-Login python3-Flask-Mail
+ python3-blinker python3-Flask-Paranoid python3-Flask-Security-Too python3-Flask-Principal
+ python3-passlib python3-Flask-WTF python3-speaklater python3-Flask-SQLAlchemy python3-simplejson python3-dateutil
+ python3-Flask-Migrate python3-alembic python3-psycopg2 python3-cryptography python3-sshtunnel python3-ldap3
+ python3-Flask-Gravatar python3-sqlparse python3-psutil python3-Flask-Compress"
+short_desc="Comprehensive design and management interface for PostgreSQL"
+maintainer="mustaqim <git@mustaqim.ml>"
+license="PostgreSQL"
+homepage="http://www.pgadmin.org"
+distfiles="https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"
+checksum=46b69668941c80da763b869b7dc6723ad502443d68e8012b7fccd3c99569475d
+patch_args="-Np1"
+
+do_configure() {
+ vsed -i runtime/ConfigWindow.ui \
+ -e 's|/usr/pgadmin4/web|/usr/lib/pgadmin4/web|'
+}
+
+do_build() {
+ export PGADMIN_PYTHON_DIR=/usr
+ cd runtime
+ qmake CONFIG+=release
+ make
+}
+
+do_install() {
+ vbin runtime/pgAdmin4
+ vmkdir /usr/lib/pgadmin4
+ vcopy web /usr/lib/pgadmin4
+}
+
+post_install() {
+ vinstall "${FILESDIR}/pgadmin4.desktop" 644 usr/share/applications/
+ vinstall runtime/pgAdmin4.png 644 usr/share/icons/
+ vlicense LICENSE
+}
From aa7202e77378165035dfdd34bbcd4e0dc5313e6b Mon Sep 17 00:00:00 2001
From: mustaqim <git@mustaqim.ml>
Date: Mon, 5 Oct 2020 07:23:15 +0200
Subject: [PATCH 02/10] New package: python3-Flask-Compress-1.5.0
---
srcpkgs/python3-Flask-Compress/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-Flask-Compress/template
diff --git a/srcpkgs/python3-Flask-Compress/template b/srcpkgs/python3-Flask-Compress/template
new file mode 100644
index 00000000000..3a11502405b
--- /dev/null
+++ b/srcpkgs/python3-Flask-Compress/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-Flask-Compress'
+pkgname=python3-Flask-Compress
+version=1.5.0
+revision=1
+wrksrc="flask-compress-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-brotli"
+short_desc="Compress responses in your Flask app with gzip or brotli"
+maintainer="mustaqim <git@mustaqim.ml>"
+license="MIT"
+homepage="https://github.com/colour-science/flask-compress"
+distfiles="https://github.com/colour-science/flask-compress/archive/v${version}.tar.gz"
+checksum=692838db8293949fdc9af814be6313743fc77d37b9981a9418eb5f87f34b09c2
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 25ed25acf66f25f668d0fbcb3f215d83801e18ca Mon Sep 17 00:00:00 2001
From: mustaqim <git@mustaqim.ml>
Date: Mon, 5 Oct 2020 07:24:03 +0200
Subject: [PATCH 03/10] New package: python3-Flask-Gravatar-0.5.0
---
srcpkgs/python3-Flask-Gravatar/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-Flask-Gravatar/template
diff --git a/srcpkgs/python3-Flask-Gravatar/template b/srcpkgs/python3-Flask-Gravatar/template
new file mode 100644
index 00000000000..645ba1cc31a
--- /dev/null
+++ b/srcpkgs/python3-Flask-Gravatar/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-Flask-Gravatar'
+pkgname=python3-Flask-Gravatar
+version=0.5.0
+revision=1
+wrksrc="Flask-Gravatar-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Small and simple integration of gravatar into flask"
+maintainer="mustaqim <git@mustaqim.ml>"
+license="BSD-3-Clause"
+homepage="https://github.com/zzzsochi/flask-gravatar"
+distfiles="https://github.com/zzzsochi/flask-gravatar/archive/v${version}.tar.gz"
+checksum=9f9ea35b3537f635a25a09390821b768c9c3cf53274e16ffabbfc1f8c6e77d55
+
+post_install() {
+ vlicense LICENSE
+}
From d2ff2679697dbe2402d3258add1a50529fa8957f Mon Sep 17 00:00:00 2001
From: mustaqim <git@mustaqim.ml>
Date: Mon, 5 Oct 2020 07:26:20 +0200
Subject: [PATCH 04/10] New package: python3-Flask-Migrate-2.5.3
---
srcpkgs/python3-Flask-Migrate/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-Flask-Migrate/template
diff --git a/srcpkgs/python3-Flask-Migrate/template b/srcpkgs/python3-Flask-Migrate/template
new file mode 100644
index 00000000000..598cc3c7e76
--- /dev/null
+++ b/srcpkgs/python3-Flask-Migrate/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-Flask-Migrate'
+pkgname=python3-Flask-Migrate
+version=2.5.3
+revision=1
+wrksrc="Flask-Migrate-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="SQLAlchemy database migrations for Flask applications using Alembic "
+maintainer="mustaqim <git@mustaqim.ml>"
+license="MIT"
+homepage="https://github.com/miguelgrinberg/flask-migrate/"
+changelog="https://raw.githubusercontent.com/miguelgrinberg/Flask-Migrate/master/CHANGES.md"
+distfiles="$PYPI_SITE/F/Flask-Migrate/Flask-Migrate-${version}.tar.gz"
+checksum=a69d508c2e09d289f6e55a417b3b8c7bfe70e640f53d2d9deb0d056a384f37ee
+
+post_install() {
+ vlicense LICENSE
+}
From 3cfe1e93a33e911c3de0d644da081401dcc00619 Mon Sep 17 00:00:00 2001
From: mustaqim <git@mustaqim.ml>
Date: Mon, 5 Oct 2020 07:30:31 +0200
Subject: [PATCH 05/10] New package: python3-Flask-Paranoid-0.2.0
---
srcpkgs/python3-Flask-Paranoid/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-Flask-Paranoid/template
diff --git a/srcpkgs/python3-Flask-Paranoid/template b/srcpkgs/python3-Flask-Paranoid/template
new file mode 100644
index 00000000000..66575a98f6c
--- /dev/null
+++ b/srcpkgs/python3-Flask-Paranoid/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-Flask-Paranoid'
+pkgname=python3-Flask-Paranoid
+version=0.2
+revision=1
+wrksrc="flask-paranoid-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Simple user session protection"
+maintainer="mustaqim <git@mustaqim.ml>"
+license="MIT"
+homepage="https://github.com/miguelgrinberg/flask-paranoid"
+distfiles="https://github.com/miguelgrinberg/flask-paranoid/archive/v${version}.tar.gz"
+checksum=cda72c43fd17e6b782e079942b79ec9b19ac40c06337c871cc1dfedbe49297d3
+
+post_install() {
+ vlicense LICENSE
+}
From c055c38df13bcdfbd76b68d5831bde05745da698 Mon Sep 17 00:00:00 2001
From: mustaqim <git@mustaqim.ml>
Date: Mon, 5 Oct 2020 07:33:14 +0200
Subject: [PATCH 06/10] New package: python3-Flask-Principal-0.4.0
---
srcpkgs/python3-Flask-Principal/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-Flask-Principal/template
diff --git a/srcpkgs/python3-Flask-Principal/template b/srcpkgs/python3-Flask-Principal/template
new file mode 100644
index 00000000000..aab51163318
--- /dev/null
+++ b/srcpkgs/python3-Flask-Principal/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-Flask-Principal'
+pkgname=python3-Flask-Principal
+version=0.4.0
+revision=1
+wrksrc="flask-principal-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Identity management for Flask"
+maintainer="mustaqim <git@mustaqim.ml>"
+license="MIT"
+homepage="https://pythonhosted.org/Flask-Principal/"
+changelog="https://pythonhosted.org/Flask-Principal/changelog.html"
+distfiles="https://github.com/mattupstate/flask-principal/archive/${version}.tar.gz"
+checksum=ed8c58943460d7d54c29463e2fe98ae4969d3818c0f59b36e9b2649128db96c9
+
+post_install() {
+ vlicense LICENSE
+}
From 0dd533b0c9a8a03eaa75e2bec514f393f4163c3c Mon Sep 17 00:00:00 2001
From: mustaqim <git@mustaqim.ml>
Date: Mon, 5 Oct 2020 07:33:51 +0200
Subject: [PATCH 07/10] New package: python3-Flask-Security-Too-3.4.4
---
srcpkgs/python3-Flask-Security-Too/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-Flask-Security-Too/template
diff --git a/srcpkgs/python3-Flask-Security-Too/template b/srcpkgs/python3-Flask-Security-Too/template
new file mode 100644
index 00000000000..eb1a5dee0ed
--- /dev/null
+++ b/srcpkgs/python3-Flask-Security-Too/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-Flask-Security-Too'
+pkgname=python3-Flask-Security-Too
+version=3.4.4
+revision=1
+wrksrc="Flask-Security-Too-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-devel"
+short_desc="Simple security for Flask apps"
+maintainer="mustaqim <git@mustaqim.ml>"
+license="MIT"
+homepage="https://github.com/Flask-Middleware/flask-security/"
+distfiles="$PYPI_SITE/F/Flask-Security-Too/Flask-Security-Too-${version}.tar.gz"
+checksum=3c52b0e0c8453a012122aad102041fd71bd1ea025f5154bbfb1d20b4c6a4477e
+
+post_install() {
+ vlicense LICENSE
+}
From f161e90e388fad7b0b7b266cee8990b0c16bb3e8 Mon Sep 17 00:00:00 2001
From: mustaqim <git@mustaqim.ml>
Date: Mon, 5 Oct 2020 07:41:45 +0200
Subject: [PATCH 08/10] New package: python3-brotli-1.0.9
---
srcpkgs/python3-brotli/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/python3-brotli/template
diff --git a/srcpkgs/python3-brotli/template b/srcpkgs/python3-brotli/template
new file mode 100644
index 00000000000..74c96a8f0f5
--- /dev/null
+++ b/srcpkgs/python3-brotli/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-brotli'
+pkgname=python3-brotli
+version=1.0.9
+revision=1
+wrksrc="brotli-${version}"
+build_style="python3-module"
+hostmakedepends="python3-setuptools python3-devel"
+short_desc="Python3 brotli module"
+maintainer="mustaqim <git@mustaqim.ml>"
+license="Apache-2.0"
+homepage="https://pypi.org/project/Brotli/"
+distfiles="https://github.com/google/brotli/archive/v${version}.tar.gz"
+checksum=f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
From aaa8ead4c9a0fe70f969dc01ea0c5e62fd7fdaec Mon Sep 17 00:00:00 2001
From: mustaqim <git@mustaqim.ml>
Date: Mon, 5 Oct 2020 07:45:09 +0200
Subject: [PATCH 09/10] New package: python3-speaklater-1.3
---
srcpkgs/python3-speaklater/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-speaklater/template
diff --git a/srcpkgs/python3-speaklater/template b/srcpkgs/python3-speaklater/template
new file mode 100644
index 00000000000..5963354fac6
--- /dev/null
+++ b/srcpkgs/python3-speaklater/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-speaklater'
+pkgname=python3-speaklater
+version=1.3
+revision=1
+wrksrc="speaklater-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Lazy strings for translations"
+maintainer="mustaqim <git@mustaqim.ml>"
+license="custom:BSD"
+homepage="https://github.com/mitsuhiko/speaklater/"
+distfiles="$PYPI_SITE/s/speaklater/speaklater-${version}.tar.gz"
+checksum=59fea336d0eed38c1f0bf3181ee1222d0ef45f3a9dd34ebe65e6bfffdd6a65a9
+
+post_install() {
+ vlicense LICENSE
+}
From 9b855102f1677344000188f11fbf13036c2b9c52 Mon Sep 17 00:00:00 2001
From: mustaqim <git@mustaqim.ml>
Date: Mon, 5 Oct 2020 07:48:13 +0200
Subject: [PATCH 10/10] New package: python3-sshtunnel-0.1.5
---
srcpkgs/python3-sshtunnel/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-sshtunnel/template
diff --git a/srcpkgs/python3-sshtunnel/template b/srcpkgs/python3-sshtunnel/template
new file mode 100644
index 00000000000..e4f7f763f6f
--- /dev/null
+++ b/srcpkgs/python3-sshtunnel/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-sshtunnel'
+pkgname=python3-sshtunnel
+version=0.1.5
+revision=1
+wrksrc="sshtunnel-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-paramiko"
+short_desc="Pure python SSH tunnels"
+maintainer="mustaqim <git@mustaqim.ml>"
+license="MIT"
+homepage="https://pypi.org/project/sshtunnel/"
+distfiles="$PYPI_SITE/s/sshtunnel/sshtunnel-${version}.tar.gz"
+checksum=c813fdcda8e81c3936ffeac47cb69cfb2d1f5e77ad0de656c6dab56aeebd9249
+
+post_install() {
+ vlicense LICENSE
+}
next prev parent reply other threads:[~2020-10-05 7:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23201@inbox.vuxu.org>
2020-07-07 6:32 ` [PR PATCH] [Updated] New package: pgadmin4-qt-4.22 mustaqimM
2020-07-07 6:35 ` [PR REVIEW] " mustaqimM
2020-07-09 16:16 ` [PR REVIEW] New package: pgadmin4-4.22 sgn
2020-07-09 16:19 ` sgn
2020-10-05 6:35 ` [PR PATCH] [Updated] " mustaqimM
2020-10-05 6:48 ` mustaqimM
2020-10-05 6:54 ` [PR PATCH] [Updated] New package: pgadmin4-4.26 mustaqimM
2020-10-05 7:08 ` mustaqimM
2020-10-05 7:51 ` mustaqimM [this message]
2021-11-06 23:53 ` [PR PATCH] [Closed]: " abenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201005075147.Df5ly4s_Nt87GN6uelgHpaW9NRhg6eBiRSEjP_9ksp8@z \
--to=mustaqimm@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).