summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2014-12-09 21:30:56 +0000
committerMatt Turner <mattst88@gentoo.org>2014-12-09 21:30:56 +0000
commit710d7297618d9abd55a2ddc129dd0ed9c91411ae (patch)
treea768010cecdf3ad336b9ba703577d57b22ea8c86 /x11-libs/cairo
parentSupport dependency on kde-apps-based packages, which have been missed by the ... (diff)
downloadgentoo-2-710d7297618d9abd55a2ddc129dd0ed9c91411ae.tar.gz
gentoo-2-710d7297618d9abd55a2ddc129dd0ed9c91411ae.tar.bz2
gentoo-2-710d7297618d9abd55a2ddc129dd0ed9c91411ae.zip
Stop applying Interix patch. ChangeLog claims incorrectly that patch was upstreamed. No documentation or bug references, and patch references libpng12.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 974CA72A)
Diffstat (limited to 'x11-libs/cairo')
-rw-r--r--x11-libs/cairo/ChangeLog7
-rw-r--r--x11-libs/cairo/cairo-1.12.18.ebuild3
-rw-r--r--x11-libs/cairo/cairo-9999.ebuild3
3 files changed, 8 insertions, 5 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index f447afeaa95e..4dfdda76016d 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/cairo
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.389 2014/12/09 21:27:32 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.390 2014/12/09 21:30:56 mattst88 Exp $
+
+ 09 Dec 2014; Matt Turner <mattst88@gentoo.org> cairo-1.12.18.ebuild,
+ cairo-9999.ebuild:
+ Stop applying Interix patch. ChangeLog claims incorrectly that patch was
+ upstreamed. No documentation or bug references, and patch references libpng12.
09 Dec 2014; Matt Turner <mattst88@gentoo.org>
+files/cairo-1.12.18-disable-test-suite.patch, cairo-1.12.18.ebuild,
diff --git a/x11-libs/cairo/cairo-1.12.18.ebuild b/x11-libs/cairo/cairo-1.12.18.ebuild
index dde64e8a6f1f..977bc44a8a50 100644
--- a/x11-libs/cairo/cairo-1.12.18.ebuild
+++ b/x11-libs/cairo/cairo-1.12.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.18.ebuild,v 1.2 2014/12/09 21:27:32 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.18.ebuild,v 1.3 2014/12/09 21:30:56 mattst88 Exp $
EAPI=5
@@ -86,7 +86,6 @@ MULTILIB_WRAPPED_HEADERS=(
)
src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
epatch "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 94fbefa8d694..9232215edc2c 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.52 2014/12/09 21:27:32 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.53 2014/12/09 21:30:56 mattst88 Exp $
EAPI=5
@@ -86,7 +86,6 @@ MULTILIB_WRAPPED_HEADERS=(
)
src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
epatch "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch