wok-6.x rev 6557
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.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Thu Oct 07 19:00:41 2010 +0000 (2010-10-07) |
parents | 6f01180108ea |
children | 6775b1ec2f6f |
files | fltk-dev/receipt fltk-doc/receipt fltk/receipt fltk/stuff/fl_set_fonts_xft.patch |
line diff
1.1 --- a/fltk-dev/receipt Thu Oct 07 15:01:45 2010 +0000 1.2 +++ b/fltk-dev/receipt Thu Oct 07 19:00:41 2010 +0000 1.3 @@ -1,10 +1,11 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="fltk-dev" 1.7 -VERSION="1.1.9" 1.8 +VERSION="1.1.10" 1.9 CATEGORY="development" 1.10 SHORT_DESC="Fast Light Tool Kit devel files." 1.11 WANTED="fltk" 1.12 +DEPENDS="fltk" 1.13 MAINTAINER="pankso@slitaz.org" 1.14 WEB_SITE="http://www.fltk.org/" 1.15
2.1 --- a/fltk-doc/receipt Thu Oct 07 15:01:45 2010 +0000 2.2 +++ b/fltk-doc/receipt Thu Oct 07 19:00:41 2010 +0000 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="fltk-doc" 2.7 -VERSION="1.1.9" 2.8 +VERSION="1.1.10" 2.9 CATEGORY="development" 2.10 SHORT_DESC="Fast Light Tool Kit documentation and examples." 2.11 WANTED="fltk"
3.1 --- a/fltk/receipt Thu Oct 07 15:01:45 2010 +0000 3.2 +++ b/fltk/receipt Thu Oct 07 19:00:41 2010 +0000 3.3 @@ -1,13 +1,13 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="fltk" 3.7 -VERSION="1.1.9" 3.8 +VERSION="1.1.10" 3.9 CATEGORY="system-tools" 3.10 SHORT_DESC="Fast Light Tool Kit (provide fluid)." 3.11 MAINTAINER="pankso@slitaz.org" 3.12 -DEPENDS="expat fontconfig freetype jpeg xorg-libX11 xorg-libXau xorg-libXdmcp \ 3.13 +DEPENDS="expat fontconfig freetype libpng jpeg xorg-libX11 xorg-libXau xorg-libXdmcp \ 3.14 xorg-libXext xorg-libXft xorg-libXrender zlib libpng gcc-lib-base" 3.15 -BUILD_DEPENDS="xorg-dev" 3.16 +BUILD_DEPENDS="xorg-dev jpeg-dev libpng-dev" 3.17 TARBALL="$PACKAGE-$VERSION-source.tar.bz2" 3.18 WEB_SITE="http://www.fltk.org/" 3.19 WGET_URL="http://ftp.easysw.com/pub/fltk/$VERSION/$TARBALL" 3.20 @@ -17,12 +17,12 @@ 3.21 { 3.22 cd $src 3.23 patch -p 0 < ../stuff/filename_list-dirent.patch || exit 1 3.24 - patch -p 0 < ../stuff/fl_set_fonts_xft.patch || exit 1 3.25 ./configure \ 3.26 --prefix=/usr \ 3.27 --mandir=/usr/share/man \ 3.28 --enable-shared \ 3.29 --enable-xft \ 3.30 + --enable-threads \ 3.31 $CONFIGURE_ARGS && 3.32 make && 3.33 make DESTDIR=$PWD/_pkg install
4.1 --- a/fltk/stuff/fl_set_fonts_xft.patch Thu Oct 07 15:01:45 2010 +0000 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,19 +0,0 @@ 4.4 ---- src/fl_set_fonts_xft.cxx 2009-03-04 10:58:49.000000000 +0000 4.5 -+++ src/fl_set_fonts_xft.cxx 2009-03-04 11:01:25.000000000 +0000 4.6 -@@ -253,13 +253,13 @@ 4.7 - // So the bit we want is up to the first comma - BUT some strings have 4.8 - // more than one name, separated by, guess what?, a comma... 4.9 - stop = start = first = 0; 4.10 -- stop = strchr((const char *)font, ','); 4.11 -- start = strchr((const char *)font, ':'); 4.12 -+ stop = strchr((char *)font, ','); 4.13 -+ start = strchr((char *)font, ':'); 4.14 - if ((stop) && (start) && (stop < start)) 4.15 - { 4.16 - first = stop + 1; // discard first version of name 4.17 - // find first comma *after* the end of the name 4.18 -- stop = strchr((const char *)start, ','); 4.19 -+ stop = strchr((char *)start, ','); 4.20 - } 4.21 - else 4.22 - {