Merge pull request #6276 from arete/pgadmin3

pgadmin3: fix startup and distfile
This commit is contained in:
Enno Boland 2017-05-09 00:28:38 +02:00 committed by GitHub
commit 893dee1224
2 changed files with 13 additions and 2 deletions

View file

@ -0,0 +1,11 @@
--- pgadmin/frm/plugins.cpp
+++ pgadmin/frm/plugins.cpp
@@ -380,7 +380,7 @@ bool pluginUtilityFactory::CheckEnable(p
{
// If we need a specific server type, we can't enable unless
// we have a connection.
- if (!obj || !(obj->GetConnection()->GetStatus() == PGCONN_OK))
+ if (!obj || !obj->GetConnection() || !(obj->GetConnection()->GetStatus() == PGCONN_OK))
return false;
// Get the server type.

View file

@ -1,7 +1,7 @@
# Template file for 'pgadmin3'
pkgname=pgadmin3
version=1.22.2
revision=2
revision=3
build_style=gnu-configure
configure_args="ac_cv_path_WX_CONFIG=wx-config-3.0 --with-wx-version=3.0"
makedepends="postgresql-libs-devel wxWidgets-devel libxslt-devel libressl-devel"
@ -9,7 +9,7 @@ short_desc="Comprehensive design and management interface for PostgreSQL"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="BSD"
homepage="http://www.pgadmin.org"
distfiles="http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz"
distfiles="https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz"
checksum=9b68b0e3d3f0a261344fb8196825967d1e7acaca1d8cc82c42e12368ca5844ac
nocross=yes