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

- fix cmuwmtopbm and other utilities by making endianess functions work

Browse Source 
correctly on 64bit systems (#476863)
This commit is contained in:
Jindrich Novy 2009-01-22 09:38:13 +00:00
parent 9a37f8cc63
commit 1e0e8dec03
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
netpbm-10.35-64bitfix.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up netpbm-10.35.58/lib/libpm.c.64bitfix netpbm-10.35.58/lib/libpm.c
--- netpbm-10.35.58/lib/libpm.c.64bitfix 2009-01-22 08:49:25.000000000 +0100
+++ netpbm-10.35.58/lib/libpm.c 2009-01-22 08:50:38.000000000 +0100
@@ -1069,7 +1069,7 @@
pm_readbiglong(FILE * const ifP,
long * const lP) {
- int c;
+ unsigned int c;
unsigned long l;
c = getc(ifP);
@@ -1148,7 +1148,7 @@
int
pm_readlittlelong(FILE * const ifP,
long * const lP) {
- int c;
+ unsigned int c;
unsigned long l;
c = getc(ifP);

8
netpbm.spec
View File

@ -1,7 +1,7 @@
Summary: A library for handling different graphics file formats Summary: A library for handling different graphics file formats
Name: netpbm Name: netpbm
Version: 10.35.58 Version: 10.35.58
Release: 2%{?dist} Release: 3%{?dist}
# See copyright_summary for details # See copyright_summary for details
License: BSD and GPLv2 and IJG and MIT and Public Domain License: BSD and GPLv2 and IJG and MIT and Public Domain
Group: System Environment/Libraries Group: System Environment/Libraries
@ -33,6 +33,7 @@ Patch20: netpbm-10.35-rgbtxt.patch
Patch21: netpbm-10.35-pamtosvgsegfault.patch Patch21: netpbm-10.35-pamtosvgsegfault.patch
Patch22: netpbm-10.35-pnmmontagefix.patch Patch22: netpbm-10.35-pnmmontagefix.patch
Patch23: netpbm-10.35-pnmtofiasco-stdin.patch Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
Patch24: netpbm-10.35-64bitfix.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, python, jasper-devel BuildRequires: libX11-devel, python, jasper-devel
@ -96,6 +97,7 @@ netpbm-progs. You'll also need to install the netpbm package.
%patch21 -p1 -b .pamtosvgsegfault %patch21 -p1 -b .pamtosvgsegfault
%patch22 -p1 -b .pnmmontagefix %patch22 -p1 -b .pnmmontagefix
%patch23 -p1 -b .pnmtofiasco-stdin %patch23 -p1 -b .pnmtofiasco-stdin
%patch24 -p1 -b .64bitfix
##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
@ -223,6 +225,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/netpbm/ %{_datadir}/netpbm/
%changelog %changelog
* Thu Jan 22 2009 Jindrich Novy <jnovy@redhat.com> 10.35.58-3
- fix cmuwmtopbm and other utilities by making endianess
functions work correctly on 64bit systems (#476863)
* Wed Jan 21 2009 Jindrich Novy <jnovy@redhat.com> 10.35.58-2 * Wed Jan 21 2009 Jindrich Novy <jnovy@redhat.com> 10.35.58-2
- fix pnmtofiasco to accept image from stdin (#476989, #227283) - fix pnmtofiasco to accept image from stdin (#476989, #227283)