diff options
Diffstat (limited to 'x11-toolkits/wxgtk24/files')
12 files changed, 0 insertions, 478 deletions
diff --git a/x11-toolkits/wxgtk24/files/patch-ac b/x11-toolkits/wxgtk24/files/patch-ac deleted file mode 100644 index 9513e8f0e204..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-ac +++ /dev/null @@ -1,124 +0,0 @@ ---- 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@ - @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@ -- @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@ - cd $(build_libdir) \ -- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \ -- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ -+ && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ - - $(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@ - @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@ -- @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@ - cd $(build_libdir) \ -- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \ -- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ -+ && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ - - $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h - -@@ -371,28 +367,23 @@ - - CREATE_INSTALLED_LINKS: preinstall - $(RM) $(libdir)/@WX_LIBRARY_LINK1@ -- $(RM) $(libdir)/@WX_LIBRARY_LINK2@ - cd $(libdir) \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ -+ && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ - - CREATE_INSTALLED_LINKS_GL: preinstall_gl - $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ -- $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ - cd $(libdir) \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \ -- && $(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: - @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi - $(INSTALL) -d $(datadir)/wx -- $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN) -- $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm -- $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm -- $(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_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm -+ $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm - --m4datainstall: preinstall -+m4datainstall: - $(INSTALL) -d $(datadir)/aclocal - $(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_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ -- $(libdir)/wx/include/@TOOLCHAIN_NAME@/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 - @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi - @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi -- @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/univ; fi - @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi - - @# always install msw headers for wxBase, it's much simpler -@@ -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/wxgtk24/files/patch-configure b/x11-toolkits/wxgtk24/files/patch-configure deleted file mode 100644 index 2236f9edacee..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-configure +++ /dev/null @@ -1,73 +0,0 @@ ---- configure.orig Tue Nov 4 19:54:04 2003 -+++ configure Tue Nov 4 20:12:59 2003 -@@ -11731,7 +11731,7 @@ - - - if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then -- if test "$USE_DARWIN" = 1; then -+ if test "$USE_DARWIN" = 1 -o "$USE_FREEBSD" = 1; then - system_zlib_h_ok="yes" - else - echo $ac_n "checking for zlib.h >= 1.1.4""... $ac_c" 1>&6 -@@ -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 - - WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" -@@ -18679,7 +18686,7 @@ - ;; - esac - -- THREAD_OPTS="$THREAD_OPTS pthread none" -+ THREAD_OPTS= - - THREADS_OK=no - for flag in $THREAD_OPTS; do -@@ -18736,6 +18743,8 @@ - THREADS_CFLAGS="" - done - -+ THREADS_OK=yes -+ - if test "x$THREADS_OK" != "xyes"; then - wxUSE_THREADS=no - echo "configure: warning: No thread support on this system... disabled" 1>&2 -@@ -18752,7 +18761,6 @@ - flag="-D_THREAD_SAFE" - ;; - *-freebsd*) -- flag="-D_THREAD_SAFE" - ;; - *-hp-hpux* ) - flag="-D_REENTRANT" -@@ -19529,21 +19537,6 @@ - CODE_GEN_FLAGS="$CODE_GEN_FLAGS -ffunction-sections" - ;; - 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 diff --git a/x11-toolkits/wxgtk24/files/patch-contrib-include-wx-fl-frmview.h b/x11-toolkits/wxgtk24/files/patch-contrib-include-wx-fl-frmview.h deleted file mode 100644 index 57217e446561..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-contrib-include-wx-fl-frmview.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/wxgtk24/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk24/files/patch-contrib-src-Makefile.in deleted file mode 100644 index 5d9fe0443f8e..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-contrib-src-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 $ - --CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc svg xrc animate #applet -+CONTRIB_SUBDIRS=canvas fl gizmos net ogl plot stc svg xrc #animate applet mmedia - - 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/wxgtk24/files/patch-contrib-src-gizmos-multicell.cpp b/x11-toolkits/wxgtk24/files/patch-contrib-src-gizmos-multicell.cpp deleted file mode 100644 index 88d6778914ba..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-contrib-src-gizmos-multicell.cpp +++ /dev/null @@ -1,33 +0,0 @@ ---- 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/wxgtk24/files/patch-contrib-src-plot-plot.cpp b/x11-toolkits/wxgtk24/files/patch-contrib-src-plot-plot.cpp deleted file mode 100644 index ff6fc281b199..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-contrib-src-plot-plot.cpp +++ /dev/null @@ -1,38 +0,0 @@ ---- 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/wxgtk24/files/patch-include::wx::wxchar.h b/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h deleted file mode 100644 index f0fd474d8047..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-include::wx::wxchar.h +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- include/wx/wxchar.h.orig Sun Sep 15 21:19:48 2002 -+++ include/wx/wxchar.h Sat Oct 26 18:06:12 2002 -@@ -554,10 +554,10 @@ - #endif // wxUSE_WCHAR_T - - // checks whether the passed in pointer is NULL and if the string is empty --inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; } -+WXDLLEXPORT inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; } - - // safe version of strlen() (returns 0 if passed NULL pointer) --inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; } -+WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; } - - WXDLLEXPORT bool wxOKlibc(); // for internal use - diff --git a/x11-toolkits/wxgtk24/files/patch-src-common-datetime.cpp b/x11-toolkits/wxgtk24/files/patch-src-common-datetime.cpp deleted file mode 100644 index f4931273f720..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-src-common-datetime.cpp +++ /dev/null @@ -1,56 +0,0 @@ ---- src/common/datetime.cpp.orig Tue Nov 4 09:50:09 2003 -+++ src/common/datetime.cpp Tue Nov 4 09:52:02 2003 -@@ -349,6 +349,35 @@ - return wxString(buf); - } - -+#ifdef HAVE_STRPTIME -+ -+// Unicode-friendly strptime() wrapper -+static const wxChar * -+CallStrptime(const wxChar *input, const char *fmt, tm *tm) -+{ -+ // the problem here is that strptime() returns pointer into the string we -+ // passed to it while we're really interested in the pointer into the -+ // original, Unicode, string so we try to transform the pointer back -+#if wxUSE_UNICODE -+ wxCharBuffer inputMB(wxConvertWX2MB(input)); -+#else // ASCII -+ const char * const inputMB = input; -+#endif // Unicode/Ascii -+ -+ const char *result = strptime(inputMB, fmt, tm); -+ if ( !result ) -+ return NULL; -+ -+#if wxUSE_UNICODE -+ // FIXME: this is wrong in presence of surrogates &c -+ return input + (result - inputMB.data()); -+#else // ASCII -+ return result; -+#endif // Unicode/Ascii -+} -+ -+#endif // HAVE_STRPTIME -+ - // if year and/or month have invalid values, replace them with the current ones - static void ReplaceDefaultYearMonthWithCurrent(int *year, - wxDateTime::Month *month) -@@ -2920,7 +2949,7 @@ - // to our generic code anyhow (FIXME !Unicode friendly) - { - struct tm tm; -- const wxChar *result = strptime(input, "%x", &tm); -+ const wxChar *result = CallStrptime(input, "%x", &tm); - if ( result ) - { - input = result; -@@ -2985,7 +3014,7 @@ - { - // use strptime() to do it for us (FIXME !Unicode friendly) - struct tm tm; -- input = strptime(input, "%X", &tm); -+ input = CallStrptime(input, "%X", &tm); - if ( !input ) - { - return (wxChar *)NULL; diff --git a/x11-toolkits/wxgtk24/files/patch-src-gtk-notebook.cpp b/x11-toolkits/wxgtk24/files/patch-src-gtk-notebook.cpp deleted file mode 100644 index 1aae1c52f5fa..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-src-gtk-notebook.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gtk/notebook.cpp.orig Sun Sep 21 18:31:57 2003 -+++ src/gtk/notebook.cpp Mon Nov 10 03:26:16 2003 -@@ -643,7 +643,7 @@ - nb_page->m_text = text; - if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT(""); - -- nb_page->m_label = GTK_LABEL( gtk_label_new(nb_page->m_text.mbc_str()) ); -+ nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) ); - gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding ); - - /* show the label */ diff --git a/x11-toolkits/wxgtk24/files/patch-src-makelib.env.in b/x11-toolkits/wxgtk24/files/patch-src-makelib.env.in deleted file mode 100644 index 17ce4b33fced..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-src-makelib.env.in +++ /dev/null @@ -1,61 +0,0 @@ ---- 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_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) --TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) -+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 +72,8 @@ - @$(INSTALL) -d $(top_builddir)/lib - $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) $(LDFLAGS_VERSIONING) - cd $(top_builddir)/lib \ -- && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \ -- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \ -- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2) -+ && $(RM) $(TARGETLIB_LINK1) \ -+ && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) - - $(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS) - @$(INSTALL) -d $(top_builddir)/lib -@@ -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) -- @$(RM) $(libdir)/$(TARGETLIB_LINK1) $(libdir)/$(TARGETLIB_LINK2) -+ @$(RM) $(libdir)/$(TARGETLIB_LINK1) - cd $(libdir) \ -- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \ -- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2) -+ && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) - - install_a: - $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC) -@@ -105,7 +105,6 @@ - $(RM) $(libdir)/$(TARGETLIB_STATIC) - $(RM) $(libdir)/$(TARGETLIB_SHARED) - $(RM) $(libdir)/$(TARGETLIB_LINK1) -- $(RM) $(libdir)/$(TARGETLIB_LINK2) - @echo "removing headers" - @for h in $(HEADERS); do \ - $(RM) $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \ -@@ -118,7 +117,6 @@ - clean: - $(RM) $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED) \ - $(top_builddir)/lib/$(TARGETLIB_LINK1) \ -- $(top_builddir)/lib/$(TARGETLIB_LINK2) \ - $(top_builddir)/lib/$(TARGETLIB_STATIC) core - - .PHONY: all libtype_so libtype_a install install_so install_a install_headers uninstall clean diff --git a/x11-toolkits/wxgtk24/files/patch-src_common_intl.cpp b/x11-toolkits/wxgtk24/files/patch-src_common_intl.cpp deleted file mode 100644 index f8e465e4cbc3..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-src_common_intl.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- src/common/intl.cpp.orig Sat Oct 4 23:10:24 2003 -+++ src/common/intl.cpp Sun Oct 5 21:35:30 2003 -@@ -743,8 +742,18 @@ - } - if ( !retloc ) - { -+ wxString langFull; -+ if (wxGetEnv(wxT("LC_ALL"), &langFull)|| -+ wxGetEnv(wxT("LC_MESSAGES"), &langFull) || -+ wxGetEnv(wxT("LANG"), &langFull)) -+ { -+ retloc = wxSetlocale(LC_ALL, langFull); -+ } -+ } -+ if ( !retloc ) -+ { - wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str()); -- return FALSE; -+ //return FALSE; - } - #elif defined(__WIN32__) - diff --git a/x11-toolkits/wxgtk24/files/patch-wx-config.in b/x11-toolkits/wxgtk24/files/patch-wx-config.in deleted file mode 100644 index a7ed9b6792da..000000000000 --- a/x11-toolkits/wxgtk24/files/patch-wx-config.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/wx/@TOOLCHAIN_NAME@$includes" - fi - - if test $static_flag = yes ; then |