[arch-commits] Commit in pgadmin3/trunk (2 files)

[Sergej Pupykin]

    Date: Monday, April 27, 2015 @ 21:12:24
  Author: spupykin
Revision: 132349

upgpkg: pgadmin3 1.20.0-5

upd

Added:
  pgadmin3/trunk/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
Modified:
  pgadmin3/trunk/PKGBUILD

----------------------------------------------------------+
 0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch |   31 +++++++++++++
 PKGBUILD                                                 |   16 +++++-
 2 files changed, 43 insertions(+), 4 deletions(-)

Added: 0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
===================================================================
--- 0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch	                        (rev 0)
+++ 0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch	2015-04-27 19:12:24 UTC (rev 132349)
@@ -0,0 +1,31 @@
+From d17a268572648b8e45ba6dc5854549a1dbf81c0a Mon Sep 17 00:00:00 2001
+From: Wander Nauta <info at wandernauta.nl>
+Date: Sun, 19 Apr 2015 16:37:41 +0200
+Subject: [PATCH] Move misplaced unlock of s_currentObjectMutex
+
+The current implementation would unlock the mutex, even if it didn't own
+it.
+---
+ pgadmin/frm/events.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pgadmin/frm/events.cpp b/pgadmin/frm/events.cpp
+index 4baaf42..f2ad570 100644
+--- a/pgadmin/frm/events.cpp
++++ b/pgadmin/frm/events.cpp
+@@ -750,11 +750,11 @@ void frmMain::OnSelRightClick(wxTreeEvent &event)
+ 		//
+ 		s_currentObjectMutex.Lock();
+ 		currentObject = browser->GetObject(item);
++		s_currentObjectMutex.Unlock();
+ 	}
+ 
+ 	if (currentObject)
+ 		doPopup(browser, event.GetPoint(), currentObject);
+-	s_currentObjectMutex.Unlock();
+ }
+ 
+ 
+-- 
+2.3.5
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-27 19:12:21 UTC (rev 132348)
+++ PKGBUILD	2015-04-27 19:12:24 UTC (rev 132349)
@@ -6,7 +6,7 @@
 
 pkgname=pgadmin3
 pkgver=1.20.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Comprehensive design and management interface for PostgreSQL"
 arch=('i686' 'x86_64')
 url="http://www.pgadmin.org"
@@ -14,10 +14,12 @@
 depends=('wxgtk2.8' 'postgresql-libs' 'libxslt')
 makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick')
 install=pgadmin3.install
-source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz)
-md5sums=('3ca39fb598d0866eca90d30b85d5d5c4')
+source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz
+	0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch)
+md5sums=('3ca39fb598d0866eca90d30b85d5d5c4'
+         '69fbfdfe1bac75d7d1cdfeacd322cf5d')
 
-build() {
+prepare() {
   cd "$srcdir"
   convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgAdmin3.png
 
@@ -24,6 +26,12 @@
   cd "pgadmin3-${pkgver}"
   sed -i 's/wx-config/wx-config-2.8/' configure
   sed -i 's/wxrc/wxrc-2.8/g' stringextract pgadmin/ui/embed-xrc
+
+  patch -p1 <$srcdir/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
+}
+
+build() {
+  cd "$srcdir"/pgadmin3-${pkgver}
   [ -f Makefile ] ||  ./configure --prefix=/usr --with-wx-version=2.8
   make
 }