153001836a
Add patch to avoid conflict with wxWidgets 2.8 branch. The patch is based on the Gentoo one, adapted for Void.
80 lines
5.5 KiB
Diff
80 lines
5.5 KiB
Diff
diff -Naur Makefile.in Makefile.in
|
|
--- Makefile.in 2014-10-06 23:33:44.000000000 +0200
|
|
+++ Makefile.in 2014-11-19 10:48:18.752319058 +0100
|
|
@@ -15258,9 +15258,11 @@
|
|
|
|
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)
|
|
+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin3.m4)
|
|
$(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 \
|
|
@@ -16145,7 +16147,7 @@
|
|
$(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) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
|
|
+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
|
|
|
|
locale_install:
|
|
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
|
|
@@ -16153,7 +16155,7 @@
|
|
$(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
|
|
|
|
@@ -16170,7 +16172,7 @@
|
|
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
|
|
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
|
|
if test -f $(srcdir)/locale/msw/$$l.mo ; then \
|
|
- $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \
|
|
+ $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \
|
|
fi ; \
|
|
done
|
|
|
|
diff -Naur build/bakefiles/wx.bkl build/bakefiles/wx.bkl
|
|
--- build/bakefiles/wx.bkl 2014-10-06 23:33:44.000000000 +0200
|
|
+++ build/bakefiles/wx.bkl 2014-11-19 10:32:21.692283955 +0100
|
|
@@ -137,7 +137,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
|
|
diff -Naur src/common/translation.cpp src/common/translation.cpp
|
|
--- src/common/translation.cpp 2014-10-06 23:33:44.000000000 +0200
|
|
+++ src/common/translation.cpp 2014-11-19 11:02:21.067788665 +0100
|
|
@@ -1471,7 +1471,7 @@
|
|
|
|
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
|
|
diff -Naur utils/wxrc/Makefile.in utils/wxrc/Makefile.in
|
|
--- utils/wxrc/Makefile.in 2014-10-06 23:33:44.000000000 +0200
|
|
+++ utils/wxrc/Makefile.in 2014-11-19 10:49:55.410110669 +0100
|
|
@@ -125,7 +125,6 @@
|
|
@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)
|