diff --git a/dev-qt/wxqt/patches/wxqt-3.1.7.patchset b/dev-qt/wxqt/patches/wxqt-3.1.7.patchset deleted file mode 100644 index 5824be5f4..000000000 --- a/dev-qt/wxqt/patches/wxqt-3.1.7.patchset +++ /dev/null @@ -1,152 +0,0 @@ -From f8b69bb670d0f013bbb57ff701ebdc2b5381c620 Mon Sep 17 00:00:00 2001 -From: Ulrich Telle -Date: Tue, 21 Jun 2022 10:58:37 +0200 -Subject: Fix wxUILocaleImplUnix::GetLocalizedName() on non-Linux systems - -On non-Linux-like systems the `_NL_*` symbols for retrieving localized -strings from a locale are typically not available, causing compile-time -errors. - -We now check for Linux-like systems, and resort to accessing our own -language database otherwise. - -Closes #22558. - -diff --git a/src/unix/uilocale.cpp b/src/unix/uilocale.cpp -index 3dfb63f..01556f2 100644 ---- a/src/unix/uilocale.cpp -+++ b/src/unix/uilocale.cpp -@@ -78,11 +78,14 @@ private: - // Call nl_langinfo_l() if available, or nl_langinfo() otherwise. - const char* GetLangInfo(nl_item item) const; - -+#ifdef __LINUX__ - // Call GetLangInfo() using either the native or English item depending on - // the form needed. - wxString GetFormOfLangInfo(wxLocaleForm form, - nl_item nlNative, - nl_item nlEnglish) const; -+#endif -+ - #endif // HAVE_LANGINFO_H - - wxLocaleIdent m_locId; -@@ -373,6 +376,7 @@ wxUILocaleImplUnix::GetLangInfo(nl_item item) const - return nl_langinfo(item); - } - -+#ifdef __LINUX__ - wxString - wxUILocaleImplUnix::GetFormOfLangInfo(wxLocaleForm form, - nl_item nlNative, -@@ -397,6 +401,7 @@ wxUILocaleImplUnix::GetFormOfLangInfo(wxLocaleForm form, - - return wxString(GetLangInfo(item), wxCSConv(m_codeset)); - } -+#endif - - #endif // HAVE_LANGINFO_H - -@@ -452,8 +457,8 @@ wxUILocaleImplUnix::GetInfo(wxLocaleInfo index, wxLocaleCategory cat) const - wxString - wxUILocaleImplUnix::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const - { --#ifdef HAVE_LANGINFO_H - wxString str; -+#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) - switch (name) - { - case wxLOCALE_NAME_LOCALE: -@@ -487,13 +492,45 @@ wxUILocaleImplUnix::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const - default: - wxFAIL_MSG("unknown wxLocaleName"); - } -+#else // !HAVE_LANGINFO_H || !__LINUX__ -+ // If HAVE_LANGINFO_H is not available, or system is not Linux-like, -+ // use our own language database to retrieve the requested information. -+ const wxLanguageInfo* langInfo = wxUILocale::FindLanguageInfo(wxLocaleIdent::FromTag(GetName())); -+ if (langInfo) -+ { -+ wxString langDesc; -+ switch ( form ) -+ { -+ case wxLOCALE_FORM_NATIVE: -+ langDesc = langInfo->Description; -+ break; -+ -+ case wxLOCALE_FORM_ENGLISH: -+ langDesc = langInfo->DescriptionNative; -+ break; -+ default: -+ break; -+ } -+ switch (name) -+ { -+ case wxLOCALE_NAME_LOCALE: -+ str = langDesc; -+ break; -+ -+ case wxLOCALE_NAME_LANGUAGE: -+ str = langDesc.BeforeFirst('(').Trim(); -+ break; -+ -+ case wxLOCALE_NAME_COUNTRY: -+ str = langDesc.AfterFirst('(').BeforeLast(')'); -+ break; -+ -+ default: -+ wxFAIL_MSG("unknown wxLocaleName"); -+ } -+ } -+#endif // HAVE_LANGINFO_H && __LINUX__/!HAVE_LANGINFO_H || !__LINUX__ - return str; --#else // !HAVE_LANGINFO_H -- // If HAVE_LANGINFO_H is not available, we could use our own language database -- // to retrieve the requested information. -- // For now, just return an empty string. -- return wxString(); --#endif // HAVE_LANGINFO_H/!HAVE_LANGINFO_H - } - - wxLayoutDirection --- -2.37.3 - - -From 8f947040170035b4b521fa9b1d3fccc30c0fbe87 Mon Sep 17 00:00:00 2001 -From: Vadim Zeitlin -Date: Sun, 23 Oct 2022 16:07:25 +0200 -Subject: Fix wxBITMAP() definition for wxQt - -Define wxBITMAP() for all non-MSW ports in the same, working, way -instead of using a weird definition which happened to accidentally work -before for wxQt due to implicitly using wxImage ctor from XPN, but -doesn't work any longer since the changes of 5e53f74af1 (Make wxImage -ctor from XPM data explicit, 2021-04-17). - -Closes #22908. - -diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h -index 2f5f8ee..0d78068 100644 ---- a/include/wx/gdicmn.h -+++ b/include/wx/gdicmn.h -@@ -238,15 +238,9 @@ enum wxEllipsizeMode - - #if defined(__WINDOWS__) && wxUSE_WXDIB - #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_BMP_RESOURCE) --#elif defined(__WXGTK__) || \ -- defined(__WXMOTIF__) || \ -- defined(__WXX11__) || \ -- defined(__WXMAC__) || \ -- defined(__WXDFB__) -+#else - // Initialize from an included XPM - #define wxBITMAP(name) wxBitmap(name##_xpm) --#else // other platforms -- #define wxBITMAP(name) wxBitmap(name##_xpm, wxBITMAP_TYPE_XPM) - #endif // platform - - // Macro for creating wxBitmap from in-memory PNG data. --- -2.37.3 - diff --git a/dev-qt/wxqt/patches/wxqt-3.2.1.patchset b/dev-qt/wxqt/patches/wxqt-3.2.1.patchset new file mode 100644 index 000000000..e3beea724 --- /dev/null +++ b/dev-qt/wxqt/patches/wxqt-3.2.1.patchset @@ -0,0 +1,319 @@ +From 5a6132bb00ffafaa499af17317d543621a4e0b8c Mon Sep 17 00:00:00 2001 +From: Vadim Zeitlin +Date: Sun, 23 Oct 2022 16:07:25 +0200 +Subject: Fix wxBITMAP() definition for wxQt + +Define wxBITMAP() for all non-MSW ports in the same, working, way +instead of using a weird definition which happened to accidentally work +before for wxQt due to implicitly using wxImage ctor from XPN, but +doesn't work any longer since the changes of 5e53f74af1 (Make wxImage +ctor from XPM data explicit, 2021-04-17). + +Closes #22908. + +diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h +index 2f5f8ee..0d78068 100644 +--- a/include/wx/gdicmn.h ++++ b/include/wx/gdicmn.h +@@ -238,15 +238,9 @@ enum wxEllipsizeMode + + #if defined(__WINDOWS__) && wxUSE_WXDIB + #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_BMP_RESOURCE) +-#elif defined(__WXGTK__) || \ +- defined(__WXMOTIF__) || \ +- defined(__WXX11__) || \ +- defined(__WXMAC__) || \ +- defined(__WXDFB__) ++#else + // Initialize from an included XPM + #define wxBITMAP(name) wxBitmap(name##_xpm) +-#else // other platforms +- #define wxBITMAP(name) wxBitmap(name##_xpm, wxBITMAP_TYPE_XPM) + #endif // platform + + // Macro for creating wxBitmap from in-memory PNG data. +-- +2.37.3 + + +From 561522537b31ddcda21441a8fe2254de3b677e39 Mon Sep 17 00:00:00 2001 +From: Vadim Zeitlin +Date: Fri, 21 Oct 2022 15:46:40 +0200 +Subject: Add Unix files to wxQt build under Unix + +Compile Unix, but not GUI toolkit, specific wxDialUpManager, wxJoystick +and wxSound implementations when building wxQt. + +Closes #22895, #22896. + +diff --git a/Makefile.in b/Makefile.in +index 7b4438b..f86f284 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -2301,6 +2301,7 @@ COND_USE_STC_1___wxscintilla___depname = \ + @COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_RELEASE) + @COND_PLATFORM_UNIX_0@PLUGVERDELIM = + @COND_PLATFORM_UNIX_1@PLUGVERDELIM = - ++@COND_PLATFORM_UNIX_1@QT_PLATFORM_HDR = wx/unix/joystick.h wx/unix/sound.h + COND_PLATFORM_WIN32_1_QT_PLATFORM_HDR = \ + wx/msw/dib.h \ + wx/msw/ole/automtn.h \ +@@ -5894,6 +5895,9 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS = \ + $(__QT_PLATFORM_SRC_OBJECTS) \ + monodll_qt_treectrl.o + @COND_TOOLKIT_QT@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS) ++@COND_PLATFORM_UNIX_1@__QT_PLATFORM_SRC_OBJECTS = \ ++@COND_PLATFORM_UNIX_1@ monodll_unix_dialup.o monodll_unix_joystick.o \ ++@COND_PLATFORM_UNIX_1@ monodll_unix_sound.o + COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS = \ + monodll_comimpl.o \ + monodll_msw_dialup.o \ +@@ -7905,6 +7909,9 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1 = \ + $(__QT_PLATFORM_SRC_OBJECTS_1) \ + monolib_qt_treectrl.o + @COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_1) ++@COND_PLATFORM_UNIX_1@__QT_PLATFORM_SRC_OBJECTS_1 = \ ++@COND_PLATFORM_UNIX_1@ monolib_unix_dialup.o monolib_unix_joystick.o \ ++@COND_PLATFORM_UNIX_1@ monolib_unix_sound.o + COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_1 = \ + monolib_comimpl.o \ + monolib_msw_dialup.o \ +@@ -10070,6 +10077,9 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2 = \ + $(__QT_PLATFORM_SRC_OBJECTS_2) \ + coredll_qt_treectrl.o + @COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_2) ++@COND_PLATFORM_UNIX_1@__QT_PLATFORM_SRC_OBJECTS_2 = \ ++@COND_PLATFORM_UNIX_1@ coredll_unix_dialup.o coredll_unix_joystick.o \ ++@COND_PLATFORM_UNIX_1@ coredll_unix_sound.o + COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_2 = \ + coredll_comimpl.o \ + coredll_msw_dialup.o \ +@@ -11808,6 +11818,9 @@ COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3 = \ + $(__QT_PLATFORM_SRC_OBJECTS_3) \ + corelib_qt_treectrl.o + @COND_TOOLKIT_QT@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_QT___GUI_SRC_OBJECTS_3) ++@COND_PLATFORM_UNIX_1@__QT_PLATFORM_SRC_OBJECTS_3 = \ ++@COND_PLATFORM_UNIX_1@ corelib_unix_dialup.o corelib_unix_joystick.o \ ++@COND_PLATFORM_UNIX_1@ corelib_unix_sound.o + COND_PLATFORM_WIN32_1___QT_PLATFORM_SRC_OBJECTS_3 = \ + corelib_comimpl.o \ + corelib_msw_dialup.o \ +@@ -18025,6 +18038,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) + @COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP) + @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP) ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp ++ + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP) + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp + +@@ -18178,6 +18194,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp + ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP) ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp ++ + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP) + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp + +@@ -18250,6 +18269,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp + ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP) ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp ++ + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP) + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp + +@@ -23347,6 +23369,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) + @COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP) + @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP) ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp ++ + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP) + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp + +@@ -23500,6 +23525,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp + ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP) ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp ++ + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP) + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp + +@@ -23572,6 +23600,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp + ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP) ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp ++ + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP) + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp + +@@ -28774,6 +28805,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) + @COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP) + @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP) ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp ++ + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP) + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp + +@@ -28927,6 +28961,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp + ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(COREDLL_ODEP) ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp ++ + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(COREDLL_ODEP) + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp + +@@ -28999,6 +29036,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@coredll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(COREDLL_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp + ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@coredll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(COREDLL_ODEP) ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp ++ + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(COREDLL_ODEP) + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp + +@@ -33055,6 +33095,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) + @COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP) + @COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp + ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP) ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp ++ + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP) + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp + +@@ -33208,6 +33251,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp + ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(CORELIB_ODEP) ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp ++ + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(CORELIB_ODEP) + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp + +@@ -33280,6 +33326,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@corelib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(CORELIB_ODEP) + @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp + ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@corelib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(CORELIB_ODEP) ++@COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp ++ + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(CORELIB_ODEP) + @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp + +diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 +index ee64e81..92bc6fb 100644 +--- a/autoconf_inc.m4 ++++ b/autoconf_inc.m4 +@@ -470,6 +470,12 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GU + COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="" + fi + AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1) ++dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0[wx.bkl] ### ++ COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#" ++ if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then ++ COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="" ++ fi ++ AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0) + dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_GUI_1[wx.bkl] ### + COND_PLATFORM_UNIX_1_USE_GUI_1="#" + if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then +diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl +index 5007c6a..3568184 100644 +--- a/build/bakefiles/files.bkl ++++ b/build/bakefiles/files.bkl +@@ -244,6 +244,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! + + + ++ ++ src/unix/dialup.cpp ++ src/unix/joystick.cpp ++ src/unix/sound.cpp ++ ++ ++ ++ wx/unix/joystick.h ++ wx/unix/sound.h ++ ++ + + src/msw/ole/comimpl.cpp + src/msw/dialup.cpp +@@ -269,10 +280,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! + + + ++ $(QT_UNIX_SRC) + $(QT_WIN32_SRC) + + + ++ $(QT_UNIX_HDR) + $(QT_WIN32_HDR) + + +diff --git a/build/files b/build/files +index e918da3..f5c6fe1 100644 +--- a/build/files ++++ b/build/files +@@ -192,6 +192,15 @@ BASE_OSX_NOTWXMAC_HDR = + + ## Qt + ++QT_UNIX_SRC= ++ src/unix/dialup.cpp ++ src/unix/joystick.cpp ++ src/unix/sound.cpp ++ ++QT_UNIX_HDR= ++ wx/unix/joystick.h ++ wx/unix/sound.h ++ + QT_WIN32_SRC= + src/msw/ole/automtn.cpp + src/msw/ole/comimpl.cpp +diff --git a/configure b/configure +index 54eb7a7..f5e8e67 100755 +--- a/configure ++++ b/configure +@@ -765,6 +765,7 @@ COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3 + COND_PLATFORM_WIN32_0 + COND_PLATFORM_UNIX_1_USE_PLUGINS_0 + COND_PLATFORM_UNIX_1_USE_GUI_1 ++COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0 + COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1 + COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1 + COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 +@@ -44874,6 +44875,11 @@ EOF + COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1="" + fi + ++ COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#" ++ if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then ++ COND_PLATFORM_UNIX_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="" ++ fi ++ + COND_PLATFORM_UNIX_1_USE_GUI_1="#" + if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then + COND_PLATFORM_UNIX_1_USE_GUI_1="" +-- +2.37.3 + diff --git a/dev-qt/wxqt/wxqt-3.1.7.recipe b/dev-qt/wxqt/wxqt-3.2.1.recipe similarity index 51% rename from dev-qt/wxqt/wxqt-3.1.7.recipe rename to dev-qt/wxqt/wxqt-3.2.1.recipe index 0de8df544..147529ea6 100644 --- a/dev-qt/wxqt/wxqt-3.1.7.recipe +++ b/dev-qt/wxqt/wxqt-3.2.1.recipe @@ -7,11 +7,11 @@ applications a truly native look and feel because it uses the platform's \ native API rather than emulating the GUI. It's also extensive, free, \ open-source and mature." HOMEPAGE="https://www.wxwidgets.org/" -COPYRIGHT="1998-2021 Julian Smart, Robert Roebling et al" +COPYRIGHT="1998-2022 Julian Smart, Robert Roebling et al" LICENSE="GNU LGPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v$portVersion/wxWidgets-$portVersion.tar.bz2" -CHECKSUM_SHA256="3d666e47d86192f085c84089b850c90db7a73a5d26b684b617298d89dce84f19" +CHECKSUM_SHA256="c229976bb413eb88e45cb5dfb68b27890d450149c09b331abd751e7ae0f5fa66" SOURCE_DIR="wxWidgets-$portVersion" PATCHES="wxqt-$portVersion.patchset" @@ -20,25 +20,25 @@ SECONDARY_ARCHITECTURES="x86" libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" -libSoVersion="7.0.0" +libSoVersion="0.1.0" PROVIDES=" wxqt$secondaryArchSuffix = $portVersion - lib:libwx_baseu_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_baseu_net_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_baseu_xml_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_qtu_adv_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_qtu_aui_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_qtu_core_3.1$secondaryArchSuffix = $libVersionCompat -# lib:libwx_qtu_gl_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_qtu_html_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_qtu_media_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_qtu_propgrid_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_qtu_qa_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_qtu_ribbon_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_qtu_richtext_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_qtu_stc_3.1$secondaryArchSuffix = $libVersionCompat - lib:libwx_qtu_xrc_3.1$secondaryArchSuffix = $libVersionCompat + lib:libwx_baseu_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_baseu_net_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_baseu_xml_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_qtu_adv_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_qtu_aui_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_qtu_core_3.2$secondaryArchSuffix = $libVersionCompat +# lib:libwx_qtu_gl_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_qtu_html_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_qtu_media_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_qtu_propgrid_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_qtu_qa_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_qtu_ribbon_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_qtu_richtext_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_qtu_stc_3.2$secondaryArchSuffix = $libVersionCompat + lib:libwx_qtu_xrc_3.2$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -55,7 +55,7 @@ REQUIRES=" lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix -# lib:libSDL$secondaryArchSuffix + lib:libSDL$secondaryArchSuffix lib:libtiff$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -64,22 +64,22 @@ PROVIDES_devel=" wxqt${secondaryArchSuffix}_devel = $portVersion cmd:wx_config$secondaryArchSuffix = $portVersion compat >= 3 cmd:wxrc$secondaryArchSuffix = $portVersion compat >= 3 - cmd:wxrc_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_baseu_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_baseu_net_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_baseu_xml_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_qtu_adv_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_qtu_aui_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_qtu_core_3.1$secondaryArchSuffix = $libVersionCompat -# devel:libwx_qtu_gl_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_qtu_html_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_qtu_media_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_qtu_propgrid_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_qtu_qa_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_qtu_ribbon_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_qtu_richtext_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_qtu_stc_3.1$secondaryArchSuffix = $libVersionCompat - devel:libwx_qtu_xrc_3.1$secondaryArchSuffix = $libVersionCompat + cmd:wxrc_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_baseu_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_baseu_net_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_baseu_xml_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_qtu_adv_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_qtu_aui_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_qtu_core_3.2$secondaryArchSuffix = $libVersionCompat +# devel:libwx_qtu_gl_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_qtu_html_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_qtu_media_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_qtu_propgrid_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_qtu_qa_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_qtu_ribbon_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_qtu_richtext_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_qtu_stc_3.2$secondaryArchSuffix = $libVersionCompat + devel:libwx_qtu_xrc_3.2$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" haiku$secondaryArchSuffix @@ -112,7 +112,7 @@ BUILD_REQUIRES=" devel:libQt5Core$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix -# devel:libSDL$secondaryArchSuffix + devel:libSDL$secondaryArchSuffix devel:libtiff$secondaryArchSuffix >= 5 devel:libz$secondaryArchSuffix " @@ -127,21 +127,21 @@ BUILD_PREREQUIRES=" " defineDebugInfoPackage wxqt$secondaryArchSuffix \ - "$libDir"/libwx_baseu-3.1.so.$libSoVersion \ - "$libDir"/libwx_baseu_net-3.1.so.$libSoVersion \ - "$libDir"/libwx_baseu_xml-3.1.so.$libSoVersion \ - "$libDir"/libwx_qtu_adv-3.1.so.$libSoVersion \ - "$libDir"/libwx_qtu_aui-3.1.so.$libSoVersion \ - "$libDir"/libwx_qtu_core-3.1.so.$libSoVersion \ - "$libDir"/libwx_qtu_html-3.1.so.$libSoVersion \ - "$libDir"/libwx_qtu_media-3.1.so.$libSoVersion \ - "$libDir"/libwx_qtu_propgrid-3.1.so.$libSoVersion \ - "$libDir"/libwx_qtu_qa-3.1.so.$libSoVersion \ - "$libDir"/libwx_qtu_ribbon-3.1.so.$libSoVersion \ - "$libDir"/libwx_qtu_richtext-3.1.so.$libSoVersion \ - "$libDir"/libwx_qtu_stc-3.1.so.$libSoVersion \ - "$libDir"/libwx_qtu_xrc-3.1.so.$libSoVersion -# "$libDir"/libwx_qtu_gl-3.1.so.$libSoVersion + "$libDir"/libwx_baseu-3.2.so.$libSoVersion \ + "$libDir"/libwx_baseu_net-3.2.so.$libSoVersion \ + "$libDir"/libwx_baseu_xml-3.2.so.$libSoVersion \ + "$libDir"/libwx_qtu_adv-3.2.so.$libSoVersion \ + "$libDir"/libwx_qtu_aui-3.2.so.$libSoVersion \ + "$libDir"/libwx_qtu_core-3.2.so.$libSoVersion \ + "$libDir"/libwx_qtu_html-3.2.so.$libSoVersion \ + "$libDir"/libwx_qtu_media-3.2.so.$libSoVersion \ + "$libDir"/libwx_qtu_propgrid-3.2.so.$libSoVersion \ + "$libDir"/libwx_qtu_qa-3.2.so.$libSoVersion \ + "$libDir"/libwx_qtu_ribbon-3.2.so.$libSoVersion \ + "$libDir"/libwx_qtu_richtext-3.2.so.$libSoVersion \ + "$libDir"/libwx_qtu_stc-3.2.so.$libSoVersion \ + "$libDir"/libwx_qtu_xrc-3.2.so.$libSoVersion +# "$libDir"/libwx_qtu_gl-3.2.so.$libSoVersion BUILD() { @@ -152,12 +152,7 @@ BUILD() --enable-shared \ --enable-printfposparam \ --enable-unicode \ - --disable-dialupman \ - --disable-sound \ - --without-sdl - - # build without SDL as otherwise we get a link issue in sound_sdl.cpp, as below: - # libwx_qtu_core-3.1.so.3.0.0: Could not resolve symbol '_ZN11wxSoundData6IncRefEv' + --with-sdl make $jobArgs } @@ -167,38 +162,38 @@ INSTALL() make install prepareInstalledDevelLibs \ - libwx_baseu-3.1 \ - libwx_baseu_net-3.1 \ - libwx_baseu_xml-3.1 \ - libwx_qtu_adv-3.1 \ - libwx_qtu_aui-3.1 \ - libwx_qtu_core-3.1 \ - libwx_qtu_html-3.1 \ - libwx_qtu_media-3.1 \ - libwx_qtu_propgrid-3.1 \ - libwx_qtu_qa-3.1 \ - libwx_qtu_ribbon-3.1 \ - libwx_qtu_richtext-3.1 \ - libwx_qtu_stc-3.1 \ - libwx_qtu_xrc-3.1 -# libwx_qtu_gl-3.1 + libwx_baseu-3.2 \ + libwx_baseu_net-3.2 \ + libwx_baseu_xml-3.2 \ + libwx_qtu_adv-3.2 \ + libwx_qtu_aui-3.2 \ + libwx_qtu_core-3.2 \ + libwx_qtu_html-3.2 \ + libwx_qtu_media-3.2 \ + libwx_qtu_propgrid-3.2 \ + libwx_qtu_qa-3.2 \ + libwx_qtu_ribbon-3.2 \ + libwx_qtu_richtext-3.2 \ + libwx_qtu_stc-3.2 \ + libwx_qtu_xrc-3.2 +# libwx_qtu_gl-3.2 # Install some missing headers that the build system didn't install. cp include/wx/generic/caret.h \ include/wx/generic/clrpickerg.h \ include/wx/generic/imaglist.h \ include/wx/generic/filepickerg.h \ - $includeDir/wx-3.1/wx/generic/ + $includeDir/wx-3.2/wx/generic/ cp include/wx/qt/nonownedwnd.h \ - $includeDir/wx-3.1/wx/qt/ + $includeDir/wx-3.2/wx/qt/ # Remove the symlinked wx-config and put the real one there instead. rm $binDir/wx-config - mv $libDir/wx/config/qt-unicode-3.1 $binDir/wx-config + mv $libDir/wx/config/qt-unicode-3.2 $binDir/wx-config # Move setup.h to the main include directory. - mv $libDir/wx/include/qt-unicode-3.1/wx/setup.h $includeDir/wx-3.1/wx/ + mv $libDir/wx/include/qt-unicode-3.2/wx/setup.h $includeDir/wx-3.2/wx/ rm -rf $libDir/wx/