rpm/plotutils
SHA256
1
0
Fork 0
forked from pool/plotutils
Code Pull Requests Activity

Accepting request 132050 from Publishing

Browse Source 
- build also with libpng15
  * libpng15.patch

OBS-URL: https://build.opensuse.org/request/show/132050
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plotutils?expand=0&rev=18
This commit is contained in:
Stephan Kulow 2012-08-31 07:55:55 +00:00 committed by Git OBS Bridge
commit ff84f4dfa3
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
plotutils-libpng15.patch Normal file
View File

@ -0,0 +1,31 @@
Index: plotutils-2.6/libplot/z_write.c
===================================================================
--- plotutils-2.6.orig/libplot/z_write.c
+++ plotutils-2.6/libplot/z_write.c
@@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter *
}
/* 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 @@ _our_error_fn_stdio (png_struct *png_ptr
#endif
}
- longjmp (png_ptr->jmpbuf, 1);
+ longjmp (png_jmpbuf(png_ptr), 1);
}
static void
@@ -515,7 +515,7 @@ _our_error_fn_stream (png_struct *png_pt
#endif
}
- longjmp (png_ptr->jmpbuf, 1);
+ longjmp (png_jmpbuf(png_ptr), 1);
}
static void

6
plotutils.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 29 12:39:58 UTC 2012 - pgajdos@suse.com
- build also with libpng15
* libpng15.patch
-------------------------------------------------------------------
Mon Aug 6 13:20:52 UTC 2012 - pgajdos@suse.com

3
plotutils.spec
View File

@ -37,6 +37,8 @@ Patch: plotutils-man.patch
Patch1: plotutils-uninitialized.patch
Patch2: plotutils-dasharray-format.patch
Patch3: plotutils-autoreconf.patch
# libpng15.patch sent 2012-08-30 at rsm@math.arizona.edu
Patch4: plotutils-libpng15.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -164,6 +166,7 @@ Authors:
%patch1
%patch2
%patch3
%patch4 -p1
# Force update lex and bison code:
grep -rslE '(made by GNU Bison|A Bison parser, made from|"lex.yy.c")' . | xargs -r rm -f