From 9a62c9c3ddf389d41d8b39b18bd513c3f375cca7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 6 Jun 2012 09:55:32 +0200 Subject: [PATCH] gd: rebuild against libpng-1.5. --- srcpkgs/gd/gd-devel.template | 4 +--- srcpkgs/gd/gd-progs.template | 4 +--- srcpkgs/gd/gd.rshlibs | 2 +- srcpkgs/gd/template | 12 ++++++------ 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/srcpkgs/gd/gd-devel.template b/srcpkgs/gd/gd-devel.template index f3fd6ca8e5..da1e8ffc6e 100644 --- a/srcpkgs/gd/gd-devel.template +++ b/srcpkgs/gd/gd-devel.template @@ -1,13 +1,11 @@ # Template file for 'gd-devel'. # -depends="libXpm-devel libX11-devel jpeg-devel fontconfig-devel freetype-devel libpng-devel zlib-devel gd" +depends="libXpm-devel jpeg-devel fontconfig-devel zlib-devel libpng-devel gd>=$version" short_desc="${sourcepkg} development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - - do_install() { vmove usr/include usr vmove "usr/lib/*.a" usr/lib diff --git a/srcpkgs/gd/gd-progs.template b/srcpkgs/gd/gd-progs.template index 5fd9fc5a6a..a75c5c2ab1 100644 --- a/srcpkgs/gd/gd-progs.template +++ b/srcpkgs/gd/gd-progs.template @@ -1,14 +1,12 @@ # Template file for 'gd-progs'. # -depends="perl>=0" +depends="perl" short_desc="Utility programs that use libgd" long_desc="${long_desc} This package contains the utility programs that use the GD library." - - do_install() { vmove usr/bin usr } diff --git a/srcpkgs/gd/gd.rshlibs b/srcpkgs/gd/gd.rshlibs index 033a457e8f..530dee5c8a 100644 --- a/srcpkgs/gd/gd.rshlibs +++ b/srcpkgs/gd/gd.rshlibs @@ -3,7 +3,7 @@ libX11.so.6 libjpeg.so.8 libfontconfig.so.1 libfreetype.so.6 -libpng14.so.14 libz.so.1 libm.so.6 libc.so.6 +libpng15.so.15 diff --git a/srcpkgs/gd/template b/srcpkgs/gd/template index 73aa85cac6..0fc91d151e 100644 --- a/srcpkgs/gd/template +++ b/srcpkgs/gd/template @@ -1,13 +1,15 @@ # Template build file for 'gd'. pkgname=gd version=2.0.35 -revision=7 -distfiles="http://jaist.dl.sourceforge.net/project/buluoos/0.1/src/gd-$version.tar.bz2" -#distfiles="http://www.libgd.org/releases/gd-$version.tar.bz2" +revision=8 build_style=gnu-configure -makedepends="pkg-config libXpm-devel libX11-devel jpeg-devel fontconfig-devel freetype-devel libpng-devel zlib-devel glibc-devel" +makedepends="pkg-config libXpm-devel jpeg-devel fontconfig-devel libpng-devel>=1.5.10" +subpackages="gd-devel gd-progs" short_desc="Graphics library for the dynamic creation of images" maintainer="Juan RP " +homepage="http://www.libgd.org/" +license="BSD" +distfiles="http://jaist.dl.sourceforge.net/project/buluoos/0.1/src/gd-$version.tar.bz2" checksum=bf222490749d2a9a9ac3593b01eb55aed98461ff81202414707f61b42aa300f9 long_desc=" gd is a graphics library. It allows your code to quickly draw images @@ -25,5 +27,3 @@ long_desc=" It is not necessary or desirable for gd to become a kitchen-sink graphics package, but incorporates most of the commonly requested features for an 8-bit 2D package." - -subpackages="$pkgname-devel $pkgname-progs"