Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of git.funtoo.org:funtoo-overlay
- Loading branch information
Showing
12 changed files
with
874 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
DIST wxPython-docs-2.9.3.1.tar.bz2 14913825 SHA256 64c6b07c8fa0277b281fb1e6210087e57fb072ce8cabe86d251c3208040cd945 SHA512 23d39a28532d686b06f410596f108a97b377e0250f2ae90b681053197c7e0bcbb98374aaeea0d343359b28ebff482d668de5b7a3d07362cc8e35c61a7d50cbb6 WHIRLPOOL 43ba589c44c70b9423639e2535e30d4a1ea0ad729964abcc48c92ae59929a9e95ea02dfd704b87b16adddb9327916832d24fe516c8a4780362a1bca718742bcd | ||
DIST wxPython-docs-2.9.4.0.tar.bz2 15477636 SHA256 42a1683f253aa36ae9ee20b8d511d8704b4e45ba124fec256a7dfce38da9f75f SHA512 f996e69f24baaa8d35bf94ef77f31f6beda5dd4ddd65d6b71558e8dbe33098c951f995172b4ccd93ad08c81df07a9b529813eac5d39ffa06290f2a9ccc87620c WHIRLPOOL b6f6d65d319683f44b1eb4708077abaecd1a972a0d79fb6293b055099a0720d36e83506df6d075243f9e8b180849ae0d44badc8a22d5c764c956d5ecfe0cc6da | ||
DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d | ||
DIST wxPython-src-2.9.3.1.tar.bz2 49131100 SHA256 7bae5bf45e98eba836472bdb358330f867c69de3a347860edd48fcb53690040d SHA512 16e5be3a2a98d64637866ecae7afb3a2835d21684077bb8a1b87d3c0cf37b75eb1169f3b8e16e38c5b85c04cce974dbfd5ba25d3d0a3016a47c005a05e5dbfc5 WHIRLPOOL ccae768ff87a95ee88d6259821be5e2073928278155743c0c16c75dd9b2262ac49ccb322dd4aa77ccfdac12d7de0e874a92b41171adacfa26ffb216f170751a7 | ||
DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507 | ||
DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
unixODBC 2.2.14 defines SQLLEN and SQLULEN using the compiler typedef | ||
declaration instead of preprocessor #define macro definition. This breaks | ||
the preprocessor checks in this include file.cpp, causing the source to fall | ||
back to older types instead, leading to compile time errors like this: | ||
|
||
db.cpp:1636: error: cannot convert ‘SQLINTEGER*’ to ‘SQLLEN*’ for argument ‘6’ to | ||
‘SQLRETURN SQLGetData(void*, SQLUSMALLINT, SQLSMALLINT, void*, SQLLEN, SQLLEN*)’ | ||
... | ||
dbtable.cpp:592: error: cannot convert ‘SQLUINTEGER*’ to ‘SQLULEN*’ for argument ‘4’ to | ||
‘SQLRETURN SQLExtendedFetch(void*, SQLUSMALLINT, SQLLEN, SQLULEN*, SQLUSMALLINT*)’ | ||
... | ||
|
||
This change hard-wires the new names, breaking compatibility with ancient | ||
(pre 2001) unixODBC versions. This change may break other ODBC implementations | ||
but in Gentoo only unixODBC is supported. | ||
|
||
References: | ||
http://bugs.gentoo.org/310923 | ||
|
||
2010-03-23 Martin von Gagern | ||
|
||
--- wxPython-src-2.6.4.0.orig/include/wx/db.h | ||
+++ wxPython-src-2.6.4.0/include/wx/db.h | ||
@@ -134,15 +134,6 @@ enum enumDummy {enumDum1}; | ||
#endif | ||
#endif | ||
|
||
-#ifndef _WIN64 | ||
-#ifndef SQLLEN | ||
-#define SQLLEN SQLINTEGER | ||
-#endif | ||
-#ifndef SQLULEN | ||
-#define SQLULEN SQLUINTEGER | ||
-#endif | ||
-#endif | ||
- | ||
const int wxDB_PATH_MAX = 254; | ||
|
||
extern WXDLLIMPEXP_DATA_ODBC(wxChar const *) SQL_LOG_FILENAME; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
Prevent file collisions between multiple installed SLOTs. | ||
|
||
- Don't install wxwin.m4. It is installed with app-admin/eselect-wxwidgets. | ||
- Version the bakefile preset filenames. Unversioned symlinks to these files | ||
are handled by eselect. | ||
- Version wx-config and wxrc. Unversioned wrapper scripts are installed with | ||
eselect-wxwidgets. | ||
- Version wxstd.mo and modify AddCatalog to find it. (this might need more | ||
work but no one has complained yet) | ||
|
||
--- a/Makefile.in | ||
+++ b/Makefile.in | ||
@@ -11695,10 +11695,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ | ||
all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___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) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___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_wxodbc___depname) $(__install_wxexpat___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_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___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_richtextdll___depname) $(__install_richtextlib___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 $(DESTDIR)$(datadir)/bakefile/presets) | ||
+ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do \ | ||
+ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) | ||
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx | ||
for f in setup.h $(RCDEFS_H); do \ | ||
if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \ | ||
@@ -12455,7 +12454,8 @@ 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) $(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)) | ||
|
||
locale_install: | ||
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale | ||
@@ -12463,7 +12463,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/src/common/intl.cpp | ||
+++ b/src/common/intl.cpp | ||
@@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit() | ||
m_initialized = false; | ||
} | ||
|
||
+#define wxSTRINGIZE2(x) wxSTRINGIZE(x) | ||
+ | ||
// NB: this function has (desired) side effect of changing current locale | ||
bool wxLocale::Init(const wxChar *szName, | ||
const wxChar *szShort, | ||
@@ -1597,7 +1599,7 @@ bool wxLocale::Init(const wxChar *szName, | ||
bool bOk = true; | ||
if ( bLoadDefault ) | ||
{ | ||
- bOk = AddCatalog(wxT("wxstd")); | ||
+ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION))); | ||
|
||
// there may be a catalog with toolkit specific overrides, it is not | ||
// an error if this does not exist | ||
--- a/utils/wxrc/Makefile.in | ||
+++ b/utils/wxrc/Makefile.in | ||
@@ -120,7 +120,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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
Allow odbc to be used with unicode builds. | ||
|
||
--- a/Makefile.in | ||
+++ b/Makefile.in | ||
@@ -1217,7 +1217,7 @@ ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \ | ||
$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ | ||
$(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) \ | ||
$(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \ | ||
- $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(PIC_FLAG) \ | ||
+ $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC -DSQL_WCHART_CONVERT $(PIC_FLAG) \ | ||
$(CPPFLAGS) $(CXXFLAGS) | ||
ODBCDLL_OBJECTS = \ | ||
$(__odbcdll___win32rc) \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
diff -Naur wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in wxPython-src-2.8.7.1/contrib/src/Makefile.in | ||
--- wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in 2007-07-27 17:57:27.000000000 -0600 | ||
+++ wxPython-src-2.8.7.1/contrib/src/Makefile.in 2007-12-28 17:34:28.000000000 -0600 | ||
@@ -1,6 +1,6 @@ | ||
# $Id: wxGTK-2.8.7-mmedia.patch,v 1.1 2008/01/06 22:47:55 dirtyepic Exp $ | ||
|
||
-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg #deprecated #applet | ||
+CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg #deprecated #applet mmedia | ||
|
||
all: | ||
@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
Prevent file collisions between multiple installed SLOTs. | ||
|
||
- Don't install wxwin.m4. It is installed with app-admin/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 | ||
@@ -14076,10 +14076,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 \ | ||
@@ -14964,15 +14964,16 @@ 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) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) | ||
- | ||
+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \ | ||
+ && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) | ||
locale_install: | ||
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale | ||
for l in $(LOCALE_LINGUAS) ; do \ | ||
$(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 | ||
@@ -124,7 +124,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) |
Oops, something went wrong.