| Prevent file collisions between multiple installed SLOTs. |
| |
| - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets. |
| - Version the bakefile preset filenames. Unversioned symlinks to these files |
| are handled by eselect. |
| - Version wx-config and wxrc. The unversioned forms are wrapper scripts |
| installed with eselect-wxwidgets. |
| - Version wxstd.mo and modify AddStdCatalog to use it. |
| |
| --- a/Makefile.in |
| +++ b/Makefile.in |
| @@ -14774,10 +14774,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ |
| all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) |
| |
| install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) |
| - $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal |
| - (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) |
| $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets |
| - (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) |
| + (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ |
| + for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \ |
| + $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) |
| $(DYLIB_RPATH_INSTALL) |
| $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx |
| for f in setup.h $(RCDEFS_H); do \ |
| @@ -15662,7 +15662,7 @@ install-wxconfig: |
| $(INSTALL_DIR) $(DESTDIR)$(bindir) |
| $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config |
| $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config |
| - (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) |
| + (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) |
| |
| locale_install: |
| $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale |
| @@ -15670,7 +15670,7 @@ locale_install: |
| $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ |
| $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ |
| if test -f $(srcdir)/locale/$$l.mo ; then \ |
| - $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ |
| + $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ |
| fi ; \ |
| done |
| |
| --- a/build/bakefiles/wx.bkl |
| +++ b/build/bakefiles/wx.bkl |
| @@ -138,7 +138,7 @@ |
| <using module="gettext"/> |
| <gettext-catalogs id="locale"> |
| <srcdir>$(SRCDIR)/locale</srcdir> |
| - <catalog-name>wxstd</catalog-name> |
| + <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> |
| <linguas> |
| ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk |
| zh zh_CN zh_TW |
| --- a/src/common/translation.cpp |
| +++ b/src/common/translation.cpp |
| @@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c |
| |
| bool wxTranslations::AddStdCatalog() |
| { |
| - if ( !AddCatalog(wxS("wxstd")) ) |
| + if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) |
| return false; |
| |
| // there may be a catalog with toolkit specific overrides, it is not |
| --- a/utils/wxrc/Makefile.in |
| +++ b/utils/wxrc/Makefile.in |
| @@ -125,7 +125,6 @@ distclean: clean |
| @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) |
| @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) |
| @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) |
| -@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) |
| |
| @COND_USE_XRC_1@uninstall_wxrc: |
| @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) |