From 28375a9b4272477250c08867db7636e036dacecf Mon Sep 17 00:00:00 2001 From: pea Date: Fri, 15 Jul 2016 14:43:40 +0000 Subject: [PATCH] Bugfix update to 1.22.1 Spotted / patch provided by Ryan Boggs ( boggsrm at gmail.com), thanks. ok ajacoutot@ --- databases/pgadmin3/Makefile | 5 ++- databases/pgadmin3/distinfo | 4 +-- databases/pgadmin3/patches/patch-configure | 10 +++--- .../patches/patch-pgadmin_frm_events_cpp | 35 ++++++------------- 4 files changed, 19 insertions(+), 35 deletions(-) diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile index 6ffe5a47ca3..14d1952e486 100644 --- a/databases/pgadmin3/Makefile +++ b/databases/pgadmin3/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.33 2016/04/15 08:53:48 shadchin Exp $ +# $OpenBSD: Makefile,v 1.34 2016/07/15 14:43:40 pea Exp $ COMMENT= administration and development platform for PostgreSQL -V= 1.20.0 +V= 1.22.1 DISTNAME= pgadmin3-$V -REVISION= 0 CATEGORIES= databases devel HOMEPAGE= http://www.pgadmin.org/ diff --git a/databases/pgadmin3/distinfo b/databases/pgadmin3/distinfo index b61892728ca..d43c39b87cd 100644 --- a/databases/pgadmin3/distinfo +++ b/databases/pgadmin3/distinfo @@ -1,2 +1,2 @@ -SHA256 (pgadmin3-1.20.0.tar.gz) = B3PXgmqcepmMSHLpsAuZjgu7EESJhNZoU0IMlfpia4w= -SIZE (pgadmin3-1.20.0.tar.gz) = 14394997 +SHA256 (pgadmin3-1.22.1.tar.gz) = cZ6nwOZdmejzZb8tOV16GZgEFwsyZq2hN02ax5C8eD4= +SIZE (pgadmin3-1.22.1.tar.gz) = 14667770 diff --git a/databases/pgadmin3/patches/patch-configure b/databases/pgadmin3/patches/patch-configure index 4a500b93193..3d08ce968df 100644 --- a/databases/pgadmin3/patches/patch-configure +++ b/databases/pgadmin3/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.4 2014/10/24 15:01:18 dcoppa Exp $ ---- configure.orig Mon Oct 7 17:13:12 2013 -+++ configure Wed Oct 22 16:32:48 2014 -@@ -5742,7 +5742,7 @@ if ${ac_cv_lib_ssl_SSL_library_init+:} false; then : +$OpenBSD: patch-configure,v 1.5 2016/07/15 14:43:40 pea Exp $ +--- configure.orig Mon Feb 8 02:27:13 2016 ++++ configure Sat Jul 2 17:10:19 2016 +@@ -5743,7 +5743,7 @@ if ${ac_cv_lib_ssl_SSL_library_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.4 2014/10/24 15:01:18 dcoppa Exp $ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -6209,7 +6209,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -6210,7 +6210,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$PG_SSL" = "yes" then diff --git a/databases/pgadmin3/patches/patch-pgadmin_frm_events_cpp b/databases/pgadmin3/patches/patch-pgadmin_frm_events_cpp index 73114df9ffa..bac3323486a 100644 --- a/databases/pgadmin3/patches/patch-pgadmin_frm_events_cpp +++ b/databases/pgadmin3/patches/patch-pgadmin_frm_events_cpp @@ -1,6 +1,6 @@ -$OpenBSD: patch-pgadmin_frm_events_cpp,v 1.2 2015/09/02 10:03:34 landry Exp $ ---- pgadmin/frm/events.cpp.orig Fri May 30 12:42:41 2014 -+++ pgadmin/frm/events.cpp Mon Aug 24 17:37:18 2015 +$OpenBSD: patch-pgadmin_frm_events_cpp,v 1.3 2016/07/15 14:43:40 pea Exp $ +--- pgadmin/frm/events.cpp.orig Thu Jan 7 04:47:32 2016 ++++ pgadmin/frm/events.cpp Sat Jul 2 17:19:34 2016 @@ -41,7 +41,7 @@ // Mutex to protect the "currentObject" from race conditions. @@ -10,7 +10,7 @@ $OpenBSD: patch-pgadmin_frm_events_cpp,v 1.2 2015/09/02 10:03:34 landry Exp $ // Event table BEGIN_EVENT_TABLE(frmMain, pgFrame) -@@ -418,9 +418,9 @@ void frmMain::execSelChange(wxTreeItemId item, bool cu +@@ -424,9 +424,9 @@ void frmMain::execSelChange(wxTreeItemId item, bool cu // // Lock the assignment to prevent the race conditions between onSelRightClick and execSelChange. // @@ -22,30 +22,15 @@ $OpenBSD: patch-pgadmin_frm_events_cpp,v 1.2 2015/09/02 10:03:34 landry Exp $ // If we didn't get an object, then we may have a right click, or // invalid click, so ignore. -@@ -735,6 +735,7 @@ void frmMain::OnContextMenu(wxCommandEvent &event) - void frmMain::OnSelRightClick(wxTreeEvent &event) - { - wxTreeItemId item = event.GetItem(); -+ - if (item != browser->GetSelection()) - { - browser->SelectItem(item); -@@ -742,13 +743,16 @@ void frmMain::OnSelRightClick(wxTreeEvent &event) - // Prevent changes to "currentObject" by "execSelchange" function by another thread. - // Will hold the lock until we do popup on the respective object. - // +@@ -747,9 +747,9 @@ void frmMain::OnSelRightClick(wxTreeEvent &event) + + // Prevent changes to "currentObject" by "execSelchange" function by another + // thread. Will hold the lock until we have the actual object in hand. - s_currentObjectMutex.Lock(); + currentObjectMutex->Lock(); currentObject = browser->GetObject(item); +- s_currentObjectMutex.Unlock(); ++ currentObjectMutex->Unlock(); } -+ else -+ currentObjectMutex->Lock(); if (currentObject) - doPopup(browser, event.GetPoint(), currentObject); -- s_currentObjectMutex.Unlock(); -+ -+ currentObjectMutex->Unlock(); - } - -