diff options
Diffstat (limited to 'x11-toolkits/wxgtk-devel/files')
9 files changed, 198 insertions, 215 deletions
diff --git a/x11-toolkits/wxgtk-devel/files/patch-aa b/x11-toolkits/wxgtk-devel/files/patch-aa deleted file mode 100644 index bd4ac2acf254..000000000000 --- a/x11-toolkits/wxgtk-devel/files/patch-aa +++ /dev/null @@ -1,108 +0,0 @@ - -$FreeBSD$ - ---- configure.in.orig Sun Sep 21 20:31:30 2003 -+++ configure.in Sun Nov 2 16:18:58 2003 -@@ -1751,7 +1751,7 @@ - dnl Apple did fix the security problem in it and not using the system - dnl library results in a whole bunch of warnings when linking with - dnl Carbon framework -- if test "$USE_DARWIN" = 1; then -+ if test "$USE_DARWIN" = 1 -o "$USE_FREEBSD" = 1; then - system_zlib_h_ok="yes" - else - dnl we have troubles with ancient zlib versions (e.g. 1.0.4 is -@@ -2785,8 +2785,8 @@ - - WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"` - --TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}" --TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}" -+TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}" -+TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl" - - if test "$cross_compiling" = "yes"; then - TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}" -@@ -2799,14 +2799,12 @@ - WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}" - - dnl the name of the shared library --WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" --WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" -+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.2" -+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.2" - - dnl the name of the links to the shared library --WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" --WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}" --WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" --WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" -+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}" -+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" - - case "${host}" in - *-*-cygwin* | *-*-mingw32* ) -@@ -3607,7 +3605,7 @@ - dnl simply linking with libpthread should make the test below work but - dnl it's far from certain that the threaded programs compiled without - dnl any special switches actually work, so try it after all the others -- THREAD_OPTS="$THREAD_OPTS pthread none" -+ THREAD_OPTS= - - dnl now test for all possibilities - THREADS_OK=no -@@ -3649,6 +3647,8 @@ - THREADS_CFLAGS="" - done - -+ THREADS_OK=yes -+ - if test "x$THREADS_OK" != "xyes"; then - wxUSE_THREADS=no - AC_MSG_WARN([No thread support on this system... disabled]) -@@ -3672,7 +3672,6 @@ - flag="-D_THREAD_SAFE" - ;; - *-freebsd*) -- flag="-D_THREAD_SAFE" - ;; - *-hp-hpux* ) - flag="-D_REENTRANT" -@@ -3954,21 +3953,6 @@ - esac - fi - --if test "$wxUSE_OPTIMISE" = "no" ; then -- OPTIMISE= --else -- if test "$GCC" = yes ; then -- OPTIMISE="-O2" -- case "${host}" in -- i586-*-*|i686-*-* ) -- OPTIMISE="${OPTIMISE} " -- ;; -- esac -- else -- OPTIMISE="-O" -- fi --fi -- - if test "$WXWIN_COMPATIBILITY_2" = "yes"; then - AC_DEFINE(WXWIN_COMPATIBILITY_2) - -@@ -5439,7 +5423,6 @@ - AC_SUBST(WX_LIBRARY_IMPORTLIB) - AC_SUBST(WX_TARGET_LIBRARY) - AC_SUBST(WX_LIBRARY_LINK1) --AC_SUBST(WX_LIBRARY_LINK2) - AC_SUBST(PROGRAM_EXT) - - dnl global gl options -@@ -5447,7 +5430,6 @@ - AC_SUBST(WX_LIBRARY_NAME_SHARED_GL) - AC_SUBST(WX_TARGET_LIBRARY_GL) - AC_SUBST(WX_LIBRARY_LINK1_GL) --AC_SUBST(WX_LIBRARY_LINK2_GL) - - dnl are we supposed to create the links? - AC_SUBST(WX_ALL) diff --git a/x11-toolkits/wxgtk-devel/files/patch-ac b/x11-toolkits/wxgtk-devel/files/patch-ac index f4522eaf15bd..9513e8f0e204 100644 --- a/x11-toolkits/wxgtk-devel/files/patch-ac +++ b/x11-toolkits/wxgtk-devel/files/patch-ac @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- Makefile.in.orig Sun Jan 5 13:54:59 2003 -+++ Makefile.in Tue Jan 14 18:29:58 2003 +--- Makefile.in.orig Sun Sep 21 18:31:27 2003 ++++ Makefile.in Tue Nov 4 22:33:54 2003 @@ -332,17 +332,13 @@ $(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ @@ -23,7 +20,7 @@ $FreeBSD$ $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h -@@ -371,26 +367,21 @@ +@@ -371,28 +367,23 @@ CREATE_INSTALLED_LINKS: preinstall $(RM) $(libdir)/@WX_LIBRARY_LINK1@ @@ -41,7 +38,8 @@ $FreeBSD$ - && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ + && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ - afminstall: preinstall +-afminstall: preinstall ++afminstall: @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi $(INSTALL) -d $(datadir)/wx - $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN) @@ -50,27 +48,42 @@ $FreeBSD$ - $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm - $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm + $(INSTALL) -d $(datadir)/wx/afm -+ $(INSTALL) -d $(datadir)/wx//gs_afm ++ $(INSTALL) -d $(datadir)/wx/gs_afm + $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm + $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm - m4datainstall: preinstall +-m4datainstall: preinstall ++m4datainstall: $(INSTALL) -d $(datadir)/aclocal -@@ -425,20 +416,16 @@ - @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ - $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi + $(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal +@@ -410,7 +401,7 @@ + + # this is the real install target: copies the library, wx-config and the + # headers to the installation directory +-preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config ++install-common: @AFMINSTALL@ m4datainstall @WIN32INSTALL@ + @echo " " + @echo " Installing wxWindows..." + @echo " " +@@ -419,26 +410,11 @@ + @if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi + @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi + +- $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config +- cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config +- @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ +- @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ +- $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi +- - $(INSTALL) -d $(libdir)/wx - $(INSTALL) -d $(libdir)/wx/include - $(INSTALL) -d $(libdir)/wx/include/univ - $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@ - $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx -+ $(INSTALL) -d $(prefix)/include/wx -+ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@ - $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ +- $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ - $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h -+ $(prefix)/include/wx/setup.h - +- $(INSTALL) -d $(includedir)/wx @# FIXME: This will erroneously install a wx/base dir for wxBase.. @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi @@ -80,18 +93,32 @@ $FreeBSD$ @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi @# always install msw headers for wxBase, it's much simpler -@@ -494,13 +481,11 @@ - @echo " Removing library..." - @$(RM) $(libdir)/@WX_TARGET_LIBRARY@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK1@ -- @$(RM) $(libdir)/@WX_LIBRARY_LINK2@ - @echo " Removing GL library..." - @$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ -- @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ - @echo " Removing helper files..." -- @$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h -+ @$(RM) $(prefix)/include/wx/@TOOLCHAIN_NAME@/setup.h - @$(RM) $(bindir)/wx-config - @$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config - @$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/* +@@ -459,6 +435,19 @@ + echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \ + done + ++preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config ++ $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config ++ @if test "$(WXGTK_FLAVOR)" = "gtk"; then \ ++ cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config; \ ++ fi ++ @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ ++ @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ ++ $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi ++ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@ ++ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx ++ $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ ++ $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx/setup.h ++ + preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@ + @echo " " + @echo " Installing wxWindows Mac resource ..." +@@ -474,7 +463,7 @@ + @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi + @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ + +-install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@ ++install: @WX_ALL_INSTALLED@ + @echo " " + @echo " The installation of wxWindows is finished. On certain" + @echo " platforms (e.g. Linux) you'll now have to run ldconfig" diff --git a/x11-toolkits/wxgtk-devel/files/patch-configure b/x11-toolkits/wxgtk-devel/files/patch-configure index 97ca751922d6..2236f9edacee 100644 --- a/x11-toolkits/wxgtk-devel/files/patch-configure +++ b/x11-toolkits/wxgtk-devel/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Sun Nov 2 16:08:40 2003 -+++ configure Sun Nov 2 16:17:32 2003 +--- configure.orig Tue Nov 4 19:54:04 2003 ++++ configure Tue Nov 4 20:12:59 2003 @@ -11731,7 +11731,7 @@ @@ -9,36 +9,21 @@ system_zlib_h_ok="yes" else echo $ac_n "checking for zlib.h >= 1.1.4""... $ac_c" 1>&6 -@@ -16048,8 +16048,8 @@ - - WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"` - --TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}" --TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}" -+TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}" -+TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl" - - if test "$cross_compiling" = "yes"; then - TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}" -@@ -16060,13 +16060,11 @@ - WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}" - WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}" - --WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" --WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" -+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.2" -+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.2" - --WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" --WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}" --WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" --WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" -+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}" -+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" +@@ -16099,6 +16099,13 @@ + WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc" + fi + ;; ++ ++ *-*-freebsd* ) ++ WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" ++ WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" ++ WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}" ++ WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" ++ ;; + esac - case "${host}" in - *-*-cygwin* | *-*-mingw32* ) -@@ -18679,7 +18677,7 @@ + WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" +@@ -18679,7 +18686,7 @@ ;; esac @@ -47,7 +32,7 @@ THREADS_OK=no for flag in $THREAD_OPTS; do -@@ -18736,6 +18734,8 @@ +@@ -18736,6 +18743,8 @@ THREADS_CFLAGS="" done @@ -56,7 +41,7 @@ if test "x$THREADS_OK" != "xyes"; then wxUSE_THREADS=no echo "configure: warning: No thread support on this system... disabled" 1>&2 -@@ -18752,7 +18752,6 @@ +@@ -18752,7 +18761,6 @@ flag="-D_THREAD_SAFE" ;; *-freebsd*) @@ -64,10 +49,12 @@ ;; *-hp-hpux* ) flag="-D_REENTRANT" -@@ -19531,21 +19530,6 @@ +@@ -19529,21 +19537,6 @@ + CODE_GEN_FLAGS="$CODE_GEN_FLAGS -ffunction-sections" + ;; esac - fi - +-fi +- -if test "$wxUSE_OPTIMISE" = "no" ; then - OPTIMISE= -else @@ -81,22 +68,6 @@ - else - OPTIMISE="-O" - fi --fi -- + fi + if test "$WXWIN_COMPATIBILITY_2" = "yes"; then - cat >> confdefs.h <<\EOF - #define WXWIN_COMPATIBILITY_2 1 -@@ -22780,13 +22764,11 @@ - s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g - s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g - s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g --s%@WX_LIBRARY_LINK2@%$WX_LIBRARY_LINK2%g - s%@PROGRAM_EXT@%$PROGRAM_EXT%g - s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g - s%@WX_LIBRARY_NAME_SHARED_GL@%$WX_LIBRARY_NAME_SHARED_GL%g - s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g - s%@WX_LIBRARY_LINK1_GL@%$WX_LIBRARY_LINK1_GL%g --s%@WX_LIBRARY_LINK2_GL@%$WX_LIBRARY_LINK2_GL%g - s%@WX_ALL@%$WX_ALL%g - s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g - s%@SHARED_LD@%$SHARED_LD%g diff --git a/x11-toolkits/wxgtk-devel/files/patch-contrib-include-wx-fl-frmview.h b/x11-toolkits/wxgtk-devel/files/patch-contrib-include-wx-fl-frmview.h new file mode 100644 index 000000000000..57217e446561 --- /dev/null +++ b/x11-toolkits/wxgtk-devel/files/patch-contrib-include-wx-fl-frmview.h @@ -0,0 +1,11 @@ +--- contrib/include/wx/fl/frmview.h.orig Wed Nov 5 00:02:21 2003 ++++ contrib/include/wx/fl/frmview.h Wed Nov 5 00:03:08 2003 +@@ -114,7 +114,7 @@ + + // if file name is empty, views are are not saved/loaded + +- virtual void Init( wxWindow* pMainFrame, const wxString& settingsFile = "" ); ++ virtual void Init( wxWindow* pMainFrame, const wxString& settingsFile = wxEmptyString ); + + // synonyms + wxFrame* GetParentFrame(); diff --git a/x11-toolkits/wxgtk-devel/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk-devel/files/patch-contrib-src-Makefile.in index e7f9083031fb..5d9fe0443f8e 100644 --- a/x11-toolkits/wxgtk-devel/files/patch-contrib-src-Makefile.in +++ b/x11-toolkits/wxgtk-devel/files/patch-contrib-src-Makefile.in @@ -1,5 +1,5 @@ ---- contrib/src/Makefile.in.orig Tue Nov 4 04:29:40 2003 -+++ contrib/src/Makefile.in Tue Nov 4 04:29:51 2003 +--- contrib/src/Makefile.in.orig Sun Sep 21 18:32:39 2003 ++++ contrib/src/Makefile.in Tue Nov 4 22:30:37 2003 @@ -1,6 +1,6 @@ # $Id: Makefile.in,v 1.13.2.1 2003/07/28 08:23:09 VS Exp $ @@ -8,3 +8,13 @@ all: @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done +@@ -10,6 +10,9 @@ + + install: + @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install); done ++ ++install-common: ++ @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install-common); done + + uninstall: + @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) uninstall); done diff --git a/x11-toolkits/wxgtk-devel/files/patch-contrib-src-gizmos-multicell.cpp b/x11-toolkits/wxgtk-devel/files/patch-contrib-src-gizmos-multicell.cpp new file mode 100644 index 000000000000..88d6778914ba --- /dev/null +++ b/x11-toolkits/wxgtk-devel/files/patch-contrib-src-gizmos-multicell.cpp @@ -0,0 +1,33 @@ +--- contrib/src/gizmos/multicell.cpp.orig Wed Nov 5 00:04:44 2003 ++++ contrib/src/gizmos/multicell.cpp Wed Nov 5 00:06:11 2003 +@@ -633,17 +633,12 @@ + m_minCellSize = wxSize(5, 5); + } + //--------------------------------------------------------------------------- +-wxString itoa(int x) +-{ +- char bfr[255]; +- sprintf(bfr, "%d", x); +- return bfr; +-} +-//--------------------------------------------------------------------------- + void wxMultiCellCanvas :: Add(wxWindow *win, unsigned int row, unsigned int col) + { +- wxASSERT_MSG(row >= 0 && row < m_maxRows, wxString("Row ") + itoa(row) + " out of bounds (" + itoa(m_maxRows) + ")"); +- wxASSERT_MSG(col >= 0 && col < m_maxCols, wxString("Column ") + itoa(col) + " out of bounds (" + itoa(m_maxCols) + ")"); ++ wxASSERT_MSG(row >= 0 && row < m_maxRows, ++ wxString::Format(_T("Row %d out of bounds (0..%d)"), row, m_maxRows) ); ++ wxASSERT_MSG(col >= 0 && col < m_maxCols, ++ wxString::Format(_T("Column %d out of bounds (0..%d)"), col, m_maxCols) ); + wxASSERT_MSG(m_cells[CELL_LOC(row, col)] == NULL, wxT("Cell already occupied")); + + wxCell *newCell = new wxCell(win); +@@ -660,7 +655,7 @@ + if (!m_cells[CELL_LOC(row, col)]) + { + // Create an empty static text field as a placeholder +- m_cells[CELL_LOC(row, col)] = new wxCell(new wxStaticText(m_parent, -1, "")); ++ m_cells[CELL_LOC(row, col)] = new wxCell(new wxStaticText(m_parent, -1, wxT(""))); + } + wxFlexGridSizer::Add(m_cells[CELL_LOC(row, col)]->m_window); + } diff --git a/x11-toolkits/wxgtk-devel/files/patch-contrib-src-plot-plot.cpp b/x11-toolkits/wxgtk-devel/files/patch-contrib-src-plot-plot.cpp new file mode 100644 index 000000000000..ff6fc281b199 --- /dev/null +++ b/x11-toolkits/wxgtk-devel/files/patch-contrib-src-plot-plot.cpp @@ -0,0 +1,38 @@ +--- contrib/src/plot/plot.cpp.orig Wed Nov 5 00:03:37 2003 ++++ contrib/src/plot/plot.cpp Wed Nov 5 00:04:27 2003 +@@ -204,7 +204,7 @@ + END_EVENT_TABLE() + + wxPlotArea::wxPlotArea( wxPlotWindow *parent ) +- : wxWindow( parent, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, "plotarea" ) ++ : wxWindow( parent, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, _T("plotarea") ) + { + m_owner = parent; + +@@ -462,7 +462,7 @@ + END_EVENT_TABLE() + + wxPlotXAxisArea::wxPlotXAxisArea( wxPlotWindow *parent ) +- : wxWindow( parent, -1, wxDefaultPosition, wxSize(-1,40), 0, "plotxaxisarea" ) ++ : wxWindow( parent, -1, wxDefaultPosition, wxSize(-1,40), 0, _T("plotxaxisarea") ) + { + m_owner = parent; + +@@ -589,7 +589,7 @@ + END_EVENT_TABLE() + + wxPlotYAxisArea::wxPlotYAxisArea( wxPlotWindow *parent ) +- : wxWindow( parent, -1, wxDefaultPosition, wxSize(60,-1), 0, "plotyaxisarea" ) ++ : wxWindow( parent, -1, wxDefaultPosition, wxSize(60,-1), 0, _T("plotyaxisarea") ) + { + m_owner = parent; + +@@ -713,7 +713,7 @@ + END_EVENT_TABLE() + + wxPlotWindow::wxPlotWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag ) +- : wxScrolledWindow( parent, id, pos, size, flag, "plotcanvas" ) ++ : wxScrolledWindow( parent, id, pos, size, flag, _T("plotcanvas") ) + { + m_xUnitsPerValue = 1.0; + m_xZoom = 1.0; diff --git a/x11-toolkits/wxgtk-devel/files/patch-src-makelib.env.in b/x11-toolkits/wxgtk-devel/files/patch-src-makelib.env.in index 0322453d05de..17ce4b33fced 100644 --- a/x11-toolkits/wxgtk-devel/files/patch-src-makelib.env.in +++ b/x11-toolkits/wxgtk-devel/files/patch-src-makelib.env.in @@ -1,20 +1,17 @@ ---- src/makelib.env.in.orig Tue Nov 4 05:00:26 2003 -+++ src/makelib.env.in Tue Nov 4 05:01:53 2003 -@@ -34,9 +34,10 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ +--- src/makelib.env.in.orig Sun Sep 21 18:31:38 2003 ++++ src/makelib.env.in Tue Nov 4 22:33:31 2003 +@@ -35,8 +35,8 @@ INSTALL_DATA = @INSTALL_DATA@ --TARGETLIB_STATIC = $(TARGET_LIBNAME).a + TARGETLIB_STATIC = $(TARGET_LIBNAME).a -TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) -TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) -+target_libname = $(TARGET_LIBNAME:-@WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@=) -+TARGETLIB_STATIC = $(target_libname).a -+TARGETLIB_SHARED = $(target_libname).so.$(LIBVERSION_CURRENT) -+TARGETLIB_LINK1 = $(target_libname).so ++TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) ++TARGETLIB_LINK1 = $(TARGET_LIBNAME).so TARGETLIB_LINK2 = $(TARGET_LIBNAME).so TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@ -@@ -72,9 +73,8 @@ +@@ -72,9 +72,8 @@ @$(INSTALL) -d $(top_builddir)/lib $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) $(LDFLAGS_VERSIONING) cd $(top_builddir)/lib \ @@ -26,7 +23,14 @@ $(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS) @$(INSTALL) -d $(top_builddir)/lib -@@ -86,10 +86,9 @@ +@@ -82,14 +81,15 @@ + $(AR) $(AROPTIONS) $@ $(OBJECTS) + $(RANLIB) $@ + +-install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers ++install: install_@WX_TARGET_LIBRARY_TYPE@ ++ ++install-common: install_headers install_so: $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED) @@ -39,7 +43,7 @@ install_a: $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC) -@@ -105,7 +104,6 @@ +@@ -105,7 +105,6 @@ $(RM) $(libdir)/$(TARGETLIB_STATIC) $(RM) $(libdir)/$(TARGETLIB_SHARED) $(RM) $(libdir)/$(TARGETLIB_LINK1) @@ -47,7 +51,7 @@ @echo "removing headers" @for h in $(HEADERS); do \ $(RM) $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \ -@@ -118,7 +116,6 @@ +@@ -118,7 +117,6 @@ clean: $(RM) $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED) \ $(top_builddir)/lib/$(TARGETLIB_LINK1) \ diff --git a/x11-toolkits/wxgtk-devel/files/patch-wx-config.in b/x11-toolkits/wxgtk-devel/files/patch-wx-config.in index ff8564822f23..a7ed9b6792da 100644 --- a/x11-toolkits/wxgtk-devel/files/patch-wx-config.in +++ b/x11-toolkits/wxgtk-devel/files/patch-wx-config.in @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- wx-config.in.orig Sun Jan 5 13:54:59 2003 -+++ wx-config.in Tue Jan 14 18:36:21 2003 +--- wx-config.in.orig Wed Nov 5 00:19:46 2003 ++++ wx-config.in Wed Nov 5 00:20:14 2003 @@ -66,7 +66,7 @@ if test $inplace_flag = yes ; then includes="-I$inplace_builddir/lib/wx/include/@TOOLCHAIN_NAME@ -I$inplace_include" else - includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@$includes" -+ includes="-I@prefix@/include $includes" ++ includes="-I@prefix@/include/wx/@TOOLCHAIN_NAME@$includes" fi if test $static_flag = yes ; then |