From dafb43e50cc3c51314205a842eccaaffa5c2829a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 6 Jun 2012 10:13:36 +0200 Subject: [PATCH] fltk: rebuild against libpng-1.5. --- srcpkgs/fltk/fltk-devel.template | 3 +-- srcpkgs/fltk/fltk.rshlibs | 2 +- srcpkgs/fltk/template | 16 +++++++--------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/srcpkgs/fltk/fltk-devel.template b/srcpkgs/fltk/fltk-devel.template index 3c9f9880d5..deee8be0a8 100644 --- a/srcpkgs/fltk/fltk-devel.template +++ b/srcpkgs/fltk/fltk-devel.template @@ -1,12 +1,11 @@ # Template file for 'fltk-devel'. # -depends="fltk>=1.3.0" +depends="fltk>=$version" short_desc="${short_desc} -- 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/fltk/fltk.rshlibs b/srcpkgs/fltk/fltk.rshlibs index b2f4dc35bb..ac092465da 100644 --- a/srcpkgs/fltk/fltk.rshlibs +++ b/srcpkgs/fltk/fltk.rshlibs @@ -1,4 +1,3 @@ -libpng14.so.14 libpthread.so.0 libX11.so.6 libstdc++.so.6 @@ -12,3 +11,4 @@ libm.so.6 libgcc_s.so.1 libz.so.1 libjpeg.so.8 +libpng15.so.15 diff --git a/srcpkgs/fltk/template b/srcpkgs/fltk/template index b0d95214e5..b2cb845fed 100644 --- a/srcpkgs/fltk/template +++ b/srcpkgs/fltk/template @@ -1,15 +1,16 @@ # Template file for 'fltk' pkgname=fltk version=1.3.0 +revision=2 +build_style=gnu-configure +configure_args="--enable-threads --enable-xft --enable-shared" +makedepends="jpeg-devel libpng-devel>=1.5.10 MesaLib-devel alsa-lib-devel freetype-devel libXinerama-devel libXft-devel" +subpackages="fltk-devel" +short_desc="Cross-platform C++ GUI toolkit" +maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.fltk.org/" distfiles="http://ftp.easysw.com/pub/fltk/$version/fltk-$version-source.tar.gz" -build_style=gnu-configure -configure_args="--enable-threads --enable-xft --enable-shared" -makedepends="jpeg-devel libpng-devel MesaLib-devel alsa-lib-devel freetype-devel libXinerama-devel libXft-devel" -revision=1 -short_desc="Cross-platform C++ GUI toolkit" -maintainer="Juan RP " checksum=990676808294cea4cca3de833ad5a5de08073c11b665356d4ecf35d22535b21c long_desc=" FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), @@ -20,9 +21,6 @@ long_desc=" fine as a shared library. FLTK also includes an excellent UI builder called FLUID that can be used to create applications in minutes." -subpackages="$pkgname-devel" - - post_install() { rm -rf ${DESTDIR}/usr/share/man/cat[13] }