diff options
author | 2008-10-28 22:52:59 +0000 | |
---|---|---|
committer | 2008-10-28 22:52:59 +0000 | |
commit | 4d276b1673306013eacae2a3b41824b63cfea068 (patch) | |
tree | 8d155ebe4a184ee48bf202e23d240bc22e05bde3 /x11-libs/wxGTK | |
parent | Drop old. (diff) | |
download | historical-4d276b1673306013eacae2a3b41824b63cfea068.tar.gz historical-4d276b1673306013eacae2a3b41824b63cfea068.tar.bz2 historical-4d276b1673306013eacae2a3b41824b63cfea068.zip |
Fix collision patch to not install unversioned bakefile presets again to
prevent clobbering the symlinks created by eselect-wxwidgets. David
Leverton - Bug #243446.
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r2 x86_64
Diffstat (limited to 'x11-libs/wxGTK')
-rw-r--r-- | x11-libs/wxGTK/ChangeLog | 8 | ||||
-rw-r--r-- | x11-libs/wxGTK/Manifest | 10 | ||||
-rw-r--r-- | x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch | 34 |
3 files changed, 29 insertions, 23 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index d098fde14a59..e560970da57b 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/wxGTK # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.206 2008/10/28 22:46:47 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.207 2008/10/28 22:52:59 dirtyepic Exp $ + + 28 Oct 2008; Ryan Hill <dirtyepic@gentoo.org> + files/wxGTK-2.8.8-collision.patch: + Fix collision patch to not install unversioned bakefile presets again to + prevent clobbering the symlinks created by eselect-wxwidgets. David + Leverton - Bug #243446. 28 Oct 2008; Ryan Hill <dirtyepic@gentoo.org> -wxGTK-2.6.4.0-r3.ebuild, -wxGTK-2.8.7.1-r1.ebuild, -wxGTK-2.8.7.1-r2.ebuild, -wxGTK-2.8.8.0.ebuild: diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index 8e6cffef8d75..ea7c9b4214af 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -10,7 +10,7 @@ AUX wxGTK-2.8.4-collision.patch 6073 RMD160 3e3d763d08d10a4d7745017fd2fc8625a6a4 AUX wxGTK-2.8.6-wxrc_link_fix.patch 989 RMD160 baf0009e0ecfe68b25df80e6b0956ef08f9e8bfd SHA1 dc8d7474647b5d8d0b9bc7c9bdf77899351808c1 SHA256 4eac080fe34870398309623cb363573b2d0242eb1dd24534efde4e7237c05fd0 AUX wxGTK-2.8.7-mmedia.patch 585 RMD160 d71b0a7211e42a58109e4f7859a87be2f23c4e19 SHA1 2c453b6a70de916ffc9e61518937fc6f487bd9bb SHA256 943203ed2ccfe52d4ea701bc15a15e9f65aff7e6e5a86145f9a593619e091f85 AUX wxGTK-2.8.7-race-fix.patch 3623 RMD160 a05a4c1c6f7b5452c1dad3ec8a5806d8344e1e64 SHA1 0d98de48b4f4f5fa06c33fc1c2aa2b3f9a775417 SHA256 c463e541c0a8d4e856698a85afb5cad9c46f687988c047a6e32b55648cad4ca8 -AUX wxGTK-2.8.8-collision.patch 6248 RMD160 44a2e312d0aa22a5df2e44a3bf696b818a0f243f SHA1 4bcb8b6575e242b30a1f540a5d5f9abcba81ff59 SHA256 58111375fb7bd70986f35450cf25502b5777c305e2c4a8e546046af1c17758d3 +AUX wxGTK-2.8.8-collision.patch 6072 RMD160 28101d936ed94190fa9a38c707f804c113a3e413 SHA1 66a7d717c5f3dc78fc3f0b451de178423b255399 SHA256 21949c67d2977a5bb59e22e73fcbeb8631462ec38fc864d4975309b3f24d69a0 DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba DIST wxPython-src-2.8.8.1.tar.bz2 27712841 RMD160 4ee33e256cc0d8caae1676b023db0b56fa435ba7 SHA1 96027778c9d8dbfbc08a1aecb2dbe358b947b897 SHA256 47821e4eda2d5b61106db08e25e53ab47999672e09ed82b523a8a11f3e83ba26 DIST wxPython-src-2.8.9.1.tar.bz2 27969655 RMD160 2b193c867a028985f8ead4084a9c1f024a1d37c6 SHA1 7359af790d58082330c867f5c10f51b6382d9a35 SHA256 584bc8a90e413409c20d1aff05bf547809fc2b57b74c5aba60fc3a2a98a0e7fa @@ -20,12 +20,12 @@ EBUILD wxGTK-2.6.4.0-r4.ebuild 4698 RMD160 e19078a908ea89af2c103fc10ced10d3f7805 EBUILD wxGTK-2.8.8.1.ebuild 3354 RMD160 f831a318f9388b9a92225001d741f4a306ac8cf8 SHA1 5acf90bc5c78a12369a79f10dd93202c69477f04 SHA256 c869ac6279d0b570bf835b27ca6b7503d29b874c9427c86e234ba5deb628d666 EBUILD wxGTK-2.8.9.1-r1.ebuild 3401 RMD160 d1db979a1bac78dc2dcd3764d34c414d25013422 SHA1 4b4cffac23dc09847f9fc19d25760c491e648697 SHA256 b603024f1a8e522657b2e2c5dfb459e86a9cb42c056ff71881fb8f0d4e8ddcfb EBUILD wxGTK-2.8.9.1.ebuild 3367 RMD160 d2a352c4ed5d9ded835ea2a16c84d30051578729 SHA1 5bb90041c4e11fcc7e5d2110169dc1c5fe70ea3d SHA256 1b6b737e134391b5d95a534585c01c5ed6485ff3eb2a7e959060e7d54622a456 -MISC ChangeLog 32281 RMD160 9dbbe8f349a233326e43359289cec24b1e73021d SHA1 e3d56e561bb3bbdf906396f405aca90d47a66424 SHA256 cbaadb3c2b3c7d45d94967e91bb4a4475846df6730b22cf6a5bf0dd57221f57a +MISC ChangeLog 32538 RMD160 a60d449cc9e148ba249290640e3dacfe2b1ac0ec SHA1 f9672f71f9c3989a72eb86032f8aaf683a8d77b1 SHA256 d3b131957fa0157329c3596a9224190662b1b6857afa0a2f971160d6de71c84a MISC metadata.xml 500 RMD160 d0f05c0d915928bc4c424ca00f20621805ddc7f0 SHA1 3ba77d570e4764cf377b3e63078b21f69232a1fc SHA256 2592b31d76fd0a79aa634bcbc9697d7ee8420b89cbead01a8db562a4d66be98c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkkHlkEACgkQiqiDRvmkBmJ1PgCg1fnHL9K41Z1DC+U5mc36MhxS -nUUAoNhQv9/BjYjtJql6NMF33BdQog77 -=fOjS +iEYEARECAAYFAkkHl7QACgkQiqiDRvmkBmJt1QCgsoaJ5wwZoxVDEj0aqAQNj+85 +I1wAn00wOWALjJXNzkm0YmG+ceNUjGD8 +=8cct -----END PGP SIGNATURE----- diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch index c0bfa6aeb3b7..6391b73a33ad 100644 --- a/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch +++ b/x11-libs/wxGTK/files/wxGTK-2.8.8-collision.patch @@ -1,7 +1,7 @@ -diff -Naurp wxPython-src-2.8.8.0-orig/Makefile.in wxPython-src-2.8.8.0/Makefile.in ---- wxPython-src-2.8.8.0-orig/Makefile.in 2008-06-28 22:44:54.000000000 -0600 -+++ wxPython-src-2.8.8.0/Makefile.in 2008-06-28 22:53:43.000000000 -0600 -@@ -27,6 +27,7 @@ STRIP = @STRIP@ +diff -Naur wxPython-src-2.8.9.1-orig/Makefile.in wxPython-src-2.8.9.1/Makefile.in +--- wxPython-src-2.8.9.1-orig/Makefile.in 2008-10-28 16:27:37.000000000 -0600 ++++ wxPython-src-2.8.9.1/Makefile.in 2008-10-28 16:29:45.000000000 -0600 +@@ -27,6 +27,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIR = @INSTALL_DIR@ @@ -9,20 +9,20 @@ diff -Naurp wxPython-src-2.8.8.0-orig/Makefile.in wxPython-src-2.8.8.0/Makefile. BK_DEPS = @BK_DEPS@ BK_MAKE_PCH = @BK_MAKE_PCH@ srcdir = @srcdir@ -@@ -11337,10 +11338,10 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = +@@ -11342,10 +11343,9 @@ 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: 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___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 ; $(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 \ -@@ -12096,8 +12097,8 @@ samples: +@@ -12101,8 +12101,8 @@ install-wxconfig: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config @@ -33,7 +33,7 @@ diff -Naurp wxPython-src-2.8.8.0-orig/Makefile.in wxPython-src-2.8.8.0/Makefile. locale_install: $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale -@@ -12105,7 +12106,7 @@ locale_install: +@@ -12110,7 +12110,7 @@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ if test -f $(srcdir)/locale/$$l.mo ; then \ @@ -42,10 +42,10 @@ diff -Naurp wxPython-src-2.8.8.0-orig/Makefile.in wxPython-src-2.8.8.0/Makefile. fi ; \ done -diff -Naurp wxPython-src-2.8.8.0-orig/src/common/intl.cpp wxPython-src-2.8.8.0/src/common/intl.cpp ---- wxPython-src-2.8.8.0-orig/src/common/intl.cpp 2008-05-31 00:04:05.000000000 -0600 -+++ wxPython-src-2.8.8.0/src/common/intl.cpp 2008-06-28 22:49:24.000000000 -0600 -@@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit() +diff -Naur wxPython-src-2.8.9.1-orig/src/common/intl.cpp wxPython-src-2.8.9.1/src/common/intl.cpp +--- wxPython-src-2.8.9.1-orig/src/common/intl.cpp 2008-10-28 16:27:37.000000000 -0600 ++++ wxPython-src-2.8.9.1/src/common/intl.cpp 2008-10-28 16:28:16.000000000 -0600 +@@ -1529,6 +1529,8 @@ m_initialized = false; } @@ -54,7 +54,7 @@ diff -Naurp wxPython-src-2.8.8.0-orig/src/common/intl.cpp wxPython-src-2.8.8.0/s // 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 +@@ -1597,7 +1599,7 @@ bool bOk = true; if ( bLoadDefault ) { @@ -63,10 +63,10 @@ diff -Naurp wxPython-src-2.8.8.0-orig/src/common/intl.cpp wxPython-src-2.8.8.0/s // there may be a catalog with toolkit specific overrides, it is not // an error if this does not exist -diff -Naurp wxPython-src-2.8.8.0-orig/utils/wxrc/Makefile.in wxPython-src-2.8.8.0/utils/wxrc/Makefile.in ---- wxPython-src-2.8.8.0-orig/utils/wxrc/Makefile.in 2008-06-08 17:37:49.000000000 -0600 -+++ wxPython-src-2.8.8.0/utils/wxrc/Makefile.in 2008-06-28 22:49:24.000000000 -0600 -@@ -120,7 +120,6 @@ distclean: clean +diff -Naur wxPython-src-2.8.9.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.9.1/utils/wxrc/Makefile.in +--- wxPython-src-2.8.9.1-orig/utils/wxrc/Makefile.in 2008-10-28 16:27:37.000000000 -0600 ++++ wxPython-src-2.8.9.1/utils/wxrc/Makefile.in 2008-10-28 16:28:16.000000000 -0600 +@@ -120,7 +120,6 @@ @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) |