mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-20 19:41:34 +01:00
graphics/plotutils: Patched SlackBuild.
Fixes build failure with libpng16 on -current. Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
parent
32920bf6d9
commit
663e45789f
3 changed files with 35 additions and 1 deletions
31
graphics/plotutils/plotutils-2.6-libpng-1.5.patch
Normal file
31
graphics/plotutils/plotutils-2.6-libpng-1.5.patch
Normal file
|
@ -0,0 +1,31 @@
|
|||
fix building with libpng-1.5
|
||||
|
||||
--- libplot/z_write.c
|
||||
+++ libplot/z_write.c
|
||||
@@ -164,7 +164,7 @@
|
||||
}
|
||||
|
||||
/* cleanup after libpng errors (error handler does a longjmp) */
|
||||
- if (setjmp (png_ptr->jmpbuf))
|
||||
+ if (setjmp (png_jmpbuf (png_ptr)))
|
||||
{
|
||||
png_destroy_write_struct (&png_ptr, (png_info **)NULL);
|
||||
return -1;
|
||||
@@ -444,7 +444,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
- longjmp (png_ptr->jmpbuf, 1);
|
||||
+ png_longjmp (png_ptr, 1);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -515,7 +515,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
- longjmp (png_ptr->jmpbuf, 1);
|
||||
+ png_longjmp (png_ptr, 1);
|
||||
}
|
||||
|
||||
static void
|
|
@ -51,6 +51,9 @@ find -L . \
|
|||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||
-exec chmod 644 {} \;
|
||||
|
||||
# Fix build with libpng16 (-current) (patch from Arch Linux)
|
||||
patch -p0 < $CWD/plotutils-2.6-libpng-1.5.patch
|
||||
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
./configure \
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
PRGNAM="plotutils"
|
||||
VERSION="2.6"
|
||||
HOMEPAGE="http://www.gnu.org/software/plotutils"
|
||||
DOWNLOAD="ftp://mirrors.kernel.org/gnu/plotutils/plotutils-2.6.tar.gz"
|
||||
DOWNLOAD="http://mirrors.kernel.org/gnu/plotutils/plotutils-2.6.tar.gz"
|
||||
MD5SUM="c08a424bd2438c80a786a7f4b5bb6a40"
|
||||
DOWNLOAD_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
|
|
Loading…
Reference in a new issue