summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-04-29 20:03:53 +0200
committertnut <thierryn1 at hispeed dot ch>2010-04-29 20:03:53 +0200
commited718bd19790a9901e0107026dfac3294ba64a8c (patch)
treebb95cb0a1a826674002f703c8f6af59a3544e898
parent0bfb0714305c87926d9be0cf216c42a0a9cf0be5 (diff)
downloadnutyx-extra-ed718bd19790a9901e0107026dfac3294ba64a8c.tar.gz
nutyx-extra-ed718bd19790a9901e0107026dfac3294ba64a8c.tar.bz2
nutyx-extra-ed718bd19790a9901e0107026dfac3294ba64a8c.tar.xz
nutyx-extra-ed718bd19790a9901e0107026dfac3294ba64a8c.zip
maj fltk#r7513-1
-rw-r--r--extra/fltk/.footprint1
-rw-r--r--extra/fltk/.md5sum2
-rw-r--r--extra/fltk/Pkgfile6
-rw-r--r--extra/fltk/libpng14.patch12
4 files changed, 16 insertions, 5 deletions
diff --git a/extra/fltk/.footprint b/extra/fltk/.footprint
index 16523f9a6..8dab3c63c 100644
--- a/extra/fltk/.footprint
+++ b/extra/fltk/.footprint
@@ -209,7 +209,6 @@ lrwxrwxrwx root/root usr/lib/libfltk2_glut.so -> libfltk2_glut.so.2.0
-rw-r--r-- root/root usr/lib/libfltk2_images.a
lrwxrwxrwx root/root usr/lib/libfltk2_images.so -> libfltk2_images.so.2.0
-rwxr-xr-x root/root usr/lib/libfltk2_images.so.2.0
--rw-r--r-- root/root usr/lib/libfltk2_png.a
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
diff --git a/extra/fltk/.md5sum b/extra/fltk/.md5sum
index bfcb606f6..9bbb96752 100644
--- a/extra/fltk/.md5sum
+++ b/extra/fltk/.md5sum
@@ -1,2 +1,2 @@
557544badbacca4ee1ebb2448f6e1f8a fltk-2.0.x-r7513.tar.bz2
-d0f5ec16a536efe1c5a3f3137c9e15cb scandir_posix.patch
+93955f17f56ad8b419ca1f8ea8c24a7f libpng14.patch
diff --git a/extra/fltk/Pkgfile b/extra/fltk/Pkgfile
index 4e243814f..97d65eb56 100644
--- a/extra/fltk/Pkgfile
+++ b/extra/fltk/Pkgfile
@@ -2,16 +2,16 @@
# URL: http://www.fltk.org/
# Maintainer: NuTyX core team
# Packager: thierryn1 at hispeed dot ch
-# Depends on: libjpeg libpng12 xorg-libxft xorg-libxi xorg-libxinerama mesa3d
+# Depends on: libjpeg libpng xorg-libxft xorg-libxi xorg-libxinerama mesa3d
name=fltk
version=r7513
release=1
source=(http://ftp.easysw.com/pub/fltk/snapshots/fltk-2.0.x-$version.tar.bz2\
- scandir_posix.patch)
+ libpng14.patch)
build() {
cd $name-*
-# patch -Np0 -i ../scandir_posix.patch
+ patch -Np1 -i ../libpng14.patch
./configure --prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
diff --git a/extra/fltk/libpng14.patch b/extra/fltk/libpng14.patch
new file mode 100644
index 000000000..f6c49228e
--- /dev/null
+++ b/extra/fltk/libpng14.patch
@@ -0,0 +1,12 @@
+diff -upr fltk-2.0.x-r6829.orig/images/fl_png.cxx fltk-2.0.x-r6829/images/fl_png.cxx
+--- fltk-2.0.x-r6829.orig/images/fl_png.cxx 2010-01-23 04:42:12.000000000 +0200
++++ fltk-2.0.x-r6829/images/fl_png.cxx 2010-01-23 04:58:31.000000000 +0200
+@@ -62,7 +62,7 @@ bool pngImage::test(const uchar* datas,
+ #if !HAVE_LIBPNG
+ return 0;
+ #else
+- return png_check_sig((png_byte*)datas, (int)size)!=0;
++ return png_sig_cmp((png_byte*)datas, 0, (int)size)==0;
+ #endif
+ }
+