From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5/, dev-python/PyQt5/files/
Date: Tue, 6 Feb 2018 13:13:02 +0000 (UTC) [thread overview]
Message-ID: <1517922770.4aaaacfc03540386c274b04297e36f301634029b.kensington@gentoo> (raw)
commit: 4aaaacfc03540386c274b04297e36f301634029b
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 13:11:53 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 13:12:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aaaacfc
dev-python/PyQt5: add patch to fix build with Qt 5.9.4
Closes: https://bugs.gentoo.org/646580
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-python/PyQt5/PyQt5-5.10.ebuild | 1 +
dev-python/PyQt5/files/PyQt5-5.10-qt594.patch | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/dev-python/PyQt5/PyQt5-5.10.ebuild b/dev-python/PyQt5/PyQt5-5.10.ebuild
index 809e464ee4b..16b925075fe 100644
--- a/dev-python/PyQt5/PyQt5-5.10.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.10.ebuild
@@ -94,6 +94,7 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
DOCS=( "${S}"/{ChangeLog,NEWS} )
+PATCHES=( "${FILESDIR}/${P}-qt594.patch" )
pyqt_use_enable() {
use "$1" || return
diff --git a/dev-python/PyQt5/files/PyQt5-5.10-qt594.patch b/dev-python/PyQt5/files/PyQt5-5.10-qt594.patch
new file mode 100644
index 00000000000..fcdadab5521
--- /dev/null
+++ b/dev-python/PyQt5/files/PyQt5-5.10-qt594.patch
@@ -0,0 +1,15 @@
+Fix build with qt-5.9.4
+
+Bug: https://bugs.gentoo.org/646580
+
+--- a/sip/QtCore/QtCoremod.sip
++++ b/sip/QtCore/QtCoremod.sip
+@@ -22,7 +22,7 @@
+
+ %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True)
+
+-%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_10_0}
++%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_10_0}
+
+ %Platforms {WS_X11 WS_WIN WS_MACX}
+
next reply other threads:[~2018-02-06 13:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-06 13:13 Michael Palimaka [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-12-23 0:45 [gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5/, dev-python/PyQt5/files/ Davide Pesavento
2018-03-04 20:40 Davide Pesavento
2017-01-02 1:02 Davide Pesavento
2016-10-28 12:08 Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1517922770.4aaaacfc03540386c274b04297e36f301634029b.kensington@gentoo \
--to=kensington@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox