summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2013-12-10 09:58:32 +0000
committerLars Wendler <polynomial-c@gentoo.org>2013-12-10 09:58:32 +0000
commit61fb8ff0b39d959f48482b0ccbbfbdee8753de32 (patch)
tree019140389eb552733af7c74470553e55b9b90cd4 /media-gfx/inkscape
parentFixed compilation with >=media-libs/freetype-2.5.1 (bug #493588) (diff)
downloadgentoo-2-61fb8ff0b39d959f48482b0ccbbfbdee8753de32.tar.gz
gentoo-2-61fb8ff0b39d959f48482b0ccbbfbdee8753de32.tar.bz2
gentoo-2-61fb8ff0b39d959f48482b0ccbbfbdee8753de32.zip
Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493478)
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'media-gfx/inkscape')
-rw-r--r--media-gfx/inkscape/ChangeLog6
-rw-r--r--media-gfx/inkscape/inkscape-0.48.4-r1.ebuild8
2 files changed, 10 insertions, 4 deletions
diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 0de02c632caf..c5d20bcc1760 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/inkscape
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.200 2013/09/22 10:30:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.201 2013/12/10 09:58:32 polynomial-c Exp $
+
+ 10 Dec 2013; Lars Wendler <polynomial-c@gentoo.org>
+ inkscape-0.48.4-r1.ebuild:
+ Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493478).
22 Sep 2013; Andreas K. Huettel <dilfridge@gentoo.org>
inkscape-0.48.4.ebuild, inkscape-0.48.4-r1.ebuild:
diff --git a/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild b/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
index 2393649ce218..35b09140e325 100644
--- a/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild,v 1.5 2013/09/22 10:30:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild,v 1.6 2013/12/10 09:58:32 polynomial-c Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -13,7 +13,8 @@ MY_P=${P/_/}
DESCRIPTION="A SVG based generic vector-drawing program"
HOMEPAGE="http://www.inkscape.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+ https://launchpadlibrarian.net/157792073/1255830-fix-freetype-includes-backport-0.48.x-v1.diff -> ${P}-freetype251.patch"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
@@ -78,7 +79,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \
"${FILESDIR}"/${PN}-0.48.4-epython.patch \
"${FILESDIR}"/${PN}-0.48.4-fix-member-decl.patch \
- "${FILESDIR}"/${PN}-0.48.4-automake-1.13.patch
+ "${FILESDIR}"/${PN}-0.48.4-automake-1.13.patch \
+ "${DISTDIR}"/${P}-freetype251.patch
sed -i \
-e "s#@EPYTHON@#${EPYTHON}#" \