| 1 |
dirtyepic 12/07/28 22:45:58 |
| 2 |
|
| 3 |
Added: wxGTK-2.9.4.1-collision.patch |
| 4 |
Removed: wxGTK-2.9.1.1-collision.patch |
| 5 |
wxGTK-2.8.11-libpng15.patch |
| 6 |
Log: |
| 7 |
Version bump, remove old. |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: wxGTK-2.9.4.1-collision.patch |
| 18 |
=================================================================== |
| 19 |
Prevent file collisions between multiple installed SLOTs. |
| 20 |
|
| 21 |
- Don't install wxwin.m4. It is installed with app-admin/eselect-wxwidgets. |
| 22 |
- Version the bakefile preset filenames. Unversioned symlinks to these files |
| 23 |
are handled by eselect. |
| 24 |
- Version wx-config and wxrc. The unversioned forms are wrapper scripts |
| 25 |
installed with eselect-wxwidgets. |
| 26 |
- Version wxstd.mo and modify AddStdCatalog to use it. |
| 27 |
|
| 28 |
--- a/Makefile.in |
| 29 |
+++ b/Makefile.in |
| 30 |
@@ -14774,10 +14774,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ |
| 31 |
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_ |
| 32 |
__depname) $(__cocoa_res___depname) |
| 33 |
|
| 34 |
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___de |
| 35 |
pname) $(__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) |
| 36 |
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal |
| 37 |
- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) |
| 38 |
$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets |
| 39 |
- (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) |
| 40 |
+ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ |
| 41 |
+ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \ |
| 42 |
+ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) |
| 43 |
$(DYLIB_RPATH_INSTALL) |
| 44 |
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx |
| 45 |
for f in setup.h $(RCDEFS_H); do \ |
| 46 |
@@ -15662,7 +15662,7 @@ install-wxconfig: |
| 47 |
$(INSTALL_DIR) $(DESTDIR)$(bindir) |
| 48 |
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config |
| 49 |
$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config |
| 50 |
- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) |
| 51 |
+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) |
| 52 |
|
| 53 |
locale_install: |
| 54 |
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale |
| 55 |
@@ -15670,7 +15670,7 @@ locale_install: |
| 56 |
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ |
| 57 |
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ |
| 58 |
if test -f $(srcdir)/locale/$$l.mo ; then \ |
| 59 |
- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ |
| 60 |
+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ |
| 61 |
fi ; \ |
| 62 |
done |
| 63 |
|
| 64 |
--- a/build/bakefiles/wx.bkl |
| 65 |
+++ b/build/bakefiles/wx.bkl |
| 66 |
@@ -138,7 +138,7 @@ |
| 67 |
<using module="gettext"/> |
| 68 |
<gettext-catalogs id="locale"> |
| 69 |
<srcdir>$(SRCDIR)/locale</srcdir> |
| 70 |
- <catalog-name>wxstd</catalog-name> |
| 71 |
+ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> |
| 72 |
<linguas> |
| 73 |
ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk |
| 74 |
zh zh_CN zh_TW |
| 75 |
--- a/src/common/translation.cpp |
| 76 |
+++ b/src/common/translation.cpp |
| 77 |
@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c |
| 78 |
|
| 79 |
bool wxTranslations::AddStdCatalog() |
| 80 |
{ |
| 81 |
- if ( !AddCatalog(wxS("wxstd")) ) |
| 82 |
+ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) |
| 83 |
return false; |
| 84 |
|
| 85 |
// there may be a catalog with toolkit specific overrides, it is not |
| 86 |
--- a/utils/wxrc/Makefile.in |
| 87 |
+++ b/utils/wxrc/Makefile.in |
| 88 |
@@ -125,7 +125,6 @@ distclean: clean |
| 89 |
@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) |
| 90 |
@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) |
| 91 |
@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) |
| 92 |
-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) |
| 93 |
|
| 94 |
@COND_USE_XRC_1@uninstall_wxrc: |
| 95 |
@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) |
Archives