diff options
| author | David Spencer <baildon.research@googlemail.com> | 2015-08-04 01:26:28 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-17 09:40:16 +0700 |
| commit | 663e45789f542ae166fde8dcc7dee8ecbed8db31 (patch) | |
| tree | 5936138db9189e439064e23cb74c213213057cdd | |
| parent | 32920bf6d93d818be5334f6edd79afeb287023ce (diff) | |
| download | slackbuilds-663e45789f542ae166fde8dcc7dee8ecbed8db31.tar.gz | |
graphics/plotutils: Patched SlackBuild.
Fixes build failure with libpng16 on -current.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | graphics/plotutils/plotutils-2.6-libpng-1.5.patch | 31 | ||||
| -rw-r--r-- | graphics/plotutils/plotutils.SlackBuild | 3 | ||||
| -rw-r--r-- | graphics/plotutils/plotutils.info | 2 |
3 files changed, 35 insertions, 1 deletions
diff --git a/graphics/plotutils/plotutils-2.6-libpng-1.5.patch b/graphics/plotutils/plotutils-2.6-libpng-1.5.patch new file mode 100644 index 0000000000..8a10d19e56 --- /dev/null +++ b/graphics/plotutils/plotutils-2.6-libpng-1.5.patch @@ -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 diff --git a/graphics/plotutils/plotutils.SlackBuild b/graphics/plotutils/plotutils.SlackBuild index d935b9d413..9f769eaaa7 100644 --- a/graphics/plotutils/plotutils.SlackBuild +++ b/graphics/plotutils/plotutils.SlackBuild @@ -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 \ diff --git a/graphics/plotutils/plotutils.info b/graphics/plotutils/plotutils.info index ead3396b61..51d93cbb9c 100644 --- a/graphics/plotutils/plotutils.info +++ b/graphics/plotutils/plotutils.info @@ -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="" |