summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Arnold <nerdboy@gentoo.org>2009-09-16 04:58:05 +0000
committerSteve Arnold <nerdboy@gentoo.org>2009-09-16 04:58:05 +0000
commit8d0d1599f6639a8d12cde1d1a8ff822c8e4996e3 (patch)
tree5499267c81f021b7e4883f1b20d9c660f52d907b /sci-libs/shapelib/files
parentDISTUTILS_GLOBAL_OPTIONS should be an array. (diff)
downloadgentoo-2-8d0d1599f6639a8d12cde1d1a8ff822c8e4996e3.tar.gz
gentoo-2-8d0d1599f6639a8d12cde1d1a8ff822c8e4996e3.tar.bz2
gentoo-2-8d0d1599f6639a8d12cde1d1a8ff822c8e4996e3.zip
Updated with test and QA fixes, closes bug 283747.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/shapelib/files')
-rw-r--r--sci-libs/shapelib/files/fix-shapelib-test.diff30
-rw-r--r--sci-libs/shapelib/files/stdlib_include_fix.patch30
2 files changed, 60 insertions, 0 deletions
diff --git a/sci-libs/shapelib/files/fix-shapelib-test.diff b/sci-libs/shapelib/files/fix-shapelib-test.diff
new file mode 100644
index 000000000000..859a5838047b
--- /dev/null
+++ b/sci-libs/shapelib/files/fix-shapelib-test.diff
@@ -0,0 +1,30 @@
+--- makeshape.sh.orig 2003-04-07 15:03:22.000000000 +0200
++++ makeshape.sh 2009-09-06 11:31:37.000000000 +0200
+@@ -5,17 +5,17 @@
+ # should display in ARCView II.
+ #
+
+-shpcreate test polygon
+-dbfcreate test.dbf -s Description 30 -n TestInt 6 0 -n TestDouble 16 5
++./shpcreate test polygon
++./dbfcreate test.dbf -s Description 30 -n TestInt 6 0 -n TestDouble 16 5
+
+-shpadd test 0 0 100 0 100 100 0 100 0 0 + 20 20 20 30 30 30 20 20
+-dbfadd test.dbf "Square with triangle missing" 1.5 2.5
++./shpadd test 0 0 100 0 100 100 0 100 0 0 + 20 20 20 30 30 30 20 20
++./dbfadd test.dbf "Square with triangle missing" 1.5 2.5
+
+-shpadd test 150 150 160 150 180 170 150 150
+-dbfadd test.dbf "Smaller triangle" 100 1000.25
++./shpadd test 150 150 160 150 180 170 150 150
++./dbfadd test.dbf "Smaller triangle" 100 1000.25
+
+-shpadd test 150 150 160 150 180 170 150 150
+-dbfadd test.dbf "" "" ""
++./shpadd test 150 150 160 150 180 170 150 150
++./dbfadd test.dbf "" "" ""
+
+-shpdump test.shp
+-dbfdump test.dbf
++./shpdump test.shp
++./dbfdump test.dbf
diff --git a/sci-libs/shapelib/files/stdlib_include_fix.patch b/sci-libs/shapelib/files/stdlib_include_fix.patch
new file mode 100644
index 000000000000..82b07699544d
--- /dev/null
+++ b/sci-libs/shapelib/files/stdlib_include_fix.patch
@@ -0,0 +1,30 @@
+--- shpcreate.c.orig 2009-09-15 20:09:39.641422056 -0700
++++ shpcreate.c 2009-09-15 20:20:31.310673754 -0700
+@@ -51,6 +51,7 @@
+ static char rcsid[] =
+ "$Id: stdlib_include_fix.patch,v 1.1 2009/09/16 04:58:04 nerdboy Exp $";
+
++#include <stdlib.h>
+ #include "shapefil.h"
+
+ int main( int argc, char ** argv )
+--- shpdump.c.orig 2009-09-15 20:09:47.615421028 -0700
++++ shpdump.c 2009-09-15 20:20:29.654673421 -0700
+@@ -67,6 +67,7 @@
+ static char rcsid[] =
+ "$Id: stdlib_include_fix.patch,v 1.1 2009/09/16 04:58:04 nerdboy Exp $";
+
++#include <stdlib.h>
+ #include "shapefil.h"
+
+ int main( int argc, char ** argv )
+--- shprewind.c.orig 2009-09-15 20:09:58.193422322 -0700
++++ shprewind.c 2009-09-15 20:20:26.954542660 -0700
+@@ -43,6 +43,7 @@
+ *
+ */
+
++#include <stdlib.h>
+ #include "shapefil.h"
+
+ int main( int argc, char ** argv )