wxGTK31: updated to 3.1.6

wxWidgets 3.1.6

New wxBitmapBundle class allowing to provide art work for both normal and high DPI in a simple way.
New wxUILocale class replacing the old (but still available) wxLocale, but not suffering from its multiple problems and providing more functionality.
Support for using native spell-checking in wxTextCtrl.
Support for undo/redo in wxTextCtrl in wxOSX.
Better drag-and-drop implementation in wxOSX.
Fixes for important bugs in wxDataViewCtrl under all platforms.
Many improvements and bug fixes for Wayland support in wxGTK.
Support for the latest OS versions (Windows 11, macOS 12) and compilers (MSVS 2022, gcc 12, clang 13).
Project bug tracker has been moved to GitHub Issues.
This commit is contained in:
adam 2022-05-30 16:31:10 +00:00
parent 68ee8b21b1
commit 9d05646deb
8 changed files with 365 additions and 168 deletions

View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.6 2021/12/08 16:03:03 adam Exp $ # $NetBSD: Makefile,v 1.7 2022/05/30 16:31:10 adam Exp $
DISTNAME= wxWidgets-3.1.4 DISTNAME= wxWidgets-3.1.6
PKGNAME= ${DISTNAME:S/wxWidgets/wxGTK31/} PKGNAME= ${DISTNAME:S/wxWidgets/wxGTK31/}
PKGREVISION= 3
CATEGORIES= x11 CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=wxWidgets/} MASTER_SITES= ${MASTER_SITE_GITHUB:=wxWidgets/}
GITHUB_PROJECT= wxWidgets GITHUB_PROJECT= wxWidgets
@ -61,6 +60,7 @@ CPPFLAGS+= -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1
.else .else
CONFIGURE_ARGS+= --with-gtk=3 CONFIGURE_ARGS+= --with-gtk=3
PLIST_SRC+= PLIST.gtk3 PLIST_SRC+= PLIST.gtk3
.include "../../sysutils/libnotify/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk"
.endif .endif
@ -75,10 +75,6 @@ post-build:
[ "$${lang}" = "wxstd.po" ] && continue; \ [ "$${lang}" = "wxstd.po" ] && continue; \
${TOOLS_PATH.msgfmt} -c -o "$${lang%.po}.mo" "$${lang}"; \ ${TOOLS_PATH.msgfmt} -c -o "$${lang%.po}.mo" "$${lang}"; \
done done
set -e; cd ${WRKSRC}/locale/msw; \
for lang in it; do \
${TOOLS_PATH.msgfmt} -c -o "$${lang}.mo" "$${lang}.po"; \
done
post-install: post-install:
${INSTALL_DATA} ${WRKSRC}/docs/licence.txt ${DESTDIR}${PREFIX}/${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/docs/licence.txt ${DESTDIR}${PREFIX}/${DOCDIR}
@ -91,8 +87,9 @@ post-install:
.include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk"
# XXX: built-in version gets configured
#.include "../../devel/pcre2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk" .include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk"
@ -101,4 +98,8 @@ post-install:
.include "../../multimedia/gstreamer1/buildlink3.mk" .include "../../multimedia/gstreamer1/buildlink3.mk"
.include "../../multimedia/gst-plugins1-base/buildlink3.mk" .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk"
.if ${OPSYS} != "Darwin"
.include "../../graphics/glu/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.endif
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2021/04/02 10:06:27 wiz Exp $ @comment $NetBSD: PLIST,v 1.2 2022/05/30 16:31:10 adam Exp $
bin/wx-config-3.1 bin/wx-config-3.1
bin/wxrc-3.1 bin/wxrc-3.1
include/wx-3.1/wx/aboutdlg.h include/wx-3.1/wx/aboutdlg.h
@ -35,6 +35,7 @@ include/wx-3.1/wx/bannerwindow.h
include/wx-3.1/wx/base64.h include/wx-3.1/wx/base64.h
include/wx-3.1/wx/beforestd.h include/wx-3.1/wx/beforestd.h
include/wx-3.1/wx/bitmap.h include/wx-3.1/wx/bitmap.h
include/wx-3.1/wx/bmpbndl.h
include/wx-3.1/wx/bmpbuttn.h include/wx-3.1/wx/bmpbuttn.h
include/wx-3.1/wx/bmpcbox.h include/wx-3.1/wx/bmpcbox.h
include/wx-3.1/wx/bookctrl.h include/wx-3.1/wx/bookctrl.h
@ -76,6 +77,7 @@ include/wx-3.1/wx/containr.h
include/wx-3.1/wx/control.h include/wx-3.1/wx/control.h
include/wx-3.1/wx/convauto.h include/wx-3.1/wx/convauto.h
include/wx-3.1/wx/cpp.h include/wx-3.1/wx/cpp.h
include/wx-3.1/wx/creddlg.h
include/wx-3.1/wx/crt.h include/wx-3.1/wx/crt.h
include/wx-3.1/wx/cshelp.h include/wx-3.1/wx/cshelp.h
include/wx-3.1/wx/ctrlsub.h include/wx-3.1/wx/ctrlsub.h
@ -162,7 +164,6 @@ include/wx-3.1/wx/gdicmn.h
include/wx-3.1/wx/gdiobj.h include/wx-3.1/wx/gdiobj.h
include/wx-3.1/wx/generic/aboutdlgg.h include/wx-3.1/wx/generic/aboutdlgg.h
include/wx-3.1/wx/generic/accel.h include/wx-3.1/wx/generic/accel.h
include/wx-3.1/wx/generic/activityindicator.h
include/wx-3.1/wx/generic/animate.h include/wx-3.1/wx/generic/animate.h
include/wx-3.1/wx/generic/bmpcbox.h include/wx-3.1/wx/generic/bmpcbox.h
include/wx-3.1/wx/generic/busyinfo.h include/wx-3.1/wx/generic/busyinfo.h
@ -172,6 +173,7 @@ include/wx-3.1/wx/generic/caret.h
include/wx-3.1/wx/generic/choicdgg.h include/wx-3.1/wx/generic/choicdgg.h
include/wx-3.1/wx/generic/collheaderctrl.h include/wx-3.1/wx/generic/collheaderctrl.h
include/wx-3.1/wx/generic/combo.h include/wx-3.1/wx/generic/combo.h
include/wx-3.1/wx/generic/creddlgg.h
include/wx-3.1/wx/generic/custombgwin.h include/wx-3.1/wx/generic/custombgwin.h
include/wx-3.1/wx/generic/dataview.h include/wx-3.1/wx/generic/dataview.h
include/wx-3.1/wx/generic/datectrl.h include/wx-3.1/wx/generic/datectrl.h
@ -201,7 +203,6 @@ include/wx-3.1/wx/generic/msgdlgg.h
include/wx-3.1/wx/generic/notebook.h include/wx-3.1/wx/generic/notebook.h
include/wx-3.1/wx/generic/notifmsg.h include/wx-3.1/wx/generic/notifmsg.h
include/wx-3.1/wx/generic/numdlgg.h include/wx-3.1/wx/generic/numdlgg.h
include/wx-3.1/wx/generic/paletteg.h
include/wx-3.1/wx/generic/panelg.h include/wx-3.1/wx/generic/panelg.h
include/wx-3.1/wx/generic/printps.h include/wx-3.1/wx/generic/printps.h
include/wx-3.1/wx/generic/prntdlgg.h include/wx-3.1/wx/generic/prntdlgg.h
@ -226,89 +227,6 @@ include/wx-3.1/wx/gifdecod.h
include/wx-3.1/wx/glcanvas.h include/wx-3.1/wx/glcanvas.h
include/wx-3.1/wx/graphics.h include/wx-3.1/wx/graphics.h
include/wx-3.1/wx/grid.h include/wx-3.1/wx/grid.h
include/wx-3.1/wx/gtk/accel.h
include/wx-3.1/wx/gtk/activityindicator.h
include/wx-3.1/wx/gtk/animate.h
include/wx-3.1/wx/gtk/anybutton.h
include/wx-3.1/wx/gtk/app.h
include/wx-3.1/wx/gtk/assertdlg_gtk.h
include/wx-3.1/wx/gtk/bitmap.h
include/wx-3.1/wx/gtk/bmpbuttn.h
include/wx-3.1/wx/gtk/bmpcbox.h
include/wx-3.1/wx/gtk/brush.h
include/wx-3.1/wx/gtk/button.h
include/wx-3.1/wx/gtk/calctrl.h
include/wx-3.1/wx/gtk/checkbox.h
include/wx-3.1/wx/gtk/checklst.h
include/wx-3.1/wx/gtk/chkconf.h
include/wx-3.1/wx/gtk/choice.h
include/wx-3.1/wx/gtk/clipbrd.h
include/wx-3.1/wx/gtk/clrpicker.h
include/wx-3.1/wx/gtk/collpane.h
include/wx-3.1/wx/gtk/colordlg.h
include/wx-3.1/wx/gtk/colour.h
include/wx-3.1/wx/gtk/combobox.h
include/wx-3.1/wx/gtk/control.h
include/wx-3.1/wx/gtk/cursor.h
include/wx-3.1/wx/gtk/dataform.h
include/wx-3.1/wx/gtk/dataobj.h
include/wx-3.1/wx/gtk/dataobj2.h
include/wx-3.1/wx/gtk/dataview.h
include/wx-3.1/wx/gtk/dialog.h
include/wx-3.1/wx/gtk/dirdlg.h
include/wx-3.1/wx/gtk/dnd.h
include/wx-3.1/wx/gtk/dvrenderer.h
include/wx-3.1/wx/gtk/dvrenderers.h
include/wx-3.1/wx/gtk/evtloop.h
include/wx-3.1/wx/gtk/evtloopsrc.h
include/wx-3.1/wx/gtk/filectrl.h
include/wx-3.1/wx/gtk/filedlg.h
include/wx-3.1/wx/gtk/filehistory.h
include/wx-3.1/wx/gtk/filepicker.h
include/wx-3.1/wx/gtk/font.h
include/wx-3.1/wx/gtk/fontdlg.h
include/wx-3.1/wx/gtk/fontpicker.h
include/wx-3.1/wx/gtk/frame.h
include/wx-3.1/wx/gtk/gauge.h
include/wx-3.1/wx/gtk/glcanvas.h
include/wx-3.1/wx/gtk/gnome/gvfs.h
include/wx-3.1/wx/gtk/hyperlink.h
include/wx-3.1/wx/gtk/infobar.h
include/wx-3.1/wx/gtk/listbox.h
include/wx-3.1/wx/gtk/mdi.h
include/wx-3.1/wx/gtk/menu.h
include/wx-3.1/wx/gtk/menuitem.h
include/wx-3.1/wx/gtk/mimetype.h
include/wx-3.1/wx/gtk/minifram.h
include/wx-3.1/wx/gtk/msgdlg.h
include/wx-3.1/wx/gtk/nonownedwnd.h
include/wx-3.1/wx/gtk/notebook.h
include/wx-3.1/wx/gtk/pen.h
include/wx-3.1/wx/gtk/popupwin.h
include/wx-3.1/wx/gtk/print.h
include/wx-3.1/wx/gtk/radiobox.h
include/wx-3.1/wx/gtk/radiobut.h
include/wx-3.1/wx/gtk/region.h
include/wx-3.1/wx/gtk/scrolbar.h
include/wx-3.1/wx/gtk/scrolwin.h
include/wx-3.1/wx/gtk/slider.h
include/wx-3.1/wx/gtk/spinbutt.h
include/wx-3.1/wx/gtk/spinctrl.h
include/wx-3.1/wx/gtk/srchctrl.h
include/wx-3.1/wx/gtk/statbmp.h
include/wx-3.1/wx/gtk/statbox.h
include/wx-3.1/wx/gtk/statline.h
include/wx-3.1/wx/gtk/stattext.h
include/wx-3.1/wx/gtk/taskbar.h
include/wx-3.1/wx/gtk/textctrl.h
include/wx-3.1/wx/gtk/textentry.h
include/wx-3.1/wx/gtk/tglbtn.h
include/wx-3.1/wx/gtk/toolbar.h
include/wx-3.1/wx/gtk/tooltip.h
include/wx-3.1/wx/gtk/toplevel.h
include/wx-3.1/wx/gtk/webview_webkit.h
include/wx-3.1/wx/gtk/webviewhistoryitem_webkit.h
include/wx-3.1/wx/gtk/window.h
include/wx-3.1/wx/hash.h include/wx-3.1/wx/hash.h
include/wx-3.1/wx/hashmap.h include/wx-3.1/wx/hashmap.h
include/wx-3.1/wx/hashset.h include/wx-3.1/wx/hashset.h
@ -373,6 +291,7 @@ include/wx-3.1/wx/listbook.h
include/wx-3.1/wx/listbox.h include/wx-3.1/wx/listbox.h
include/wx-3.1/wx/listctrl.h include/wx-3.1/wx/listctrl.h
include/wx-3.1/wx/listimpl.cpp include/wx-3.1/wx/listimpl.cpp
include/wx-3.1/wx/localedefs.h
include/wx-3.1/wx/log.h include/wx-3.1/wx/log.h
include/wx-3.1/wx/longlong.h include/wx-3.1/wx/longlong.h
include/wx-3.1/wx/lzmastream.h include/wx-3.1/wx/lzmastream.h
@ -579,6 +498,7 @@ include/wx-3.1/wx/txtstrm.h
include/wx-3.1/wx/typeinfo.h include/wx-3.1/wx/typeinfo.h
include/wx-3.1/wx/types.h include/wx-3.1/wx/types.h
include/wx-3.1/wx/uiaction.h include/wx-3.1/wx/uiaction.h
include/wx-3.1/wx/uilocale.h
include/wx-3.1/wx/unichar.h include/wx-3.1/wx/unichar.h
include/wx-3.1/wx/unix/app.h include/wx-3.1/wx/unix/app.h
include/wx-3.1/wx/unix/apptbase.h include/wx-3.1/wx/unix/apptbase.h
@ -586,19 +506,10 @@ include/wx-3.1/wx/unix/apptrait.h
include/wx-3.1/wx/unix/chkconf.h include/wx-3.1/wx/unix/chkconf.h
include/wx-3.1/wx/unix/evtloop.h include/wx-3.1/wx/unix/evtloop.h
include/wx-3.1/wx/unix/evtloopsrc.h include/wx-3.1/wx/unix/evtloopsrc.h
include/wx-3.1/wx/unix/fontutil.h
include/wx-3.1/wx/unix/fswatcher_inotify.h
include/wx-3.1/wx/unix/fswatcher_kqueue.h include/wx-3.1/wx/unix/fswatcher_kqueue.h
include/wx-3.1/wx/unix/glx11.h
include/wx-3.1/wx/unix/joystick.h
include/wx-3.1/wx/unix/mimetype.h
include/wx-3.1/wx/unix/pipe.h include/wx-3.1/wx/unix/pipe.h
include/wx-3.1/wx/unix/sound.h
include/wx-3.1/wx/unix/stackwalk.h include/wx-3.1/wx/unix/stackwalk.h
include/wx-3.1/wx/unix/stdpaths.h
include/wx-3.1/wx/unix/taskbarx11.h
include/wx-3.1/wx/unix/tls.h include/wx-3.1/wx/unix/tls.h
include/wx-3.1/wx/unix/utilsx11.h
include/wx-3.1/wx/uri.h include/wx-3.1/wx/uri.h
include/wx-3.1/wx/url.h include/wx-3.1/wx/url.h
include/wx-3.1/wx/ustring.h include/wx-3.1/wx/ustring.h
@ -617,6 +528,7 @@ include/wx-3.1/wx/vms_x_fix.h
include/wx-3.1/wx/volume.h include/wx-3.1/wx/volume.h
include/wx-3.1/wx/vscroll.h include/wx-3.1/wx/vscroll.h
include/wx-3.1/wx/weakref.h include/wx-3.1/wx/weakref.h
include/wx-3.1/wx/webrequest.h
include/wx-3.1/wx/webview.h include/wx-3.1/wx/webview.h
include/wx-3.1/wx/webviewarchivehandler.h include/wx-3.1/wx/webviewarchivehandler.h
include/wx-3.1/wx/webviewfshandler.h include/wx-3.1/wx/webviewfshandler.h
@ -648,6 +560,7 @@ include/wx-3.1/wx/xrc/xh_bannerwindow.h
include/wx-3.1/wx/xrc/xh_bmp.h include/wx-3.1/wx/xrc/xh_bmp.h
include/wx-3.1/wx/xrc/xh_bmpbt.h include/wx-3.1/wx/xrc/xh_bmpbt.h
include/wx-3.1/wx/xrc/xh_bmpcbox.h include/wx-3.1/wx/xrc/xh_bmpcbox.h
include/wx-3.1/wx/xrc/xh_bookctrlbase.h
include/wx-3.1/wx/xrc/xh_bttn.h include/wx-3.1/wx/xrc/xh_bttn.h
include/wx-3.1/wx/xrc/xh_cald.h include/wx-3.1/wx/xrc/xh_cald.h
include/wx-3.1/wx/xrc/xh_chckb.h include/wx-3.1/wx/xrc/xh_chckb.h
@ -701,6 +614,7 @@ include/wx-3.1/wx/xrc/xh_stbmp.h
include/wx-3.1/wx/xrc/xh_stbox.h include/wx-3.1/wx/xrc/xh_stbox.h
include/wx-3.1/wx/xrc/xh_stlin.h include/wx-3.1/wx/xrc/xh_stlin.h
include/wx-3.1/wx/xrc/xh_sttxt.h include/wx-3.1/wx/xrc/xh_sttxt.h
include/wx-3.1/wx/xrc/xh_styledtextctrl.h
include/wx-3.1/wx/xrc/xh_text.h include/wx-3.1/wx/xrc/xh_text.h
include/wx-3.1/wx/xrc/xh_tglbtn.h include/wx-3.1/wx/xrc/xh_tglbtn.h
include/wx-3.1/wx/xrc/xh_timectrl.h include/wx-3.1/wx/xrc/xh_timectrl.h
@ -723,14 +637,14 @@ include/wx-3.1/wx/xtixml.h
include/wx-3.1/wx/zipstrm.h include/wx-3.1/wx/zipstrm.h
include/wx-3.1/wx/zstream.h include/wx-3.1/wx/zstream.h
lib/libwx_baseu-3.1.so lib/libwx_baseu-3.1.so
lib/libwx_baseu-3.1.so.4 lib/libwx_baseu-3.1.so.6
lib/libwx_baseu-3.1.so.4.0.0 lib/libwx_baseu-3.1.so.6.0.0
lib/libwx_baseu_net-3.1.so lib/libwx_baseu_net-3.1.so
lib/libwx_baseu_net-3.1.so.4 lib/libwx_baseu_net-3.1.so.6
lib/libwx_baseu_net-3.1.so.4.0.0 lib/libwx_baseu_net-3.1.so.6.0.0
lib/libwx_baseu_xml-3.1.so lib/libwx_baseu_xml-3.1.so
lib/libwx_baseu_xml-3.1.so.4 lib/libwx_baseu_xml-3.1.so.6
lib/libwx_baseu_xml-3.1.so.4.0.0 lib/libwx_baseu_xml-3.1.so.6.0.0
libexec/wx-3.1/wx-config libexec/wx-3.1/wx-config
libexec/wx-3.1/wxrc libexec/wx-3.1/wxrc
libexec/wx-3.1/wxrc-3.1 libexec/wx-3.1/wxrc-3.1
@ -744,26 +658,25 @@ share/wx-3.1/doc/wxWidgets/changes.txt
share/wx-3.1/doc/wxWidgets/lgpl.txt share/wx-3.1/doc/wxWidgets/lgpl.txt
share/wx-3.1/doc/wxWidgets/licence.txt share/wx-3.1/doc/wxWidgets/licence.txt
share/wx-3.1/doc/wxWidgets/readme.txt share/wx-3.1/doc/wxWidgets/readme.txt
share/wx-3.1/locale/ca/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/ca/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/cs/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/cs/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/da/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/da/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/de/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/de/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/el/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/el/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/es/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/es/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/fi/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/fi/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/fr/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/fr/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/hu/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/hu/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/id/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/id/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/it/LC_MESSAGES/wxmsw.mo share/wx-3.1/locale/it/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/it/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/ja/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/ja/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/nl/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/nl/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/pl/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/pl/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/ru/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/ru/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/sl/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/sl/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/sv/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/sv/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/tr/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/tr/LC_MESSAGES/wxstd.mo share/wx-3.1/locale/uk/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/uk/LC_MESSAGES/wxstd.mo
share/wx-3.1/locale/zh_CN/LC_MESSAGES/wxstd.mo
share/wx-3.1/locale/zh_TW/LC_MESSAGES/wxstd.mo
@pkgdir share/wx-3.1/locale/zh/LC_MESSAGES @pkgdir share/wx-3.1/locale/zh/LC_MESSAGES
share/wx-3.1/locale/zh_CN/LC_MESSAGES/wxstd-3.1.mo
share/wx-3.1/locale/zh_TW/LC_MESSAGES/wxstd-3.1.mo

156
x11/wxGTK31/PLIST.Darwin Normal file
View file

@ -0,0 +1,156 @@
@comment $NetBSD: PLIST.Darwin,v 1.1 2022/05/30 16:31:10 adam Exp $
include/wx-3.1/wx/generic/clrpickerg.h
include/wx-3.1/wx/generic/collpaneg.h
include/wx-3.1/wx/generic/colrdlgg.h
include/wx-3.1/wx/generic/dirdlgg.h
include/wx-3.1/wx/generic/filedlgg.h
include/wx-3.1/wx/generic/fontdlgg.h
include/wx-3.1/wx/generic/fontpickerg.h
include/wx-3.1/wx/generic/region.h
include/wx-3.1/wx/osx/accel.h
include/wx-3.1/wx/osx/activityindicator.h
include/wx-3.1/wx/osx/anybutton.h
include/wx-3.1/wx/osx/app.h
include/wx-3.1/wx/osx/appprogress.h
include/wx-3.1/wx/osx/bitmap.h
include/wx-3.1/wx/osx/bmpbuttn.h
include/wx-3.1/wx/osx/brush.h
include/wx-3.1/wx/osx/button.h
include/wx-3.1/wx/osx/carbon/region.h
include/wx-3.1/wx/osx/checkbox.h
include/wx-3.1/wx/osx/checklst.h
include/wx-3.1/wx/osx/chkconf.h
include/wx-3.1/wx/osx/choice.h
include/wx-3.1/wx/osx/clipbrd.h
include/wx-3.1/wx/osx/cocoa/chkconf.h
include/wx-3.1/wx/osx/cocoa/dataview.h
include/wx-3.1/wx/osx/cocoa/evtloop.h
include/wx-3.1/wx/osx/cocoa/private.h
include/wx-3.1/wx/osx/cocoa/stdpaths.h
include/wx-3.1/wx/osx/colordlg.h
include/wx-3.1/wx/osx/colour.h
include/wx-3.1/wx/osx/combobox.h
include/wx-3.1/wx/osx/control.h
include/wx-3.1/wx/osx/core/cfarray.h
include/wx-3.1/wx/osx/core/cfdataref.h
include/wx-3.1/wx/osx/core/cfdictionary.h
include/wx-3.1/wx/osx/core/cfref.h
include/wx-3.1/wx/osx/core/cfstring.h
include/wx-3.1/wx/osx/core/cftype.h
include/wx-3.1/wx/osx/core/colour.h
include/wx-3.1/wx/osx/core/dataview.h
include/wx-3.1/wx/osx/core/evtloop.h
include/wx-3.1/wx/osx/core/hid.h
include/wx-3.1/wx/osx/core/joystick.h
include/wx-3.1/wx/osx/core/mimetype.h
include/wx-3.1/wx/osx/core/objcid.h
include/wx-3.1/wx/osx/core/private.h
include/wx-3.1/wx/osx/cursor.h
include/wx-3.1/wx/osx/dataform.h
include/wx-3.1/wx/osx/dataobj.h
include/wx-3.1/wx/osx/dataobj2.h
include/wx-3.1/wx/osx/dataview.h
include/wx-3.1/wx/osx/datectrl.h
include/wx-3.1/wx/osx/datetimectrl.h
include/wx-3.1/wx/osx/dc.h
include/wx-3.1/wx/osx/dcclient.h
include/wx-3.1/wx/osx/dcmemory.h
include/wx-3.1/wx/osx/dcprint.h
include/wx-3.1/wx/osx/dcscreen.h
include/wx-3.1/wx/osx/dialog.h
include/wx-3.1/wx/osx/dirdlg.h
include/wx-3.1/wx/osx/dnd.h
include/wx-3.1/wx/osx/dvrenderer.h
include/wx-3.1/wx/osx/dvrenderers.h
include/wx-3.1/wx/osx/evtloop.h
include/wx-3.1/wx/osx/evtloopsrc.h
include/wx-3.1/wx/osx/filedlg.h
include/wx-3.1/wx/osx/font.h
include/wx-3.1/wx/osx/fontdlg.h
include/wx-3.1/wx/osx/frame.h
include/wx-3.1/wx/osx/fswatcher_fsevents.h
include/wx-3.1/wx/osx/gauge.h
include/wx-3.1/wx/osx/glcanvas.h
include/wx-3.1/wx/osx/joystick.h
include/wx-3.1/wx/osx/listbox.h
include/wx-3.1/wx/osx/mdi.h
include/wx-3.1/wx/osx/menu.h
include/wx-3.1/wx/osx/menuitem.h
include/wx-3.1/wx/osx/metafile.h
include/wx-3.1/wx/osx/mimetype.h
include/wx-3.1/wx/osx/minifram.h
include/wx-3.1/wx/osx/msgdlg.h
include/wx-3.1/wx/osx/nonownedwnd.h
include/wx-3.1/wx/osx/notebook.h
include/wx-3.1/wx/osx/palette.h
include/wx-3.1/wx/osx/pen.h
include/wx-3.1/wx/osx/popupwin.h
include/wx-3.1/wx/osx/printdlg.h
include/wx-3.1/wx/osx/printmac.h
include/wx-3.1/wx/osx/private.h
include/wx-3.1/wx/osx/radiobox.h
include/wx-3.1/wx/osx/radiobut.h
include/wx-3.1/wx/osx/region.h
include/wx-3.1/wx/osx/scrolbar.h
include/wx-3.1/wx/osx/slider.h
include/wx-3.1/wx/osx/sound.h
include/wx-3.1/wx/osx/spinbutt.h
include/wx-3.1/wx/osx/srchctrl.h
include/wx-3.1/wx/osx/statbmp.h
include/wx-3.1/wx/osx/statbox.h
include/wx-3.1/wx/osx/statline.h
include/wx-3.1/wx/osx/stattext.h
include/wx-3.1/wx/osx/statusbr.h
include/wx-3.1/wx/osx/taskbarosx.h
include/wx-3.1/wx/osx/textctrl.h
include/wx-3.1/wx/osx/textentry.h
include/wx-3.1/wx/osx/tglbtn.h
include/wx-3.1/wx/osx/timectrl.h
include/wx-3.1/wx/osx/toolbar.h
include/wx-3.1/wx/osx/tooltip.h
include/wx-3.1/wx/osx/toplevel.h
include/wx-3.1/wx/osx/uma.h
include/wx-3.1/wx/osx/webview_webkit.h
include/wx-3.1/wx/osx/webviewhistoryitem_webkit.h
include/wx-3.1/wx/osx/window.h
lib/libwx_osx_cocoau_adv-3.1.so
lib/libwx_osx_cocoau_adv-3.1.so.6
lib/libwx_osx_cocoau_adv-3.1.so.6.0.0
lib/libwx_osx_cocoau_aui-3.1.so
lib/libwx_osx_cocoau_aui-3.1.so.6
lib/libwx_osx_cocoau_aui-3.1.so.6.0.0
lib/libwx_osx_cocoau_core-3.1.so
lib/libwx_osx_cocoau_core-3.1.so.6
lib/libwx_osx_cocoau_core-3.1.so.6.0.0
lib/libwx_osx_cocoau_gl-3.1.so
lib/libwx_osx_cocoau_gl-3.1.so.6
lib/libwx_osx_cocoau_gl-3.1.so.6.0.0
lib/libwx_osx_cocoau_html-3.1.so
lib/libwx_osx_cocoau_html-3.1.so.6
lib/libwx_osx_cocoau_html-3.1.so.6.0.0
lib/libwx_osx_cocoau_media-3.1.so
lib/libwx_osx_cocoau_media-3.1.so.6
lib/libwx_osx_cocoau_media-3.1.so.6.0.0
lib/libwx_osx_cocoau_propgrid-3.1.so
lib/libwx_osx_cocoau_propgrid-3.1.so.6
lib/libwx_osx_cocoau_propgrid-3.1.so.6.0.0
lib/libwx_osx_cocoau_qa-3.1.so
lib/libwx_osx_cocoau_qa-3.1.so.6
lib/libwx_osx_cocoau_qa-3.1.so.6.0.0
lib/libwx_osx_cocoau_ribbon-3.1.so
lib/libwx_osx_cocoau_ribbon-3.1.so.6
lib/libwx_osx_cocoau_ribbon-3.1.so.6.0.0
lib/libwx_osx_cocoau_richtext-3.1.so
lib/libwx_osx_cocoau_richtext-3.1.so.6
lib/libwx_osx_cocoau_richtext-3.1.so.6.0.0
lib/libwx_osx_cocoau_stc-3.1.so
lib/libwx_osx_cocoau_stc-3.1.so.6
lib/libwx_osx_cocoau_stc-3.1.so.6.0.0
lib/libwx_osx_cocoau_webview-3.1.so
lib/libwx_osx_cocoau_webview-3.1.so.6
lib/libwx_osx_cocoau_webview-3.1.so.6.0.0
lib/libwx_osx_cocoau_xrc-3.1.so
lib/libwx_osx_cocoau_xrc-3.1.so.6
lib/libwx_osx_cocoau_xrc-3.1.so.6.0.0
lib/wx/config/osx_cocoa-unicode-3.1
lib/wx/include/osx_cocoa-unicode-3.1/wx/setup.h

View file

@ -1,39 +1,134 @@
@comment $NetBSD: PLIST.gtk3,v 1.1 2021/04/02 10:06:27 wiz Exp $ @comment $NetBSD: PLIST.gtk3,v 1.2 2022/05/30 16:31:10 adam Exp $
include/wx-3.1/wx/generic/activityindicator.h
include/wx-3.1/wx/generic/paletteg.h
include/wx-3.1/wx/gtk/accel.h
include/wx-3.1/wx/gtk/activityindicator.h
include/wx-3.1/wx/gtk/animate.h
include/wx-3.1/wx/gtk/anybutton.h
include/wx-3.1/wx/gtk/app.h
include/wx-3.1/wx/gtk/assertdlg_gtk.h
include/wx-3.1/wx/gtk/bitmap.h
include/wx-3.1/wx/gtk/bmpbuttn.h
include/wx-3.1/wx/gtk/bmpcbox.h
include/wx-3.1/wx/gtk/brush.h
include/wx-3.1/wx/gtk/button.h
include/wx-3.1/wx/gtk/calctrl.h
include/wx-3.1/wx/gtk/checkbox.h
include/wx-3.1/wx/gtk/checklst.h
include/wx-3.1/wx/gtk/chkconf.h
include/wx-3.1/wx/gtk/choice.h
include/wx-3.1/wx/gtk/clipbrd.h
include/wx-3.1/wx/gtk/clrpicker.h
include/wx-3.1/wx/gtk/collpane.h
include/wx-3.1/wx/gtk/colordlg.h
include/wx-3.1/wx/gtk/colour.h
include/wx-3.1/wx/gtk/combobox.h
include/wx-3.1/wx/gtk/control.h
include/wx-3.1/wx/gtk/cursor.h
include/wx-3.1/wx/gtk/dataform.h
include/wx-3.1/wx/gtk/dataobj.h
include/wx-3.1/wx/gtk/dataobj2.h
include/wx-3.1/wx/gtk/dataview.h
include/wx-3.1/wx/gtk/dialog.h
include/wx-3.1/wx/gtk/dirdlg.h
include/wx-3.1/wx/gtk/dnd.h
include/wx-3.1/wx/gtk/dvrenderer.h
include/wx-3.1/wx/gtk/dvrenderers.h
include/wx-3.1/wx/gtk/evtloop.h
include/wx-3.1/wx/gtk/evtloopsrc.h
include/wx-3.1/wx/gtk/filectrl.h
include/wx-3.1/wx/gtk/filedlg.h
include/wx-3.1/wx/gtk/filehistory.h
include/wx-3.1/wx/gtk/filepicker.h
include/wx-3.1/wx/gtk/font.h
include/wx-3.1/wx/gtk/fontdlg.h
include/wx-3.1/wx/gtk/fontpicker.h
include/wx-3.1/wx/gtk/frame.h
include/wx-3.1/wx/gtk/gauge.h
include/wx-3.1/wx/gtk/glcanvas.h
include/wx-3.1/wx/gtk/gnome/gvfs.h
include/wx-3.1/wx/gtk/hyperlink.h
include/wx-3.1/wx/gtk/infobar.h
include/wx-3.1/wx/gtk/listbox.h
include/wx-3.1/wx/gtk/mdi.h
include/wx-3.1/wx/gtk/menu.h
include/wx-3.1/wx/gtk/menuitem.h
include/wx-3.1/wx/gtk/mimetype.h
include/wx-3.1/wx/gtk/minifram.h
include/wx-3.1/wx/gtk/msgdlg.h
include/wx-3.1/wx/gtk/nonownedwnd.h
include/wx-3.1/wx/gtk/notebook.h
include/wx-3.1/wx/gtk/pen.h
include/wx-3.1/wx/gtk/popupwin.h
include/wx-3.1/wx/gtk/print.h
include/wx-3.1/wx/gtk/radiobox.h
include/wx-3.1/wx/gtk/radiobut.h
include/wx-3.1/wx/gtk/region.h
include/wx-3.1/wx/gtk/scrolbar.h
include/wx-3.1/wx/gtk/scrolwin.h
include/wx-3.1/wx/gtk/slider.h
include/wx-3.1/wx/gtk/spinbutt.h
include/wx-3.1/wx/gtk/spinctrl.h
include/wx-3.1/wx/gtk/srchctrl.h
include/wx-3.1/wx/gtk/statbmp.h
include/wx-3.1/wx/gtk/statbox.h
include/wx-3.1/wx/gtk/statline.h
include/wx-3.1/wx/gtk/stattext.h
include/wx-3.1/wx/gtk/taskbar.h
include/wx-3.1/wx/gtk/textctrl.h
include/wx-3.1/wx/gtk/textentry.h
include/wx-3.1/wx/gtk/tglbtn.h
include/wx-3.1/wx/gtk/toolbar.h
include/wx-3.1/wx/gtk/tooltip.h
include/wx-3.1/wx/gtk/toplevel.h
include/wx-3.1/wx/gtk/webview_webkit.h
include/wx-3.1/wx/gtk/webviewhistoryitem_webkit.h
include/wx-3.1/wx/gtk/window.h
include/wx-3.1/wx/unix/fontutil.h
include/wx-3.1/wx/unix/fswatcher_inotify.h
include/wx-3.1/wx/unix/glegl.h
include/wx-3.1/wx/unix/glx11.h
include/wx-3.1/wx/unix/joystick.h
include/wx-3.1/wx/unix/mimetype.h
include/wx-3.1/wx/unix/sound.h
include/wx-3.1/wx/unix/stdpaths.h
include/wx-3.1/wx/unix/taskbarx11.h
include/wx-3.1/wx/unix/utilsx11.h
lib/libwx_gtk3u_adv-3.1.so lib/libwx_gtk3u_adv-3.1.so
lib/libwx_gtk3u_adv-3.1.so.4 lib/libwx_gtk3u_adv-3.1.so.6
lib/libwx_gtk3u_adv-3.1.so.4.0.0 lib/libwx_gtk3u_adv-3.1.so.6.0.0
lib/libwx_gtk3u_aui-3.1.so lib/libwx_gtk3u_aui-3.1.so
lib/libwx_gtk3u_aui-3.1.so.4 lib/libwx_gtk3u_aui-3.1.so.6
lib/libwx_gtk3u_aui-3.1.so.4.0.0 lib/libwx_gtk3u_aui-3.1.so.6.0.0
lib/libwx_gtk3u_core-3.1.so lib/libwx_gtk3u_core-3.1.so
lib/libwx_gtk3u_core-3.1.so.4 lib/libwx_gtk3u_core-3.1.so.6
lib/libwx_gtk3u_core-3.1.so.4.0.0 lib/libwx_gtk3u_core-3.1.so.6.0.0
lib/libwx_gtk3u_gl-3.1.so lib/libwx_gtk3u_gl-3.1.so
lib/libwx_gtk3u_gl-3.1.so.4 lib/libwx_gtk3u_gl-3.1.so.6
lib/libwx_gtk3u_gl-3.1.so.4.0.0 lib/libwx_gtk3u_gl-3.1.so.6.0.0
lib/libwx_gtk3u_html-3.1.so lib/libwx_gtk3u_html-3.1.so
lib/libwx_gtk3u_html-3.1.so.4 lib/libwx_gtk3u_html-3.1.so.6
lib/libwx_gtk3u_html-3.1.so.4.0.0 lib/libwx_gtk3u_html-3.1.so.6.0.0
lib/libwx_gtk3u_media-3.1.so lib/libwx_gtk3u_media-3.1.so
lib/libwx_gtk3u_media-3.1.so.4 lib/libwx_gtk3u_media-3.1.so.6
lib/libwx_gtk3u_media-3.1.so.4.0.0 lib/libwx_gtk3u_media-3.1.so.6.0.0
lib/libwx_gtk3u_propgrid-3.1.so lib/libwx_gtk3u_propgrid-3.1.so
lib/libwx_gtk3u_propgrid-3.1.so.4 lib/libwx_gtk3u_propgrid-3.1.so.6
lib/libwx_gtk3u_propgrid-3.1.so.4.0.0 lib/libwx_gtk3u_propgrid-3.1.so.6.0.0
lib/libwx_gtk3u_qa-3.1.so lib/libwx_gtk3u_qa-3.1.so
lib/libwx_gtk3u_qa-3.1.so.4 lib/libwx_gtk3u_qa-3.1.so.6
lib/libwx_gtk3u_qa-3.1.so.4.0.0 lib/libwx_gtk3u_qa-3.1.so.6.0.0
lib/libwx_gtk3u_ribbon-3.1.so lib/libwx_gtk3u_ribbon-3.1.so
lib/libwx_gtk3u_ribbon-3.1.so.4 lib/libwx_gtk3u_ribbon-3.1.so.6
lib/libwx_gtk3u_ribbon-3.1.so.4.0.0 lib/libwx_gtk3u_ribbon-3.1.so.6.0.0
lib/libwx_gtk3u_richtext-3.1.so lib/libwx_gtk3u_richtext-3.1.so
lib/libwx_gtk3u_richtext-3.1.so.4 lib/libwx_gtk3u_richtext-3.1.so.6
lib/libwx_gtk3u_richtext-3.1.so.4.0.0 lib/libwx_gtk3u_richtext-3.1.so.6.0.0
lib/libwx_gtk3u_stc-3.1.so lib/libwx_gtk3u_stc-3.1.so
lib/libwx_gtk3u_stc-3.1.so.4 lib/libwx_gtk3u_stc-3.1.so.6
lib/libwx_gtk3u_stc-3.1.so.4.0.0 lib/libwx_gtk3u_stc-3.1.so.6.0.0
lib/libwx_gtk3u_xrc-3.1.so lib/libwx_gtk3u_xrc-3.1.so
lib/libwx_gtk3u_xrc-3.1.so.4 lib/libwx_gtk3u_xrc-3.1.so.6
lib/libwx_gtk3u_xrc-3.1.so.4.0.0 lib/libwx_gtk3u_xrc-3.1.so.6.0.0
lib/wx/config/gtk3-unicode-3.1 lib/wx/config/gtk3-unicode-3.1
lib/wx/include/gtk3-unicode-3.1/wx/setup.h lib/wx/include/gtk3-unicode-3.1/wx/setup.h

View file

@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.3 2021/10/26 11:34:32 nia Exp $ $NetBSD: distinfo,v 1.4 2022/05/30 16:31:10 adam Exp $
BLAKE2s (wxWidgets-3.1.4.tar.bz2) = 5940ae166dbd917a950d332524ff505047482ea9345074b8a73c6ab2dcdd4bab BLAKE2s (wxWidgets-3.1.6.tar.bz2) = 93c2be721610aa273a1b209e6b9426ef27cec1d5a0ad7763f3d48db5d4871939
SHA512 (wxWidgets-3.1.4.tar.bz2) = aabb257fa222eb819f1e16086977b0ecfd3eb3406d695e0e642ffdb8b4dc586a9721404916be4756a2d92a1a8dc41b661b54717a64e03850a8a92d32d45ece14 SHA512 (wxWidgets-3.1.6.tar.bz2) = c55f8ecb62bc47c053e24fa8c5cbb744afe4c4b00a3fae760035c539499b3875cabfb5c4542d721efec83464f48925fdd05b7d9ca624b430567c0b579afa7277
Size (wxWidgets-3.1.4.tar.bz2) = 21581661 bytes Size (wxWidgets-3.1.6.tar.bz2) = 25194403 bytes
SHA1 (patch-configure) = 0c287f8d0f24c62bbb0efae300043dd83a156fce SHA1 (patch-configure) = e6c3f2d03fd6cdc889d3c9fc701daf8d70f2b216
SHA1 (patch-configure.in) = 9f01c9d0478ffbd399f5765de9cc1d4115085201 SHA1 (patch-configure.in) = 88838768b965341a80468008f9fc5cc431a0e821
SHA1 (patch-src_unix_uilocale.cpp) = 48668890bcc90f77fdbb62ad50a15fc387275f6a

View file

@ -1,11 +1,19 @@
$NetBSD: patch-configure,v 1.1 2021/04/02 10:06:27 wiz Exp $ $NetBSD: patch-configure,v 1.2 2022/05/30 16:31:11 adam Exp $
Fix shell script portability Fix shell script portability
tweak SEARCH_LIB tweak SEARCH_LIB
--- configure.orig 2020-07-22 17:20:06.000000000 +0000 --- configure.orig 2022-04-04 13:41:33.000000000 +0000
+++ configure +++ configure
@@ -39240,7 +39240,8 @@ fi @@ -33861,7 +33861,6 @@ rm -f core conftest.err conftest.$ac_obj
*-*-darwin* )
install_name_tool=`which ${HOST_PREFIX}install_name_tool`
if test "$install_name_tool" -a -x "$install_name_tool"; then
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
cat <<EOF >change-install-names
#!/bin/sh
libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
@@ -44075,7 +44074,8 @@ fi
*-*-solaris2* ) *-*-solaris2* )
SONAME_FLAG="-h " SONAME_FLAG="-h "
USE_SOVERSION=1 USE_SOVERSION=1

