[arch-commits] Commit in pgadmin3/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Mon Jan 23 17:18:43 UTC 2017
Date: Monday, January 23, 2017 @ 17:18:42
Author: arojas
Revision: 208606
archrelease: copy trunk to community-i686, community-x86_64
Added:
pgadmin3/repos/community-i686/PKGBUILD
(from rev 208605, pgadmin3/trunk/PKGBUILD)
pgadmin3/repos/community-i686/pgadmin3-fix-segfault.patch
(from rev 208605, pgadmin3/trunk/pgadmin3-fix-segfault.patch)
pgadmin3/repos/community-x86_64/PKGBUILD
(from rev 208605, pgadmin3/trunk/PKGBUILD)
pgadmin3/repos/community-x86_64/pgadmin3-fix-segfault.patch
(from rev 208605, pgadmin3/trunk/pgadmin3-fix-segfault.patch)
Deleted:
pgadmin3/repos/community-i686/PKGBUILD
pgadmin3/repos/community-x86_64/PKGBUILD
----------------------------------------------+
/PKGBUILD | 106 +++++++++++++++++++++++++
community-i686/PKGBUILD | 47 -----------
community-i686/pgadmin3-fix-segfault.patch | 11 ++
community-x86_64/PKGBUILD | 47 -----------
community-x86_64/pgadmin3-fix-segfault.patch | 11 ++
5 files changed, 128 insertions(+), 94 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-01-23 17:17:38 UTC (rev 208605)
+++ community-i686/PKGBUILD 2017-01-23 17:18:42 UTC (rev 208606)
@@ -1,47 +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.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"
-}
Copied: pgadmin3/repos/community-i686/PKGBUILD (from rev 208605, pgadmin3/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-01-23 17:18:42 UTC (rev 208606)
@@ -0,0 +1,53 @@
+# $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=2
+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}
+ pgadmin3-fix-segfault.patch)
+sha256sums=('9b68b0e3d3f0a261344fb8196825967d1e7acaca1d8cc82c42e12368ca5844ac'
+ 'SKIP'
+ 'b175869b77bcbfa43f1bc256277966882789883792c4f9dd26038ec248def6a2')
+
+prepare() {
+ cd "$srcdir"
+ convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgAdmin3.png
+
+# Fix segfault at startup (Debian)
+ cd $pkgname-$pkgver
+ patch -p1 -i ../pgadmin3-fix-segfault.patch
+}
+
+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"
+}
Copied: pgadmin3/repos/community-i686/pgadmin3-fix-segfault.patch (from rev 208605, pgadmin3/trunk/pgadmin3-fix-segfault.patch)
===================================================================
--- community-i686/pgadmin3-fix-segfault.patch (rev 0)
+++ community-i686/pgadmin3-fix-segfault.patch 2017-01-23 17:18:42 UTC (rev 208606)
@@ -0,0 +1,11 @@
+--- a/pgadmin/frm/plugins.cpp
++++ b/pgadmin/frm/plugins.cpp
+@@ -380,7 +380,7 @@ bool pluginUtilityFactory::CheckEnable(p
+ {
+ // If we need a specific server type, we can't enable unless
+ // we have a connection.
+- if (!obj || !(obj->GetConnection()->GetStatus() == PGCONN_OK))
++ if (!obj || !obj->GetConnection() || !(obj->GetConnection()->GetStatus() == PGCONN_OK))
+ return false;
+
+ // Get the server type.
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-01-23 17:17:38 UTC (rev 208605)
+++ community-x86_64/PKGBUILD 2017-01-23 17:18:42 UTC (rev 208606)
@@ -1,47 +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.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"
-}
Copied: pgadmin3/repos/community-x86_64/PKGBUILD (from rev 208605, pgadmin3/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-01-23 17:18:42 UTC (rev 208606)
@@ -0,0 +1,53 @@
+# $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=2
+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}
+ pgadmin3-fix-segfault.patch)
+sha256sums=('9b68b0e3d3f0a261344fb8196825967d1e7acaca1d8cc82c42e12368ca5844ac'
+ 'SKIP'
+ 'b175869b77bcbfa43f1bc256277966882789883792c4f9dd26038ec248def6a2')
+
+prepare() {
+ cd "$srcdir"
+ convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgAdmin3.png
+
+# Fix segfault at startup (Debian)
+ cd $pkgname-$pkgver
+ patch -p1 -i ../pgadmin3-fix-segfault.patch
+}
+
+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"
+}
Copied: pgadmin3/repos/community-x86_64/pgadmin3-fix-segfault.patch (from rev 208605, pgadmin3/trunk/pgadmin3-fix-segfault.patch)
===================================================================
--- community-x86_64/pgadmin3-fix-segfault.patch (rev 0)
+++ community-x86_64/pgadmin3-fix-segfault.patch 2017-01-23 17:18:42 UTC (rev 208606)
@@ -0,0 +1,11 @@
+--- a/pgadmin/frm/plugins.cpp
++++ b/pgadmin/frm/plugins.cpp
+@@ -380,7 +380,7 @@ bool pluginUtilityFactory::CheckEnable(p
+ {
+ // If we need a specific server type, we can't enable unless
+ // we have a connection.
+- if (!obj || !(obj->GetConnection()->GetStatus() == PGCONN_OK))
++ if (!obj || !obj->GetConnection() || !(obj->GetConnection()->GetStatus() == PGCONN_OK))
+ return false;
+
+ // Get the server type.
More information about the arch-commits
mailing list