Enable unicode even with wprintf() available but not wscanf().
Fixes at least the buidl breakage for the ports reported by landry@
and naddy@: py-wxPython, opennx, filezilla, mkvtoolnix, hugin,
poedit, codeblocks, pgadmin3, audacity (built here on amd64), with
stsp@'s wprintf diff in place.
A quick test with audacity seems to be fine -- an audacity project
created with pre-wprintf versions of wxWidgets and audacity and
containing some non-ascii characters in the metadata was successfully
loaded with wprintf in action and the below diff to wxWidgets (and
a backout of the no-unicode diff I committed for audacity), and the
metadate did stil display correct (and changing and saving the
metadata sill created a correct .aup file).
rpointel@ was so kind to do some test builds on what's currently
in the tree (also with a backout of the disabled unicode in
wxWidgets); unfortunately, he got a segfault during that build, so
I can't present a convincing diff of build and regress logs for
wxWidgets. I did such a test build myself earlier this day, but
deleted the logs by accident. Grrr.
Anyway, I think with the diff below it can't be worse than it
currently is. I'll send a diff for audacity as a followup to this
mail in a minute.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 23 Apr 2011 09:07:50 -0000 1.33
+++ Makefile 27 Apr 2011 16:13:34 -0000
@@ -65,7 +65,10 @@ WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gt
AUTOCONF_VERSION = 2.59
CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -pthread" \
CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng
-I${X11BASE}/include" \
- ac_cv_lib_esd_esd_close=no
+ ac_cv_lib_esd_esd_close=no \
+ ac_cv_func_swprintf=no \
+ wx_cv_func_wprintf=no \
+ wx_cv_func_vswprintf=no
CONFIGURE_STYLE =autoconf no-autoheader
CONFIGURE_ARGS =--with-expat=sys \
--with-odbc=sys \
@@ -85,8 +88,7 @@ CONFIGURE_ARGS =--with-expat=sys \
--enable-sound \
--enable-unicode \
--disable-backtrace \
- --disable-stl \
- --disable-unicode
+ --disable-stl
.ifdef DEBUG
CONFIGURE_ARGS += --enable-debug
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 23 Apr 2011 09:07:50 -0000 1.8
+++ pkg/PLIST 27 Apr 2011 16:13:34 -0000
@@ -643,15 +643,11 @@ include/wx/zstream.h
@lib lib/libwx_gtk2_xrc.so.${LIBwx_gtk2_xrc_VERSION}
lib/wx/
lib/wx/config/
-@comment lib/wx/config/gtk2-unicode-release-2.8
-lib/wx/config/gtk2-ansi-release-2.8
+lib/wx/config/gtk2-unicode-release-2.8
lib/wx/include/
-@comment lib/wx/include/gtk2-unicode-release-2.8/
-@comment lib/wx/include/gtk2-unicode-release-2.8/wx/
-@comment lib/wx/include/gtk2-unicode-release-2.8/wx/setup.h
-lib/wx/include/gtk2-ansi-release-2.8/
-lib/wx/include/gtk2-ansi-release-2.8/wx/
-lib/wx/include/gtk2-ansi-release-2.8/wx/setup.h
+lib/wx/include/gtk2-unicode-release-2.8/
+lib/wx/include/gtk2-unicode-release-2.8/wx/
+lib/wx/include/gtk2-unicode-release-2.8/wx/setup.h
share/aclocal/wxwin.m4
share/bakefile/
share/bakefile/presets/
