From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/krfb/
Date: Mon, 4 Aug 2014 15:22:17 +0000 (UTC) [thread overview]
Message-ID: <1407158469.615bf8a055a52de8640fbdd61feba364c7abbb17.johu@gentoo> (raw)
commit: 615bf8a055a52de8640fbdd61feba364c7abbb17
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 4 13:21:09 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug 4 13:21:09 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=615bf8a0
[kde-base/krfb] Apply patch before eclass src_prepare, fixes bug #518824
Package-Manager: portage-2.2.10
---
kde-base/krfb/krfb-4.13.97.ebuild | 7 ++++++-
kde-base/krfb/krfb-4.14.49.9999.ebuild | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/kde-base/krfb/krfb-4.13.97.ebuild b/kde-base/krfb/krfb-4.13.97.ebuild
index 6030a3a..f578547 100644
--- a/kde-base/krfb/krfb-4.13.97.ebuild
+++ b/kde-base/krfb/krfb-4.13.97.ebuild
@@ -26,7 +26,12 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch" )
+src_prepare() {
+ # bug 518824, patch before eclass magic
+ epatch "${FILESDIR}/${PN}-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch"
+
+ kde4-base_src_prepare
+}
src_configure() {
local mycmakeargs=(
diff --git a/kde-base/krfb/krfb-4.14.49.9999.ebuild b/kde-base/krfb/krfb-4.14.49.9999.ebuild
index 7840cdd..a23b2b9 100644
--- a/kde-base/krfb/krfb-4.14.49.9999.ebuild
+++ b/kde-base/krfb/krfb-4.14.49.9999.ebuild
@@ -26,7 +26,12 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch" )
+src_prepare() {
+ # bug 518824, patch before eclass magic
+ epatch "${FILESDIR}/${PN}-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch"
+
+ kde4-base_src_prepare
+}
src_configure() {
local mycmakeargs=(
next reply other threads:[~2014-08-04 15:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-04 15:22 Johannes Huber [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-08-25 3:55 [gentoo-commits] proj/kde:master commit in: kde-base/krfb/ Patrick Lauer
2013-08-29 13:27 Michael Palimaka
2013-08-06 7:23 Michael Palimaka
2013-06-06 19:39 Johannes Huber
2013-03-26 16:39 Michael Palimaka
2012-03-25 13:12 Dennis Schridde
2012-03-25 13:12 Dennis Schridde
2011-05-26 19:27 Jorge Manuel B. S. Vicetto
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=1407158469.615bf8a055a52de8640fbdd61feba364c7abbb17.johu@gentoo \
--to=johu@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