# HG changeset patch # User Christopher Rogers # Date 1286478041 0 # Node ID 9a49781544921d6b0794d8028b82419781c3a071 # Parent 6f01180108ea8724591e2058e7c4e04307292f55 Up: fltk, fltk-dev, fltk-doc to 1.1.10. I removed one of the patches since its not need anymore. Added --enable-threads so cinepaint can build. diff -r 6f01180108ea -r 9a4978154492 fltk-dev/receipt --- a/fltk-dev/receipt Thu Oct 07 15:01:45 2010 +0000 +++ b/fltk-dev/receipt Thu Oct 07 19:00:41 2010 +0000 @@ -1,10 +1,11 @@ # SliTaz package receipt. PACKAGE="fltk-dev" -VERSION="1.1.9" +VERSION="1.1.10" CATEGORY="development" SHORT_DESC="Fast Light Tool Kit devel files." WANTED="fltk" +DEPENDS="fltk" MAINTAINER="pankso@slitaz.org" WEB_SITE="http://www.fltk.org/" diff -r 6f01180108ea -r 9a4978154492 fltk-doc/receipt --- a/fltk-doc/receipt Thu Oct 07 15:01:45 2010 +0000 +++ b/fltk-doc/receipt Thu Oct 07 19:00:41 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="fltk-doc" -VERSION="1.1.9" +VERSION="1.1.10" CATEGORY="development" SHORT_DESC="Fast Light Tool Kit documentation and examples." WANTED="fltk" diff -r 6f01180108ea -r 9a4978154492 fltk/receipt --- a/fltk/receipt Thu Oct 07 15:01:45 2010 +0000 +++ b/fltk/receipt Thu Oct 07 19:00:41 2010 +0000 @@ -1,13 +1,13 @@ # SliTaz package receipt. PACKAGE="fltk" -VERSION="1.1.9" +VERSION="1.1.10" CATEGORY="system-tools" SHORT_DESC="Fast Light Tool Kit (provide fluid)." MAINTAINER="pankso@slitaz.org" -DEPENDS="expat fontconfig freetype jpeg xorg-libX11 xorg-libXau xorg-libXdmcp \ +DEPENDS="expat fontconfig freetype libpng jpeg xorg-libX11 xorg-libXau xorg-libXdmcp \ xorg-libXext xorg-libXft xorg-libXrender zlib libpng gcc-lib-base" -BUILD_DEPENDS="xorg-dev" +BUILD_DEPENDS="xorg-dev jpeg-dev libpng-dev" TARBALL="$PACKAGE-$VERSION-source.tar.bz2" WEB_SITE="http://www.fltk.org/" WGET_URL="http://ftp.easysw.com/pub/fltk/$VERSION/$TARBALL" @@ -17,12 +17,12 @@ { cd $src patch -p 0 < ../stuff/filename_list-dirent.patch || exit 1 - patch -p 0 < ../stuff/fl_set_fonts_xft.patch || exit 1 ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ --enable-shared \ --enable-xft \ + --enable-threads \ $CONFIGURE_ARGS && make && make DESTDIR=$PWD/_pkg install diff -r 6f01180108ea -r 9a4978154492 fltk/stuff/fl_set_fonts_xft.patch --- a/fltk/stuff/fl_set_fonts_xft.patch Thu Oct 07 15:01:45 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ ---- src/fl_set_fonts_xft.cxx 2009-03-04 10:58:49.000000000 +0000 -+++ src/fl_set_fonts_xft.cxx 2009-03-04 11:01:25.000000000 +0000 -@@ -253,13 +253,13 @@ - // So the bit we want is up to the first comma - BUT some strings have - // more than one name, separated by, guess what?, a comma... - stop = start = first = 0; -- stop = strchr((const char *)font, ','); -- start = strchr((const char *)font, ':'); -+ stop = strchr((char *)font, ','); -+ start = strchr((char *)font, ':'); - if ((stop) && (start) && (stop < start)) - { - first = stop + 1; // discard first version of name - // find first comma *after* the end of the name -- stop = strchr((const char *)start, ','); -+ stop = strchr((char *)start, ','); - } - else - {