commit: 64be6ff3b3f656796f82582e39c7dbd164094c49
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 1 17:32:46 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 17:33:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64be6ff3
x11-wm/xpra: do not interfere with '--param key=value' gcc args (bug 607776,
thanks Fabian Henze and Hendrik v. Raven).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-wm/xpra/files/xpra-1.0.1-cflags-param.patch | 17 +++++++++++++++++
x11-wm/xpra/xpra-1.0.1.ebuild | 3 ++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/x11-wm/xpra/files/xpra-1.0.1-cflags-param.patch
b/x11-wm/xpra/files/xpra-1.0.1-cflags-param.patch
new file mode 100644
index 00000000..11dbb81
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-1.0.1-cflags-param.patch
@@ -0,0 +1,17 @@
+--- xpra-1.0.1/setup.py
++++ xpra-1.0.1/setup.py
+@@ -696,7 +696,14 @@
+ for s in (pkg_config_out, env_cflags, env_ldflags):
+ if not s:
+ continue
++ ahead = False
+ for token in s.split():
++ if token == '--param':
++ ahead = True
++ continue
++ if ahead:
++ ahead = False
++ continue
+ if token[:2] in ignored_flags:
+ pass
+ elif token[:2] in flag_map:
diff --git a/x11-wm/xpra/xpra-1.0.1.ebuild b/x11-wm/xpra/xpra-1.0.1.ebuild
index 6d66ba3..9ec4c53 100644
--- a/x11-wm/xpra/xpra-1.0.1.ebuild
+++ b/x11-wm/xpra/xpra-1.0.1.ebuild
@@ -91,7 +91,8 @@ python_prepare_all() {
epatch \
"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch
+ "${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch \
+ "${FILESDIR}"/${PN}-1.0.1-cflags-param.patch
if use libav ; then
if ! has_version ">=media-video/libav-9" ; then
