From 42782479af8e9281a7555ba9e32496b9f80ceabe Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Mon, 11 Apr 2005 18:47:07 +0000 Subject: [PATCH] - Fix "invalid lvalue in assignment" for GCC4. --- shapelib-1.2.10-gcc4.patch | 12 ++++++++++++ shapelib.spec | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 shapelib-1.2.10-gcc4.patch diff --git a/shapelib-1.2.10-gcc4.patch b/shapelib-1.2.10-gcc4.patch new file mode 100644 index 0000000..4c53b98 --- /dev/null +++ b/shapelib-1.2.10-gcc4.patch @@ -0,0 +1,12 @@ +diff -Nur shapelib-1.2.10-orig/contrib/shpgeo.c shapelib-1.2.10/contrib/shpgeo.c +--- shapelib-1.2.10-orig/contrib/shpgeo.c 2003-04-07 15:03:22.000000000 +0200 ++++ shapelib-1.2.10/contrib/shpgeo.c 2005-04-11 20:41:37.000000000 +0200 +@@ -543,7 +543,7 @@ + nextring = 0; + cParts=0; + while ( nextring >= 0 ) { +- (SHPObject*) ppsC[cParts] = SHPUnCompound ( psCShape, &nextring ); ++ ppsC[cParts] = SHPUnCompound ( psCShape, &nextring ); + cParts++; + } + diff --git a/shapelib.spec b/shapelib.spec index 2ca6d9a..7389e0b 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -2,12 +2,12 @@ Summary: API in "C" for Shapefile handling Name: shapelib Version: 1.2.10 -Release: 7 - +Release: 8 URL: http://shapelib.maptools.org/ Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz Patch0: shapelib-%{version}.patch Patch1: shapelib-1.2.10-endian.patch +Patch2: shapelib-1.2.10-gcc4.patch License: LGPL/MIT Group: Development/Libraries Buildrequires: libtool @@ -32,6 +32,7 @@ This package contains libshp and the appropriate header files. %setup -q -T -b 0 %patch -p1 -b .buildroot %patch1 -p1 -b .endian +%patch2 -p1 -b .gcc4 %build make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" lib @@ -72,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_libdir}/libshp.la %changelog +* Mon Apr 11 2005 Michael Schwendt - 1.2.10-8 +- Fix "invalid lvalue in assignment" for GCC4. + * Fri Apr 7 2005 Michael Schwendt - rebuilt