summaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorfjoe <fjoe@FreeBSD.org>2005-11-08 07:28:39 +0000
committerfjoe <fjoe@FreeBSD.org>2005-11-08 07:28:39 +0000
commitabb952ff3b5ce82439d394f8bafb43d6ccdc9cda (patch)
treeb2386a91746e850289d342b92fbf5a655b13fe76 /x11-toolkits
parent23a707f6001b782831109ad00f032a2e1fc8e1b9 (diff)
downloadFreeBSD-ports-abb952ff3b5ce82439d394f8bafb43d6ccdc9cda.zip
FreeBSD-ports-abb952ff3b5ce82439d394f8bafb43d6ccdc9cda.tar.gz
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')
-rw-r--r--x11-toolkits/wxgtk26-unicode/Makefile1
-rw-r--r--x11-toolkits/wxgtk26/Makefile1
-rw-r--r--x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp23
-rw-r--r--x11-toolkits/wxgtk28-unicode/Makefile1
-rw-r--r--x11-toolkits/wxgtk28/Makefile1
-rw-r--r--x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp23
-rw-r--r--x11-toolkits/wxgtk29-unicode/Makefile1
-rw-r--r--x11-toolkits/wxgtk29/Makefile1
-rw-r--r--x11-toolkits/wxgtk29/files/patch-src-common-intl.cpp23
9 files changed, 75 insertions, 0 deletions
diff --git a/x11-toolkits/wxgtk26-unicode/Makefile b/x11-toolkits/wxgtk26-unicode/Makefile
index 049949a..82ce75a 100644
--- a/x11-toolkits/wxgtk26-unicode/Makefile
+++ b/x11-toolkits/wxgtk26-unicode/Makefile
@@ -5,6 +5,7 @@
# $FreeBSD$
#
+PORTREVISION= 1
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit (Unicode)
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index 074af7a..04c248b 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/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/wxgtk26/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp
new file mode 100644
index 0000000..12488d2
--- /dev/null
+++ b/x11-toolkits/wxgtk26/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
diff --git a/x11-toolkits/wxgtk28-unicode/Makefile b/x11-toolkits/wxgtk28-unicode/Makefile
index 049949a..82ce75a 100644
--- a/x11-toolkits/wxgtk28-unicode/Makefile
+++ b/x11-toolkits/wxgtk28-unicode/Makefile
@@ -5,6 +5,7 @@
# $FreeBSD$
#
+PORTREVISION= 1
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit (Unicode)
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 074af7a..04c248b 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 0000000..12488d2
--- /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
diff --git a/x11-toolkits/wxgtk29-unicode/Makefile b/x11-toolkits/wxgtk29-unicode/Makefile
index 049949a..82ce75a 100644
--- a/x11-toolkits/wxgtk29-unicode/Makefile
+++ b/x11-toolkits/wxgtk29-unicode/Makefile
@@ -5,6 +5,7 @@
# $FreeBSD$
#
+PORTREVISION= 1
MAINTAINER= fjoe@FreeBSD.org
COMMENT= The wxWidgets GUI toolkit (Unicode)
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index 074af7a..04c248b 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/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/wxgtk29/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk29/files/patch-src-common-intl.cpp
new file mode 100644
index 0000000..12488d2
--- /dev/null
+++ b/x11-toolkits/wxgtk29/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
OpenPOWER on IntegriCloud