<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/858686b852427a52fe0b6ca78e47a60594f1648d">https://github.com/macports/macports-ports/commit/858686b852427a52fe0b6ca78e47a60594f1648d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 858686b osmocore-devel: update to cf665fc6 (20190218)
</span>858686b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 858686b852427a52fe0b6ca78e47a60594f1648d
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Feb 18 14:04:59 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> osmocore-devel: update to cf665fc6 (20190218)
</span>---
science/osmocore/Portfile | 22 ++++++++++++++--------
...fix-python.diff => patch-fix-python.devel.diff} | 4 ++--
...x-python.diff => patch-fix-python.release.diff} | 0
.../files/patch-fix_clock_gettime.devel.diff | 2 +-
4 files changed, 17 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/Portfile b/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fea5149..dfd01ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,14 +32,18 @@ if {${subport} eq ${name}} {
</span>
patchfiles-append patch-fix_clock_gettime.release.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix use of Python2, part 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-python.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup osmocom libosmocore 6b4895ff53b0fe8880dadf7c8d759a63938bbb3e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190207
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 487b899c55fa54899f3ff11bb8aebbfb767a67d8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f6c7c24a5e618081fe0fa1894dad74011c96681119849679069abbe070924f91 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1153018
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup osmocom libosmocore cf665fc6bcf5ba0848a2880815964dbcef1953ff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190218
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 cb215f6d4f4a8c1c0c711c0a30a2e73b13a7b0d7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 49569ea96003042b024cd43255256369fcce8f1cf1406db9c4a9bb0a3bb32b82 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1155045
</span> revision 0
# fix 'timer_clockgettime.c' to work with OSs that don't provide
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +51,10 @@ if {${subport} eq ${name}} {
</span>
patchfiles-append patch-fix_clock_gettime.devel.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix use of Python2, part 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-python.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,9 +85,7 @@ patchfiles-append patch-configure.ac.diff
</span>
patchfiles-append patch-include_osmocom_coding_gsm0503_parity.h.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix use of Python2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix-python.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix use of Python2, part 2
</span>
post-patch {
reinplace "s|@PYTHON_EXECUTABLE@|${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix-python.diff b/science/osmocore/files/patch-fix-python.devel.diff
</span>similarity index 97%
copy from science/osmocore/files/patch-fix-python.diff
copy to science/osmocore/files/patch-fix-python.devel.diff
<span style='display:block; white-space:pre;color:#808080;'>index 7a62b6f..f7b1b47 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-fix-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-fix-python.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/include/Makefile.am b/include/Makefile.am
</span> index 19695d1..6a746b1 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -173,7 +173,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,7 +175,7 @@
</span> $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@
osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ diff --git a/tests/Makefile.am b/tests/Makefile.am
</span> index 18d4bb4..6191867 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -306,7 +306,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -332,7 +332,7 @@
</span> mv $@.tmp $@
conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix-python.diff b/science/osmocore/files/patch-fix-python.release.diff
</span>similarity index 100%
rename from science/osmocore/files/patch-fix-python.diff
rename to science/osmocore/files/patch-fix-python.release.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix_clock_gettime.devel.diff b/science/osmocore/files/patch-fix_clock_gettime.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d09195..8dfb461 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-fix_clock_gettime.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-fix_clock_gettime.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -496,7 +496,7 @@ diff --git a/src/utils.c b/src/utils.c
</span> index 35d70ac..9394733 100644
--- a/src/utils.c
+++ b/src/utils.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -346,7 +346,7 @@ char *osmo_osmo_hexdump_nospc(const unsigned char *buf, int len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -349,7 +349,7 @@ char *osmo_osmo_hexdump_nospc(const unsigned char *buf, int len)
</span> __attribute__((weak, alias("osmo_hexdump_nospc")));
#endif
</pre><pre style='margin:0'>
</pre>