| 1 |
mgorny 13/02/26 14:40:54 |
| 2 |
|
| 3 |
Modified: freetype-2.4.11-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix out-of-source demo builds. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 media-libs/freetype/freetype-2.4.11-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.4.11-r1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.4.11-r1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.4.11-r1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: freetype-2.4.11-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.11-r1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- freetype-2.4.11-r1.ebuild 25 Feb 2013 22:20:29 -0000 1.1 |
| 23 |
+++ freetype-2.4.11-r1.ebuild 26 Feb 2013 14:40:54 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.11-r1.ebuild,v 1.1 2013/02/25 22:20:29 mgorny Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.11-r1.ebuild,v 1.2 2013/02/26 14:40:54 mgorny Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -79,8 +79,7 @@ |
| 33 |
sed -i -n -e '/@includedir@/{x;n;p;x};p' builds/unix/freetype-config.in || die |
| 34 |
|
| 35 |
if use utils; then |
| 36 |
- cd "${WORKDIR}/ft2demos-${PV}" |
| 37 |
- sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" Makefile || die |
| 38 |
+ cd "${WORKDIR}/ft2demos-${PV}" || die |
| 39 |
# Disable tests needing X11 when USE="-X". (bug #177597) |
| 40 |
if ! use X; then |
| 41 |
sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die |
| 42 |
@@ -114,9 +113,12 @@ |
| 43 |
|
| 44 |
if use utils; then |
| 45 |
einfo "Building utils" |
| 46 |
- cd "${WORKDIR}/ft2demos-${PV}" |
| 47 |
+ cd "${WORKDIR}/ft2demos-${PV}" || die |
| 48 |
# fix for Prefix, bug #339334 |
| 49 |
- emake X11_PATH="${EPREFIX}/usr/$(get_libdir)" |
| 50 |
+ # XXX: replace ${ARCH} assumption when bug #459210 is fixed |
| 51 |
+ emake X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ |
| 52 |
+ TOP_DIR="${S}" \ |
| 53 |
+ {BUILD_DIR,OBJ_DIR}="${S%%/}-${ARCH}" |
| 54 |
fi |
| 55 |
} |
| 56 |
|
| 57 |
@@ -125,20 +127,22 @@ |
| 58 |
|
| 59 |
if use utils; then |
| 60 |
einfo "Installing utils" |
| 61 |
- rm "${WORKDIR}"/ft2demos-${PV}/bin/README |
| 62 |
+ rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die |
| 63 |
+ local ft2demo |
| 64 |
for ft2demo in ../ft2demos-${PV}/bin/*; do |
| 65 |
- ./builds/unix/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \ |
| 66 |
- "${ED}"/usr/bin |
| 67 |
+ "${S%%/}-${ARCH}"/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \ |
| 68 |
+ "${ED}"/usr/bin || die |
| 69 |
done |
| 70 |
fi |
| 71 |
|
| 72 |
if use fontforge; then |
| 73 |
# Probably fontforge needs less but this way makes things simplier... |
| 74 |
einfo "Installing internal headers required for fontforge" |
| 75 |
+ local header |
| 76 |
find src/truetype include/freetype/internal -name '*.h' | \ |
| 77 |
while read header; do |
| 78 |
- mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" |
| 79 |
- cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" |
| 80 |
+ mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die |
| 81 |
+ cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die |
| 82 |
done |
| 83 |
fi |
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
|
| 88 |
1.363 media-libs/freetype/ChangeLog |
| 89 |
|
| 90 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?rev=1.363&view=markup |
| 91 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?rev=1.363&content-type=text/plain |
| 92 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?r1=1.362&r2=1.363 |
| 93 |
|
| 94 |
Index: ChangeLog |
| 95 |
=================================================================== |
| 96 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v |
| 97 |
retrieving revision 1.362 |
| 98 |
retrieving revision 1.363 |
| 99 |
diff -u -r1.362 -r1.363 |
| 100 |
--- ChangeLog 25 Feb 2013 22:20:29 -0000 1.362 |
| 101 |
+++ ChangeLog 26 Feb 2013 14:40:54 -0000 1.363 |
| 102 |
@@ -1,6 +1,9 @@ |
| 103 |
# ChangeLog for media-libs/freetype |
| 104 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 105 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.362 2013/02/25 22:20:29 mgorny Exp $ |
| 106 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.363 2013/02/26 14:40:54 mgorny Exp $ |
| 107 |
+ |
| 108 |
+ 26 Feb 2013; Michał Górny <mgorny@g.o> freetype-2.4.11-r1.ebuild: |
| 109 |
+ Fix out-of-source demo builds. |
| 110 |
|
| 111 |
*freetype-2.4.11-r1 (25 Feb 2013) |
Archives