[arch-commits] Commit in pgadmin3/repos/community-x86_64 (4 files)
Levente Polyak
anthraxx at archlinux.org
Mon Oct 1 15:33:58 UTC 2018
Date: Monday, October 1, 2018 @ 15:33:58
Author: anthraxx
Revision: 388893
archrelease: copy trunk to community-x86_64
Added:
pgadmin3/repos/community-x86_64/PKGBUILD
(from rev 388892, pgadmin3/trunk/PKGBUILD)
pgadmin3/repos/community-x86_64/pgadmin3-fix-segfault.patch
(from rev 388892, pgadmin3/trunk/pgadmin3-fix-segfault.patch)
Deleted:
pgadmin3/repos/community-x86_64/PKGBUILD
pgadmin3/repos/community-x86_64/pgadmin3-fix-segfault.patch
-----------------------------+
PKGBUILD | 111 +++++++++++++++++++++---------------------
pgadmin3-fix-segfault.patch | 22 ++++----
2 files changed, 68 insertions(+), 65 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-10-01 15:33:46 UTC (rev 388892)
+++ PKGBUILD 2018-10-01 15:33:58 UTC (rev 388893)
@@ -1,54 +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=6
-pkgdesc="Comprehensive design and management interface for PostgreSQL"
-arch=('i686' 'x86_64')
-url="http://www.pgadmin.org"
-license=('custom')
-# Dependency wxgtk3 is not supported due to segmentation fault (FS#54676)
-depends=('wxgtk2' 'postgresql-libs' 'libxslt' 'libgcrypt')
-makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick')
-validpgpkeys=('E0C4CEEB826B1FDA4FB468E024ADFAAF698F1519')
-source=(https://ftp.postgresql.org/pub/pgadmin/pgadmin3/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}
- ./configure --prefix=/usr --with-wx-version=3.0 --with-libgcrypt
- 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 388892, pgadmin3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-10-01 15:33:58 UTC (rev 388893)
@@ -0,0 +1,57 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: 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=7
+pkgdesc='Comprehensive design and management interface for PostgreSQL'
+url='https://www.pgadmin.org'
+arch=('x86_64')
+license=('custom')
+# Dependency wxgtk3 is not supported due to segmentation fault (FS#54676)
+depends=('wxgtk2' 'postgresql-libs' 'libxslt' 'libgcrypt')
+makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick')
+validpgpkeys=('E0C4CEEB826B1FDA4FB468E024ADFAAF698F1519')
+source=(https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz{,.sig}
+ pgadmin3-fix-segfault.patch)
+sha256sums=('9b68b0e3d3f0a261344fb8196825967d1e7acaca1d8cc82c42e12368ca5844ac'
+ 'SKIP'
+ 'b175869b77bcbfa43f1bc256277966882789883792c4f9dd26038ec248def6a2')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ convert +set date:create +set date:modify pgadmin/include/images/pgAdmin3.ico pgAdmin3.png
+# Fix segfault at startup (Debian)
+ patch -p1 -i ../pgadmin3-fix-segfault.patch
+ sed -E 's|(Categories=.+)|\1Database;|' -i pkg/pgadmin3.desktop
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure \
+ --prefix=/usr \
+ --with-wx-version=3.0 \
+ --with-libgcrypt
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+ install -Dm 644 i18n/${pkgname}.lng "${pkgdir}/usr/share/pgadmin3/i18n"
+ install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+
+ install -Dm 644 pgadmin/include/images/pgAdmin3.ico -t "${pkgdir}/usr/share/pgadmin3"
+ install -Dm 644 pgAdmin3-1.png "${pkgdir}/usr/share/pgadmin3/pgAdmin3.png"
+ install -Dm 644 pgAdmin3-3.png "${pkgdir}/usr/share/icons/hicolor/16x16/apps/pgAdmin3.png"
+ install -Dm 644 pgAdmin3-2.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/pgAdmin3.png"
+ install -Dm 644 pgAdmin3-1.png "${pkgdir}/usr/share/icons/hicolor/48x48/apps/pgAdmin3.png"
+
+ install -Dm 644 pkg/pgadmin3.desktop -t "${pkgdir}/usr/share/applications"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: pgadmin3-fix-segfault.patch
===================================================================
--- pgadmin3-fix-segfault.patch 2018-10-01 15:33:46 UTC (rev 388892)
+++ pgadmin3-fix-segfault.patch 2018-10-01 15:33:58 UTC (rev 388893)
@@ -1,11 +0,0 @@
---- 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.
Copied: pgadmin3/repos/community-x86_64/pgadmin3-fix-segfault.patch (from rev 388892, pgadmin3/trunk/pgadmin3-fix-segfault.patch)
===================================================================
--- pgadmin3-fix-segfault.patch (rev 0)
+++ pgadmin3-fix-segfault.patch 2018-10-01 15:33:58 UTC (rev 388893)
@@ -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