diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-01-21 22:56:05 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-01-21 22:56:05 +0000 |
commit | 187706fa8b9815ae964747b3dbbfb7ac699a6f71 (patch) | |
tree | 7f922b57b8955f2e71137a57be3db7edd7d188c9 /media-libs/netpbm | |
parent | version bump (diff) | |
download | gentoo-2-187706fa8b9815ae964747b3dbbfb7ac699a6f71.tar.gz gentoo-2-187706fa8b9815ae964747b3dbbfb7ac699a6f71.tar.bz2 gentoo-2-187706fa8b9815ae964747b3dbbfb7ac699a6f71.zip |
Apply fix from upstream for fontdir bug #249384.
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)
Diffstat (limited to 'media-libs/netpbm')
-rw-r--r-- | media-libs/netpbm/ChangeLog | 8 | ||||
-rw-r--r-- | media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch | 50 | ||||
-rw-r--r-- | media-libs/netpbm/netpbm-10.44.00-r1.ebuild | 149 |
3 files changed, 206 insertions, 1 deletions
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index 4e35f1375ea5..e2d8c9d85ca8 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/netpbm # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.202 2009/01/21 22:55:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.203 2009/01/21 22:56:05 vapier Exp $ + +*netpbm-10.44.00-r1 (21 Jan 2009) + + 21 Jan 2009; Mike Frysinger <vapier@gentoo.org> + +files/netpbm-10.44.00-fontdir.patch, +netpbm-10.44.00-r1.ebuild: + Apply fix from upstream for fontdir bug #249384. *netpbm-10.26.59 (21 Jan 2009) diff --git a/media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch b/media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch new file mode 100644 index 000000000000..35c4a17b5d7e --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch @@ -0,0 +1,50 @@ +fix from upstream + +http://bugs.gentoo.org/249384#c6 + +Index: converter/ppm/picttoppm.c +=================================================================== +--- converter/ppm/picttoppm.c (revision 811) ++++ converter/ppm/picttoppm.c (revision 812) +@@ -4056,6 +4056,23 @@ + + + ++static void ++loadDefaultFontDir(void) { ++/*---------------------------------------------------------------------------- ++ Load the fonts from the font directory file "fontdir" (in the current ++ directory), if it exists. ++-----------------------------------------------------------------------------*/ ++ struct stat statbuf; ++ int rc; ++ ++ rc = stat("fontdir", &statbuf); ++ ++ if (rc == 0) ++ load_fontdir("fontdir"); ++} ++ ++ ++ + int + main(int argc, char * argv[]) { + int argn; +@@ -4092,8 +4109,6 @@ + ++argn; + } + +- load_fontdir("fontdir"); +- + if (argn < argc) { + ifp = pm_openr(argv[argn]); + ++argn; +@@ -4103,6 +4118,8 @@ + if (argn != argc) + pm_usage(usage); + ++ loadDefaultFontDir(); ++ + if (header) { + stage = "Reading 512 byte header"; + skip(512); diff --git a/media-libs/netpbm/netpbm-10.44.00-r1.ebuild b/media-libs/netpbm/netpbm-10.44.00-r1.ebuild new file mode 100644 index 000000000000..ce9d9dd3316a --- /dev/null +++ b/media-libs/netpbm/netpbm-10.44.00-r1.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.44.00-r1.ebuild,v 1.1 2009/01/21 22:56:05 vapier Exp $ + +inherit flag-o-matic toolchain-funcs eutils multilib + +MAN_VER=10.33 +DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" +HOMEPAGE="http://netpbm.sourceforge.net/" +SRC_URI="mirror://gentoo/${P}.tar.lzma + mirror://gentoo/${PN}-${MAN_VER}-manpages.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="jbig jpeg jpeg2k png rle svga tiff xml zlib" + +RDEPEND="jpeg? ( >=media-libs/jpeg-6b ) + jpeg2k? ( media-libs/jasper ) + tiff? ( >=media-libs/tiff-3.5.5 ) + png? ( >=media-libs/libpng-1.2.1 ) + xml? ( dev-libs/libxml2 ) + zlib? ( sys-libs/zlib ) + svga? ( media-libs/svgalib ) + jbig? ( media-libs/jbigkit ) + rle? ( media-libs/urt )" +DEPEND="${RDEPEND} + app-arch/lzma-utils" + +maint_pkg_create() { + local base="/usr/local/src" + local srcdir="${base}/netpbm/release_number" + if [[ -d ${srcdir} ]] ; then + cd "${T}" || die + + ebegin "Exporting ${srcdir}/${PV} to netpbm-${PV}" + svn export -q ${srcdir}/${PV} netpbm-${PV} + eend $? || return 1 + + ebegin "Creating netpbm-${PV}.tar.lzma" + tar cf - netpbm-${PV} | lzma > netpbm-${PV}.tar.lzma + eend $? + + einfo "Tarball now ready at: ${T}/netpbm-${PV}.tar.lzma" + else + einfo "You need to run:" + einfo " cd ${base}" + einfo " svn co https://netpbm.svn.sourceforge.net/svnroot/netpbm" + die "need svn checkout dir" + fi +} +pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} && ! -e ${DISTDIR}/${P}.tar.lzma ]] && maint_pkg_create ; } + +netpbm_libtype() { + case ${CHOST} in + *-darwin*) echo dylib;; + *) echo unixshared;; + esac +} +netpbm_libsuffix() { + local suffix=$(get_libname) + echo ${suffix//\.} +} +netpbm_ldshlib() { + case ${CHOST} in + *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; + *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; + esac +} +netpbm_config() { + if use $1 ; then + [[ $2 != "!" ]] && echo -l${2:-$1} + else + echo NONE + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/netpbm-10.31-build.patch + epatch "${FILESDIR}"/netpbm-10.35.0-xml2.patch #137871 + epatch "${FILESDIR}"/netpbm-10.44.00-fontdir.patch #249384#c6 + + rm -f configure + cp Makefile.config.in Makefile.config + cat >> Makefile.config <<-EOF + # Gentoo toolchain options + CC = $(tc-getCC) -Wall + CC_FOR_BUILD = $(tc-getBUILD_CC) + AR = $(tc-getAR) + RANLIB = $(tc-getRANLIB) + STRIPFLAG = + CFLAGS_SHLIB = -fPIC + + # workaround parallel build issues + SYMLINK = ln -sf + + NETPBMLIBTYPE = $(netpbm_libtype) + NETPBMLIBSUFFIX = $(netpbm_libsuffix) + LDSHLIB = $(netpbm_ldshlib) + + # Gentoo build options + TIFFLIB = $(netpbm_config tiff) + JPEGLIB = $(netpbm_config jpeg) + PNGLIB = $(netpbm_config png) + ZLIB = $(netpbm_config zlib z) + LINUXSVGALIB = $(netpbm_config svga vga) + XML2_LIBS = $(netpbm_config xml xml2) + JBIGLIB = -ljbig + JBIGHDR_DIR = $(netpbm_config jbig "!") + JASPERLIB = -ljasper + JASPERHDR_DIR = $(netpbm_config jpeg2k "!") + URTLIB = $(netpbm_config rle) + URTHDR_DIR = + EOF +} + +src_compile() { + replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc" + replace-flags -mcpu=v9 "-mcpu=v8 -mtune=v9" + + emake -j1 || die +} + +src_install() { + emake -j1 package pkgdir="${D}"/usr || die "make package failed" + + [[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) + + # Remove cruft that we don't need, and move around stuff we want + rm -f "${D}"/usr/bin/{doc.url,manweb} || die + rm -r "${D}"/usr/man/web || die + rm -r "${D}"/usr/link || die + rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo} || die + dodir /usr/share + mv "${D}"/usr/man "${D}"/usr/share/ || die + mv "${D}"/usr/misc "${D}"/usr/share/netpbm || die + + dodoc README + cd doc + GLOBIGNORE='*.html:.*' dodoc * + dohtml -r . + + cd "${WORKDIR}"/${PN}-${MAN_VER}-manpages || die + doman *.[0-9] + dodoc README* gen-netpbm-manpages +} |