Browse Source

fix building under WX 2.8

master
parent
commit
74e666292b
  1. 36
      pgadmin/pgadmin.patch
  2. 9
      pgadmin/pgadmin.spec

36
pgadmin/pgadmin.patch

@ -0,0 +1,36 @@
Index: src/frm/frmEditGrid.cpp
--- src/frm/frmEditGrid.cpp.orig 2006-11-30 11:48:30 +0100
+++ src/frm/frmEditGrid.cpp 2006-12-13 08:08:04 +0100
@@ -75,7 +75,7 @@
EVT_GRID_EDITOR_SHOWN( frmEditGrid::OnEditorShown)
EVT_GRID_EDITOR_HIDDEN( frmEditGrid::OnEditorHidden)
EVT_GRID_LABEL_RIGHT_CLICK( frmEditGrid::OnLabelRightClick)
- EVT_AUI_PANEBUTTON( frmEditGrid::OnAuiUpdate)
+ EVT_AUI_PANE_BUTTON( frmEditGrid::OnAuiUpdate)
END_EVENT_TABLE()
Index: src/frm/frmQuery.cpp
--- src/frm/frmQuery.cpp.orig 2006-11-30 11:48:30 +0100
+++ src/frm/frmQuery.cpp 2006-12-13 08:08:34 +0100
@@ -103,7 +103,7 @@
EVT_ACTIVATE( frmQuery::OnActivate)
EVT_STC_MODIFIED(CTL_SQLQUERY, frmQuery::OnChangeStc)
EVT_STC_UPDATEUI(CTL_SQLQUERY, frmQuery::OnPositionStc)
- EVT_AUI_PANECLOSE( frmQuery::OnAuiUpdate)
+ EVT_AUI_PANE_CLOSE( frmQuery::OnAuiUpdate)
END_EVENT_TABLE()
frmQuery::frmQuery(frmMain *form, const wxString& _title, pgConn *_conn, const wxString& query)
Index: src/main/events.cpp
--- src/main/events.cpp.orig 2006-11-30 11:48:30 +0100
+++ src/main/events.cpp 2006-12-13 08:09:52 +0100
@@ -71,7 +71,7 @@
EVT_STC_UPDATEUI(CTL_SQLPANE, frmMain::OnPositionStc)
EVT_CLOSE( frmMain::OnClose)
- EVT_AUI_PANECLOSE( frmMain::OnAuiUpdate)
+ EVT_AUI_PANE_CLOSE( frmMain::OnAuiUpdate)
#ifdef __WXGTK__
EVT_TREE_KEY_DOWN(CTL_BROWSER, frmMain::OnTreeKeyDown)

9
pgadmin/pgadmin.spec

@ -33,18 +33,19 @@ Class: EVAL
Group: Database
License: Artistic
Version: 1.6.1
Release: 20061201
Release: 20061213
# list of sources
Source0: ftp://ftp.postgresql.org/pub/pgadmin3/release/v%{version}/src/pgadmin3-%{version}.tar.gz
Patch0: pgadmin.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: X11, wx >= 2.6.2-20051106, postgresql, openssl, libxml, libxslt
PreReq: X11, wx >= 2.6.2-20051106, postgresql, openssl, libxml, libxslt
BuildPreReq: X11, wx >= 2.8.0, postgresql, openssl, libxml, libxslt
PreReq: X11, wx >= 2.8.0, postgresql, openssl, libxml, libxslt
AutoReq: no
AutoReqProv: no
@ -63,6 +64,7 @@ AutoReqProv: no
%prep
%setup -q -n pgadmin3-%{version}
%patch -p0
%build
CC="%{l_cc}" \
@ -74,6 +76,7 @@ AutoReqProv: no
LIBS="`wx-config --libs` `wx-config --libs stc ogl` -lpq -lssl -lcrypto -lcrypt `pkg-config gtk+-2.0 --static --libs`" \
./configure \
--prefix=%{l_prefix} \
--with-wx-version=2.8 \
--with-wx=%{l_prefix} \
--with-wx-config=wx-config \
--with-pgsql-include=%{l_prefix}/include/postgresql \

Loading…
Cancel
Save