Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ryan Hill (dirtyepic)" <dirtyepic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK/files: wxGTK-2.8.8-collision.patch
Date: Tue, 28 Oct 2008 22:53:03
Message-Id: E1KuxQq-0006aV-1A@stork.gentoo.org
1 dirtyepic 08/10/28 22:53:00
2
3 Modified: wxGTK-2.8.8-collision.patch
4 Log:
5 Fix collision patch to not install unversioned bakefile presets again to
6 prevent clobbering the symlinks created by eselect-wxwidgets. David
7 Leverton - Bug #243446.
8 (Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r2 x86_64)
9
10 Revision Changes Path
11 1.2 x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch?r1=1.1&r2=1.2
16
17 Index: wxGTK-2.8.8-collision.patch
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- wxGTK-2.8.8-collision.patch 29 Jun 2008 05:22:01 -0000 1.1
24 +++ wxGTK-2.8.8-collision.patch 28 Oct 2008 22:52:59 -0000 1.2
25 @@ -1,7 +1,7 @@
26 -diff -Naurp wxPython-src-2.8.8.0-orig/Makefile.in wxPython-src-2.8.8.0/Makefile.in
27 ---- wxPython-src-2.8.8.0-orig/Makefile.in 2008-06-28 22:44:54.000000000 -0600
28 -+++ wxPython-src-2.8.8.0/Makefile.in 2008-06-28 22:53:43.000000000 -0600
29 -@@ -27,6 +27,7 @@ STRIP = @STRIP@
30 +diff -Naur wxPython-src-2.8.9.1-orig/Makefile.in wxPython-src-2.8.9.1/Makefile.in
31 +--- wxPython-src-2.8.9.1-orig/Makefile.in 2008-10-28 16:27:37.000000000 -0600
32 ++++ wxPython-src-2.8.9.1/Makefile.in 2008-10-28 16:29:45.000000000 -0600
33 +@@ -27,6 +27,7 @@
34 INSTALL_PROGRAM = @INSTALL_PROGRAM@
35 INSTALL_DATA = @INSTALL_DATA@
36 INSTALL_DIR = @INSTALL_DIR@
37 @@ -9,20 +9,20 @@
38 BK_DEPS = @BK_DEPS@
39 BK_MAKE_PCH = @BK_MAKE_PCH@
40 srcdir = @srcdir@
41 -@@ -11337,10 +11338,10 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
42 +@@ -11342,10 +11343,9 @@
43 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)
44
45 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___depna
46 me) $(__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)
47 - $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
48 - (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
49 $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
50 - (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
51 +- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
52 + (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; \
53 + do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
54 $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
55 for f in setup.h $(RCDEFS_H); do \
56 if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
57 -@@ -12096,8 +12097,8 @@ samples:
58 +@@ -12101,8 +12101,8 @@
59 install-wxconfig:
60 $(INSTALL_DIR) $(DESTDIR)$(bindir)
61 $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
62 @@ -33,7 +33,7 @@
63
64 locale_install:
65 $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
66 -@@ -12105,7 +12106,7 @@ locale_install:
67 +@@ -12110,7 +12110,7 @@
68 $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
69 $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
70 if test -f $(srcdir)/locale/$$l.mo ; then \
71 @@ -42,10 +42,10 @@
72 fi ; \
73 done
74
75 -diff -Naurp wxPython-src-2.8.8.0-orig/src/common/intl.cpp wxPython-src-2.8.8.0/src/common/intl.cpp
76 ---- wxPython-src-2.8.8.0-orig/src/common/intl.cpp 2008-05-31 00:04:05.000000000 -0600
77 -+++ wxPython-src-2.8.8.0/src/common/intl.cpp 2008-06-28 22:49:24.000000000 -0600
78 -@@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit()
79 +diff -Naur wxPython-src-2.8.9.1-orig/src/common/intl.cpp wxPython-src-2.8.9.1/src/common/intl.cpp
80 +--- wxPython-src-2.8.9.1-orig/src/common/intl.cpp 2008-10-28 16:27:37.000000000 -0600
81 ++++ wxPython-src-2.8.9.1/src/common/intl.cpp 2008-10-28 16:28:16.000000000 -0600
82 +@@ -1529,6 +1529,8 @@
83 m_initialized = false;
84 }
85
86 @@ -54,7 +54,7 @@
87 // NB: this function has (desired) side effect of changing current locale
88 bool wxLocale::Init(const wxChar *szName,
89 const wxChar *szShort,
90 -@@ -1597,7 +1599,7 @@ bool wxLocale::Init(const wxChar *szName
91 +@@ -1597,7 +1599,7 @@
92 bool bOk = true;
93 if ( bLoadDefault )
94 {
95 @@ -63,10 +63,10 @@
96
97 // there may be a catalog with toolkit specific overrides, it is not
98 // an error if this does not exist
99 -diff -Naurp wxPython-src-2.8.8.0-orig/utils/wxrc/Makefile.in wxPython-src-2.8.8.0/utils/wxrc/Makefile.in
100 ---- wxPython-src-2.8.8.0-orig/utils/wxrc/Makefile.in 2008-06-08 17:37:49.000000000 -0600
101 -+++ wxPython-src-2.8.8.0/utils/wxrc/Makefile.in 2008-06-28 22:49:24.000000000 -0600
102 -@@ -120,7 +120,6 @@ distclean: clean
103 +diff -Naur wxPython-src-2.8.9.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.9.1/utils/wxrc/Makefile.in
104 +--- wxPython-src-2.8.9.1-orig/utils/wxrc/Makefile.in 2008-10-28 16:27:37.000000000 -0600
105 ++++ wxPython-src-2.8.9.1/utils/wxrc/Makefile.in 2008-10-28 16:28:16.000000000 -0600
106 +@@ -120,7 +120,6 @@
107 @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
108 @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
109 @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
Report Message
Find on MARC Find on Google Groups