Date: Friday, April 20, 2018 @ 21:09:28 Author: anthraxx Revision: 317224
archrelease: copy trunk to community-x86_64 Added: pgadmin4/repos/community-x86_64/PKGBUILD (from rev 317223, pgadmin4/trunk/PKGBUILD) pgadmin4/repos/community-x86_64/config_distro.py (from rev 317223, pgadmin4/trunk/config_distro.py) pgadmin4/repos/community-x86_64/config_local.py (from rev 317223, pgadmin4/trunk/config_local.py) pgadmin4/repos/community-x86_64/pgAdmin4.desktop (from rev 317223, pgadmin4/trunk/pgAdmin4.desktop) Deleted: pgadmin4/repos/community-x86_64/PKGBUILD pgadmin4/repos/community-x86_64/config_distro.py pgadmin4/repos/community-x86_64/config_local.py pgadmin4/repos/community-x86_64/pgAdmin4.desktop ------------------+ PKGBUILD | 189 +++++++++++++++++++++++++---------------------------- config_distro.py | 4 - pgAdmin4.desktop | 22 +++--- 3 files changed, 105 insertions(+), 110 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-04-20 21:09:18 UTC (rev 317223) +++ PKGBUILD 2018-04-20 21:09:28 UTC (rev 317224) @@ -1,97 +0,0 @@ -# $Id$ -# Maintainer: Jerome Leclanche <jer...@leclan.ch> - -pkgname=pgadmin4 -pkgver=2.1 -pkgrel=1 -pkgdesc="Comprehensive design and management interface for PostgreSQL" -arch=("x86_64") -url="https://www.pgadmin.org/" -license=("custom") -depends=("qt5-webengine" "python" "python-psycopg2" "postgresql-libs" "hicolor-icon-theme") -makedepends=("python-setuptools" "imagemagick") -source=( - "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v$pkgver/source/$pkgname-$pkgver.tar.gz"{,.sig} - "pgAdmin4.desktop" - "config_distro.py" - "config_local.py" - # https://www.postgresql.org/message-id/CAMQ-g0dHUN2SFioNg93hCTJkRR3LsVZ-ZvhUh6in%2BO4UAU2Qow%40mail.gmail.com -) -validpgpkeys=( - "E0C4CEEB826B1FDA4FB468E024ADFAAF698F1519" -) -sha256sums=('6c73244552c3195ced59282ed8eab3a0cae7c1a99fe30e7ec13bc3f2a102ab4a' - 'SKIP' - '9a39a321fa5a7fcf4f7f7abf6872de6de537800212e9f6f4902ed37b806765b7' - '510c11bf26fa335548ec4c582bc9f5a5242b8e03f3cb0b7c19e6bfd12b6d663c' - 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855') - - -prepare() { - cd "$pkgname-$pkgver" - local PYTHONVERSION="$(python -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')" - sed 's|value("PythonPath")|value("PythonPath", "/usr/lib/pgadmin4/venv/lib/python'${PYTHONVERSION}'/site-packages:/usr/lib/python'${PYTHONVERSION}'/site-packages:/usr/lib/python'${PYTHONVERSION}'")|g' -i runtime/{pgAdmin4.cpp,Server.cpp,BrowserWindow.cpp} - sed -r 's|(venv/lib/python)|\1'${PYTHONVERSION}'|g' runtime/Server.cpp -} - - -build() { - export LANG=en_US.UTF-8 - export LC_ALL=en_US.UTF-8 - - cd "$pkgname-$pkgver" - convert runtime/pgAdmin4.{ico,png} - - python -m venv "$srcdir/$pkgname-$pkgver/venv" - "$srcdir/$pkgname-$pkgver/venv/bin/python" -m pip install -r "$srcdir/$pkgname-$pkgver/requirements.txt" - - python -m venv "$srcdir/$pkgname-$pkgver/venv-docs" - "$srcdir/$pkgname-$pkgver/venv-docs/bin/python" -m pip install -r "$srcdir/$pkgname-$pkgver/requirements.txt" - "$srcdir/$pkgname-$pkgver/venv-docs/bin/python" -m pip install sphinx - - PATH="$srcdir/$pkgname-$pkgver/venv-docs/bin:$PATH" make docs - - cd runtime - qmake CONFIG+=release - make -} - - -package() { - cd "$pkgname-$pkgver" - - install -D runtime/pgAdmin4 "$pkgdir/usr/lib/pgadmin4/runtime/pgAdmin4" - - cp -a docs web "$pkgdir/usr/lib/pgadmin4" - cp -a venv "$pkgdir/usr/lib/pgadmin4/venv" - - install -Dm644 "$srcdir/config_distro.py" "$pkgdir/usr/lib/pgadmin4/web/config_distro.py" - install -Dm644 "$srcdir/config_local.py" "$pkgdir/usr/lib/pgadmin4/web/config_local.py" - - ### fixup some python wonkyness - local PYTHONVERSION="$(python -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')" - rm -r "${pkgdir}/usr/lib/pgadmin4/venv/lib/python${PYTHONVERSION}/site-packages/psycopg2" - ln -s /usr/lib/python3.6/lib-dynload "${pkgdir}/usr/lib/pgadmin4/venv/lib/python${PYTHONVERSION}/lib-dynload" - - ### Launcher - - install -Dm644 runtime/pgAdmin4-0.png "$pkgdir/usr/share/icons/hicolor/256x256/apps/pgAdmin4.png" - install -Dm644 runtime/pgAdmin4-1.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/pgAdmin4.png" - install -Dm644 runtime/pgAdmin4-2.png "$pkgdir/usr/share/icons/hicolor/32x32/apps/pgAdmin4.png" - install -Dm644 runtime/pgAdmin4-3.png "$pkgdir/usr/share/icons/hicolor/16x16/apps/pgAdmin4.png" - - install -Dm644 "$srcdir/pgAdmin4.desktop" "$pkgdir/usr/share/applications/pgAdmin4.desktop" - - install -D /dev/stdin "$pkgdir/usr/bin/pgadmin4" <<END -#!/bin/sh -cd /usr/lib/pgadmin4 -exec runtime/pgAdmin4 "\$@" -END - install -D /dev/stdin "$pkgdir/usr/bin/pgadmin4-server" <<END -#!/bin/sh -cd /usr/lib/pgadmin4 -PYTHONPATH="/usr/lib/pgadmin4/venv/lib/python${PYTHONVERSION}/site-packages" python web/pgAdmin4.py "\$@" -END - - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} Copied: pgadmin4/repos/community-x86_64/PKGBUILD (from rev 317223, pgadmin4/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-04-20 21:09:28 UTC (rev 317224) @@ -0,0 +1,92 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Jerome Leclanche <jer...@leclan.ch> + +pkgname=pgadmin4 +pkgver=3.0 +pkgrel=1 +pkgdesc='Comprehensive design and management interface for PostgreSQL' +url='https://www.pgadmin.org/' +arch=('x86_64') +license=('custom') +depends=('qt5-webengine' 'python' 'python-psycopg2' 'postgresql-libs' 'hicolor-icon-theme') +makedepends=('python-setuptools' 'imagemagick') +source=(https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${pkgver}/source/${pkgname}-${pkgver}.tar.gz{,.sig} + pgAdmin4.desktop + config_distro.py + config_local.py) +validpgpkeys=('E0C4CEEB826B1FDA4FB468E024ADFAAF698F1519') +sha512sums=('5921340176e6748ef13112d906061f195d4bb2f73917d762371bbaeb44ef66cf8e0edcd1cd241eb78dae46ed0b3af014c749468a930fb0c0983b38b2c54dfc3a' + 'SKIP' + '25e6ae6658dd25aa9ebaccaef89ab15c19d513da3641fecaf9100d1139b0cc32c027f60a688f5fdff3b26e7be7897e33e9a7b4dddbf68599e583bd5b2e7946e9' + '16d00dc2095904a6b12da7039458f632873829ad98d4d7653eac5804032ba92097ccae4488d56467d0ea9bd64e2654a3dead73eb7924c947ff1737ff6e3b4745' + 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e') + +prepare() { + cd "${pkgname}-${pkgver}" + local PYTHONVERSION="$(python -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')" + sed 's|value("PythonPath")|value("PythonPath", "/usr/lib/pgadmin4/venv/lib/python'${PYTHONVERSION}'/site-packages:/usr/lib/python'${PYTHONVERSION}'/site-packages:/usr/lib/python'${PYTHONVERSION}'")|g' -i runtime/{pgAdmin4.cpp,Server.cpp,TrayIcon.cpp} + sed -r 's|(venv/lib/python)|\1'${PYTHONVERSION}'|g' runtime/Server.cpp +} + + +build() { + export LANG=en_US.UTF-8 + export LC_ALL=en_US.UTF-8 + + cd ${pkgname}-${pkgver} + convert runtime/pgAdmin4.{ico,png} + + python -m venv "${srcdir}/${pkgname}-${pkgver}/venv" + "${srcdir}/${pkgname}-${pkgver}/venv/bin/python" -m pip install -r "${srcdir}/${pkgname}-${pkgver}/requirements.txt" + + python -m venv "${srcdir}/${pkgname}-${pkgver}/venv-docs" + "${srcdir}/${pkgname}-${pkgver}/venv-docs/bin/python" -m pip install -r "${srcdir}/${pkgname}-${pkgver}/requirements.txt" + "${srcdir}/${pkgname}-${pkgver}/venv-docs/bin/python" -m pip install sphinx + + PATH="${srcdir}/${pkgname}-${pkgver}/venv-docs/bin:${PATH}" make docs + + cd runtime + qmake CONFIG+=release + make +} + + +package() { + cd "${pkgname}-${pkgver}" + + install -D runtime/pgAdmin4 "${pkgdir}/usr/lib/pgadmin4/runtime/pgAdmin4" + + cp -a docs web "${pkgdir}/usr/lib/pgadmin4" + cp -a venv "${pkgdir}/usr/lib/pgadmin4/venv" + + install -Dm 644 "${srcdir}"/config_{distro,local}.py -t "${pkgdir}/usr/lib/pgadmin4/web" + + ### fixup some python wonkyness + local PYTHONVERSION="$(python -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')" + rm -r "${pkgdir}/usr/lib/pgadmin4/venv/lib/python${PYTHONVERSION}/site-packages/psycopg2" + ln -s /usr/lib/python3.6/lib-dynload "${pkgdir}/usr/lib/pgadmin4/venv/lib/python${PYTHONVERSION}/lib-dynload" + + ### Launcher + + install -Dm 644 runtime/pgAdmin4-0.png "${pkgdir}/usr/share/icons/hicolor/256x256/apps/pgAdmin4.png" + install -Dm 644 runtime/pgAdmin4-1.png "${pkgdir}/usr/share/icons/hicolor/48x48/apps/pgAdmin4.png" + install -Dm 644 runtime/pgAdmin4-2.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/pgAdmin4.png" + install -Dm 644 runtime/pgAdmin4-3.png "${pkgdir}/usr/share/icons/hicolor/16x16/apps/pgAdmin4.png" + + install -Dm 644 "${srcdir}/pgAdmin4.desktop" -t "${pkgdir}/usr/share/applications" + + install -D /dev/stdin "${pkgdir}/usr/bin/pgadmin4" <<END +#!/bin/sh +cd /usr/lib/pgadmin4 +exec runtime/pgAdmin4 "\$@" +END + install -D /dev/stdin "${pkgdir}/usr/bin/pgadmin4-server" <<END +#!/bin/sh +cd /usr/lib/pgadmin4 +PYTHONPATH="/usr/lib/pgadmin4/venv/lib/python${PYTHONVERSION}/site-packages" python web/pgAdmin4.py "\$@" +END + + install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" +} + +# vim: ts=2 sw=2 et: Deleted: config_distro.py =================================================================== --- config_distro.py 2018-04-20 21:09:18 UTC (rev 317223) +++ config_distro.py 2018-04-20 21:09:28 UTC (rev 317224) @@ -1,2 +0,0 @@ -SERVER_MODE = False -HELP_PATH = "/usr/lib/pgadmin4/docs/en_US/_build/html/" Copied: pgadmin4/repos/community-x86_64/config_distro.py (from rev 317223, pgadmin4/trunk/config_distro.py) =================================================================== --- config_distro.py (rev 0) +++ config_distro.py 2018-04-20 21:09:28 UTC (rev 317224) @@ -0,0 +1,2 @@ +SERVER_MODE = False +HELP_PATH = "/usr/lib/pgadmin4/docs/en_US/_build/html/" Deleted: config_local.py =================================================================== Copied: pgadmin4/repos/community-x86_64/config_local.py (from rev 317223, pgadmin4/trunk/config_local.py) =================================================================== Deleted: pgAdmin4.desktop =================================================================== --- pgAdmin4.desktop 2018-04-20 21:09:18 UTC (rev 317223) +++ pgAdmin4.desktop 2018-04-20 21:09:28 UTC (rev 317224) @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=pgAdmin 4 -Exec=/usr/lib/pgadmin4/runtime/pgAdmin4 -Icon=pgAdmin4 -Type=Application -Categories=Application;Development; -MimeType=text/html -DocPath=/usr/lib/pgadmin4/docs/en_US/_build/html/index.html -Comment=PostgreSQL Tools -Keywords=database;db;sql;query;administration;development; Copied: pgadmin4/repos/community-x86_64/pgAdmin4.desktop (from rev 317223, pgadmin4/trunk/pgAdmin4.desktop) =================================================================== --- pgAdmin4.desktop (rev 0) +++ pgAdmin4.desktop 2018-04-20 21:09:28 UTC (rev 317224) @@ -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; +MimeType=text/html +DocPath=/usr/lib/pgadmin4/docs/en_US/_build/html/index.html +Comment=PostgreSQL Tools +Keywords=database;db;sql;query;administration;development;