Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-libs/wxGTK
diff options
context:
space:
mode:
authorRyan Hill <rhill@gentoo.org>2010-02-14 23:57:45 +0000
committerRyan Hill <rhill@gentoo.org>2010-02-14 23:57:45 +0000
commite1b37d7343de317000e24c7c7745d15c7786dd64 (patch)
tree54a16ac9ae8b86cd119809f7f271322a47a99b0d /x11-libs/wxGTK
parentremove old gimp ebuilds (diff)
downloadhistorical-e1b37d7343de317000e24c7c7745d15c7786dd64.tar.gz
historical-e1b37d7343de317000e24c7c7745d15c7786dd64.tar.bz2
historical-e1b37d7343de317000e24c7c7745d15c7786dd64.zip
Build fix for >=libpng-1.4.0 (bug #305119 by Poly-C). Also ensure system
libs are always being used. Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/wxGTK')
-rw-r--r--x11-libs/wxGTK/ChangeLog7
-rw-r--r--x11-libs/wxGTK/Manifest22
-rw-r--r--x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild15
-rw-r--r--x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild5
4 files changed, 25 insertions, 24 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index ccd1d8ff7b64..e1d4ccc09a53 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/wxGTK
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.243 2010/02/02 19:10:58 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.244 2010/02/14 23:57:45 dirtyepic Exp $
+
+ 14 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.6.4.0-r6.ebuild,
+ wxGTK-2.8.10.1-r5.ebuild:
+ Build fix for >=libpng-1.4.0 (bug #305119 by Poly-C). Also ensure system
+ libs are always being used.
*wxGTK-2.8.10.1-r5 (02 Feb 2010)
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 831572d136b1..9b93a677e3a4 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,9 +1,6 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX wxGTK-2.6.3-unicode-odbc.patch 729 RMD160 cad7401a478ccf30a06c2b856d446804d068a1fa SHA1 3cdaf28a083316c20bbb2d72c4a1b606ce001d2c SHA256 195494cc97b99674f08f30f46322458a90cc146cf70749cdb0c7d255424ab00f
AUX wxGTK-2.6.4-collision.patch 5778 RMD160 cbe029a606ec1f46ae7f29605631b8f05bd50cb4 SHA1 05a80154ad673b26a6e8dadc79c488ce5a0357b4 SHA256 0f7ac329ce24fbac7828a0b7c249ac0b376334da0f563456572172359ad78435
AUX wxGTK-2.6.4-mmedia.patch 599 RMD160 e894dacc346d7c10f9582c2885df8c0b82962bb1 SHA1 d1da9fe158c5db80f8e65395b9d2c3383133352c SHA256 0f848e5985e404d89fbcc4820ca07069845dc8219e0a8679ff5ad3bf28dbc93f
@@ -18,22 +15,15 @@ DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d65
DIST wxPython-src-2.8.10.1.tar.bz2 29770994 RMD160 bb606046d140623041b988e64ab268ced9aa958f SHA1 6598fbafd979a91f20100171fa23a91779f6dc62 SHA256 447690773279088e9d06dcfe56f00f310c0186de435969bb60b04ed0c3f25f5f
DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
EBUILD wxGTK-2.6.4.0-r5.ebuild 4765 RMD160 f7f7e49e22003fe00a280ec12def28349ed3ea55 SHA1 aa63f810cd8e8029da28c3fa629b226107342f55 SHA256 fcb538bd0b2065bdf21596e453996d2a3949dcc8b14c128f1ea6ff523093ff30
-EBUILD wxGTK-2.6.4.0-r6.ebuild 4829 RMD160 4bc062f5daa70dcdd1ff731975cb1a0307471886 SHA1 cd57a191ccbb8fea9aa578c184e0609355a798e1 SHA256 d6f3674d9ec3c869aae0304ef13d2d0d26418d62fbd75382143c74026991ae81
+EBUILD wxGTK-2.6.4.0-r6.ebuild 4947 RMD160 4a46eb5c3b25f7bf99282bdcd89e69504ec4c847 SHA1 461a9a7caf2b7865c5193d0a90a7573f963cefbb SHA256 6cf2e5764e5f7620fd53c85b66246db96f4b45bd51f869d0b60071fa8fce5194
EBUILD wxGTK-2.8.10.1-r1.ebuild 3588 RMD160 08c246b8c2651bf26a3250b9e8c4b8fbb6e94818 SHA1 697540aea5ab9815ebab8abd1e9291a478e58e32 SHA256 39d95da1522cc0926c5ba1f129e1f1f4803a98bce41780bcb68ada92afd216fc
-EBUILD wxGTK-2.8.10.1-r5.ebuild 3738 RMD160 3a58296e0572512cb71345e7d85ba1c7f199e2e0 SHA1 0084de677fb17f283f38bb2ba147e28536485bd8 SHA256 6e60096b3eeb720680d6dfcb8c6ade1212f8b653ca803fa03c2503c45fffd9c9
-MISC ChangeLog 38268 RMD160 8951f261aacb47608b37b2c32ffd3e2dc1c6bd6e SHA1 8bd719197de43b9bbcc3e80a277672edf57bdc94 SHA256 a77d0594696a0d45e416b3a394e87e50b3f07facf3d4659226d1fce5dc6ade56
+EBUILD wxGTK-2.8.10.1-r5.ebuild 3845 RMD160 d2b82a3d02c6eade5ac2093bcc6b1d71f6ea5c37 SHA1 e28fe2c09baaf361a8472a5f33dd63e29131c198 SHA256 4213102b85df0bdd8bcc07ff84e670033e26d894dd06175381c54ab04e5bafba
+MISC ChangeLog 38475 RMD160 f1334551b9c618f463d96cd29b886509401ee3c2 SHA1 42593a5c340ea9a27437b6ba0cf290e15b021eb5 SHA256 d6d29f54f762e1617ffb249b4edab55f570323972ab6add5181ae371044c2deb
MISC metadata.xml 500 RMD160 d0f05c0d915928bc4c424ca00f20621805ddc7f0 SHA1 3ba77d570e4764cf377b3e63078b21f69232a1fc SHA256 2592b31d76fd0a79aa634bcbc9697d7ee8420b89cbead01a8db562a4d66be98c
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktoeVEACgkQiqiDRvmkBmJOcACgiALpx1fCwimXBBUNiwe+G9jE
-1xYAoN8uJnOUsuds1bDeC2g3qaE93L1r
-=+p5a
-- -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAktoeaUACgkQiqiDRvmkBmIPsACgwD14ttmvhozsALJBtOvsbIb3
-a8wAnj+/TAi7mzpbqtZ86Fqoa8xCRV2F
-=lkLk
+iEYEARECAAYFAkt4jogACgkQiqiDRvmkBmK5+QCeP6o0ftC13S6d9z1++gANd9ye
+3vIAoL36Tuxzbx9XIGKNc0nEevctWbTi
+=sIoj
-----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
index 75cd4e24820d..cd2e9bf056d0 100644
--- a/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.1 2009/08/06 04:56:07 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.2 2010/02/14 23:57:45 dirtyepic Exp $
inherit eutils versionator flag-o-matic
@@ -77,6 +77,9 @@ src_unpack() {
# wxBase has an automagic sdl dependency. short circuit it here.
# http://bugs.gentoo.org/show_bug.cgi?id=91574
use sdl || sed -i -e 's:$wxUSE_LIBSDL" != "no":$wxUSE_LIBSDL" = "yes":' configure
+
+ # Fix for >=libpng-1.4.0. Bug #305119.
+ sed -i -e 's:png_check_sig:png_sig_cmp:g' "${S}"/configure
}
src_compile() {
@@ -98,10 +101,10 @@ src_compile() {
use X && \
myconf="${myconf}
--enable-gui
- --with-libpng
- --with-libxpm
- --with-libjpeg
- --with-libtiff
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --with-libtiff=sys
$(use_enable opengl)
$(use_with opengl)
$(use_with gnome gnomeprint)"
diff --git a/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild b/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild
index bd0f34bb56c7..1d129638f120 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild,v 1.1 2010/02/02 19:10:58 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild,v 1.2 2010/02/14 23:57:45 dirtyepic Exp $
EAPI="2"
@@ -64,6 +64,9 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-CVE-2009-2369.patch # Bug #277722
epatch "${FILESDIR}"/${P}-gsocket.patch # Bug #278778
epatch "${FILESDIR}"/${P}-wxTimer-unbounded-hook.patch # Bug #301143
+
+ # Fix for >=libpng-1.4.0 Bug #305119.
+ sed -i -e 's:png_check_sig:png_sig_cmp:g' "${S}"/configure{,.in}
}
src_configure() {