From 952f831e98abeb4261489b83772665b6f13d79f1 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Fri, 15 Feb 2008 11:00:35 +0000
Subject: [PATCH] build with gcc 4.3

---
 netpbm-10.35-gcc43.patch | 12 ++++++++++++
 netpbm.spec              |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 netpbm-10.35-gcc43.patch

diff --git a/netpbm-10.35-gcc43.patch b/netpbm-10.35-gcc43.patch
new file mode 100644
index 0000000..36eea6f
--- /dev/null
+++ b/netpbm-10.35-gcc43.patch
@@ -0,0 +1,12 @@
+diff -up netpbm-10.35.36/lib/libpbm3.c.gcc43 netpbm-10.35.36/lib/libpbm3.c
+--- netpbm-10.35.36/lib/libpbm3.c.gcc43	2007-12-31 07:02:07.000000000 +0100
++++ netpbm-10.35.36/lib/libpbm3.c	2008-01-08 13:08:52.000000000 +0100
+@@ -105,7 +105,7 @@ packBitsWithMmxSse(FILE *          const
+             ) ];
+     */
+ 
+-    typedef int v8qi __attribute__ ((mode(V8QI)));
++    typedef int v8qi __attribute__ ((vector_size(8)));
+     typedef int di __attribute__ ((mode(DI)));
+ 
+     di const zero64 = 0;        /* to clear with PXOR */
diff --git a/netpbm.spec b/netpbm.spec
index 31e0192..2255485 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -27,6 +27,7 @@ Patch15: netpbm-10.35-ppmquantall.patch
 Patch16: netpbm-10.35-pbmtog3segfault.patch
 Patch17: netpbm-10.35-pbmtomacp.patch
 Patch18: netpbm-10.35-glibc.patch
+Patch19: netpbm-10.35-gcc43.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel xorg-x11-server-utils python
@@ -85,6 +86,7 @@ netpbm-progs.  You'll also need to install the netpbm package.
 %patch16 -p1 -b .pbmtog3segfault
 %patch17 -p1 -b .pbmtomacp
 %patch18 -p1 -b .glibc
+%patch19 -p1 -b .gcc43
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -115,7 +117,7 @@ EOF
 TOP=`pwd`
 make \
 	CC=%{__cc} \
-	CFLAGS="$RPM_OPT_FLAGS -fPIC" \
+	CFLAGS="$RPM_OPT_FLAGS -fPIC -flax-vector-conversions" \
 	LDFLAGS="-L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \
 	LADD="-lm" \
 	JPEGINC_DIR=%{_includedir} \
@@ -211,6 +213,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Feb 14 2008 Jindrich Novy <jnovy@redhat.com> 10.35.38-1
 - update to 10.35.38 (fixes to pbmtext and ppmtoarbtxt)
+- fix to let it built with gcc 4.3
 
 * Thu Jan 17 2008 Jindrich Novy <jnovy@redhat.com> 10.35.37-1
 - update to 10.35.37