2 files changed, 17 insertions, 43 deletions

diff --git a/databases/pgadmin3-12/files/patch-configure b/databases/pgadmin3-12/files/patch-configure
deleted file mode 100644
index 0a8db47b2dfe..000000000000
--- a/databases/pgadmin3-12/files/patch-configure
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig	Tue Nov 30 02:09:55 2004
-+++ configure	Tue May 17 22:46:56 2005
-@@ -4996,6 +4996,9 @@
-     # Which version of wxWindows is this?
-     WX_VERSION=`${WX_CONFIG} --version`
-     case "${WX_VERSION}" in
-+        2.6*)
-+            WX_VERSION="2.6"
-+            ;;
-         2.5*)
-             WX_VERSION="2.5"
-             ;;
-@@ -5175,6 +5178,10 @@
-                 LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION}"
-                 LIBS="$LIBS $WX_NEW_LDFLAGS"
-                 ;;
-+            *wx_gtk2_core*)
-+                LIBS="$LIBS -lwx_gtk2_stc-${WX_VERSION}"
-+                LIBS="$LIBS $WX_NEW_LDFLAGS"
-+                ;;
-             *wx_gtkud-*)
-                 LIBS="$LIBS -lwx_gtkud_stc-${WX_VERSION}"
-                 LIBS="$LIBS $WX_NEW_LDFLAGS"
-@@ -5214,11 +5221,11 @@
-             ;;
-     esac
-     wx_wx_h="yes"
--    if test ! -f "${WX_HOME}/include/wx-2.5/wx/version.h"
-+    if test ! -f "${WX_HOME}/include/wx-${WX_VERSION}/wx/version.h"
-     then
-         wx_wx_h="no"
-     fi
--    if test ! -f "${WX_HOME}/include/wx-2.5/wx/stc/stc.h"
-+    if test ! -f "${WX_HOME}/include/wx-${WX_VERSION}/wx/stc/stc.h"
-     then
-         { { echo "$as_me:$LINENO: error: you need to install the stc package from wxWindows/contrib/src/stc" >&5
- echo "$as_me: error: you need to install the stc package from wxWindows/contrib/src/stc" >&2;}
diff --git a/databases/pgadmin3-12/files/patch-src-utils-utffile.cpp b/databases/pgadmin3-12/files/patch-src-utils-utffile.cpp
index ca3579afcf78..464d0abae817 100644
--- a/databases/pgadmin3-12/files/patch-src-utils-utffile.cpp
+++ b/databases/pgadmin3-12/files/patch-src-utils-utffile.cpp
@@ -1,14 +1,25 @@
---- src/utils/utffile.cpp.orig	Thu Feb 24 00:41:36 2005
-+++ src/utils/utffile.cpp	Thu Feb 24 00:41:18 2005
-@@ -83,7 +83,12 @@
+--- src/utils/utffile.cpp.orig	Thu May 26 19:54:45 2005
++++ src/utils/utffile.cpp	Sun Oct 16 23:42:59 2005
+@@ -16,10 +16,6 @@
+ extern wxMBConvUTF32BE wxConvUTF32BE;
+ extern wxMBConvUTF32LE wxConvUTF32LE;
+ 
+-#if !wxUSE_UNICODE
+-#error utffile.cpp is implemented for unicode only.
+-#endif
+-
+ 
+ // these are the magic characters identifying an Unicode file
+ #define BOM_UTF8    "\357\273\277"
+@@ -87,7 +83,12 @@
              if (decr)
                  Seek(-decr, wxFromCurrent);
  
--            m_conversion->MB2WC((wchar_t*)(wxChar*)wxStringBuffer(str, nLen), (const char*)buffer, (size_t)(nLen+1));
+-            m_conversion->MB2WC((wchar_t*)(wxChar*)wxStringBuffer(str, nLen+1), (const char*)buffer, (size_t)(nLen+1));
 +#if wxUSE_UNICODE
-+            size_t buf_len = nLen;
++            size_t buf_len = nLen + 1;
 +#else
-+            size_t buf_len = nLen * sizeof(wchar_t);
++            size_t buf_len = (nLen + 1) * sizeof(wchar_t);
 +#endif
 +            m_conversion->MB2WC((wchar_t*)(wxChar*)wxStringBuffer(str, buf_len), (const char*)buffer, (size_t)(nLen+1));
          }