diff options
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/PyQt4/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild | 9 | ||||
| -rw-r--r-- | dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch | 25 |
3 files changed, 36 insertions, 4 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog index cc41c23b0445..9f940db86041 100644 --- a/dev-python/PyQt4/ChangeLog +++ b/dev-python/PyQt4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/PyQt4 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.272 2014/10/13 19:27:07 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.273 2014/10/14 02:49:02 pesa Exp $ + + 14 Oct 2014; Davide Pesavento <pesa@gentoo.org> + +files/PyQt4-4.11.2-phonon.patch, PyQt4-4.11.2-r1.ebuild: + Fix building against media-libs/phonon (bug 525354). *PyQt4-4.11.2-r1 (13 Oct 2014) diff --git a/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild b/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild index dfa6ad9b8a6f..9a8a273845df 100644 --- a/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild +++ b/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild,v 1.1 2014/10/13 19:27:07 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild,v 1.2 2014/10/14 02:49:02 pesa Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} ) @@ -49,8 +49,8 @@ RDEPEND=" multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} ) opengl? ( >=dev-qt/qtopengl-${QT_PV} ) phonon? ( - kde? ( media-libs/phonon ) - !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon ) ) + kde? ( >=media-libs/phonon-4.7[qt4] ) + !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} >=media-libs/phonon-4.7[qt4] ) ) ) script? ( >=dev-qt/qtscript-${QT_PV} ) scripttools? ( >=dev-qt/qtgui-${QT_PV} ) @@ -70,6 +70,9 @@ src_prepare() { # Support qreal on arm architecture (bug 322349). use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch" + # Allow building against KDE's phonon (bug 525354). + epatch "${FILESDIR}/${PN}-4.11.2-phonon.patch" + if ! use dbus; then sed -i -e '/^\s\+check_dbus(/d' configure-ng.py || die fi diff --git a/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch b/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch new file mode 100644 index 000000000000..e3449b3b4bfc --- /dev/null +++ b/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch @@ -0,0 +1,25 @@ +From e8931ed7f49eb55d6259328a5a78f3fc18472d48 Mon Sep 17 00:00:00 2001 +From: Davide Pesavento <pesa@gentoo.org> +Date: Tue, 14 Oct 2014 04:30:29 +0200 +Subject: [PATCH] Support building against KDE's phonon variant. + +--- + configure-ng.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure-ng.py b/configure-ng.py +index a80cb57..fd2c56c 100644 +--- a/configure-ng.py ++++ b/configure-ng.py +@@ -2256,6 +2256,8 @@ def generate_sip_module_code(target_config, verbose, no_timestamp, parts, tracin + if mname == 'QtCore': + includepath = target_config.vend_inc_dir + libs = '-L%s -lvendorid' % target_config.vend_lib_dir ++ if mname == 'phonon': ++ includepath = os.path.join(sys.prefix, 'include', 'phonon') + + generate_module_makefile(target_config, verbose, mname, + includepath=includepath, libs=libs, qpy_sources=qpy_sources, +-- +2.1.2 + |