| 1 |
bicatali 08/07/02 17:00:06 |
| 2 |
|
| 3 |
Added: basemap-0.99-syslib.patch |
| 4 |
Log: |
| 5 |
Version bump. Closing bug #229857 |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-python/basemap/files/basemap-0.99-syslib.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/basemap/files/basemap-0.99-syslib.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/basemap/files/basemap-0.99-syslib.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: basemap-0.99-syslib.patch |
| 15 |
=================================================================== |
| 16 |
--- setup.py.orig 2008-07-02 17:17:56.980035282 +0100 |
| 17 |
+++ setup.py 2008-07-02 17:49:26.354807468 +0100 |
| 18 |
@@ -26,7 +26,7 @@ |
| 19 |
DBFUpdateHeader is available, we scan shapefil.h for the string |
| 20 |
'DBFUpdateHeader'. |
| 21 |
""" |
| 22 |
- f = open(convert_path("pyshapelib/shapelib/shapefil.h")) |
| 23 |
+ f = open(convert_path("/usr/include/libshp/shapefil.h")) |
| 24 |
contents = f.read() |
| 25 |
f.close() |
| 26 |
if contents.find("DBFUpdateHeader") >= 0: |
| 27 |
@@ -55,7 +55,7 @@ |
| 28 |
|
| 29 |
if GEOS_dir is None: |
| 30 |
# if GEOS_dir not set, check a few standard locations. |
| 31 |
- GEOS_dirs = ['/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')] |
| 32 |
+ GEOS_dirs = ['/usr','/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')] |
| 33 |
for direc in GEOS_dirs: |
| 34 |
geos_version = checkversion(direc) |
| 35 |
print 'checking for GEOS lib in %s ....' % direc |
| 36 |
@@ -104,17 +104,16 @@ |
| 37 |
package_dirs['dbflib'] = os.path.join('lib','dbflib') |
| 38 |
extensions = extensions + \ |
| 39 |
[Extension("shapelibc", |
| 40 |
- ["pyshapelib/shapelib_wrap.c", |
| 41 |
- "pyshapelib/shapelib/shpopen.c", |
| 42 |
- "pyshapelib/shapelib/shptree.c"], |
| 43 |
- include_dirs = ["pyshapelib/shapelib"]), |
| 44 |
+ ["pyshapelib/shapelib_wrap.c"], |
| 45 |
+ include_dirs = ["/usr/include/libshp"], |
| 46 |
+ libraries = ["shp"]), |
| 47 |
Extension("shptree", |
| 48 |
["pyshapelib/shptreemodule.c"], |
| 49 |
- include_dirs = ["pyshapelib/shapelib"]), |
| 50 |
+ include_dirs = ["/usr/include/libshp"]), |
| 51 |
Extension("dbflibc", |
| 52 |
- ["pyshapelib/dbflib_wrap.c", |
| 53 |
- "pyshapelib/shapelib/dbfopen.c"], |
| 54 |
- include_dirs = ["pyshapelib/shapelib"], |
| 55 |
+ ["pyshapelib/dbflib_wrap.c"], |
| 56 |
+ include_dirs = ["/usr/include/libshp"], |
| 57 |
+ libraries = ["shp"], |
| 58 |
define_macros = dbf_macros()) ] |
| 59 |
|
| 60 |
# check setup.cfg file to see how to install auxilliary packages. |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
-- |
| 65 |
gentoo-commits@l.g.o mailing list |
Archives