[arch-commits] Commit in pgadmin3/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Sun Jan 22 23:36:48 UTC 2017
Date: Sunday, January 22, 2017 @ 23:36:47
Author: arojas
Revision: 208457
archrelease: copy trunk to community-i686, community-x86_64
Added:
pgadmin3/repos/community-i686/PKGBUILD
(from rev 208456, pgadmin3/trunk/PKGBUILD)
pgadmin3/repos/community-x86_64/PKGBUILD
(from rev 208456, pgadmin3/trunk/PKGBUILD)
Deleted:
pgadmin3/repos/community-i686/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
pgadmin3/repos/community-i686/PKGBUILD
pgadmin3/repos/community-x86_64/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
pgadmin3/repos/community-x86_64/PKGBUILD
---------------------------------------------------------------------------+
/PKGBUILD | 94 ++++++++++
community-i686/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch | 31 ---
community-i686/PKGBUILD | 49 -----
community-x86_64/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch | 31 ---
community-x86_64/PKGBUILD | 49 -----
5 files changed, 94 insertions(+), 160 deletions(-)
Deleted: community-i686/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
===================================================================
--- community-i686/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch 2017-01-22 23:36:17 UTC (rev 208456)
+++ community-i686/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch 2017-01-22 23:36:47 UTC (rev 208457)
@@ -1,31 +0,0 @@
-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
-
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-01-22 23:36:17 UTC (rev 208456)
+++ community-i686/PKGBUILD 2017-01-22 23:36:47 UTC (rev 208457)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Douglas Soares de Andrade <dsa at aur.archlinux.org>
-# Contributor: Benjamin Andresen <benny at klapmuetz.org>
-# Contributor: bekks <eduard.warkentin at gmx.de>
-
-pkgname=pgadmin3
-pkgver=1.22.1
-pkgrel=2
-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')
-source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz)
-md5sums=('fe56418e9efcd291f5c1f81708d005fe')
-
-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
-}
-
-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-1.png" "$pkgdir/usr/share/pgadmin3/pgAdmin3.png"
-
- install -Dm644 "$srcdir/pgAdmin3-3.png" "$pkgdir/usr/share/icons/hicolor/16x16/apps/pgAdmin3.png"
- install -Dm644 "$srcdir/pgAdmin3-2.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/pgAdmin3.png"
- install -Dm644 "$srcdir/pgAdmin3-1.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-i686/PKGBUILD (from rev 208456, pgadmin3/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-01-22 23:36:47 UTC (rev 208457)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+# Contributor: Benjamin Andresen <benny at klapmuetz.org>
+# Contributor: bekks <eduard.warkentin at gmx.de>
+
+pkgname=pgadmin3
+pkgver=1.22.2
+pkgrel=1
+pkgdesc="Comprehensive design and management interface for PostgreSQL"
+arch=('i686' 'x86_64')
+url="http://www.pgadmin.org"
+license=('custom')
+depends=('wxgtk' 'postgresql-libs' 'libxslt')
+makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick')
+validpgpkeys=('E0C4CEEB826B1FDA4FB468E024ADFAAF698F1519')
+source=(https://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz{,.sig})
+sha256sums=('9b68b0e3d3f0a261344fb8196825967d1e7acaca1d8cc82c42e12368ca5844ac'
+ 'SKIP')
+
+prepare() {
+ cd "$srcdir"
+ convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgAdmin3.png
+}
+
+build() {
+ cd "$srcdir"/pgadmin3-${pkgver}
+ [ -f Makefile ] || ./configure --prefix=/usr --with-wx-version=3.0
+ 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-1.png" "$pkgdir/usr/share/pgadmin3/pgAdmin3.png"
+
+ install -Dm644 "$srcdir/pgAdmin3-3.png" "$pkgdir/usr/share/icons/hicolor/16x16/apps/pgAdmin3.png"
+ install -Dm644 "$srcdir/pgAdmin3-2.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/pgAdmin3.png"
+ install -Dm644 "$srcdir/pgAdmin3-1.png" "$pkgdir/usr/share/icons/hicolor/48x48/apps/pgAdmin3.png"
+
+ install -Dm644 "pkg/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop"
+}
Deleted: community-x86_64/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
===================================================================
--- community-x86_64/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch 2017-01-22 23:36:17 UTC (rev 208456)
+++ community-x86_64/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch 2017-01-22 23:36:47 UTC (rev 208457)
@@ -1,31 +0,0 @@
-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
-
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-01-22 23:36:17 UTC (rev 208456)
+++ community-x86_64/PKGBUILD 2017-01-22 23:36:47 UTC (rev 208457)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Douglas Soares de Andrade <dsa at aur.archlinux.org>
-# Contributor: Benjamin Andresen <benny at klapmuetz.org>
-# Contributor: bekks <eduard.warkentin at gmx.de>
-
-pkgname=pgadmin3
-pkgver=1.22.1
-pkgrel=2
-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')
-source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz)
-md5sums=('fe56418e9efcd291f5c1f81708d005fe')
-
-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
-}
-
-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-1.png" "$pkgdir/usr/share/pgadmin3/pgAdmin3.png"
-
- install -Dm644 "$srcdir/pgAdmin3-3.png" "$pkgdir/usr/share/icons/hicolor/16x16/apps/pgAdmin3.png"
- install -Dm644 "$srcdir/pgAdmin3-2.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/pgAdmin3.png"
- install -Dm644 "$srcdir/pgAdmin3-1.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-x86_64/PKGBUILD (from rev 208456, pgadmin3/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-01-22 23:36:47 UTC (rev 208457)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+# Contributor: Benjamin Andresen <benny at klapmuetz.org>
+# Contributor: bekks <eduard.warkentin at gmx.de>
+
+pkgname=pgadmin3
+pkgver=1.22.2
+pkgrel=1
+pkgdesc="Comprehensive design and management interface for PostgreSQL"
+arch=('i686' 'x86_64')
+url="http://www.pgadmin.org"
+license=('custom')
+depends=('wxgtk' 'postgresql-libs' 'libxslt')
+makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick')
+validpgpkeys=('E0C4CEEB826B1FDA4FB468E024ADFAAF698F1519')
+source=(https://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz{,.sig})
+sha256sums=('9b68b0e3d3f0a261344fb8196825967d1e7acaca1d8cc82c42e12368ca5844ac'
+ 'SKIP')
+
+prepare() {
+ cd "$srcdir"
+ convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgAdmin3.png
+}
+
+build() {
+ cd "$srcdir"/pgadmin3-${pkgver}
+ [ -f Makefile ] || ./configure --prefix=/usr --with-wx-version=3.0
+ 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-1.png" "$pkgdir/usr/share/pgadmin3/pgAdmin3.png"
+
+ install -Dm644 "$srcdir/pgAdmin3-3.png" "$pkgdir/usr/share/icons/hicolor/16x16/apps/pgAdmin3.png"
+ install -Dm644 "$srcdir/pgAdmin3-2.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/pgAdmin3.png"
+ install -Dm644 "$srcdir/pgAdmin3-1.png" "$pkgdir/usr/share/icons/hicolor/48x48/apps/pgAdmin3.png"
+
+ install -Dm644 "pkg/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop"
+}
More information about the arch-commits
mailing list