<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c6285bcc114309425a4789067ccb52406a342593">https://github.com/macports/macports-ports/commit/c6285bcc114309425a4789067ccb52406a342593</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 c6285bcc114 gtk4: add system blockers
</span>c6285bcc114 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c6285bcc114309425a4789067ccb52406a342593
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Aug 22 23:40:35 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> gtk4: add system blockers
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> block +quartz on darwin < 15
</span><span style='display:block; white-space:pre;color:#404040;'> block +x11 on all systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> change default to x11 to match macports
</span><span style='display:block; white-space:pre;color:#404040;'> this presently gives a message to users to install with +quartz
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> revbump to enforce new defaults
</span>---
gnome/gtk4/Portfile | 43 ++++++++++++++++++++++++++++++++++---------
1 file changed, 34 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk4/Portfile b/gnome/gtk4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e23677afc73..6f887ccbb74 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ set my_name gtk4
</span> set gname gtk
version 4.6.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories gnome
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,6 +130,18 @@ variant quartz conflicts x11 {
</span> configure.objcxxflags-prepend -isystem ${filespath}/old_appkit_compat
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ archive_sites
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} is not supported on this os version at present."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error {unsupported platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,16 +154,29 @@ variant x11 conflicts quartz {
</span> port:xorg-libXinerama
configure.args-append -Dx11-backend=true -Dmacos-backend=false
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the x11 variant needs EGL support added to mesa and libepoxy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and even then the performance is well below the quartz variant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# default_variants +x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the x11 variant needs EGL support added to mesa and libepoxy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and even then the performance is well below the quartz variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so keep it disabled until it can be fixed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ archive_sites
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} is not supported with the +x11 variant at present."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Please use the +quartz variant instead"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error {unsupported platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it is somewhat illogical to default to a variant that cannot build, however
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this matches the rest of macports and will tweak users to build as +quartz manually
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +x11
</span> }
variant tests description "build tests" {
</pre><pre style='margin:0'>
</pre>