From d148c69d7825a834719f74a886a93fbf2abb124b Mon Sep 17 00:00:00 2001 From: Max Khon Date: Mon, 18 Dec 2006 10:19:16 +0000 Subject: - Fix build with gcc 4.1. - Bump PORTREVISION. --- databases/pgadmin3-12/Makefile | 2 +- databases/pgadmin3-12/files/patch-src-include-pgFunction.h | 11 +++++++++++ databases/pgadmin3-12/files/patch-src-include-pgObject.h | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 databases/pgadmin3-12/files/patch-src-include-pgFunction.h create mode 100644 databases/pgadmin3-12/files/patch-src-include-pgObject.h (limited to 'databases') diff --git a/databases/pgadmin3-12/Makefile b/databases/pgadmin3-12/Makefile index e71b07a20be0..522ef378295c 100644 --- a/databases/pgadmin3-12/Makefile +++ b/databases/pgadmin3-12/Makefile @@ -7,7 +7,7 @@ PORTNAME= pgadmin3 PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src diff --git a/databases/pgadmin3-12/files/patch-src-include-pgFunction.h b/databases/pgadmin3-12/files/patch-src-include-pgFunction.h new file mode 100644 index 000000000000..d3db42602fa5 --- /dev/null +++ b/databases/pgadmin3-12/files/patch-src-include-pgFunction.h @@ -0,0 +1,11 @@ +--- src/include/pgFunction.h.orig Mon Dec 18 14:03:22 2006 ++++ src/include/pgFunction.h Mon Dec 18 14:03:33 2006 +@@ -33,7 +33,7 @@ + int GetIcon() { return PGICON_FUNCTION; } + void ShowTreeDetail(wxTreeCtrl *browser, frmMain *form=0, ctlListView *properties=0, ctlSQLBox *sqlPane=0); + static pgObject *ReadObjects(pgCollection *collection, wxTreeCtrl *browser); +- static pgFunction *pgFunction::AppendFunctions(pgObject *obj, pgSchema *schema, wxTreeCtrl *browser, const wxString &restriction); ++ static pgFunction *AppendFunctions(pgObject *obj, pgSchema *schema, wxTreeCtrl *browser, const wxString &restriction); + + wxString GetFullName() const {return GetName()+wxT("(")+GetArgTypes()+wxT(")"); } + wxString GetArgTypeNames() const { return argTypeNames; } diff --git a/databases/pgadmin3-12/files/patch-src-include-pgObject.h b/databases/pgadmin3-12/files/patch-src-include-pgObject.h new file mode 100644 index 000000000000..f93e21925b1e --- /dev/null +++ b/databases/pgadmin3-12/files/patch-src-include-pgObject.h @@ -0,0 +1,11 @@ +--- src/include/pgObject.h.orig Mon Dec 18 14:02:09 2006 ++++ src/include/pgObject.h Mon Dec 18 14:02:19 2006 +@@ -223,7 +223,7 @@ + pgSchemaObject(pgSchema *newSchema, int newType, const wxString& newName = wxT("")) : pgDatabaseObject(newType, newName) + { tableOid=0; SetSchema(newSchema); wxLogInfo(wxT("Creating a pg") + GetTypeName() + wxT(" object")); } + +- pgSchemaObject::~pgSchemaObject() ++ ~pgSchemaObject() + { wxLogInfo(wxT("Destroying a pg") + GetTypeName() + wxT(" object")); } + + bool GetSystemObject() const; -- cgit v1.2.3