diff options
| author |   Hanno Boeck <hanno@gentoo.org> | 2005-12-06 12:34:48 +0000 |
|---|---|---|
| committer | Hanno Boeck <hanno@gentoo.org> | 2005-12-06 12:34:48 +0000 |
| commit | 9a6287a83707399e50e204ea6d21d4051c35c2b7 (patch) | |
| tree | 3d17c0e61909d5412136b97e09a0b8150fc847e6 | |
| parent | - initial multilib profile (diff) | |
| download | historical-9a6287a83707399e50e204ea6d21d4051c35c2b7.tar.gz historical-9a6287a83707399e50e204ea6d21d4051c35c2b7.tar.bz2 historical-9a6287a83707399e50e204ea6d21d4051c35c2b7.zip | |
wxGTK gcc41 fix
Package-Manager: portage-2.0.53
| -rw-r--r-- | x11-libs/wxGTK/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/wxGTK/Manifest | 13 | ||||
| -rw-r--r-- | x11-libs/wxGTK/files/wxWidgets-2.6.2-gcc41.patch | 13 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild | 9 |
4 files changed, 30 insertions, 11 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index b6ef53e1ffdf..8c5bd92b6b1d 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/wxGTK # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.97 2005/11/26 20:02:59 sekretarz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.98 2005/12/06 12:34:48 hanno Exp $ + + 06 Dec 2005; Hanno Boeck <hanno@gentoo.org> + +files/wxWidgets-2.6.2-gcc41.patch, wxGTK-2.6.2-r1.ebuild: + Fix for gcc 4.1. 26 Nov 2005; Karol Wojtaszek <sekretarz@gentoo.org> +files/wxGTK-2.4.2-pango_fix.patch, +wxGTK-2.4.2-r4.ebuild: diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index 9b23eadddb14..810042a9ba02 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 5d75da26acd7360fc26dbe96910b6a19 ChangeLog 15557 +MD5 e963d798b81aade0db34d1a9c8cefc82 ChangeLog 15680 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r2 65 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r3 65 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r4 65 @@ -18,6 +18,7 @@ MD5 6c8af85a3bfec0c477a778258368de56 files/wxGTK-2.4.2-cleanup.patch 18162 MD5 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442 MD5 f3bc3ab73cb31c91683e3ed58f8ffabb files/wxGTK-2.4.2-menu.cpp.patch 2253 MD5 568639b28866f0c708c091d2e28f982e files/wxGTK-2.4.2-pango_fix.patch 618 +MD5 a7173de92807f66492cda98731156932 files/wxWidgets-2.6.2-gcc41.patch 559 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162 MD5 62be82618a657fca19a51e0825e5e4e9 wxGTK-2.4.2-r2.ebuild 4249 MD5 58a128b966a8c93bd4b1fbef17e044ed wxGTK-2.4.2-r3.ebuild 4733 @@ -25,12 +26,12 @@ MD5 b0a33941a9b264d1378ef9ae9181ecb6 wxGTK-2.4.2-r4.ebuild 4840 MD5 b8d2d1196e6c7f31335748286b926533 wxGTK-2.5.3.ebuild 4812 MD5 b2544e112108097113205b4559e87ce7 wxGTK-2.6.0-r1.ebuild 2273 MD5 56de842cb982e2aeb27abbfe3cb3d2ff wxGTK-2.6.1.ebuild 1922 -MD5 7a7a6e86253922af888b557dd6c92be9 wxGTK-2.6.2-r1.ebuild 1534 +MD5 fff55dd575a0f802b5891f02372bee3a wxGTK-2.6.2-r1.ebuild 1575 MD5 5160fec1fb87f760b1cd6cc0a25860b8 wxGTK-2.6.2.ebuild 1531 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDiM7RZ/iYVBmujdURAkuYAJ0aij+OAm5PfiA1dBBwHyy6gbnaeQCgzO9w -VtZNCTxcnsTlZs4makT+X8g= -=OZeZ +iD8DBQFDlYV/r2QksT29OyARAjUuAJ98af5X2ebw5A8OJwlRagYagenyQACcCLVJ +R4Cg+94jfEpPARIKoChk5fY= +=B1HA -----END PGP SIGNATURE----- diff --git a/x11-libs/wxGTK/files/wxWidgets-2.6.2-gcc41.patch b/x11-libs/wxGTK/files/wxWidgets-2.6.2-gcc41.patch new file mode 100644 index 000000000000..675ea8f5ebb6 --- /dev/null +++ b/x11-libs/wxGTK/files/wxWidgets-2.6.2-gcc41.patch @@ -0,0 +1,13 @@ +--- wxWidgets-2.6.2/src/common/uri.cpp 2005-08-13 02:24:13.000000000 +0200 ++++ wxWidgets-2.6.2-gcc41/src/common/uri.cpp 2005-12-04 22:49:30.996859750 +0100 +@@ -886,8 +886,8 @@ + op += 3; + } + +- m_path = base.m_path.substr(0, bp - base.m_path.c_str()) + +- m_path.substr((op - m_path.c_str()), m_path.Length()); ++ m_path = (wxString)base.m_path.substr(0, bp - base.m_path.c_str()) + ++ (wxString)m_path.substr((op - m_path.c_str()), m_path.Length()); + } + } + diff --git a/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild index 33ae6c96758c..88b32145d124 100644 --- a/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild,v 1.1 2005/11/26 17:32:08 sekretarz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild,v 1.2 2005/12/06 12:34:48 hanno Exp $ inherit wxlib gnuconfig @@ -28,10 +28,11 @@ pkg_setup() { } src_unpack() { - unpack ${A} - cd ${S} + unpack ${A} + cd ${S} - epatch ${FILESDIR}/intl.cpp.diff + epatch ${FILESDIR}/wxWidgets-2.6.2-gcc41.patch + epatch ${FILESDIR}/intl.cpp.diff } src_compile() { |