<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[154177] trunk/dports/python/py-spatialite</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/154177">154177</a></dd>
<dt>Author</dt> <dd>vince@macports.org</dd>
<dt>Date</dt> <dd>2016-10-23 17:21:28 +0200 (Sun, 23 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-spatialite: get rid of obsolete API “amalgamation”</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyspatialitePortfile">trunk/dports/python/py-spatialite/Portfile</a></li>
<li><a href="#trunkdportspythonpyspatialitefilespatchsetup_pydiff">trunk/dports/python/py-spatialite/files/patch-setup_py.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyspatialitefilespatchconnection_hdiff">trunk/dports/python/py-spatialite/files/patch-connection_h.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyspatialitefilespatchlib_dbapi2_pydiff">trunk/dports/python/py-spatialite/files/patch-lib_dbapi2_py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpyspatialitePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-spatialite/Portfile (154176 => 154177)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> github.setup lokkju pyspatialite 3.0.1-alpha-0
</span><span class="cx"> name py-spatialite
</span><span class="cx"> version 3.0.1
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx">
</span><span class="cx"> # pyspatialite comes in several flavors according the spatialite API it's going to work with
</span><span class="cx"> set spatialite-compat "-spatialite.2.3.1"
</span><span class="lines">@@ -43,9 +43,8 @@
</span><span class="cx"> port:geos \
</span><span class="cx"> port:proj
</span><span class="cx">
</span><del>- patchfiles patch-setup_py.diff
-# patch-lib_dbapi2_py.diff \
-# patch-src_connection.diff
</del><ins>+ patchfiles patch-setup_py.diff \
+ patch-connection_h.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace -locale C "s|%%PREFIX%%|${prefix}|" ${worksrcpath}/setup.py
</span></span></pre></div>
<a id="trunkdportspythonpyspatialitefilespatchconnection_hdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-spatialite/files/patch-connection_h.diff (0 => 154177)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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);
</ins></span></pre></div>
<a id="trunkdportspythonpyspatialitefilespatchlib_dbapi2_pydiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/python/py-spatialite/files/patch-lib_dbapi2_py.diff (154176 => 154177)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- 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
</del></span></pre></div>
<a id="trunkdportspythonpyspatialitefilespatchsetup_pydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-spatialite/files/patch-setup_py.diff (154176 => 154177)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,10 +1,46 @@
</span><del>---- 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')
</del><ins>+--- 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'."
</ins><span class="cx">
</span><del>- if self.with_proj4:
- self.check_header(ext,"proj_api.h")
</del><ins>+-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"')
+ ],
+ )
</ins></span></pre>
</div>
</div>
</body>
</html>