Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1194 from ertugerata/master

Browse Source 
pgadmin3
This commit is contained in:
Ertuğrul Erata
2016-02-26 22:57:41 +02:00
parent 15fe81d09c 56ac8a4afb
commit 94af6c356a
10 changed files with 438 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/wxGTK2.8/pspec.xml
+2 -2
View File
@@ -72,7 +72,7 @@
<Summary>wxGTK-devel is the development files for wxGTK</Summary>
<RuntimeDependencies>
<Dependency release="current">wxBase-devel</Dependency>
<Dependency release="current">wxGTK</Dependency>
<Dependency release="current">wxGTK2.8</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/lib/wx/include</Path>
@@ -102,7 +102,7 @@
<Name>wxBase-devel</Name>
<Summary>wxBase-devel is the development files for wxBase</Summary>
<RuntimeDependencies>
<Dependency release="current">wxGTK</Dependency>
<Dependency release="current">wxGTK2.8</Dependency>
<Dependency release="current">wxBase</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>expat-devel</Dependency>
pisi-index.xml
+250 -85
View File
@@ -28517,91 +28517,6 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>perl-ExtUtils-MakeMaker</Name>
<Homepage>http://search.cpan.org/~mschwern/ExtUtils-MakeMaker/</Homepage>
<Packager>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Packager>
<License>Artistic</License>
<License>GPLv2</License>
<IsA>app:console</IsA>
<PartOf>programming.language.perl</PartOf>
<Summary xml:lang="en">Create a module Makefile</Summary>
<Description xml:lang="en">This utility is designed to write a Makefile for an extension module from a Makefile.PL. It is based on the Makefile.SH model provided by Andy Dougherty and the perl5-porters.</Description>
<Archive type="targz" sha1sum="3f4ce44fbff3e59fe52266bed4155c6f31d3b901">http://www.cpan.org/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-6.99_11.tar.gz</Archive>
<BuildDependencies>
<Dependency>perl</Dependency>
</BuildDependencies>
<SourceURI>programming/language/perl/perl-ExtUtils-MakeMaker/pspec.xml</SourceURI>
</Source>
<Package>
<Name>perl-ExtUtils-MakeMaker</Name>
<RuntimeDependencies>
<Dependency>perl</Dependency>
<Dependency>perl-docs</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="data">/usr/share</Path>
</Files>
</Package>
<History>
<Update release="7">
<Date>2014-09-10</Date>
<Version>6.99_11</Version>
<Comment>Version bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2014-05-24</Date>
<Version>6.98</Version>
<Comment>Version bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2014-04-26</Date>
<Version>6.94</Version>
<Comment>Rebuild</Comment>
<Name>Aydın Demirel</Name>
<Email>aydin.demirel@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2014-04-06</Date>
<Version>6.94</Version>
<Comment>Version bump</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-12-23</Date>
<Version>6.82</Version>
<Comment>Rebuild</Comment>
<Name>Richard de Bruin</Name>
<Email>richdb@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-11-09</Date>
<Version>6.82</Version>
<Comment>Version bump</Comment>
<Name>Richard de Bruin</Name>
<Email>richdb@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-09-06</Date>
<Version>6.62</Version>
<Comment>First release</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>perl-Crypt-PasswdMD5</Name>
@@ -52238,6 +52153,104 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>pgadmin3</Name>
<Homepage>http://www.pgadmin.org</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>BSD</License>
<IsA>app:gui</IsA>
<PartOf>util.admin</PartOf>
<Summary xml:lang="en">Graphical client for PostgreSQL</Summary>
<Summary xml:lang="tr">PostgreSQL grafik arabirimi</Summary>
<Description xml:lang="en">pgadmin3 is a powerful administration and development platform for the PostgreSQL database, free for any use.</Description>
<Description xml:lang="tr">wxGTK temelli PostgreSQL grafik arabirimi</Description>
<Archive type="targz" sha1sum="3091b0bdc5156e54197f157a86240e47af9becc2">https://ftp.postgresql.org/pub/pgadmin3/release/v1.22.0/src/pgadmin3-1.22.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>postgresql-lib</Dependency>
<Dependency>libxslt-devel</Dependency>
<Dependency>openssl-devel</Dependency>
<Dependency>wxGTK2.8-devel</Dependency>
</BuildDependencies>
<SourceURI>util/admin/pgadmin3/pspec.xml</SourceURI>
</Source>
<Package>
<Name>pgadmin3</Name>
<RuntimeDependencies>
<Dependency>postgresql-lib</Dependency>
<Dependency>libxslt</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>zlib</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>openssl</Dependency>
<Dependency>wxGTK2.8</Dependency>
<Dependency>wxBase</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share/pgadmin3</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/pixmaps</Path>
</Files>
<AdditionalFiles>
<AdditionalFile target="/usr/share/applications/pgadmin3.desktop" permission="0644" owner="root">pgadmin3.desktop</AdditionalFile>
</AdditionalFiles>
</Package>
<History>
<Update release="7">
<Date>2016-02-26</Date>
<Version>1.22</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="6">
<Date>2015-01-26</Date>
<Version>1.20.0</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2014-06-18</Date>
<Version>1.18.1</Version>
<Comment>Version bump.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2014-03-10</Date>
<Version>1.16.1</Version>
<Comment>Rebuild</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-07-30</Date>
<Version>1.16.1</Version>
<Comment>Rebuild</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-02-23</Date>
<Version>1.16.1</Version>
<Comment>Version bump</Comment>
<Name>Ertan Güven</Name>
<Email>ertan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2011-01-07</Date>
<Version>1.12.2</Version>
<Comment>First release</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>pisilinux-dev-tools</Name>
@@ -119973,6 +119986,158 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>wxGTK</Name>
<Homepage>http://www.wxwidgets.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>wxWinLL-3</License>
<License>GPLv2</License>
<License>LGPLv2</License>
<License>wxWinFDL-3</License>
<IsA>library</IsA>
<PartOf>desktop.toolkit</PartOf>
<Summary xml:lang="en">GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit</Summary>
<Summary xml:lang="tr">Birçok platform için ortak C++ arayüz araç takımı olan wxWindows&apos;un GTK+ sürümü</Summary>
<Description xml:lang="fr">wxWidgets/GTK2 est le port GTK2 de la librairie graphique multi-plateforme wxWidgets, offrant des classes pour les contrôles IHM communs ainsi qu&apos;un ensemble complet de classes d&apos;aides pour les tâches applicatives habituelles, allant du réseau à l&apos;affichage HTML en passant par la manipulation d&apos;images.</Description>
<Description xml:lang="en">wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets GUI library, offering classes for all common GUI controls as well as a comprehensive set of helper classes for most common application tasks, ranging from networking to HTML display and image manipulation.</Description>
<Description xml:lang="tr">wxWidgets/GTK2 birçok platform için ortak bir C++ arayüz kitaplığı olan wxWidgets&apos;ın GTK2 sürümüdür. Ağ araçları, HTML gösterimi ve resim işleme gibi en yaygın kullanılan uygulama görevleri için kapsamlı bir sınıf kümesinin yanında tüm genel GUI denetimlerini içerir.</Description>
<Description xml:lang="es">wxWidgets/GTK2 es la versión portada a GTK2 de la librería GUI wxWidgets cross-plataforma en C++, con clases para todos los controles GUI comunes y tambien un conjunto de clases con ayudantes para la mayoría de las tareas comunes de aplicaciones, desde networking a visualización HTML y manipulación de imagenes.</Description>
<Archive type="tarbz2" sha1sum="a8d31ef924ae49e97690646b13d5a2a7be7dda10">mirrors://sourceforge/wxwindows/wxGTK-2.8.12.tar.bz2</Archive>
<BuildDependencies>
<Dependency>gst-plugins-base-devel</Dependency>
<Dependency>gstreamer-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>libSM-devel</Dependency>
<Dependency>libXinerama-devel</Dependency>
<Dependency>libXxf86vm-devel</Dependency>
<Dependency>libsdl-devel</Dependency>
<Dependency>mesa-devel</Dependency>
<Dependency>mesa-glu-devel</Dependency>
<Dependency>pango-devel</Dependency>
<Dependency>tiff-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">make-abicheck-non-fatal.patch</Patch>
<Patch level="1">wxGTK-collision.patch</Patch>
<Patch>wxGTK-2.8.10-CVE-2009-XXXX.diff</Patch>
</Patches>
<SourceURI>desktop/toolkit/wxGTK2.8/pspec.xml</SourceURI>
</Source>
<Package>
<Name>wxGTK2.8</Name>
<RuntimeDependencies>
<Dependency>gst-plugins-base</Dependency>
<Dependency>gstreamer</Dependency>
<Dependency>gtk2</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>libSM</Dependency>
<Dependency>libXinerama</Dependency>
<Dependency>libXxf86vm</Dependency>
<Dependency>libsdl</Dependency>
<Dependency>mesa</Dependency>
<Dependency>pango</Dependency>
<Dependency>tiff</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libpng</Dependency>
<Dependency>gdk-pixbuf</Dependency>
<Dependency release="5">wxBase</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/wx-config-2.8</Path>
<Path fileType="executable">/usr/bin/wxconfig</Path>
<Path fileType="library">/usr/lib/libwx_gtk*</Path>
<Path fileType="library">/usr/lib/wx/config/gtk2-unicode-release-2.8</Path>
</Files>
</Package>
<Package>
<Name>wxGTK2.8-devel</Name>
<Summary xml:lang="en">wxGTK-devel is the development files for wxGTK</Summary>
<RuntimeDependencies>
<Dependency release="5">wxBase-devel</Dependency>
<Dependency release="5">wxGTK2.8</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/lib/wx/include</Path>
</Files>
</Package>
<Package>
<Name>wxBase</Name>
<Summary xml:lang="en">wxBase is the GUI independent part of wxWidgets</Summary>
<Summary xml:lang="tr">wxWidgets/wxGTK için arayüz bağımsız olan kitaplıklar</Summary>
<RuntimeDependencies>
<Dependency>libunwind</Dependency>
<Dependency>zlib</Dependency>
<Dependency>expat</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/wxrc</Path>
<Path fileType="executable">/usr/bin/wxrc-2.8</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/share/bakefile</Path>
<Path fileType="locale">/usr/share/locale</Path>
<Path fileType="library">/usr/lib/libwx_base*</Path>
</Files>
</Package>
<Package>
<Name>wxBase-devel</Name>
<Summary xml:lang="en">wxBase-devel is the development files for wxBase</Summary>
<Summary xml:lang="tr">wxBase sınıfları için geliştirme dosyaları</Summary>
<RuntimeDependencies>
<Dependency release="5">wxGTK2.8</Dependency>
<Dependency release="5">wxBase</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>expat-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
</Files>
</Package>
<History>
<Update release="5">
<Date>2015-01-05</Date>
<Version>2.8.12</Version>
<Comment>use symlink not rename.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4">
<Date>2014-06-18</Date>
<Version>2.8.12</Version>
<Comment>Rebuild.</Comment>
<Name>Aydın Demirel</Name>
<Email>aydin.demirel@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2014-05-28</Date>
<Version>2.8.12</Version>
<Comment>Rebuild.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-08-17</Date>
<Version>2.8.12</Version>
<Comment>Release bump</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2011-05-06</Date>
<Version>2.8.12</Version>
<Comment>First release</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>qscintilla2</Name>
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
c2493a35abf6b96be5822de84a9a6a47f1a64a1d
c8808c3f7d2cab4c65c74871a2042b807d1e7b53
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
915fb93b9508db2d258d8063185bc7b0b70955ac
c69170c76cffd4f1d8e0a2678853648330d43815
util/admin/pgadmin3/actions.py
+32
View File
@@ -0,0 +1,32 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt.
from pisi.actionsapi import autotools
from pisi.actionsapi import shelltools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def setup():
shelltools.system("sed -i -e 's/wx-config/wx-config-2.8/' configure")
shelltools.system("sed -i 's/wxrc/wxrc-2.8/g' stringextract pgadmin/ui/embed-xrc")
shelltools.export("WX_CONFIG", "/usr/bin/wx-config-2.8 ")
shelltools.export("WXDIR", "/usr ")
autotools.configure("--disable-static \
--disable-debug \
--with-wx=/usr \
--disable-dependency-tracking \
--with-wx-config=/usr/bin/wx-config-2.8 \
--with-wx-version=2.8")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.insinto("/usr/share/pixmaps", "pkg/debian/pgadmin3.xpm")
util/admin/pgadmin3/files/0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch
+31
View File
@@ -0,0 +1,31 @@
From d17a268572648b8e45ba6dc5854549a1dbf81c0a Mon Sep 17 00:00:00 2001
From: Wander Nauta <info@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
util/admin/pgadmin3/files/pgadmin3.desktop
+11
View File
@@ -0,0 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
Name=pgadmin3
Comment=Graphical client for PostgreSQL
Comment[tr]=PostgreSQL için grafiksel istemci
GenericName=PostgreSQL Tools
GenericName[tr]=PostgreSQL Yönetim Aracı
Exec=pgadmin3
Icon=pgadmin3
Type=Application
Categories=Application;Development;
util/admin/pgadmin3/pspec.xml
+102
View File
@@ -0,0 +1,102 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>pgadmin3</Name>
<Homepage>http://www.pgadmin.org</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>BSD</License>
<IsA>app:gui</IsA>
<Summary>Graphical client for PostgreSQL</Summary>
<Description>pgadmin3 is a powerful administration and development platform for the PostgreSQL database, free for any use.</Description>
<Archive sha1sum="3091b0bdc5156e54197f157a86240e47af9becc2" type="targz">https://ftp.postgresql.org/pub/pgadmin3/release/v1.22.0/src/pgadmin3-1.22.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>postgresql-lib</Dependency>
<Dependency>libxslt-devel</Dependency>
<Dependency>openssl-devel</Dependency>
<Dependency>wxGTK2.8-devel</Dependency>
<!--Dependency>wxMaxima</Dependency-->
</BuildDependencies>
<!--Patches>
<Patch level="2">0001-Move-misplaced-unlock-of-s_currentObjectMutex.patch</Patch>
</Patches-->
</Source>
<Package>
<Name>pgadmin3</Name>
<RuntimeDependencies>
<Dependency>postgresql-lib</Dependency>
<Dependency>libxslt</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>zlib</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>openssl</Dependency>
<Dependency>wxGTK2.8</Dependency>
<Dependency>wxBase</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share/pgadmin3</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/pixmaps</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/share/applications/pgadmin3.desktop">pgadmin3.desktop</AdditionalFile>
</AdditionalFiles>
</Package>
<History>
<Update release="7">
<Date>2016-02-26</Date>
<Version>1.22</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="6">
<Date>2015-01-26</Date>
<Version>1.20.0</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2014-06-18</Date>
<Version>1.18.1</Version>
<Comment>Version bump.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2014-03-10</Date>
<Version>1.16.1</Version>
<Comment>Rebuild</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-07-30</Date>
<Version>1.16.1</Version>
<Comment>Rebuild</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-02-23</Date>
<Version>1.16.1</Version>
<Comment>Version bump</Comment>
<Name>Ertan Güven</Name>
<Email>ertan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2011-01-07</Date>
<Version>1.12.2</Version>
<Comment>First release</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
util/admin/pgadmin3/translations.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>pgadmin3</Name>
<Summary xml:lang="tr">PostgreSQL grafik arabirimi</Summary>
<Description xml:lang="tr">wxGTK temelli PostgreSQL grafik arabirimi</Description>
</Source>
</PISI>