<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ae2f2dea2861f67c6a6d38c658199ee9afd6701c">https://github.com/macports/macports-ports/commit/ae2f2dea2861f67c6a6d38c658199ee9afd6701c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ae2f2dea2861f67c6a6d38c658199ee9afd6701c
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Fri Apr 5 16:13:30 2024 +0200
<span style='display:block; white-space:pre;color:#404040;'> openstreetmap-carto: update to 5.8.0
</span>---
gis/openstreetmap-carto/Portfile | 16 ++-----
.../files/scripts-get-external-data-py.diff | 53 ----------------------
gis/openstreetmap-carto/files/style-fonts-mss.diff | 4 +-
3 files changed, 7 insertions(+), 66 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/openstreetmap-carto/Portfile b/gis/openstreetmap-carto/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7509f403e33..d5ddf3a0088 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/openstreetmap-carto/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/openstreetmap-carto/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,11 @@ PortGroup active_variants 1.1
</span> PortGroup github 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup gravitystorm openstreetmap-carto 5.3.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gravitystorm openstreetmap-carto 5.8.0 v
</span> github.tarball_from archive
revision 0
categories gis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {@frankdean fdsd.co.uk:frank.dean} openmaintainer
# license CC0-1.0 (http://creativecommons.org/publicdomain/zero/1.0/)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +20,9 @@ description A general-purpose OpenStreetMap mapnik style, in CartoCSS
</span> long_description These are the CartoCSS map stylesheets for the Standard \
map layer on OpenStreetMap.org.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f3effe425ea8c0d54f5437f22fe0181bb1005ea3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 be63d4fc06f1db447f1a249515f9fc83449f7f3027469d1cc051150ded3f85e9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2719803
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a2bc4b2445857a7334fc031e8397c8e16984e832 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fb8ab188d3677a81132948ceed14a7e6352f6cee3d7112db405712881f083c7b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3472021
</span>
python.default_version 39
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,12 +34,7 @@ set datadir ${prefix}/var/lib/${name}
</span> set docdir ${prefix}/share/doc/${name}
set configdir ${prefix}/etc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# The `scripts-get-external-data-py.diff` patch has been merged
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# into the upstream master at
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/gravitystorm/openstreetmap-carto/commit/4ec2dc9391c411e124c78b3ba1aad9173fea20cb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# so it should be possible to remove it after the next release (> v5.3.1).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles style-fonts-mss.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts-get-external-data-py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles style-fonts-mss.diff
</span>
variant postgresql12 conflicts postgresql13 description {Use with PostgreSQL 12} {
require_active_variants py${python.version}-psycopg2 postgresql12
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/openstreetmap-carto/files/scripts-get-external-data-py.diff b/gis/openstreetmap-carto/files/scripts-get-external-data-py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 118610914ff..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/openstreetmap-carto/files/scripts-get-external-data-py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/get-external-data.py.orig 2021-08-21 19:05:54.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/get-external-data.py 2021-08-23 15:41:48.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,7 +54,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- with self._conn.cursor() as cur:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cur.execute('''DROP TABLE IF EXISTS "{temp_schema}"."{name}"'''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .format(name=self._name, temp_schema=self._temp_schema))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self._conn.commit()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self._conn.commit()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # get the last modified date from the metadata table
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def last_modified(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,6 +64,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- results = cur.fetchone()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if results is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return results[0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self._conn.commit()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def grant_access(self, user):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- with self._conn.cursor() as cur:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,7 +99,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # matter since it'll never need a vacuum.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cur.execute('''ALTER TABLE "{temp_schema}"."{name}" RESET ( autovacuum_enabled );'''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .format(name=self._name, temp_schema=self._temp_schema))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self._conn.commit()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self._conn.commit()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # VACUUM can't be run in transaction, so autocommit needs to be turned on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- old_autocommit = self._conn.autocommit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -188,11 +189,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- renderuser = opts.renderuser or config["settings"].get("renderuser")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- with requests.Session() as s, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- psycopg2.connect(database=database,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ with requests.Session() as s:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ conn = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ conn = psycopg2.connect(database=database,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- host=host, port=port,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- user=user,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- password=password) as conn:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ password=password)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- s.headers.update({'User-Agent': 'get-external-data.py/osm-carto'})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -288,6 +290,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- logging.info(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Table {} did not require updating".format(name))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if conn:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ conn.close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if __name__ == '__main__':
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/openstreetmap-carto/files/style-fonts-mss.diff b/gis/openstreetmap-carto/files/style-fonts-mss.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 28f46fbe300..00cd7155178 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/openstreetmap-carto/files/style-fonts-mss.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/openstreetmap-carto/files/style-fonts-mss.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> --- style/fonts.mss.orig 2021-08-21 18:35:03.000000000 +0100
+++ style/fonts.mss 2021-08-21 18:37:38.000000000 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -189,4 +189,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Italics are only available for the base font, not the other scripts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,4 +174,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (Apart from that, only Noto Tamil has an Italic style, but just for Serif, not for Sans.)
</span> For a considerable number of labels this style will make no difference to the regular style.
*/
-@oblique-fonts: "Noto Sans Italic", @book-fonts;
</pre><pre style='margin:0'>
</pre>