<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7b2658b08df6afd7cdd71387bbc81375e7da88e9">https://github.com/macports/macports-ports/commit/7b2658b08df6afd7cdd71387bbc81375e7da88e9</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 7b2658b08df libepoxy: force correct python3 path, remove python27 variant
</span>7b2658b08df is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7b2658b08df6afd7cdd71387bbc81375e7da88e9
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sat Jan 15 13:20:41 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> libepoxy: force correct python3 path, remove python27 variant
</span>---
graphics/libepoxy/Portfile | 37 ++++++++++------------
.../libepoxy/files/patch-src-gen_dispatch.py.diff | 8 +++++
2 files changed, 25 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libepoxy/Portfile b/graphics/libepoxy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 67562afc968..5c9a2617c09 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libepoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libepoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup meson 1.0
github.setup anholt libepoxy 1.5.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license MIT permissive
categories graphics
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,37 +33,34 @@ depends_build port:pkgconfig \
</span> port:mesa \
port:xorg-libX11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles prefix.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles prefix.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-gen_dispatch.py.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/dispatch_common.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_vers 3.9
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python37 python38 python39 python310 description {build with python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python27 python38 python39 python310 description {build with python 3.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python38 python39 python310 description {build with python 3.7} {
</span> depends_build-append port:python37
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_vers 3.7
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python27 python37 python39 python310 description {build with python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python37 python39 python310 description {build with python 3.8} {
</span> depends_build-append port:python38
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_vers 3.8
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python27 python37 python38 python310 description {build with python 3.9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python37 python38 python310 description {build with python 3.9} {
</span> depends_build-append port:python39
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.9
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 conflicts python27 python37 python38 python39 description {build with python 3.10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python37 python38 python39 description {build with python 3.10} {
</span> depends_build-append port:python310
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_vers 3.10
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python37] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python37] && \
</span> ![variant_isset python38] && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python39] && \
</span> ![variant_isset python310]} {
default_variants-append +python39
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/dispatch_common.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PYTHON3@|${prefix}/bin/python${python_vers}|g" ${worksrcpath}/src/gen_dispatch.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libepoxy/files/patch-src-gen_dispatch.py.diff b/graphics/libepoxy/files/patch-src-gen_dispatch.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bb9f049acb8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libepoxy/files/patch-src-gen_dispatch.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gen_dispatch.py.orig 2021-07-12 10:53:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gen_dispatch.py 2022-01-15 13:12:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!@PYTHON3@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -*- coding: utf-8 -*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright © 2013 Intel Corporation
</span></pre><pre style='margin:0'>
</pre>