| 1 |
dirtyepic 08/06/29 05:22:01 |
| 2 |
|
| 3 |
Added: wxGTK-2.8.8-collision.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc8 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: wxGTK-2.8.8-collision.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naurp wxPython-src-2.8.8.0-orig/Makefile.in wxPython-src-2.8.8.0/Makefile.in |
| 17 |
--- wxPython-src-2.8.8.0-orig/Makefile.in 2008-06-28 22:44:54.000000000 -0600 |
| 18 |
+++ wxPython-src-2.8.8.0/Makefile.in 2008-06-28 22:53:43.000000000 -0600 |
| 19 |
@@ -27,6 +27,7 @@ STRIP = @STRIP@ |
| 20 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
| 21 |
INSTALL_DATA = @INSTALL_DATA@ |
| 22 |
INSTALL_DIR = @INSTALL_DIR@ |
| 23 |
+INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
| 24 |
BK_DEPS = @BK_DEPS@ |
| 25 |
BK_MAKE_PCH = @BK_MAKE_PCH@ |
| 26 |
srcdir = @srcdir@ |
| 27 |
@@ -11337,10 +11338,10 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = |
| 28 |
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) |
| 29 |
|
| 30 |
install: all $(__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___depnam |
| 31 |
e) $(__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) |
| 32 |
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal |
| 33 |
- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) |
| 34 |
$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets |
| 35 |
(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets) |
| 36 |
+ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; \ |
| 37 |
+ do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) |
| 38 |
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx |
| 39 |
for f in setup.h $(RCDEFS_H); do \ |
| 40 |
if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \ |
| 41 |
@@ -12096,8 +12097,8 @@ samples: |
| 42 |
install-wxconfig: |
| 43 |
$(INSTALL_DIR) $(DESTDIR)$(bindir) |
| 44 |
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config |
| 45 |
- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config |
| 46 |
- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) |
| 47 |
+ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config |
| 48 |
+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) |
| 49 |
|
| 50 |
locale_install: |
| 51 |
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale |
| 52 |
@@ -12105,7 +12106,7 @@ locale_install: |
| 53 |
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ |
| 54 |
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ |
| 55 |
if test -f $(srcdir)/locale/$$l.mo ; then \ |
| 56 |
- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ |
| 57 |
+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ |
| 58 |
fi ; \ |
| 59 |
done |
| 60 |
|
| 61 |
diff -Naurp wxPython-src-2.8.8.0-orig/src/common/intl.cpp wxPython-src-2.8.8.0/src/common/intl.cpp |
| 62 |
--- wxPython-src-2.8.8.0-orig/src/common/intl.cpp 2008-05-31 00:04:05.000000000 -0600 |
| 63 |
+++ wxPython-src-2.8.8.0/src/common/intl.cpp 2008-06-28 22:49:24.000000000 -0600 |
| 64 |
@@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit() |
| 65 |
m_initialized = false; |
| 66 |
} |
| 67 |
|
| 68 |
+#define wxSTRINGIZE2(x) wxSTRINGIZE(x) |
| 69 |
+ |
| 70 |
// NB: this function has (desired) side effect of changing current locale |
| 71 |
bool wxLocale::Init(const wxChar *szName, |
| 72 |
const wxChar *szShort, |
| 73 |
@@ -1597,7 +1599,7 @@ bool wxLocale::Init(const wxChar *szName |
| 74 |
bool bOk = true; |
| 75 |
if ( bLoadDefault ) |
| 76 |
{ |
| 77 |
- bOk = AddCatalog(wxT("wxstd")); |
| 78 |
+ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));bOk = AddCatalog(wxT("wxstd")); |
| 79 |
|
| 80 |
// there may be a catalog with toolkit specific overrides, it is not |
| 81 |
// an error if this does not exist |
| 82 |
diff -Naurp wxPython-src-2.8.8.0-orig/utils/wxrc/Makefile.in wxPython-src-2.8.8.0/utils/wxrc/Makefile.in |
| 83 |
--- wxPython-src-2.8.8.0-orig/utils/wxrc/Makefile.in 2008-06-08 17:37:49.000000000 -0600 |
| 84 |
+++ wxPython-src-2.8.8.0/utils/wxrc/Makefile.in 2008-06-28 22:49:24.000000000 -0600 |
| 85 |
@@ -120,7 +120,6 @@ distclean: clean |
| 86 |
@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) |
| 87 |
@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) |
| 88 |
@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) |
| 89 |
-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) |
| 90 |
|
| 91 |
@COND_USE_XRC_1@uninstall_wxrc: |
| 92 |
@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) |
| 93 |
|
| 94 |
|
| 95 |
|
| 96 |
-- |
| 97 |
gentoo-commits@l.g.o mailing list |
Archives