From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 853D1139085 for ; Wed, 1 Feb 2017 17:33:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25020E0D33; Wed, 1 Feb 2017 17:33:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 073CEE0D33 for ; Wed, 1 Feb 2017 17:33:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 11CD23411D7 for ; Wed, 1 Feb 2017 17:33:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D78A3D71 for ; Wed, 1 Feb 2017 17:33:09 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1485970381.64be6ff3b3f656796f82582e39c7dbd164094c49.xmw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/files/, x11-wm/xpra/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/xpra/files/xpra-1.0.1-cflags-param.patch x11-wm/xpra/xpra-1.0.1.ebuild X-VCS-Directories: x11-wm/xpra/ x11-wm/xpra/files/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: 64be6ff3b3f656796f82582e39c7dbd164094c49 X-VCS-Branch: master Date: Wed, 1 Feb 2017 17:33:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9a602dc0-1e31-4e97-bf36-b67321edd376 X-Archives-Hash: 5af63dc91bff7cfd81be3159d7c4f410 commit: 64be6ff3b3f656796f82582e39c7dbd164094c49 Author: Michael Weber gentoo org> AuthorDate: Wed Feb 1 17:32:46 2017 +0000 Commit: Michael Weber gentoo 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