[arch-commits] Commit in pgadmin3/trunk (PKGBUILD pgadmin3-fix-segfault.patch)
Antonio Rojas
arojas at archlinux.org
Mon Jan 23 17:17:39 UTC 2017
Date: Monday, January 23, 2017 @ 17:17:38
Author: arojas
Revision: 208605
Fix segfault at startup (FS#52683)
Added:
pgadmin3/trunk/pgadmin3-fix-segfault.patch
Modified:
pgadmin3/trunk/PKGBUILD
-----------------------------+
PKGBUILD | 12 +++++++++---
pgadmin3-fix-segfault.patch | 11 +++++++++++
2 files changed, 20 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-23 16:40:53 UTC (rev 208604)
+++ PKGBUILD 2017-01-23 17:17:38 UTC (rev 208605)
@@ -6,7 +6,7 @@
pkgname=pgadmin3
pkgver=1.22.2
-pkgrel=1
+pkgrel=2
pkgdesc="Comprehensive design and management interface for PostgreSQL"
arch=('i686' 'x86_64')
url="http://www.pgadmin.org"
@@ -14,13 +14,19 @@
depends=('wxgtk' 'postgresql-libs' 'libxslt')
makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick')
validpgpkeys=('E0C4CEEB826B1FDA4FB468E024ADFAAF698F1519')
-source=(https://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz{,.sig})
+source=(https://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz{,.sig}
+ pgadmin3-fix-segfault.patch)
sha256sums=('9b68b0e3d3f0a261344fb8196825967d1e7acaca1d8cc82c42e12368ca5844ac'
- 'SKIP')
+ 'SKIP'
+ 'b175869b77bcbfa43f1bc256277966882789883792c4f9dd26038ec248def6a2')
prepare() {
cd "$srcdir"
convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgAdmin3.png
+
+# Fix segfault at startup (Debian)
+ cd $pkgname-$pkgver
+ patch -p1 -i ../pgadmin3-fix-segfault.patch
}
build() {
Added: pgadmin3-fix-segfault.patch
===================================================================
--- pgadmin3-fix-segfault.patch (rev 0)
+++ pgadmin3-fix-segfault.patch 2017-01-23 17:17:38 UTC (rev 208605)
@@ -0,0 +1,11 @@
+--- a/pgadmin/frm/plugins.cpp
++++ b/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.
More information about the arch-commits
mailing list