mirror of
https://git.freebsd.org/ports.git
synced 2025-07-17 01:09:24 -04:00
Update to 1.2.2.
PR: 86990
This commit is contained in:
Max Khon
parent
46df580663
commit
7251e51710
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=145945
10 changed files with 94 additions and 112 deletions
|
|
@ -6,8 +6,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= pgadmin3
|
||||
PORTVERSION= 1.2.0
|
||||
PORTREVISION= 6
|
||||
PORTVERSION= 1.2.2
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= ${MASTER_SITE_PGSQL}
|
||||
MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src
|
||||
|
|
@ -18,7 +17,7 @@ COMMENT= PostgreSQL database design and management system
|
|||
USE_PGSQL= yes
|
||||
USE_REINPLACE= yes
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --with-wx=${X11BASE}
|
||||
CONFIGURE_ARGS= --with-wx=${X11BASE} --with-wx-config=${WX_CONFIG}
|
||||
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
|
||||
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}"
|
||||
|
||||
|
|
@ -35,7 +34,7 @@ pre-everything::
|
|||
|
||||
.if !defined(WITHOUT_UNICODE)
|
||||
LIB_DEPENDS+= wx_gtk2u_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib
|
||||
CONFIGURE_ARGS+=--with-wx-config=wxgtk2u-2.6-config
|
||||
WX_CONFIG= wxgtk2u-2.6-config
|
||||
PKGNAMESUFFIX= -unicode
|
||||
PKGMESSAGE= ${PKGDIR}/pkg-message-unicode
|
||||
|
||||
|
|
@ -43,7 +42,7 @@ post-install:
|
|||
@${CAT} ${PKGMESSAGE}
|
||||
.else
|
||||
LIB_DEPENDS+= wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
|
||||
CONFIGURE_ARGS+=--with-wx-config=wxgtk2-2.6-config
|
||||
WX_CONFIG= wxgtk2-2.6-config
|
||||
.endif # WITHOUT_UNICODE
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
MD5 (pgadmin3-1.2.0.tar.gz) = 09caa00a0249978781215bf3e4ac02b8
|
||||
SIZE (pgadmin3-1.2.0.tar.gz) = 3688790
|
||||
MD5 (pgadmin3-1.2.2.tar.gz) = daead4660883f423db31f2019cac2f34
|
||||
SIZE (pgadmin3-1.2.2.tar.gz) = 4029500
|
||||
|
|
|
|||
|
|
@ -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;}
|
||||
|
|
@ -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));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,14 +4,12 @@ share/pgadmin3/docs/en_US/bugreport.html
|
|||
share/pgadmin3/docs/en_US/connect-error.html
|
||||
share/pgadmin3/docs/en_US/connect.html
|
||||
share/pgadmin3/docs/en_US/control-server.html
|
||||
share/pgadmin3/docs/en_US/cvs.html
|
||||
share/pgadmin3/docs/en_US/editgrid.html
|
||||
share/pgadmin3/docs/en_US/export.html
|
||||
share/pgadmin3/docs/en_US/extend.html
|
||||
share/pgadmin3/docs/en_US/freebsd_notes.html
|
||||
share/pgadmin3/docs/en_US/grantwiz.html
|
||||
share/pgadmin3/docs/en_US/gridopts.html
|
||||
share/pgadmin3/docs/en_US/guruhints.html
|
||||
share/pgadmin3/docs/en_US/images/backup.png
|
||||
share/pgadmin3/docs/en_US/images/connect.png
|
||||
share/pgadmin3/docs/en_US/images/editgrid.png
|
||||
|
|
@ -49,6 +47,7 @@ share/pgadmin3/docs/en_US/options-tab3.html
|
|||
share/pgadmin3/docs/en_US/options-tab4.html
|
||||
share/pgadmin3/docs/en_US/options.html
|
||||
share/pgadmin3/docs/en_US/password.html
|
||||
share/pgadmin3/docs/en_US/pg/LEGALNOTICE.html
|
||||
share/pgadmin3/docs/en_US/pg/admin.html
|
||||
share/pgadmin3/docs/en_US/pg/app-clusterdb.html
|
||||
share/pgadmin3/docs/en_US/pg/app-createdb.html
|
||||
|
|
@ -82,6 +81,7 @@ share/pgadmin3/docs/en_US/pg/biblio.html
|
|||
share/pgadmin3/docs/en_US/pg/bki-commands.html
|
||||
share/pgadmin3/docs/en_US/pg/bki-example.html
|
||||
share/pgadmin3/docs/en_US/pg/bki.html
|
||||
share/pgadmin3/docs/en_US/pg/bookindex.html
|
||||
share/pgadmin3/docs/en_US/pg/bug-reporting.html
|
||||
share/pgadmin3/docs/en_US/pg/catalog-pg-aggregate.html
|
||||
share/pgadmin3/docs/en_US/pg/catalog-pg-am.html
|
||||
|
|
@ -169,6 +169,7 @@ share/pgadmin3/docs/en_US/pg/ecpg-process.html
|
|||
share/pgadmin3/docs/en_US/pg/ecpg-set-connection.html
|
||||
share/pgadmin3/docs/en_US/pg/ecpg-variables.html
|
||||
share/pgadmin3/docs/en_US/pg/ecpg.html
|
||||
share/pgadmin3/docs/en_US/pg/encryption-options.html
|
||||
share/pgadmin3/docs/en_US/pg/errcodes-appendix.html
|
||||
share/pgadmin3/docs/en_US/pg/error-message-reporting.html
|
||||
share/pgadmin3/docs/en_US/pg/error-style-guide.html
|
||||
|
|
@ -179,8 +180,9 @@ share/pgadmin3/docs/en_US/pg/explicit-locking.html
|
|||
share/pgadmin3/docs/en_US/pg/extend-type-system.html
|
||||
share/pgadmin3/docs/en_US/pg/extend.html
|
||||
share/pgadmin3/docs/en_US/pg/extensibility.html
|
||||
share/pgadmin3/docs/en_US/pg/external-extensions.html
|
||||
share/pgadmin3/docs/en_US/pg/external-projects.html
|
||||
share/pgadmin3/docs/en_US/pg/features.html
|
||||
share/pgadmin3/docs/en_US/pg/file-layout.html
|
||||
share/pgadmin3/docs/en_US/pg/functions-admin.html
|
||||
share/pgadmin3/docs/en_US/pg/functions-aggregate.html
|
||||
share/pgadmin3/docs/en_US/pg/functions-array.html
|
||||
|
|
@ -311,7 +313,6 @@ share/pgadmin3/docs/en_US/pg/nls-programmer.html
|
|||
share/pgadmin3/docs/en_US/pg/nls.html
|
||||
share/pgadmin3/docs/en_US/pg/notation.html
|
||||
share/pgadmin3/docs/en_US/pg/overview.html
|
||||
share/pgadmin3/docs/en_US/pg/page.html
|
||||
share/pgadmin3/docs/en_US/pg/parser-stage.html
|
||||
share/pgadmin3/docs/en_US/pg/performance-tips.html
|
||||
share/pgadmin3/docs/en_US/pg/perm-functions.html
|
||||
|
|
@ -406,8 +407,11 @@ share/pgadmin3/docs/en_US/pg/release-7-2-3.html
|
|||
share/pgadmin3/docs/en_US/pg/release-7-2-4.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-2-5.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-2-6.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-2-7.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-2-8.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-2.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-1.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-10.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-2.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-3.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-4.html
|
||||
|
|
@ -415,6 +419,7 @@ share/pgadmin3/docs/en_US/pg/release-7-3-5.html
|
|||
share/pgadmin3/docs/en_US/pg/release-7-3-6.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-7.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-8.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-9.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-4-1.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-4-2.html
|
||||
|
|
@ -422,7 +427,12 @@ share/pgadmin3/docs/en_US/pg/release-7-4-3.html
|
|||
share/pgadmin3/docs/en_US/pg/release-7-4-4.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-4-5.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-4-6.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-4-7.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-4-8.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-4.html
|
||||
share/pgadmin3/docs/en_US/pg/release-8-0-1.html
|
||||
share/pgadmin3/docs/en_US/pg/release-8-0-2.html
|
||||
share/pgadmin3/docs/en_US/pg/release-8-0.html
|
||||
share/pgadmin3/docs/en_US/pg/release.html
|
||||
share/pgadmin3/docs/en_US/pg/resources.html
|
||||
share/pgadmin3/docs/en_US/pg/routine-reindex.html
|
||||
|
|
@ -586,6 +596,9 @@ share/pgadmin3/docs/en_US/pg/sql-vacuum.html
|
|||
share/pgadmin3/docs/en_US/pg/sql.html
|
||||
share/pgadmin3/docs/en_US/pg/ssh-tunnels.html
|
||||
share/pgadmin3/docs/en_US/pg/ssl-tcp.html
|
||||
share/pgadmin3/docs/en_US/pg/storage-page-layout.html
|
||||
share/pgadmin3/docs/en_US/pg/storage-toast.html
|
||||
share/pgadmin3/docs/en_US/pg/storage.html
|
||||
share/pgadmin3/docs/en_US/pg/stylesheet.css
|
||||
share/pgadmin3/docs/en_US/pg/supported-platforms.html
|
||||
share/pgadmin3/docs/en_US/pg/transaction-iso.html
|
||||
|
|
@ -618,7 +631,7 @@ share/pgadmin3/docs/en_US/pg/typeconv-oper.html
|
|||
share/pgadmin3/docs/en_US/pg/typeconv-query.html
|
||||
share/pgadmin3/docs/en_US/pg/typeconv-union-case.html
|
||||
share/pgadmin3/docs/en_US/pg/typeconv.html
|
||||
share/pgadmin3/docs/en_US/pg/unsupported-features-sql99.html
|
||||
share/pgadmin3/docs/en_US/pg/unsupported-features-sql-standard.html
|
||||
share/pgadmin3/docs/en_US/pg/user-attributes.html
|
||||
share/pgadmin3/docs/en_US/pg/user-manag.html
|
||||
share/pgadmin3/docs/en_US/pg/view-pg-indexes.html
|
||||
|
|
@ -654,10 +667,10 @@ share/pgadmin3/docs/en_US/pgadmin3.hhp.cached
|
|||
share/pgadmin3/docs/en_US/preparing_for_translation.html
|
||||
share/pgadmin3/docs/en_US/prop_page_design.html
|
||||
share/pgadmin3/docs/en_US/query.html
|
||||
share/pgadmin3/docs/en_US/querybuilder.html
|
||||
share/pgadmin3/docs/en_US/restore.html
|
||||
share/pgadmin3/docs/en_US/snapshots.html
|
||||
share/pgadmin3/docs/en_US/status.html
|
||||
share/pgadmin3/docs/en_US/svn.html
|
||||
share/pgadmin3/docs/en_US/team.html
|
||||
share/pgadmin3/docs/en_US/tech.html
|
||||
share/pgadmin3/docs/en_US/tips.txt
|
||||
|
|
@ -668,6 +681,7 @@ share/pgadmin3/docs/en_US/unix_compilation.html
|
|||
share/pgadmin3/docs/en_US/using.html
|
||||
share/pgadmin3/ui/af_ZA/pgadmin3.mo
|
||||
share/pgadmin3/ui/af_ZA/wxstd.mo
|
||||
share/pgadmin3/ui/ar_SA/pgadmin3.mo
|
||||
share/pgadmin3/ui/ca_ES/pgadmin3.mo
|
||||
share/pgadmin3/ui/ca_ES/wxstd.mo
|
||||
share/pgadmin3/ui/common/dlgAggregate.xrc
|
||||
|
|
@ -714,6 +728,8 @@ share/pgadmin3/ui/da_DK/pgadmin3.mo
|
|||
share/pgadmin3/ui/da_DK/wxstd.mo
|
||||
share/pgadmin3/ui/de_DE/pgadmin3.mo
|
||||
share/pgadmin3/ui/de_DE/wxstd.mo
|
||||
share/pgadmin3/ui/el_GR/pgadmin3.mo
|
||||
share/pgadmin3/ui/el_GR/wxstd.mo
|
||||
share/pgadmin3/ui/es_ES/pgadmin3.mo
|
||||
share/pgadmin3/ui/es_ES/wxstd.mo
|
||||
share/pgadmin3/ui/fi_FI/pgadmin3.mo
|
||||
|
|
@ -766,10 +782,12 @@ share/pgadmin3/ui/zh_TW/wxstd.mo
|
|||
@dirrm share/pgadmin3/ui/fr_FR
|
||||
@dirrm share/pgadmin3/ui/fi_FI
|
||||
@dirrm share/pgadmin3/ui/es_ES
|
||||
@dirrm share/pgadmin3/ui/el_GR
|
||||
@dirrm share/pgadmin3/ui/de_DE
|
||||
@dirrm share/pgadmin3/ui/da_DK
|
||||
@dirrm share/pgadmin3/ui/common
|
||||
@dirrm share/pgadmin3/ui/ca_ES
|
||||
@dirrm share/pgadmin3/ui/ar_SA
|
||||
@dirrm share/pgadmin3/ui/af_ZA
|
||||
@dirrm share/pgadmin3/ui
|
||||
@dirrm share/pgadmin3/docs/en_US/pg
|
||||
|
|
|
|||
|
|
@ -6,8 +6,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= pgadmin3
|
||||
PORTVERSION= 1.2.0
|
||||
PORTREVISION= 6
|
||||
PORTVERSION= 1.2.2
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= ${MASTER_SITE_PGSQL}
|
||||
MASTER_SITE_SUBDIR= pgadmin3/release/v${PORTVERSION}/src
|
||||
|
|
@ -18,7 +17,7 @@ COMMENT= PostgreSQL database design and management system
|
|||
USE_PGSQL= yes
|
||||
USE_REINPLACE= yes
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --with-wx=${X11BASE}
|
||||
CONFIGURE_ARGS= --with-wx=${X11BASE} --with-wx-config=${WX_CONFIG}
|
||||
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
|
||||
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}"
|
||||
|
||||
|
|
@ -35,7 +34,7 @@ pre-everything::
|
|||
|
||||
.if !defined(WITHOUT_UNICODE)
|
||||
LIB_DEPENDS+= wx_gtk2u_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib
|
||||
CONFIGURE_ARGS+=--with-wx-config=wxgtk2u-2.6-config
|
||||
WX_CONFIG= wxgtk2u-2.6-config
|
||||
PKGNAMESUFFIX= -unicode
|
||||
PKGMESSAGE= ${PKGDIR}/pkg-message-unicode
|
||||
|
||||
|
|
@ -43,7 +42,7 @@ post-install:
|
|||
@${CAT} ${PKGMESSAGE}
|
||||
.else
|
||||
LIB_DEPENDS+= wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
|
||||
CONFIGURE_ARGS+=--with-wx-config=wxgtk2-2.6-config
|
||||
WX_CONFIG= wxgtk2-2.6-config
|
||||
.endif # WITHOUT_UNICODE
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
MD5 (pgadmin3-1.2.0.tar.gz) = 09caa00a0249978781215bf3e4ac02b8
|
||||
SIZE (pgadmin3-1.2.0.tar.gz) = 3688790
|
||||
MD5 (pgadmin3-1.2.2.tar.gz) = daead4660883f423db31f2019cac2f34
|
||||
SIZE (pgadmin3-1.2.2.tar.gz) = 4029500
|
||||
|
|
|
|||
|
|
@ -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;}
|
||||
|
|
@ -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));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,14 +4,12 @@ share/pgadmin3/docs/en_US/bugreport.html
|
|||
share/pgadmin3/docs/en_US/connect-error.html
|
||||
share/pgadmin3/docs/en_US/connect.html
|
||||
share/pgadmin3/docs/en_US/control-server.html
|
||||
share/pgadmin3/docs/en_US/cvs.html
|
||||
share/pgadmin3/docs/en_US/editgrid.html
|
||||
share/pgadmin3/docs/en_US/export.html
|
||||
share/pgadmin3/docs/en_US/extend.html
|
||||
share/pgadmin3/docs/en_US/freebsd_notes.html
|
||||
share/pgadmin3/docs/en_US/grantwiz.html
|
||||
share/pgadmin3/docs/en_US/gridopts.html
|
||||
share/pgadmin3/docs/en_US/guruhints.html
|
||||
share/pgadmin3/docs/en_US/images/backup.png
|
||||
share/pgadmin3/docs/en_US/images/connect.png
|
||||
share/pgadmin3/docs/en_US/images/editgrid.png
|
||||
|
|
@ -49,6 +47,7 @@ share/pgadmin3/docs/en_US/options-tab3.html
|
|||
share/pgadmin3/docs/en_US/options-tab4.html
|
||||
share/pgadmin3/docs/en_US/options.html
|
||||
share/pgadmin3/docs/en_US/password.html
|
||||
share/pgadmin3/docs/en_US/pg/LEGALNOTICE.html
|
||||
share/pgadmin3/docs/en_US/pg/admin.html
|
||||
share/pgadmin3/docs/en_US/pg/app-clusterdb.html
|
||||
share/pgadmin3/docs/en_US/pg/app-createdb.html
|
||||
|
|
@ -82,6 +81,7 @@ share/pgadmin3/docs/en_US/pg/biblio.html
|
|||
share/pgadmin3/docs/en_US/pg/bki-commands.html
|
||||
share/pgadmin3/docs/en_US/pg/bki-example.html
|
||||
share/pgadmin3/docs/en_US/pg/bki.html
|
||||
share/pgadmin3/docs/en_US/pg/bookindex.html
|
||||
share/pgadmin3/docs/en_US/pg/bug-reporting.html
|
||||
share/pgadmin3/docs/en_US/pg/catalog-pg-aggregate.html
|
||||
share/pgadmin3/docs/en_US/pg/catalog-pg-am.html
|
||||
|
|
@ -169,6 +169,7 @@ share/pgadmin3/docs/en_US/pg/ecpg-process.html
|
|||
share/pgadmin3/docs/en_US/pg/ecpg-set-connection.html
|
||||
share/pgadmin3/docs/en_US/pg/ecpg-variables.html
|
||||
share/pgadmin3/docs/en_US/pg/ecpg.html
|
||||
share/pgadmin3/docs/en_US/pg/encryption-options.html
|
||||
share/pgadmin3/docs/en_US/pg/errcodes-appendix.html
|
||||
share/pgadmin3/docs/en_US/pg/error-message-reporting.html
|
||||
share/pgadmin3/docs/en_US/pg/error-style-guide.html
|
||||
|
|
@ -179,8 +180,9 @@ share/pgadmin3/docs/en_US/pg/explicit-locking.html
|
|||
share/pgadmin3/docs/en_US/pg/extend-type-system.html
|
||||
share/pgadmin3/docs/en_US/pg/extend.html
|
||||
share/pgadmin3/docs/en_US/pg/extensibility.html
|
||||
share/pgadmin3/docs/en_US/pg/external-extensions.html
|
||||
share/pgadmin3/docs/en_US/pg/external-projects.html
|
||||
share/pgadmin3/docs/en_US/pg/features.html
|
||||
share/pgadmin3/docs/en_US/pg/file-layout.html
|
||||
share/pgadmin3/docs/en_US/pg/functions-admin.html
|
||||
share/pgadmin3/docs/en_US/pg/functions-aggregate.html
|
||||
share/pgadmin3/docs/en_US/pg/functions-array.html
|
||||
|
|
@ -311,7 +313,6 @@ share/pgadmin3/docs/en_US/pg/nls-programmer.html
|
|||
share/pgadmin3/docs/en_US/pg/nls.html
|
||||
share/pgadmin3/docs/en_US/pg/notation.html
|
||||
share/pgadmin3/docs/en_US/pg/overview.html
|
||||
share/pgadmin3/docs/en_US/pg/page.html
|
||||
share/pgadmin3/docs/en_US/pg/parser-stage.html
|
||||
share/pgadmin3/docs/en_US/pg/performance-tips.html
|
||||
share/pgadmin3/docs/en_US/pg/perm-functions.html
|
||||
|
|
@ -406,8 +407,11 @@ share/pgadmin3/docs/en_US/pg/release-7-2-3.html
|
|||
share/pgadmin3/docs/en_US/pg/release-7-2-4.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-2-5.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-2-6.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-2-7.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-2-8.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-2.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-1.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-10.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-2.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-3.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-4.html
|
||||
|
|
@ -415,6 +419,7 @@ share/pgadmin3/docs/en_US/pg/release-7-3-5.html
|
|||
share/pgadmin3/docs/en_US/pg/release-7-3-6.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-7.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-8.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3-9.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-3.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-4-1.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-4-2.html
|
||||
|
|
@ -422,7 +427,12 @@ share/pgadmin3/docs/en_US/pg/release-7-4-3.html
|
|||
share/pgadmin3/docs/en_US/pg/release-7-4-4.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-4-5.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-4-6.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-4-7.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-4-8.html
|
||||
share/pgadmin3/docs/en_US/pg/release-7-4.html
|
||||
share/pgadmin3/docs/en_US/pg/release-8-0-1.html
|
||||
share/pgadmin3/docs/en_US/pg/release-8-0-2.html
|
||||
share/pgadmin3/docs/en_US/pg/release-8-0.html
|
||||
share/pgadmin3/docs/en_US/pg/release.html
|
||||
share/pgadmin3/docs/en_US/pg/resources.html
|
||||
share/pgadmin3/docs/en_US/pg/routine-reindex.html
|
||||
|
|
@ -586,6 +596,9 @@ share/pgadmin3/docs/en_US/pg/sql-vacuum.html
|
|||
share/pgadmin3/docs/en_US/pg/sql.html
|
||||
share/pgadmin3/docs/en_US/pg/ssh-tunnels.html
|
||||
share/pgadmin3/docs/en_US/pg/ssl-tcp.html
|
||||
share/pgadmin3/docs/en_US/pg/storage-page-layout.html
|
||||
share/pgadmin3/docs/en_US/pg/storage-toast.html
|
||||
share/pgadmin3/docs/en_US/pg/storage.html
|
||||
share/pgadmin3/docs/en_US/pg/stylesheet.css
|
||||
share/pgadmin3/docs/en_US/pg/supported-platforms.html
|
||||
share/pgadmin3/docs/en_US/pg/transaction-iso.html
|
||||
|
|
@ -618,7 +631,7 @@ share/pgadmin3/docs/en_US/pg/typeconv-oper.html
|
|||
share/pgadmin3/docs/en_US/pg/typeconv-query.html
|
||||
share/pgadmin3/docs/en_US/pg/typeconv-union-case.html
|
||||
share/pgadmin3/docs/en_US/pg/typeconv.html
|
||||
share/pgadmin3/docs/en_US/pg/unsupported-features-sql99.html
|
||||
share/pgadmin3/docs/en_US/pg/unsupported-features-sql-standard.html
|
||||
share/pgadmin3/docs/en_US/pg/user-attributes.html
|
||||
share/pgadmin3/docs/en_US/pg/user-manag.html
|
||||
share/pgadmin3/docs/en_US/pg/view-pg-indexes.html
|
||||
|
|
@ -654,10 +667,10 @@ share/pgadmin3/docs/en_US/pgadmin3.hhp.cached
|
|||
share/pgadmin3/docs/en_US/preparing_for_translation.html
|
||||
share/pgadmin3/docs/en_US/prop_page_design.html
|
||||
share/pgadmin3/docs/en_US/query.html
|
||||
share/pgadmin3/docs/en_US/querybuilder.html
|
||||
share/pgadmin3/docs/en_US/restore.html
|
||||
share/pgadmin3/docs/en_US/snapshots.html
|
||||
share/pgadmin3/docs/en_US/status.html
|
||||
share/pgadmin3/docs/en_US/svn.html
|
||||
share/pgadmin3/docs/en_US/team.html
|
||||
share/pgadmin3/docs/en_US/tech.html
|
||||
share/pgadmin3/docs/en_US/tips.txt
|
||||
|
|
@ -668,6 +681,7 @@ share/pgadmin3/docs/en_US/unix_compilation.html
|
|||
share/pgadmin3/docs/en_US/using.html
|
||||
share/pgadmin3/ui/af_ZA/pgadmin3.mo
|
||||
share/pgadmin3/ui/af_ZA/wxstd.mo
|
||||
share/pgadmin3/ui/ar_SA/pgadmin3.mo
|
||||
share/pgadmin3/ui/ca_ES/pgadmin3.mo
|
||||
share/pgadmin3/ui/ca_ES/wxstd.mo
|
||||
share/pgadmin3/ui/common/dlgAggregate.xrc
|
||||
|
|
@ -714,6 +728,8 @@ share/pgadmin3/ui/da_DK/pgadmin3.mo
|
|||
share/pgadmin3/ui/da_DK/wxstd.mo
|
||||
share/pgadmin3/ui/de_DE/pgadmin3.mo
|
||||
share/pgadmin3/ui/de_DE/wxstd.mo
|
||||
share/pgadmin3/ui/el_GR/pgadmin3.mo
|
||||
share/pgadmin3/ui/el_GR/wxstd.mo
|
||||
share/pgadmin3/ui/es_ES/pgadmin3.mo
|
||||
share/pgadmin3/ui/es_ES/wxstd.mo
|
||||
share/pgadmin3/ui/fi_FI/pgadmin3.mo
|
||||
|
|
@ -766,10 +782,12 @@ share/pgadmin3/ui/zh_TW/wxstd.mo
|
|||
@dirrm share/pgadmin3/ui/fr_FR
|
||||
@dirrm share/pgadmin3/ui/fi_FI
|
||||
@dirrm share/pgadmin3/ui/es_ES
|
||||
@dirrm share/pgadmin3/ui/el_GR
|
||||
@dirrm share/pgadmin3/ui/de_DE
|
||||
@dirrm share/pgadmin3/ui/da_DK
|
||||
@dirrm share/pgadmin3/ui/common
|
||||
@dirrm share/pgadmin3/ui/ca_ES
|
||||
@dirrm share/pgadmin3/ui/ar_SA
|
||||
@dirrm share/pgadmin3/ui/af_ZA
|
||||
@dirrm share/pgadmin3/ui
|
||||
@dirrm share/pgadmin3/docs/en_US/pg
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue