diff --git a/pgadmin3-nullthis.patch b/pgadmin3-nullthis.patch index 40fabd8..248bd67 100644 --- a/pgadmin3-nullthis.patch +++ b/pgadmin3-nullthis.patch @@ -1,6 +1,7 @@ ---- pgadmin/db/pgConn.cpp.old 2016-11-11 09:19:11.623252356 +0300 -+++ pgadmin/db/pgConn.cpp 2016-11-11 09:23:23.316047020 +0300 -@@ -407,21 +407,20 @@ +diff -up ./pgadmin/db/pgConn.cpp.nullthis ./pgadmin/db/pgConn.cpp +--- ./pgadmin/db/pgConn.cpp.nullthis 2016-02-08 05:19:40.000000000 -0500 ++++ ./pgadmin/db/pgConn.cpp 2017-02-19 03:11:04.318716963 -0500 +@@ -407,21 +407,20 @@ bool pgConn::GetIsEdb() { // to retrieve edb flag BackendMinimumVersion(0, 0); @@ -25,7 +26,7 @@ } wxString pgConn::SystemNamespaceRestriction(const wxString &nsp) -@@ -475,6 +474,9 @@ +@@ -475,6 +474,9 @@ bool pgConn::IsSuperuser() bool pgConn::BackendMinimumVersion(int major, int minor) { @@ -35,7 +36,7 @@ if (!majorVersion) { wxString version = GetVersionString(); -@@ -503,8 +505,8 @@ +@@ -503,8 +505,8 @@ bool pgConn::BackendMinimumVersion(int m // releases are not coordinated with PostgreSQL minor releases. bool pgConn::BackendMinimumVersion(int major, int minor, int patch) { @@ -46,7 +47,7 @@ return majorVersion > major || (majorVersion == major && minorVersion > minor) || (majorVersion == major && minorVersion == minor && patchVersion >= patch); } -@@ -648,6 +650,11 @@ +@@ -648,6 +650,11 @@ void pgConn::ExamineLibpqVersion() } } @@ -58,7 +59,7 @@ wxString pgConn::GetName() const { wxString str; -@@ -1003,13 +1010,13 @@ +@@ -1003,15 +1010,15 @@ bool pgConn::IsAlive() } @@ -74,21 +75,27 @@ + if (p->conn) // FIXME: casting away const ! + ((pgConn *)p)->connStatus = PQstatus(p->conn); - return connStatus; +- return connStatus; ++ return p->connStatus; } ---- pgadmin/include/db/pgConn.h.old 2016-11-11 09:23:37.029926872 +0300 -+++ pgadmin/include/db/pgConn.h 2016-11-11 09:24:47.726307501 +0300 -@@ -195,9 +195,6 @@ + + +diff -up ./pgadmin/include/db/pgConn.h.nullthis ./pgadmin/include/db/pgConn.h +--- ./pgadmin/include/db/pgConn.h.nullthis 2016-02-16 11:58:40.000000000 -0500 ++++ ./pgadmin/include/db/pgConn.h 2017-02-19 03:03:25.631214015 -0500 +@@ -194,10 +194,7 @@ public: + { return utfConnectString; } - int GetPort() const +- int GetPort() const - { - return conn ? atoi(PQport(conn)) : 0; - }; ++ int GetPort() const; wxString GetTTY() const { return conn ? wxString(PQtty(conn), *conv) : wxT(""); -@@ -215,7 +212,11 @@ +@@ -215,7 +212,11 @@ public: { return conn ? PQbackendPID(conn) : 0; } diff --git a/pgadmin3.spec b/pgadmin3.spec index ac875c8..00f213e 100644 --- a/pgadmin3.spec +++ b/pgadmin3.spec @@ -37,7 +37,7 @@ required to communicate with the database server. %setup -q %patch0 -p1 %patch2 -p0 -%patch3 -p0 +%patch3 -p0 -b .nullthis %build export LIBS="-lwx_gtk2u_core-2.8"