| 1 |
polynomial-c 13/12/06 22:04:42 |
| 2 |
|
| 3 |
Modified: ChangeLog freetype-2.5.1.ebuild |
| 4 |
Log: |
| 5 |
Fixed compilation with "utils" USE flag being enabled. Got rid of all instances of MY_PV this time |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.384 media-libs/freetype/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?rev=1.384&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?rev=1.384&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?r1=1.383&r2=1.384 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v |
| 19 |
retrieving revision 1.383 |
| 20 |
retrieving revision 1.384 |
| 21 |
diff -u -r1.383 -r1.384 |
| 22 |
--- ChangeLog 6 Dec 2013 21:42:02 -0000 1.383 |
| 23 |
+++ ChangeLog 6 Dec 2013 22:04:42 -0000 1.384 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for media-libs/freetype |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.383 2013/12/06 21:42:02 floppym Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.384 2013/12/06 22:04:42 polynomial-c Exp $ |
| 29 |
+ |
| 30 |
+ 06 Dec 2013; Lars Wendler <polynomial-c@g.o> freetype-2.5.1.ebuild, |
| 31 |
+ +files/ft2demos-2.5.1-compilefix.patch: |
| 32 |
+ Fixed compilation with "utils" USE flag being enabled. Got rid of all |
| 33 |
+ instances of MY_PV this time. |
| 34 |
|
| 35 |
06 Dec 2013; Mike Gilbert <floppym@g.o> freetype-2.5.1.ebuild: |
| 36 |
Restore MY_PV variable. |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.3 media-libs/freetype/freetype-2.5.1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.5.1.ebuild?rev=1.3&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.5.1.ebuild?rev=1.3&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.5.1.ebuild?r1=1.2&r2=1.3 |
| 45 |
|
| 46 |
Index: freetype-2.5.1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.1.ebuild,v |
| 49 |
retrieving revision 1.2 |
| 50 |
retrieving revision 1.3 |
| 51 |
diff -u -r1.2 -r1.3 |
| 52 |
--- freetype-2.5.1.ebuild 6 Dec 2013 21:42:02 -0000 1.2 |
| 53 |
+++ freetype-2.5.1.ebuild 6 Dec 2013 22:04:42 -0000 1.3 |
| 54 |
@@ -1,13 +1,11 @@ |
| 55 |
# Copyright 1999-2013 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.1.ebuild,v 1.2 2013/12/06 21:42:02 floppym Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.1.ebuild,v 1.3 2013/12/06 22:04:42 polynomial-c Exp $ |
| 59 |
|
| 60 |
EAPI=5 |
| 61 |
|
| 62 |
inherit autotools-multilib flag-o-matic multilib |
| 63 |
|
| 64 |
-MY_PV=${PV} |
| 65 |
- |
| 66 |
DESCRIPTION="A high-quality and portable font engine" |
| 67 |
HOMEPAGE="http://www.freetype.org/" |
| 68 |
SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 |
| 69 |
@@ -78,16 +76,9 @@ |
| 70 |
|
| 71 |
epatch "${FILESDIR}"/${P}-TT_Load_Simple_Glyph_fix.patch |
| 72 |
|
| 73 |
- #if use png; then |
| 74 |
- # local pnglibs=$(pkg-config libpng --libs) # 488222 487646 |
| 75 |
- # sed -e "s@××××.private: %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS%@××××.private: %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS% ${pnglibs}@" \ |
| 76 |
- # -e 's@Requires:@Requires.private: zlib libpng\nRequires:@' \ |
| 77 |
- # -i "${S}/builds/unix/freetype2.in" \ |
| 78 |
- # || die "Could not sed pkg-config libpng --libs in builds/unix/freetype2.in" |
| 79 |
- #fi |
| 80 |
- |
| 81 |
if use utils; then |
| 82 |
- cd "${WORKDIR}/ft2demos-${MY_PV}" || die |
| 83 |
+ cd "${WORKDIR}/ft2demos-${PV}" || die |
| 84 |
+ epatch "${FILESDIR}"/ft2demos-${PV}-compilefix.patch |
| 85 |
# Disable tests needing X11 when USE="-X". (bug #177597) |
| 86 |
if ! use X; then |
| 87 |
sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die |
| 88 |
@@ -124,7 +115,7 @@ |
| 89 |
# fix for Prefix, bug #339334 |
| 90 |
multilib_for_best_abi autotools-utils_src_compile \ |
| 91 |
X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ |
| 92 |
- FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${MY_PV}" |
| 93 |
+ FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" |
| 94 |
fi |
| 95 |
} |
| 96 |
|
| 97 |
@@ -134,9 +125,9 @@ |
| 98 |
if use utils; then |
| 99 |
install_utils() { |
| 100 |
einfo "Installing utils" |
| 101 |
- rm "${WORKDIR}"/ft2demos-${MY_PV}/bin/README || die |
| 102 |
+ rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die |
| 103 |
local ft2demo |
| 104 |
- for ft2demo in ../ft2demos-${MY_PV}/bin/*; do |
| 105 |
+ for ft2demo in ../ft2demos-${PV}/bin/*; do |
| 106 |
"${BUILD_DIR}"/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \ |
| 107 |
"${ED}"/usr/bin || die |
| 108 |
done |
Archives