From 688f3c389edcf5009d8f5ba5b256a76b75c09ee0 Mon Sep 17 00:00:00 2001
From: "Aaron W. Swenson" <titanofold@gentoo.org>
Date: Sat, 7 Oct 2017 16:42:52 -0400
Subject: dev-db/pgadmin3: Bump to 1.22.2, fix startup crash

Bump to version 1.22.2.

Also fix crash on start up when using GCC 6. Thanks torto09.

Gentoo-Bug: https://bugs.gentoo.org/629422
Package-Manager: Portage-2.3.8, Repoman-2.3.3
---
 dev-db/pgadmin3/Manifest                           |  1 +
 .../files/pgadmin3-gcc6-null-pointer.patch         | 11 ++++++
 dev-db/pgadmin3/pgadmin3-1.22.2.ebuild             | 45 ++++++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch
 create mode 100644 dev-db/pgadmin3/pgadmin3-1.22.2.ebuild

diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index fc4732a14954..8f248f01e441 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -1 +1,2 @@
 DIST pgadmin3-1.22.1.tar.gz 14667770 SHA256 719ea7c0e65d99e8f365bf2d395d7a199804170b3266ada1374d9ac790bc783e SHA512 f190e82317e10b75cb0ebd7cc0c878c4be9c392e33aba44a1356446e4cac92735834a32b1d65999ffc3e36ed130d4cfcc1c25ad5faa3c745e884fccd797331e0 WHIRLPOOL ce7291cd0257914d6c5c11b71f0de630d9b72ac1ec9ee890a4b1feffed540c751c16e4164544223bb7db0eca02d1798d83f188362db4b750c504fd44aad081b7
+DIST pgadmin3-1.22.2.tar.gz 14788481 SHA256 9b68b0e3d3f0a261344fb8196825967d1e7acaca1d8cc82c42e12368ca5844ac SHA512 dcfc72cc2e33dbf1c9d1ce287f9d1d46eb047c99a165372cb74ef1716098f90f2ce2a8d0cd21b511a1ac8c0569dc7b3c0593208a74641f5a8f29dc9c04e40bbd WHIRLPOOL 22db2eb23520d80a3a2d2187954885ed46dac5a8db3fc26eec81faec20987fcc9a2529e0f5d91a6560374c9518209f361530911fbc60488109ec22819e0c048d
diff --git a/dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch b/dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch
new file mode 100644
index 000000000000..1396f8de8aab
--- /dev/null
+++ b/dev-db/pgadmin3/files/pgadmin3-gcc6-null-pointer.patch
@@ -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.
diff --git a/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild
new file mode 100644
index 000000000000..efce58f103c6
--- /dev/null
+++ b/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils multilib versionator wxwidgets
+
+DESCRIPTION="wxWidgets GUI for PostgreSQL"
+HOMEPAGE="http://www.pgadmin.org/"
+SRC_URI="mirror://postgresql/pgadmin/pgadmin3/v${PV}/src/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE="debug +databasedesigner"
+
+DEPEND="
+	x11-libs/wxGTK:3.0=[X]
+	>=dev-db/postgresql-8.4.0:=
+	>=dev-libs/libxml2-2.6.18
+	>=dev-libs/libxslt-1.1"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/pgadmin3-{desktop,gcc6-null-pointer}.patch )
+
+src_configure() {
+	WX_GTK_VER="3.0"
+
+	setup-wxwidgets
+
+	econf --with-wx-version=${WX_GTK_VER} \
+		$(use_enable debug) \
+		$(use_enable databasedesigner)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newicon "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png
+
+	domenu "${S}/pkg/pgadmin3.desktop"
+
+	# Fixing world-writable files
+	fperms -R go-w /usr/share
+}
-- 
cgit v1.2.3-65-gdbad