Update of /cvsroot/fink/experimental/babayoshihiko/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30645
Added Files:
pyspatialite-py.patch
Log Message:
patch
--- NEW FILE: pyspatialite-py.patch ---
diff -ruN pyspatialite-3.0.1-orig/setup.py pyspatialite-3.0.1/setup.py
--- pyspatialite-3.0.1-orig/setup.py 2012-12-31 11:16:40.000000000 +0900
+++ pyspatialite-3.0.1/setup.py 2012-12-31 11:45:00.000000000 +0900
@@ -113,24 +113,24 @@
class MyBuildExt(build_ext):
def build_extension(self, ext):
- get_amalgamation()
+ # get_amalgamation()
# sometimes iconv is built in, sometimes it isn't
if not self.compiler.has_function("iconv"):
ext.libraries.append("iconv")
#Default locations for Mac
-
ext.include_dirs.append("/Library/Frameworks/GEOS.framework/unix/include/")
-
ext.include_dirs.append("/Library/Frameworks/PROJ.framework/unix/include/")
- ext.library_dirs.append("/Library/Frameworks/GEOS.framework/unix/lib")
- ext.library_dirs.append("/Library/Frameworks/PROJ.framework/unix/lib")
+ ext.include_dirs.append("@PREFIX@/opt/libgeos3.3.3/include/")
+ ext.include_dirs.append("@PREFIX@/include/")
+ ext.library_dirs.append("@PREFIX@/opt/libgeos3.3.3/lib")
+ ext.library_dirs.append("@PREFIX@/lib")
ext.define_macros.append(("SQLITE_ENABLE_FTS3", "1")) # build with
fulltext search enabled
ext.define_macros.append(("SQLITE_ENABLE_RTREE", "1")) # build with
fulltext search enabled
ext.define_macros.append(("SQLITE_ENABLE_COLUMN_METADATA", "1")) #
build with fulltext search enabled
ext.define_macros.append(("OMIT_FREEXL","1")) # build without FreeXL
- ext.sources.append(os.path.join(AMALGAMATION_ROOT, "sqlite3.c"))
- ext.sources.append(os.path.join(AMALGAMATION_ROOT, "spatialite.c"))
- ext.include_dirs.append(AMALGAMATION_ROOT)
+
ext.sources.append(os.path.join("@PREFIX@/src/fink.build/pyspatialite-py27-3.0.1-1/sqlite-autoconf-3071300/",
"sqlite3.c"))
+
ext.sources.append(os.path.join("@PREFIX@/src/fink.build/pyspatialite-py27-3.0.1-1/libspatialite-3.0.1/src/spatialite/",
"spatialite.c"))
+ ext.include_dirs.append("@PREFIX@/include/")
build_ext.build_extension(self, ext)
diff -ruN pyspatialite-3.0.1-orig/src/connection.h
pyspatialite-3.0.1/src/connection.h
--- pyspatialite-3.0.1-orig/src/connection.h 2012-12-31 11:16:40.000000000
+0900
+++ pyspatialite-3.0.1/src/connection.h 2012-12-31 11:31:59.000000000 +0900
@@ -33,7 +33,7 @@
#include "sqlite3.h"
#include "spatialite.h"
-int spatialite_init(int verbose);
+void spatialite_init(int verbose);
typedef struct
{
------------------------------------------------------------------------------
Master SQL Server Development, Administration, T-SQL, SSAS, SSIS, SSRS
and more. Get SQL Server skills now (including 2012) with LearnDevNow -
200+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only - learn more at:
http://p.sf.net/sfu/learnmore_122512
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
