* [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK/files: wxGTK-2.8.4-collision.patch wxGTK-2.6.4-collision.patch digest-wxGTK-2.6.4.0-r3 wxGTK-2.6.3.3-dialog_focus.patch digest-wxGTK-2.6.3.3 wxGTK-2.6.3.3-wxrc_build_fix.patch wxGTK-2.6.3.3-slider_linesize.patch wxGTK-2.6.3.3-wxrc_link_fix.patch digest-wxGTK-2.6.4.0-r2
@ 2007-12-20 0:14 Ryan Hill (dirtyepic)
0 siblings, 0 replies; only message in thread
From: Ryan Hill (dirtyepic) @ 2007-12-20 0:14 UTC (permalink / raw
To: gentoo-commits
dirtyepic 07/12/20 00:14:02
Modified: wxGTK-2.8.4-collision.patch
wxGTK-2.6.4-collision.patch
Added: digest-wxGTK-2.6.4.0-r3
Removed: wxGTK-2.6.3.3-dialog_focus.patch
digest-wxGTK-2.6.3.3
wxGTK-2.6.3.3-wxrc_build_fix.patch
wxGTK-2.6.3.3-slider_linesize.patch
wxGTK-2.6.3.3-wxrc_link_fix.patch
digest-wxGTK-2.6.4.0-r2
Log:
Move wxwin.m4 handling to eselect-wxwidgets. Remove old.
(Portage version: 2.1.4_rc10)
Revision Changes Path
1.2 x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch?r1=1.1&r2=1.2
Index: wxGTK-2.8.4-collision.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.8.4-collision.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wxGTK-2.8.4-collision.patch 29 Nov 2007 01:48:30 -0000 1.1
+++ wxGTK-2.8.4-collision.patch 20 Dec 2007 00:14:01 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Naur wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx.bkl wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx.bkl
---- wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx.bkl 2007-07-04 13:24:53.000000000 -0600
-+++ wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx.bkl 2007-10-25 19:15:37.000000000 -0600
+diff -Naur wxPython-src-2.8.7.1-orig/build/bakefiles/wxpresets/presets/wx.bkl wxPython-src-2.8.7.1/build/bakefiles/wxpresets/presets/wx.bkl
+--- wxPython-src-2.8.7.1-orig/build/bakefiles/wxpresets/presets/wx.bkl 2007-07-04 13:24:53.000000000 -0600
++++ wxPython-src-2.8.7.1/build/bakefiles/wxpresets/presets/wx.bkl 2007-12-17 19:58:30.000000000 -0600
@@ -51,12 +51,12 @@
<set var="__wx_included_impl">0</set>
@@ -16,9 +16,9 @@
<set var="__wx_included_impl">1</set>
</if>
-diff -Naur wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx_unix.bkl wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx_unix.bkl
---- wxPython-src-2.8.6.0-orig/build/bakefiles/wxpresets/presets/wx_unix.bkl 2007-07-04 13:24:53.000000000 -0600
-+++ wxPython-src-2.8.6.0/build/bakefiles/wxpresets/presets/wx_unix.bkl 2007-10-25 19:15:23.000000000 -0600
+diff -Naur wxPython-src-2.8.7.1-orig/build/bakefiles/wxpresets/presets/wx_unix.bkl wxPython-src-2.8.7.1/build/bakefiles/wxpresets/presets/wx_unix.bkl
+--- wxPython-src-2.8.7.1-orig/build/bakefiles/wxpresets/presets/wx_unix.bkl 2007-11-12 13:33:30.000000000 -0600
++++ wxPython-src-2.8.7.1/build/bakefiles/wxpresets/presets/wx_unix.bkl 2007-12-17 19:58:30.000000000 -0600
@@ -3,7 +3,7 @@
<!--
@@ -37,9 +37,9 @@
</error>
</if>
-diff -Naur wxPython-src-2.8.6.0-orig/Makefile.in wxPython-src-2.8.6.0/Makefile.in
---- wxPython-src-2.8.6.0-orig/Makefile.in 2007-10-25 19:11:40.000000000 -0600
-+++ wxPython-src-2.8.6.0/Makefile.in 2007-10-25 19:13:06.000000000 -0600
+diff -Naur wxPython-src-2.8.7.1-orig/Makefile.in wxPython-src-2.8.7.1/Makefile.in
+--- wxPython-src-2.8.7.1-orig/Makefile.in 2007-12-17 19:48:48.000000000 -0600
++++ wxPython-src-2.8.7.1/Makefile.in 2007-12-17 19:58:42.000000000 -0600
@@ -26,6 +26,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -48,12 +48,12 @@
BK_DEPS = @BK_DEPS@
BK_MAKE_PCH = @BK_MAKE_PCH@
srcdir = @srcdir@
-@@ -11335,9 +11336,10 @@
+@@ -11335,10 +11336,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___depna
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)
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
-+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
$(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/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; \
@@ -61,7 +61,7 @@
$(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 \
-@@ -12093,8 +12095,8 @@
+@@ -12094,8 +12094,8 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
@@ -72,7 +72,7 @@
locale_install:
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -12102,7 +12104,7 @@
+@@ -12103,7 +12103,7 @@
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
if test -f $(srcdir)/locale/$$l.mo ; then \
@@ -81,10 +81,10 @@
fi ; \
done
-diff -Naur wxPython-src-2.8.6.0-orig/src/common/intl.cpp wxPython-src-2.8.6.0/src/common/intl.cpp
---- wxPython-src-2.8.6.0-orig/src/common/intl.cpp 2007-07-04 13:25:04.000000000 -0600
-+++ wxPython-src-2.8.6.0/src/common/intl.cpp 2007-10-25 19:13:06.000000000 -0600
-@@ -1513,6 +1513,8 @@
+diff -Naur wxPython-src-2.8.7.1-orig/src/common/intl.cpp wxPython-src-2.8.7.1/src/common/intl.cpp
+--- wxPython-src-2.8.7.1-orig/src/common/intl.cpp 2007-11-12 13:33:31.000000000 -0600
++++ wxPython-src-2.8.7.1/src/common/intl.cpp 2007-12-17 19:58:30.000000000 -0600
+@@ -1517,6 +1517,8 @@
m_initialized = false;
}
@@ -93,7 +93,7 @@
// NB: this function has (desired) side effect of changing current locale
bool wxLocale::Init(const wxChar *szName,
const wxChar *szShort,
-@@ -1581,7 +1583,7 @@
+@@ -1585,7 +1587,7 @@
bool bOk = true;
if ( bLoadDefault )
{
@@ -102,9 +102,9 @@
// there may be a catalog with toolkit specific overrides, it is not
// an error if this does not exist
-diff -Naur wxPython-src-2.8.6.0-orig/utils/wxrc/Makefile.in wxPython-src-2.8.6.0/utils/wxrc/Makefile.in
---- wxPython-src-2.8.6.0-orig/utils/wxrc/Makefile.in 2007-09-11 15:25:24.000000000 -0600
-+++ wxPython-src-2.8.6.0/utils/wxrc/Makefile.in 2007-10-25 19:13:06.000000000 -0600
+diff -Naur wxPython-src-2.8.7.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.7.1/utils/wxrc/Makefile.in
+--- wxPython-src-2.8.7.1-orig/utils/wxrc/Makefile.in 2007-12-17 19:48:49.000000000 -0600
++++ wxPython-src-2.8.7.1/utils/wxrc/Makefile.in 2007-12-17 19:58:30.000000000 -0600
@@ -118,7 +118,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)
1.4 x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch?r1=1.3&r2=1.4
Index: wxGTK-2.6.4-collision.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/files/wxGTK-2.6.4-collision.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wxGTK-2.6.4-collision.patch 25 Oct 2007 13:11:54 -0000 1.3
+++ wxGTK-2.6.4-collision.patch 20 Dec 2007 00:14:01 -0000 1.4
@@ -1,6 +1,6 @@
diff -Naur wxPython-src-2.6.4.0-orig/build/bakefiles/wxpresets/presets/wx.bkl wxPython-src-2.6.4.0/build/bakefiles/wxpresets/presets/wx.bkl
--- wxPython-src-2.6.4.0-orig/build/bakefiles/wxpresets/presets/wx.bkl 2005-01-27 16:47:16.000000000 -0600
-+++ wxPython-src-2.6.4.0/build/bakefiles/wxpresets/presets/wx.bkl 2007-10-25 06:46:31.000000000 -0600
++++ wxPython-src-2.6.4.0/build/bakefiles/wxpresets/presets/wx.bkl 2007-12-17 19:39:44.000000000 -0600
@@ -15,12 +15,12 @@
<set var="__wx_included_impl">0</set>
@@ -17,8 +17,8 @@
</if>
diff -Naur wxPython-src-2.6.4.0-orig/Makefile.in wxPython-src-2.6.4.0/Makefile.in
---- wxPython-src-2.6.4.0-orig/Makefile.in 2007-10-25 06:35:58.000000000 -0600
-+++ wxPython-src-2.6.4.0/Makefile.in 2007-10-25 06:37:21.000000000 -0600
+--- wxPython-src-2.6.4.0-orig/Makefile.in 2007-12-17 19:38:16.000000000 -0600
++++ wxPython-src-2.6.4.0/Makefile.in 2007-12-17 19:41:49.000000000 -0600
@@ -26,6 +26,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -27,12 +27,12 @@
BK_DEPS = @BK_DEPS@
BK_MAKE_PCH = @BK_MAKE_PCH@
srcdir = @srcdir@
-@@ -9535,9 +9536,10 @@
+@@ -9534,10 +9535,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) $(__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_gldll___depnam
e) $(__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
+- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
-+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
$(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/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; \
@@ -40,7 +40,7 @@
$(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 \
-@@ -10215,8 +10217,8 @@
+@@ -10215,8 +10215,8 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
@@ -51,7 +51,7 @@
locale_install:
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -10224,7 +10226,7 @@
+@@ -10224,7 +10224,7 @@
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
if test -f $(srcdir)/locale/$$l.mo ; then \
@@ -62,7 +62,7 @@
diff -Naur wxPython-src-2.6.4.0-orig/src/common/intl.cpp wxPython-src-2.6.4.0/src/common/intl.cpp
--- wxPython-src-2.6.4.0-orig/src/common/intl.cpp 2007-03-20 09:25:41.000000000 -0600
-+++ wxPython-src-2.6.4.0/src/common/intl.cpp 2007-10-25 06:37:21.000000000 -0600
++++ wxPython-src-2.6.4.0/src/common/intl.cpp 2007-12-17 19:39:44.000000000 -0600
@@ -1452,6 +1452,8 @@
m_initialized = false;
}
@@ -82,8 +82,8 @@
// there may be a catalog with toolkit specific overrides, it is not
// an error if this does not exist
diff -Naur wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in wxPython-src-2.6.4.0/utils/wxrc/Makefile.in
---- wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in 2007-10-25 06:35:58.000000000 -0600
-+++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in 2007-10-25 06:37:21.000000000 -0600
+--- wxPython-src-2.6.4.0-orig/utils/wxrc/Makefile.in 2007-12-17 19:38:16.000000000 -0600
++++ wxPython-src-2.6.4.0/utils/wxrc/Makefile.in 2007-12-17 19:39:44.000000000 -0600
@@ -125,7 +125,6 @@
@COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
1.1 x11-libs/wxGTK/files/digest-wxGTK-2.6.4.0-r3
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/digest-wxGTK-2.6.4.0-r3?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/files/digest-wxGTK-2.6.4.0-r3?rev=1.1&content-type=text/plain
Index: digest-wxGTK-2.6.4.0-r3
===================================================================
MD5 489301bffcf845a0f810e41c1f571ff5 wxPython-src-2.6.4.0.tar.bz2 19062795
RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 wxPython-src-2.6.4.0.tar.bz2 19062795
SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba wxPython-src-2.6.4.0.tar.bz2 19062795
MD5 a231eec9c8f35ec12e55e133464ce7bd wxWidgets-2.6.4-HTML.tar.gz 1364468
RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f wxWidgets-2.6.4-HTML.tar.gz 1364468
SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c wxWidgets-2.6.4-HTML.tar.gz 1364468
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-12-20 0:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-20 0:14 [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK/files: wxGTK-2.8.4-collision.patch wxGTK-2.6.4-collision.patch digest-wxGTK-2.6.4.0-r3 wxGTK-2.6.3.3-dialog_focus.patch digest-wxGTK-2.6.3.3 wxGTK-2.6.3.3-wxrc_build_fix.patch wxGTK-2.6.3.3-slider_linesize.patch wxGTK-2.6.3.3-wxrc_link_fix.patch digest-wxGTK-2.6.4.0-r2 Ryan Hill (dirtyepic)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox