| 1 |
pesa 12/03/07 18:43:03 |
| 2 |
|
| 3 |
Modified: PyQt4-4.8.4.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix insecure RUNPATH in qpy/QtOpenGL, thanks to Steve L <slong@××××××××××××××××××.uk> in bug #407281. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.8 dev-python/PyQt4/PyQt4-4.8.4.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.4.ebuild?rev=1.8&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.4.ebuild?rev=1.8&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.4.ebuild?r1=1.7&r2=1.8 |
| 15 |
|
| 16 |
Index: PyQt4-4.8.4.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.4.ebuild,v |
| 19 |
retrieving revision 1.7 |
| 20 |
retrieving revision 1.8 |
| 21 |
diff -u -r1.7 -r1.8 |
| 22 |
--- PyQt4-4.8.4.ebuild 2 Mar 2012 18:34:25 -0000 1.7 |
| 23 |
+++ PyQt4-4.8.4.ebuild 7 Mar 2012 18:43:03 -0000 1.8 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.4.ebuild,v 1.7 2012/03/02 18:34:25 pesa Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.4.ebuild,v 1.8 2012/03/07 18:43:03 pesa Exp $ |
| 29 |
|
| 30 |
EAPI="3" |
| 31 |
PYTHON_DEPEND="*" |
| 32 |
@@ -55,7 +55,7 @@ |
| 33 |
|
| 34 |
src_prepare() { |
| 35 |
if ! use dbus; then |
| 36 |
- sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed" |
| 37 |
+ sed -e 's/^\([[:blank:]]\+\)check_dbus()/\1pass/' -i configure.py || die |
| 38 |
fi |
| 39 |
|
| 40 |
# Support qreal for arm architecture (bug #322349). |
| 41 |
@@ -64,12 +64,12 @@ |
| 42 |
qt4-r2_src_prepare |
| 43 |
|
| 44 |
# Use proper include directory. |
| 45 |
- sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed" |
| 46 |
+ sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die |
| 47 |
|
| 48 |
python_copy_sources |
| 49 |
|
| 50 |
preparation() { |
| 51 |
- if [[ "$(python_get_version --major)" == "3" ]]; then |
| 52 |
+ if [[ $(python_get_version -l --major) == 3 ]]; then |
| 53 |
rm -fr pyuic/uic/port_v2 |
| 54 |
else |
| 55 |
rm -fr pyuic/uic/port_v3 |
| 56 |
@@ -122,14 +122,19 @@ |
| 57 |
"${myconf[@]}" || return 1 |
| 58 |
|
| 59 |
local mod |
| 60 |
- for mod in QtCore $(use X && echo QtDesigner QtGui) $(use declarative && echo QtDeclarative); do |
| 61 |
- # Run eqmake4 inside the qpy subdirectories to respect CC, CXX, CFLAGS, CXXFLAGS and LDFLAGS and avoid stripping. |
| 62 |
+ for mod in QtCore \ |
| 63 |
+ $(use X && echo QtDesigner QtGui) \ |
| 64 |
+ $(use declarative && echo QtDeclarative) \ |
| 65 |
+ $(use opengl && echo QtOpenGL); do |
| 66 |
+ # Run eqmake4 inside the qpy subdirectories to respect |
| 67 |
+ # CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping. |
| 68 |
pushd qpy/${mod} > /dev/null || return 1 |
| 69 |
eqmake4 $(ls w_qpy*.pro) |
| 70 |
popd > /dev/null || return 1 |
| 71 |
|
| 72 |
# Fix insecure runpaths. |
| 73 |
- sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of runpaths failed" |
| 74 |
+ sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \ |
| 75 |
+ -i ${mod}/Makefile || die "Failed to fix runpath for ${mod}" |
| 76 |
done |
| 77 |
|
| 78 |
# Avoid stripping of libpythonplugin.so. |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
1.173 dev-python/PyQt4/ChangeLog |
| 83 |
|
| 84 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.173&view=markup |
| 85 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.173&content-type=text/plain |
| 86 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?r1=1.172&r2=1.173 |
| 87 |
|
| 88 |
Index: ChangeLog |
| 89 |
=================================================================== |
| 90 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v |
| 91 |
retrieving revision 1.172 |
| 92 |
retrieving revision 1.173 |
| 93 |
diff -u -r1.172 -r1.173 |
| 94 |
--- ChangeLog 3 Mar 2012 11:48:59 -0000 1.172 |
| 95 |
+++ ChangeLog 7 Mar 2012 18:43:03 -0000 1.173 |
| 96 |
@@ -1,6 +1,10 @@ |
| 97 |
# ChangeLog for dev-python/PyQt4 |
| 98 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 99 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.172 2012/03/03 11:48:59 pesa Exp $ |
| 100 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.173 2012/03/07 18:43:03 pesa Exp $ |
| 101 |
+ |
| 102 |
+ 07 Mar 2012; Davide Pesavento <pesa@g.o> PyQt4-4.8.4.ebuild: |
| 103 |
+ Fix insecure RUNPATH in qpy/QtOpenGL, thanks to Steve L |
| 104 |
+ <slong@××××××××××××××××××.uk> in bug #407281. |
| 105 |
|
| 106 |
03 Mar 2012; Davide Pesavento <pesa@g.o> PyQt4-4.9.1.ebuild: |
| 107 |
Switch to EAPI 4, add REQUIRED_USE. |
Archives