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 BC2541382C5 for ; Sat, 21 Apr 2018 20:56:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8DE7E0817; Sat, 21 Apr 2018 20:56:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97A51E0817 for ; Sat, 21 Apr 2018 20:56:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C8566335C78 for ; Sat, 21 Apr 2018 20:56:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 550D7291 for ; Sat, 21 Apr 2018 20:56:17 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1524344169.614ffb79e1bb969e77646f768d00bd0e02cf3647.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/gimp/gimp-2.9.8-r1.ebuild X-VCS-Directories: media-gfx/gimp/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 614ffb79e1bb969e77646f768d00bd0e02cf3647 X-VCS-Branch: master Date: Sat, 21 Apr 2018 20:56:17 +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: d05bb7be-0ebc-48f2-b8c6-f306f8bceab3 X-Archives-Hash: 8de5cc40cb02f08fa995eb1cbbad9868 commit: 614ffb79e1bb969e77646f768d00bd0e02cf3647 Author: Marty E. Plummer startmail com> AuthorDate: Fri Apr 20 14:01:47 2018 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sat Apr 21 20:56:09 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=614ffb79 media-gfx/gimp: epatch->PATCHES=() This one was a bit strange; just moving all the patches into a PATCHES=() array and calling default at the start of src_prepare() didn't do the trick, as apparently it was applying the patches twice. Apparently gnome2_src_configure calls xdg_src_configure, which calls default. Moving gnome2_src_configure to the start of src_prepare() worked. Due to how involved the change was, I gave this a full ebuild gimp-2.9.8-r1.ebuild clean install treatment instead of my standard clean prepare for these patch fixes. Package-Manager: Portage-2.3.31, Repoman-2.3.9 media-gfx/gimp/gimp-2.9.8-r1.ebuild | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild index fc1d80723b3..fd50f6600b1 100644 --- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild +++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild @@ -85,23 +85,23 @@ pkg_setup() { fi } -src_prepare() { - epatch "${FILESDIR}"/${P}-cve-2017-17784.patch # bug 641954 - epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17785.patch # bug 641954 - epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-1.patch # bug 641954 - epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-2.patch # bug 641954 - epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17787.patch # bug 641954 +PATCHES=( + "${FILESDIR}"/${P}-cve-2017-17784.patch # bug 641954 + "${FILESDIR}"/${PN}-2.8.22-cve-2017-17785.patch # bug 641954 + "${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-1.patch # bug 641954 + "${FILESDIR}"/${PN}-2.8.22-cve-2017-17786-2.patch # bug 641954 + "${FILESDIR}"/${PN}-2.8.22-cve-2017-17787.patch # bug 641954 # NOTE: CVE-2017-17788 already fixed upstream - epatch "${FILESDIR}"/${PN}-2.8.22-cve-2017-17789.patch # bug 641954 + "${FILESDIR}"/${PN}-2.8.22-cve-2017-17789.patch # bug 641954 +) - eapply_user +src_prepare() { + gnome2_src_prepare sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too - gnome2_src_prepare - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test }