Date: Monday, December 7, 2015 @ 07:22:46
Author: bpiotrowski
Revision: 149647
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
pgadmin3/repos/community-staging-i686/
pgadmin3/repos/community-staging-i686/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
(from rev 149646,
pgadmin3/trunk/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch)
pgadmin3/repos/community-staging-i686/PKGBUILD
(from rev 149646, pgadmin3/trunk/PKGBUILD)
pgadmin3/repos/community-staging-i686/pgadmin3.install
(from rev 149646, pgadmin3/trunk/pgadmin3.install)
pgadmin3/repos/community-staging-x86_64/
pgadmin3/repos/community-staging-x86_64/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
(from rev 149646,
pgadmin3/trunk/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch)
pgadmin3/repos/community-staging-x86_64/PKGBUILD
(from rev 149646, pgadmin3/trunk/PKGBUILD)
pgadmin3/repos/community-staging-x86_64/pgadmin3.install
(from rev 149646, pgadmin3/trunk/pgadmin3.install)
-----------------------------------------------------------------------------------+
community-staging-i686/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
| 31 +++++
community-staging-i686/PKGBUILD
| 54 ++++++++++
community-staging-i686/pgadmin3.install
| 12 ++
community-staging-x86_64/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
| 31 +++++
community-staging-x86_64/PKGBUILD
| 54 ++++++++++
community-staging-x86_64/pgadmin3.install
| 12 ++
6 files changed, 194 insertions(+)
Copied:
pgadmin3/repos/community-staging-i686/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
(from rev 149646,
pgadmin3/trunk/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch)
===================================================================
---
community-staging-i686/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
(rev 0)
+++
community-staging-i686/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
2015-12-07 06:22:46 UTC (rev 149647)
@@ -0,0 +1,31 @@
+From d17a268572648b8e45ba6dc5854549a1dbf81c0a Mon Sep 17 00:00:00 2001
+From: Wander Nauta <[email protected]>
+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
+
Copied: pgadmin3/repos/community-staging-i686/PKGBUILD (from rev 149646,
pgadmin3/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-07 06:22:46 UTC (rev 149647)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+# Maintainer: Douglas Soares de Andrade <[email protected]>
+# Contributor: Benjamin Andresen <[email protected]>
+# Contributor: bekks <[email protected]>
+
+pkgname=pgadmin3
+pkgver=1.20.0
+pkgrel=6
+pkgdesc="Comprehensive design and management interface for PostgreSQL"
+arch=('i686' 'x86_64')
+url="http://www.pgadmin.org";
+license=('custom')
+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
+ 0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch)
+md5sums=('3ca39fb598d0866eca90d30b85d5d5c4'
+ '69fbfdfe1bac75d7d1cdfeacd322cf5d')
+
+prepare() {
+ cd "$srcdir"
+ convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgAdmin3.png
+
+ 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
+}
+
+package() {
+ cd "$srcdir"/pgadmin3-${pkgver}
+
+ make DESTDIR="$pkgdir/" install
+ install -Dm644 i18n/$pkgname.lng "$pkgdir/usr/share/pgadmin3/i18n"
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ install -Dm644 pgadmin/include/images/pgAdmin3.ico
"$pkgdir/usr/share/pgadmin3/pgAdmin3.ico"
+ install -Dm644 "$srcdir/pgAdmin3-3.png"
"$pkgdir/usr/share/pgadmin3/pgAdmin3.png"
+
+ install -Dm644 "$srcdir/pgAdmin3-5.png"
"$pkgdir/usr/share/icons/hicolor/16x16/apps/pgAdmin3.png"
+ install -Dm644 "$srcdir/pgAdmin3-4.png"
"$pkgdir/usr/share/icons/hicolor/32x32/apps/pgAdmin3.png"
+ install -Dm644 "$srcdir/pgAdmin3-3.png"
"$pkgdir/usr/share/icons/hicolor/48x48/apps/pgAdmin3.png"
+
+ install -Dm644 "pkg/pgadmin3.desktop"
"$pkgdir/usr/share/applications/pgadmin3.desktop"
+}
Copied: pgadmin3/repos/community-staging-i686/pgadmin3.install (from rev
149646, pgadmin3/trunk/pgadmin3.install)
===================================================================
--- community-staging-i686/pgadmin3.install (rev 0)
+++ community-staging-i686/pgadmin3.install 2015-12-07 06:22:46 UTC (rev
149647)
@@ -0,0 +1,12 @@
+post_install() {
+ [ -x usr/bin/update-desktop-database ] && update-desktop-database -q || true
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ [ -x usr/bin/update-desktop-database ] && update-desktop-database -q || true
+}
+
+post_remove() {
+ [ -x usr/bin/update-desktop-database ] && update-desktop-database -q || true
+}
Copied:
pgadmin3/repos/community-staging-x86_64/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
(from rev 149646,
pgadmin3/trunk/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch)
===================================================================
---
community-staging-x86_64/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
(rev 0)
+++
community-staging-x86_64/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
2015-12-07 06:22:46 UTC (rev 149647)
@@ -0,0 +1,31 @@
+From d17a268572648b8e45ba6dc5854549a1dbf81c0a Mon Sep 17 00:00:00 2001
+From: Wander Nauta <[email protected]>
+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
+
Copied: pgadmin3/repos/community-staging-x86_64/PKGBUILD (from rev 149646,
pgadmin3/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-12-07 06:22:46 UTC (rev 149647)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+# Maintainer: Douglas Soares de Andrade <[email protected]>
+# Contributor: Benjamin Andresen <[email protected]>
+# Contributor: bekks <[email protected]>
+
+pkgname=pgadmin3
+pkgver=1.20.0
+pkgrel=6
+pkgdesc="Comprehensive design and management interface for PostgreSQL"
+arch=('i686' 'x86_64')
+url="http://www.pgadmin.org";
+license=('custom')
+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
+ 0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch)
+md5sums=('3ca39fb598d0866eca90d30b85d5d5c4'
+ '69fbfdfe1bac75d7d1cdfeacd322cf5d')
+
+prepare() {
+ cd "$srcdir"
+ convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgAdmin3.png
+
+ 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
+}
+
+package() {
+ cd "$srcdir"/pgadmin3-${pkgver}
+
+ make DESTDIR="$pkgdir/" install
+ install -Dm644 i18n/$pkgname.lng "$pkgdir/usr/share/pgadmin3/i18n"
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ install -Dm644 pgadmin/include/images/pgAdmin3.ico
"$pkgdir/usr/share/pgadmin3/pgAdmin3.ico"
+ install -Dm644 "$srcdir/pgAdmin3-3.png"
"$pkgdir/usr/share/pgadmin3/pgAdmin3.png"
+
+ install -Dm644 "$srcdir/pgAdmin3-5.png"
"$pkgdir/usr/share/icons/hicolor/16x16/apps/pgAdmin3.png"
+ install -Dm644 "$srcdir/pgAdmin3-4.png"
"$pkgdir/usr/share/icons/hicolor/32x32/apps/pgAdmin3.png"
+ install -Dm644 "$srcdir/pgAdmin3-3.png"
"$pkgdir/usr/share/icons/hicolor/48x48/apps/pgAdmin3.png"
+
+ install -Dm644 "pkg/pgadmin3.desktop"
"$pkgdir/usr/share/applications/pgadmin3.desktop"
+}
Copied: pgadmin3/repos/community-staging-x86_64/pgadmin3.install (from rev
149646, pgadmin3/trunk/pgadmin3.install)
===================================================================
--- community-staging-x86_64/pgadmin3.install (rev 0)
+++ community-staging-x86_64/pgadmin3.install 2015-12-07 06:22:46 UTC (rev
149647)
@@ -0,0 +1,12 @@
+post_install() {
+ [ -x usr/bin/update-desktop-database ] && update-desktop-database -q || true
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ [ -x usr/bin/update-desktop-database ] && update-desktop-database -q || true
+}
+
+post_remove() {
+ [ -x usr/bin/update-desktop-database ] && update-desktop-database -q || true
+}
