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