diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-03-07 18:43:03 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-03-07 18:43:03 +0000 |
| commit | be398bafb928b1d2362a11f8e5aab1126754c8e4 (patch) | |
| tree | 36e877d17f9945a7577bb04a133bd0a4142659d9 /dev-python/PyQt4 | |
| parent | Add ~x86-fbsd (diff) | |
| download | gentoo-2-be398bafb928b1d2362a11f8e5aab1126754c8e4.tar.gz gentoo-2-be398bafb928b1d2362a11f8e5aab1126754c8e4.tar.bz2 gentoo-2-be398bafb928b1d2362a11f8e5aab1126754c8e4.zip | |
Fix insecure RUNPATH in qpy/QtOpenGL, thanks to Steve L <slong@rathaus.eclipse.co.uk> in bug #407281.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/PyQt4')
| -rw-r--r-- | dev-python/PyQt4/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/PyQt4/PyQt4-4.8.4.ebuild | 19 |
2 files changed, 17 insertions, 8 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog index 85c5b767bb48..238a7bf8ccfd 100644 --- a/dev-python/PyQt4/ChangeLog +++ b/dev-python/PyQt4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/PyQt4 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.172 2012/03/03 11:48:59 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.173 2012/03/07 18:43:03 pesa Exp $ + + 07 Mar 2012; Davide Pesavento <pesa@gentoo.org> PyQt4-4.8.4.ebuild: + Fix insecure RUNPATH in qpy/QtOpenGL, thanks to Steve L + <slong@rathaus.eclipse.co.uk> in bug #407281. 03 Mar 2012; Davide Pesavento <pesa@gentoo.org> PyQt4-4.9.1.ebuild: Switch to EAPI 4, add REQUIRED_USE. diff --git a/dev-python/PyQt4/PyQt4-4.8.4.ebuild b/dev-python/PyQt4/PyQt4-4.8.4.ebuild index cc09f60e1c85..3f01c24f5ddb 100644 --- a/dev-python/PyQt4/PyQt4-4.8.4.ebuild +++ b/dev-python/PyQt4/PyQt4-4.8.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.4.ebuild,v 1.7 2012/03/02 18:34:25 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.4.ebuild,v 1.8 2012/03/07 18:43:03 pesa Exp $ EAPI="3" PYTHON_DEPEND="*" @@ -55,7 +55,7 @@ PATCHES=( src_prepare() { if ! use dbus; then - sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed" + sed -e 's/^\([[:blank:]]\+\)check_dbus()/\1pass/' -i configure.py || die fi # Support qreal for arm architecture (bug #322349). @@ -64,12 +64,12 @@ src_prepare() { qt4-r2_src_prepare # Use proper include directory. - sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed" + sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die python_copy_sources preparation() { - if [[ "$(python_get_version --major)" == "3" ]]; then + if [[ $(python_get_version -l --major) == 3 ]]; then rm -fr pyuic/uic/port_v2 else rm -fr pyuic/uic/port_v3 @@ -122,14 +122,19 @@ src_configure() { "${myconf[@]}" || return 1 local mod - for mod in QtCore $(use X && echo QtDesigner QtGui) $(use declarative && echo QtDeclarative); do - # Run eqmake4 inside the qpy subdirectories to respect CC, CXX, CFLAGS, CXXFLAGS and LDFLAGS and avoid stripping. + for mod in QtCore \ + $(use X && echo QtDesigner QtGui) \ + $(use declarative && echo QtDeclarative) \ + $(use opengl && echo QtOpenGL); do + # Run eqmake4 inside the qpy subdirectories to respect + # CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping. pushd qpy/${mod} > /dev/null || return 1 eqmake4 $(ls w_qpy*.pro) popd > /dev/null || return 1 # Fix insecure runpaths. - sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of runpaths failed" + sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \ + -i ${mod}/Makefile || die "Failed to fix runpath for ${mod}" done # Avoid stripping of libpythonplugin.so. |