diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2009-05-29 16:27:00 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2009-05-29 16:27:00 +0000 |
| commit | eb3353c09b9ff2a2396a9dd1920004d67f7bc0a4 (patch) | |
| tree | 623e22d907ac5f27dc9da3fa0ab2b908ac2fdea3 /x11-libs | |
| parent | Fix glibc 2.10 issues for Emacs 18. Move Emacs 22 patches to mirrors. (diff) | |
| download | gentoo-2-eb3353c09b9ff2a2396a9dd1920004d67f7bc0a4.tar.gz gentoo-2-eb3353c09b9ff2a2396a9dd1920004d67f7bc0a4.tar.bz2 gentoo-2-eb3353c09b9ff2a2396a9dd1920004d67f7bc0a4.zip | |
Apply ia64 patch correctly
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt-core/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt-core/qt-core-4.5.1.ebuild | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index 49a668065006..390e301684e4 100644 --- a/x11-libs/qt-core/ChangeLog +++ b/x11-libs/qt-core/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-core # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.51 2009/05/28 11:56:21 dagger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.52 2009/05/29 16:27:00 hwoarang Exp $ + + 29 May 2009; Markos Chandras <hwoarang@gentoo.org> qt-core-4.5.1.ebuild: + Apply patch correctly 28 May 2009; Robert Piasek <dagger@gentoo.org> qt-core-4.5.1.ebuild: stable on arm (bug #266201) diff --git a/x11-libs/qt-core/qt-core-4.5.1.ebuild b/x11-libs/qt-core/qt-core-4.5.1.ebuild index 12f331439f64..120a833a2756 100644 --- a/x11-libs/qt-core/qt-core-4.5.1.ebuild +++ b/x11-libs/qt-core/qt-core-4.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.5.1.ebuild,v 1.7 2009/05/28 11:56:21 dagger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.5.1.ebuild,v 1.8 2009/05/29 16:27:00 hwoarang Exp $ EAPI="2" inherit qt4-build @@ -49,9 +49,6 @@ src/3rdparty/sha1/ src/script/ translations/" -#patch for ia64 requested from armin76 -PATCHES=( "${FILESDIR}/${PN}-4.5-boilerplate.diff" ) - pkg_setup() { qt4-build_pkg_setup @@ -122,6 +119,8 @@ src_prepare(){ "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" + #patch for ia64 requested from armin76 + epatch "${FILESDIR}/${PN}-4.5-boilerplate.diff" } src_configure() { |