SOURCES: pgadmin3-wx.patch (NEW), pgadmin3-m4.patch - new

[arekm]

Author: arekm                        Date: Thu Dec  7 23:38:26 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new

---- Files affected:
SOURCES:
   pgadmin3-wx.patch (NONE -> 1.1)  (NEW), pgadmin3-m4.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/pgadmin3-wx.patch
diff -u /dev/null SOURCES/pgadmin3-wx.patch:1.1
--- /dev/null	Fri Dec  8 00:38:26 2006
+++ SOURCES/pgadmin3-wx.patch	Fri Dec  8 00:38:20 2006
@@ -0,0 +1,36 @@
+diff -ur pgadmin3-1.6.1.org/src/frm/frmEditGrid.cpp pgadmin3-1.6.1/src/frm/frmEditGrid.cpp
+--- pgadmin3-1.6.1.org/src/frm/frmEditGrid.cpp	2006-11-30 11:48:30.000000000 +0100
++++ pgadmin3-1.6.1/src/frm/frmEditGrid.cpp	2006-12-08 01:06:14.686789500 +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()
+ 
+ 
+diff -ur pgadmin3-1.6.1.org/src/frm/frmQuery.cpp pgadmin3-1.6.1/src/frm/frmQuery.cpp
+--- pgadmin3-1.6.1.org/src/frm/frmQuery.cpp	2006-11-30 11:48:30.000000000 +0100
++++ pgadmin3-1.6.1/src/frm/frmQuery.cpp	2006-12-08 01:13:41.662723750 +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)
+diff -ur pgadmin3-1.6.1.org/src/main/events.cpp pgadmin3-1.6.1/src/main/events.cpp
+--- pgadmin3-1.6.1.org/src/main/events.cpp	2006-11-30 11:48:30.000000000 +0100
++++ pgadmin3-1.6.1/src/main/events.cpp	2006-12-08 01:13:52.807420250 +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)

================================================================
Index: SOURCES/pgadmin3-m4.patch
diff -u SOURCES/pgadmin3-m4.patch:1.2 SOURCES/pgadmin3-m4.patch:1.3
--- SOURCES/pgadmin3-m4.patch:1.2	Thu Dec  7 23:45:36 2006
+++ SOURCES/pgadmin3-m4.patch	Fri Dec  8 00:38:21 2006
@@ -1,6 +1,6 @@
 diff -urN pgadmin3-1.6.1.org/acinclude.m4 pgadmin3-1.6.1/acinclude.m4
 --- pgadmin3-1.6.1.org/acinclude.m4	2006-11-30 11:48:45.000000000 +0100
-+++ pgadmin3-1.6.1/acinclude.m4	2006-12-08 00:29:11.747864500 +0100
++++ pgadmin3-1.6.1/acinclude.m4	2006-12-08 01:22:54.341264000 +0100
 @@ -47,34 +47,10 @@
  ####################
  AC_DEFUN([LOCATE_WXWIDGETS],
@@ -39,4 +39,39 @@
  	])
  ])
  
-
+@@ -320,33 +296,8 @@
+ 		AC_LANG_C
+ 		AC_CHECK_LIB(pq, PQexec, [PG_LIBPQ=yes], [PG_LIBPQ=no])
+ 
+-		if test "$build_cpu-$build_vendor" = "powerpc-apple"
+-		then
+-			echo -n "checking if libpq links against libssl: "
+-			if test "$(otool -L ${PG_HOME}/lib/libpq.?.dylib | grep -c libssl)" -gt 0
+-			then
+-				PG_SSL="yes"
+-			else
+-				PG_SSL="no"
+-			fi
+-			echo $PG_SSL
+-		else
+-			AC_CHECK_LIB(pq, SSL_connect, [PG_SSL=yes], [PG_SSL=no])
+-		fi
+-
+-		if test "$build_cpu-$build_vendor" = "powerpc-apple"
+-		then
+-			echo -n "checking if libpq links against libkrb5: "
+-			if test "$(otool -L ${PG_HOME}/lib/libpq.?.dylib | grep -c libkrb5)" -gt 0
+-			then
+-				PG_KRB5="yes"
+-			else
+-				PG_KRB5="no"
+-			fi
+-			echo $PG_KRB5
+-		else
+-			AC_CHECK_LIB(pq, krb5_free_principal, [PG_KRB5=yes], [PG_KRB5=no])
+-		fi
++		PG_SSL=yes
++		PG_KRB5=yes
+ 
+ 		AC_LANG_RESTORE
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/pgadmin3-m4.patch?r1=1.2&r2=1.3&f=u