diff options
| author | fjoe <fjoe@FreeBSD.org> | 2005-11-08 15:28:39 +0800 |
|---|---|---|
| committer | fjoe <fjoe@FreeBSD.org> | 2005-11-08 15:28:39 +0800 |
| commit | abb952ff3b5ce82439d394f8bafb43d6ccdc9cda (patch) | |
| tree | b2386a91746e850289d342b92fbf5a655b13fe76 /x11-toolkits/wxgtk28 | |
| parent | 23a707f6001b782831109ad00f032a2e1fc8e1b9 (diff) | |
| download | freebsd-ports-graphics-abb952ff3b5ce82439d394f8bafb43d6ccdc9cda.tar.gz freebsd-ports-graphics-abb952ff3b5ce82439d394f8bafb43d6ccdc9cda.tar.zst freebsd-ports-graphics-abb952ff3b5ce82439d394f8bafb43d6ccdc9cda.zip | |
Add a patch from WX_2_6_BRANCH:
src/common/intl.cpp rev. 1.166.2.1:
backported fix for crash in Unicode build (bug 1303851)
Submitted by: mux
Diffstat (limited to 'x11-toolkits/wxgtk28')
| -rw-r--r-- | x11-toolkits/wxgtk28/Makefile | 1 | ||||
| -rw-r--r-- | x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile index 074af7a1ec6..04c248ba60d 100644 --- a/x11-toolkits/wxgtk28/Makefile +++ b/x11-toolkits/wxgtk28/Makefile @@ -50,6 +50,7 @@ PLIST= ${.CURDIR}/pkg-plist WXGTK_FLAVOR?= gtk2 .if ${WXGTK_FLAVOR} == "gtk2" +PORTREVISION= 1 CONFLICTS= wxgtk2-contrib-devel-2.5.2* .endif diff --git a/x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp new file mode 100644 index 00000000000..12488d2b710 --- /dev/null +++ b/x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp @@ -0,0 +1,23 @@ +=================================================================== +RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/common/intl.cpp,v +retrieving revision 1.166 +retrieving revision 1.166.2.1 +diff -u -r1.166 -r1.166.2.1 +--- src/common/intl.cpp 2005/09/18 23:38:06 1.166 ++++ src/common/intl.cpp 2005/09/28 09:48:03 1.166.2.1 +@@ -1260,9 +1260,14 @@ + inputConv = + csConv = new wxCSConv(m_charset); + } +- else // no conversion needed ++ else // no need to convert the encoding + { ++ // we still need the conversion for Unicode build ++#if wxUSE_UNICODE ++ inputConv = wxConvCurrent; ++#else // !wxUSE_UNICODE + inputConv = NULL; ++#endif + } + + // conversion to apply to msgid strings before looking them up: we only |