<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/4a787103ec28c9ec4562e286856f23bf3effe3f5">https://github.com/macports/macports-ports/commit/4a787103ec28c9ec4562e286856f23bf3effe3f5</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 4a787103ec2 gtk3-devel: update to 3.24.37 - Thanks to @ctreleaven for help with patching Fixes: https://trac.macports.org/ticket/66487 Fixes: https://trac.macports.org/ticket/66899
</span>4a787103ec2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4a787103ec28c9ec4562e286856f23bf3effe3f5
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Apr 22 17:55:53 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> gtk3-devel: update to 3.24.37
</span><span style='display:block; white-space:pre;color:#404040;'> - Thanks to @ctreleaven for help with patching
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/66487
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/66899
</span>---
gnome/gtk3-devel/Portfile | 101 +++++++++++----------
.../files/patch-meson.build-x11-enabled.diff | 11 +++
2 files changed, 65 insertions(+), 47 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3-devel/Portfile b/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5fe438f929..fd55808e1b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,12 +6,13 @@ PortGroup xcodeversion 1.0
</span> PortGroup active_variants 1.1
PortGroup compiler_blacklist_versions 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
name gtk3-devel
conflicts gtk3
set my_name gtk3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.24.34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.24.37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> epoch 0
set proj_name gtk+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,46 +23,49 @@ maintainers {mascguy @mascguy} openmaintainer
</span> platforms darwin
description GTK+ widget toolkit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> long_description GTK+ is a highly usable, feature-rich toolkit for creating graphical user \
interfaces, which boasts cross-platform compatibility and an easy-to-use \
API. GTK+ is written in C, but has bindings to many other popular \
programming languages, such as C++, Python and C#, among others.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage http://www.gtk.org/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> distname ${proj_name}-${version}
dist_subdir ${my_name}
use_xz yes
master_sites gnome:sources/${proj_name}/${branch}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2060a89575f9adf938bf91e4f06935ea619f7577 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21587592
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 afab13f415e5923bb185d923f3a37734e0f346d7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12401196
</span>
minimum_xcodeversions {9 3.1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:gtk-doc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk-doc \
</span> path:bin/pkg-config:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:atk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/pango.pc:pango \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:atk \
</span> path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libepoxy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:iso-codes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libepoxy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/pango.pc:pango
</span>
# mesa required to configure both +x11, +quartz (not just +x11) due to their dependency on libepoxy
depends_lib-append port:mesa
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:shared-mime-info \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:shared-mime-info \
</span> port:hicolor-icon-theme
# darwin 10 and earlier requires legacy support for O_CLOEXEC
legacysupport.newest_darwin_requires_legacy 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# use autoreconf to deal with dependency tracking issues in configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream disables X11 for macOS; disable that behavior
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson.build-x11-enabled.diff
</span>
# gtk3 +quartz uses instancetype which is not available
# before approximately Xcode 4.6 (#49391)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,11 +87,6 @@ if {${universal_possible} && [variant_isset universal]} {
</span> lappend merger_destroot_args(${arch}) CC='${configure.cc} -arch ${arch}'
lappend merger_destroot_args(${arch}) CC_FOR_BUILD='${configure.cc} -arch ${arch}'
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append CC="${configure.cc} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC_FOR_BUILD="${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append CC="${configure.cc} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC_FOR_BUILD="${configure.cc} ${configure.cc_archflags}"
</span> }
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,31 +95,26 @@ pre-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ccache no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.cppflags-append \
-DX_LOCALE
configure.cflags-append \
-fstrict-aliasing
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-static \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-glibtest \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-introspection \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-wayland-backend \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-schemas-compile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gio_can_sniff=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append V=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPP_FOR_BUILD="${configure.cpp}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dtests=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgtk_doc=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dman=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dintrospection=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddemos=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dexamples=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dprofiler=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dwayland_backend=false
</span>
post-destroot {
set docdir ${prefix}/share/doc/${name}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING HACKING NEWS README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} CONTRIBUTING.md COPYING NEWS README.md \
</span> ${destroot}${docdir}
# avoid conflict with the gtk-update-icon-cache installed by gtk2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,9 +138,6 @@ platform darwin {
</span> if {[variant_isset quartz] || ![variant_isset x11]} {
configure.ldflags-append -framework Cocoa -framework Carbon
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/63151
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-dependency-tracking
</span> }
if {${os.major} <= 10} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,7 +148,8 @@ platform darwin {
</span> }
if {${os.major} <= 12} {
# requires cups 1.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-cups
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dprint_backends=file,lpr,test
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,30 +228,45 @@ if {${universal_possible} && [variant_isset universal]} {
</span> configure.cc "${configure.cc} ${configure.cc_archflags}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tests description {Enable tests} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dtests=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dtests=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.target test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant quartz conflicts x11 {
require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
require_active_variants path:lib/pkgconfig/pango.pc:pango quartz
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-quartz-backend
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dx11_backend=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dquartz_backend=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dxinerama=no
</span> }
variant x11 conflicts quartz {
require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
require_active_variants path:lib/pkgconfig/pango.pc:pango x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:xorg-libXi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:at-spi2-atk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxkbcommon-x11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXi \
</span> port:xorg-libXrandr \
port:xorg-libXcursor \
port:xorg-libXinerama \
port:xorg-libXdamage \
port:xorg-libXcomposite \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXfixes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:at-spi2-atk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXfixes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-xinerama \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-include=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-lib=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-x11-backend
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dx11_backend=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dquartz_backend=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dxinerama=yes
</span> }
if {![variant_isset quartz]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3-devel/files/patch-meson.build-x11-enabled.diff b/gnome/gtk3-devel/files/patch-meson.build-x11-enabled.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b6a903b6a3e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk3-devel/files/patch-meson.build-x11-enabled.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2023-01-09 13:44:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2023-01-09 13:45:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -158,7 +158,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if os_darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wayland_enabled = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x11_enabled = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# x11_enabled = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ quartz_enabled = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span></pre><pre style='margin:0'>
</pre>