View file

@ -1,13 +1,13 @@
$NetBSD: patch-configure.in,v 1.1 2021/04/02 10:06:27 wiz Exp $ $NetBSD: patch-configure.in,v 1.2 2022/05/30 16:31:11 adam Exp $
XXX XXX
https://trac.wxwidgets.org/ticket/18198 https://trac.wxwidgets.org/ticket/18198
tweak SEARCH_LIB tweak SEARCH_LIB
--- configure.in.orig 2014-06-14 21:48:48.000000000 +0000 --- configure.in.orig 2022-04-04 13:41:33.000000000 +0000
+++ configure.in +++ configure.in
@@ -2245,7 +2245,7 @@ fi @@ -2270,7 +2270,7 @@ fi
AC_MSG_RESULT($wx_cv_std_libfullpath) AC_MSG_RESULT($wx_cv_std_libfullpath)
@ -16,3 +16,11 @@ tweak SEARCH_LIB
dnl Cross compiling with gcc? dnl Cross compiling with gcc?
if test "$build" != "$host" -a "$GCC" = yes; then if test "$build" != "$host" -a "$GCC" = yes; then
@@ -4024,7 +4024,6 @@ if test "$wxUSE_SHARED" = "yes"; then
*-*-darwin* )
install_name_tool=`which ${HOST_PREFIX}install_name_tool`
if test "$install_name_tool" -a -x "$install_name_tool"; then
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
cat <<EOF >change-install-names
#!/bin/sh
libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`

View file

@ -0,0 +1,15 @@
$NetBSD: patch-src_unix_uilocale.cpp,v 1.1 2022/05/30 16:31:11 adam Exp $
Fix build for non-Linux.
--- src/unix/uilocale.cpp.orig 2022-05-30 15:19:39.798310136 +0000
+++ src/unix/uilocale.cpp
@@ -448,7 +448,7 @@ wxUILocaleImplUnix::GetInfo(wxLocaleInfo
wxString
wxUILocaleImplUnix::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const
{
-#ifdef HAVE_LANGINFO_H
+#if defined(HAVE_LANGINFO_H) && defined(__linux__)
wxString str;
switch (name)
{