[gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK: ChangeLog wxGTK-2.8.10.1-r5.ebuild wxGTK-2.6.4.0-r6.ebuild

["Ryan Hill (dirtyepic)" <dirtyepic@gentoo.org>]

dirtyepic    10/02/14 23:57:46

  Modified:             ChangeLog wxGTK-2.8.10.1-r5.ebuild
                        wxGTK-2.6.4.0-r6.ebuild
  Log:
  Build fix for >=libpng-1.4.0 (bug #305119 by Poly-C). Also ensure system
  libs are always being used.
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.244                x11-libs/wxGTK/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.244&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.244&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.243&r2=1.244

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- ChangeLog	2 Feb 2010 19:10:58 -0000	1.243
+++ ChangeLog	14 Feb 2010 23:57:45 -0000	1.244
@@ -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)
 



1.2                  x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild?r1=1.1&r2=1.2

Index: wxGTK-2.8.10.1-r5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wxGTK-2.8.10.1-r5.ebuild	2 Feb 2010 19:10:58 -0000	1.1
+++ wxGTK-2.8.10.1-r5.ebuild	14 Feb 2010 23:57:45 -0000	1.2
@@ -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 @@
 	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() {



1.2                  x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild?r1=1.1&r2=1.2

Index: wxGTK-2.6.4.0-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wxGTK-2.6.4.0-r6.ebuild	6 Aug 2009 04:56:07 -0000	1.1
+++ wxGTK-2.6.4.0-r6.ebuild	14 Feb 2010 23:57:45 -0000	1.2
@@ -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 @@
 	# 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 @@
 	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)"