rpms/netpbm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix open() calls so that netpbm builds with new glibc

Browse Source
This commit is contained in:
Jindrich Novy 2007-08-23 07:53:36 +00:00
parent 9e15b8d0b9
commit 6b912db7f1
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
netpbm-10.35-glibc.patch Normal file
View File

@ -0,0 +1,13 @@
--- netpbm-10.35/converter/other/pnmtotiffcmyk.c.glibc 2006-09-18 12:20:06.000000000 +0200
+++ netpbm-10.35/converter/other/pnmtotiffcmyk.c 2007-08-23 09:18:30.000000000 +0200
@@ -974,8 +974,8 @@ int main( int argc, char **argv ) {
if ( (err = parseOpts( argc, argv, rt )) ) goto exit ;
- if ( (err = rt->in->open( rt->in, rt )) ) goto exit ;
- if ( (err = rt->out->open( rt->out, rt )) ) goto exit ;
+ if ( (err = (rt->in->open)( rt->in, rt )) ) goto exit ;
+ if ( (err = (rt->out->open)( rt->out, rt )) ) goto exit ;
while ( rt->in->hasMore( rt->in ) ) {
if ( (err = rt->in->next( rt->in, &r, &g, &b )) ) goto exit ;

3
netpbm.spec
View File

@ -23,6 +23,7 @@ Patch14: netpbm-10.34-pamscale.patch
Patch15: netpbm-10.35-ppmquantall.patch Patch15: netpbm-10.35-ppmquantall.patch
Patch16: netpbm-10.35-pbmtog3segfault.patch Patch16: netpbm-10.35-pbmtog3segfault.patch
Patch17: netpbm-10.35-pbmtomacp.patch Patch17: netpbm-10.35-pbmtomacp.patch
Patch18: netpbm-10.35-glibc.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
BuildRequires: libX11-devel BuildRequires: libX11-devel
@ -80,6 +81,7 @@ netpbm-progs. You'll also need to install the netpbm package.
%patch15 -p1 -b .pqall %patch15 -p1 -b .pqall
%patch16 -p1 -b .pbmtog3segfault %patch16 -p1 -b .pbmtog3segfault
%patch17 -p1 -b .pbmtomacp %patch17 -p1 -b .pbmtomacp
%patch18 -p1 -b .glibc
##mv shhopt/shhopt.h shhopt/pbmshhopt.h ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@ -193,6 +195,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Thu Aug 23 2007 Jindrich Novy <jnovy@redhat.com> 10.35-16 * Thu Aug 23 2007 Jindrich Novy <jnovy@redhat.com> 10.35-16
- rebuild for ppc32 - rebuild for ppc32
- fix open() calls so that netpbm builds with new glibc
* Mon Aug 20 2007 Jindrich Novy <jnovy@redhat.com> 10.35-15 * Mon Aug 20 2007 Jindrich Novy <jnovy@redhat.com> 10.35-15
- fix .ppmquantall patch (#207799) - fix .ppmquantall patch (#207799)