[154177] trunk/dports/python/py-spatialite
vince at macports.org
vince at macports.org
Sun Oct 23 17:21:29 CEST 2016
Revision: 154177
https://trac.macports.org/changeset/154177
Author: vince at macports.org
Date: 2016-10-23 17:21:28 +0200 (Sun, 23 Oct 2016)
Log Message:
-----------
py-spatialite: get rid of obsolete API “amalgamation”
Modified Paths:
--------------
trunk/dports/python/py-spatialite/Portfile
trunk/dports/python/py-spatialite/files/patch-setup_py.diff
Added Paths:
-----------
trunk/dports/python/py-spatialite/files/patch-connection_h.diff
Removed Paths:
-------------
trunk/dports/python/py-spatialite/files/patch-lib_dbapi2_py.diff
Modified: trunk/dports/python/py-spatialite/Portfile
===================================================================
--- trunk/dports/python/py-spatialite/Portfile 2016-10-23 15:20:25 UTC (rev 154176)
+++ trunk/dports/python/py-spatialite/Portfile 2016-10-23 15:21:28 UTC (rev 154177)
@@ -8,7 +8,7 @@
github.setup lokkju pyspatialite 3.0.1-alpha-0
name py-spatialite
version 3.0.1
-revision 1
+revision 2
# pyspatialite comes in several flavors according the spatialite API it's going to work with
set spatialite-compat "-spatialite.2.3.1"
@@ -43,9 +43,8 @@
port:geos \
port:proj
- patchfiles patch-setup_py.diff
-# patch-lib_dbapi2_py.diff \
-# patch-src_connection.diff
+ patchfiles patch-setup_py.diff \
+ patch-connection_h.diff
post-patch {
reinplace -locale C "s|%%PREFIX%%|${prefix}|" ${worksrcpath}/setup.py
Added: trunk/dports/python/py-spatialite/files/patch-connection_h.diff
===================================================================
--- trunk/dports/python/py-spatialite/files/patch-connection_h.diff (rev 0)
+++ trunk/dports/python/py-spatialite/files/patch-connection_h.diff 2016-10-23 15:21:28 UTC (rev 154177)
@@ -0,0 +1,11 @@
+--- src/connection.h.old 2016-10-23 13:33:51.000000000 +0200
++++ src/connection.h 2016-10-23 13:34:08.000000000 +0200
+@@ -30,7 +30,7 @@
+ #include "cache.h"
+ #include "module.h"
+
+-#include "spatialite/sqlite3.h"
++#include "spatialite/sqlite.h"
+ #include "spatialite.h"
+
+ SPATIALITE_DECLARE void spatialite_init(int verbose);
Deleted: trunk/dports/python/py-spatialite/files/patch-lib_dbapi2_py.diff
===================================================================
--- trunk/dports/python/py-spatialite/files/patch-lib_dbapi2_py.diff 2016-10-23 15:20:25 UTC (rev 154176)
+++ trunk/dports/python/py-spatialite/files/patch-lib_dbapi2_py.diff 2016-10-23 15:21:28 UTC (rev 154177)
@@ -1,11 +0,0 @@
---- lib/dbapi2.py.orig 2012-08-18 14:35:30.000000000 +0200
-+++ lib/dbapi2.py 2012-08-18 14:35:53.000000000 +0200
-@@ -47,7 +47,7 @@
- def TimestampFromTicks(ticks):
- return Timestamp(*time.localtime(ticks)[:6])
-
--version_info = tuple([int(x) for x in version.split(".")])
-+version_info = tuple([int(x) for x in version.split("-")[0].split(".")])
- sqlite_version_info = tuple([int(x) for x in sqlite_version.split(".")])
-
- Binary = buffer
Modified: trunk/dports/python/py-spatialite/files/patch-setup_py.diff
===================================================================
--- trunk/dports/python/py-spatialite/files/patch-setup_py.diff 2016-10-23 15:20:25 UTC (rev 154176)
+++ trunk/dports/python/py-spatialite/files/patch-setup_py.diff 2016-10-23 15:21:28 UTC (rev 154177)
@@ -1,10 +1,46 @@
---- setup.py.old 2013-11-30 11:54:05.000000000 +0100
-+++ setup.py 2013-11-30 11:53:34.000000000 +0100
-@@ -170,6 +170,7 @@
- include_dirs.extend(self.strip_includes(self.compiler.linker_exe))
- include_dirs.extend(self.strip_includes(self.compiler.preprocessor))
- self.compiler.include_dirs.extend(self.uniq(include_dirs))
-+ self.compiler.include_dirs.append('%%PREFIX%%/include')
+--- setup.py.old 2016-10-23 12:59:11.000000000 +0200
++++ setup.py 2016-10-23 13:00:43.000000000 +0200
+@@ -65,7 +65,7 @@
+ if rc != 0:
+ print "Is sphinx installed? If not, try 'sudo easy_install sphinx'."
- if self.with_proj4:
- self.check_header(ext,"proj_api.h")
+-AMALGAMATION_ROOT = "amalgamation/libspatialite-amalgamation-3.0.1"
++#AMALGAMATION_ROOT = "amalgamation/libspatialite-amalgamation-3.0.1"
+
+ TRUTHY = ("yes", "true", "t", "1")
+
+@@ -162,7 +162,7 @@
+
+ def build_extension(self,ext):
+ # Load includes from module directories first!
+- include_dirs = []
++ include_dirs = ["%%PREFIX%%/include"]
+ include_dirs.extend(self.strip_includes(self.compiler.compiler))
+ include_dirs.extend(self.strip_includes(self.compiler.compiler_so))
+ include_dirs.extend(self.strip_includes(self.compiler.compiler_cxx))
+@@ -258,12 +258,12 @@
+ "src/prepare_protocol.c",
+ "src/statement.c",
+ "src/util.c",
+- "src/row.c",
+- os.path.join(AMALGAMATION_ROOT, "sqlite3.c"),
+- os.path.join(AMALGAMATION_ROOT, "spatialite.c")
++ "src/row.c"#,
++ #os.path.join(AMALGAMATION_ROOT, "sqlite3.c"),
++ #os.path.join(AMALGAMATION_ROOT, "spatialite.c")
+ ],
+ include_dirs = [
+- os.path.join(AMALGAMATION_ROOT,"headers")
++ "/opt/local/include"
+ ],
+ library_dirs = [],
+ runtime_library_dirs = [],
+@@ -272,7 +272,7 @@
+ ("VERSION",'"%s"' % PYSPATIALITE_VERSION),
+ ("SQLITE_ENABLE_RTREE", "1"), # build with fulltext search enabled
+ ("NDEBUG","1"),
+- ("SPL_AMALGAMATION","1"),
++ #("SPL_AMALGAMATION","1"),
+ ('MODULE_NAME', '\\"spatialite.dbapi2\\"') if sys.platform == "win32" else ('MODULE_NAME', '"spatialite.dbapi2"')
+ ],
+ )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161023/0dff900a/attachment-0002.html>
More information about the macports-changes
mailing list