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
macports · Apr 23, 2023 · 729c549 · 729c549
1 parent b55a6d5
commit 729c549
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 47 deletions.
diff --git a/gnome/gtk3-devel/Portfile b/gnome/gtk3-devel/Portfile
@@ -6,12 +6,13 @@ PortGroup           xcodeversion 1.0
 PortGroup           active_variants 1.1
 PortGroup           compiler_blacklist_versions 1.0
 PortGroup           legacysupport 1.1
+PortGroup           meson 1.0
 
 name                gtk3-devel
 conflicts           gtk3
 set my_name         gtk3
-version             3.24.34
-revision            2
+version             3.24.37
+revision            0
 epoch               0
 
 set proj_name       gtk+
@@ -22,46 +23,49 @@ maintainers         {mascguy @mascguy} openmaintainer
 platforms           darwin
 
 description         GTK+ widget toolkit
-
 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.
-
 homepage            http://www.gtk.org/
+
 distname            ${proj_name}-${version}
 dist_subdir         ${my_name}
 use_xz              yes
 master_sites        gnome:sources/${proj_name}/${branch}/
 
-checksums           rmd160  2060a89575f9adf938bf91e4f06935ea619f7577 \
-                    sha256  dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec \
-                    size    21587592
+checksums           rmd160  afab13f415e5923bb185d923f3a37734e0f346d7 \
+                    sha256  6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57 \
+                    size    12401196
 
 minimum_xcodeversions {9 3.1}
 
-depends_build       port:gtk-doc \
+depends_build-append \
+                    port:gtk-doc \
                     path:bin/pkg-config:pkgconfig
 
-depends_lib         port:atk \
-                    path:lib/pkgconfig/pango.pc:pango \
+depends_lib-append \
+                    port:atk \
                     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 \
-                    port:libepoxy
+                    path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
+                    port:iso-codes \
+                    port:libepoxy \
+                    path:lib/pkgconfig/pango.pc:pango
 
 # mesa required to configure both +x11, +quartz (not just +x11) due to their dependency on libepoxy
 depends_lib-append  port:mesa
 
-depends_run         port:shared-mime-info \
+depends_run-append \
+                    port:shared-mime-info \
                     port:hicolor-icon-theme
 
 # darwin 10 and earlier requires legacy support for O_CLOEXEC
 legacysupport.newest_darwin_requires_legacy 10
 
-# use autoreconf to deal with dependency tracking issues in configure
-use_autoreconf      yes
-autoreconf.args     -fvi
+# Upstream disables X11 for macOS; disable that behavior
+patchfiles-append   patch-meson.build-x11-enabled.diff
 
 # gtk3 +quartz uses instancetype which is not available
 # before approximately Xcode 4.6 (#49391)
@@ -83,11 +87,6 @@ if {${universal_possible} && [variant_isset universal]} {
         lappend merger_destroot_args(${arch})  CC='${configure.cc} -arch ${arch}'
         lappend merger_destroot_args(${arch})  CC_FOR_BUILD='${configure.cc} -arch ${arch}'
     }
-} else {
-    build.args-append       CC="${configure.cc} ${configure.cc_archflags}" \
-                            CC_FOR_BUILD="${configure.cc} ${configure.cc_archflags}"
-    destroot.args-append    CC="${configure.cc} ${configure.cc_archflags}" \
-                            CC_FOR_BUILD="${configure.cc} ${configure.cc_archflags}"
 }
 
 pre-configure {
@@ -96,31 +95,26 @@ pre-configure {
     }
 }
 
-configure.ccache    no
-
 configure.cppflags-append \
                     -DX_LOCALE
 
 configure.cflags-append \
                     -fstrict-aliasing
 
-configure.args      --enable-static \
-                    --disable-glibtest \
-                    --enable-introspection \
-                    --disable-wayland-backend \
-                    --disable-schemas-compile \
-                    gio_can_sniff=yes
-
-build.args-append   V=1 \
-                    CPP_FOR_BUILD="${configure.cpp}"
-
-test.run            yes
-test.target         check
+configure.args-append \
+                    -Dtests=false \
+                    -Dgtk_doc=false \
+                    -Dman=true \
+                    -Dintrospection=true \
+                    -Ddemos=true \
+                    -Dexamples=true \
+                    -Dprofiler=false \
+                    -Dwayland_backend=false
 
 post-destroot {
     set docdir ${prefix}/share/doc/${name}
     xinstall -d ${destroot}${docdir}
-    xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING HACKING NEWS README \
+    xinstall -m 644 -W ${worksrcpath} CONTRIBUTING.md COPYING NEWS README.md \
         ${destroot}${docdir}
 
     # avoid conflict with the gtk-update-icon-cache installed by gtk2
@@ -144,9 +138,6 @@ platform darwin {
         if {[variant_isset quartz] || ![variant_isset x11]} {
             configure.ldflags-append  -framework Cocoa -framework Carbon
         }
-
-        # https://trac.macports.org/ticket/63151
-        configure.args-append --disable-dependency-tracking
     }
 
     if {${os.major} <= 10} {
@@ -157,7 +148,8 @@ platform darwin {
     }
     if {${os.major} <= 12} {
         # requires cups 1.7
-        configure.args-append --disable-cups
+        configure.args-append \
+            -Dprint_backends=file,lpr,test
     }
 }
 
@@ -236,30 +228,45 @@ if {${universal_possible} && [variant_isset universal]} {
     configure.cc "${configure.cc} ${configure.cc_archflags}"
 }
 
+variant tests description {Enable tests} {
+    configure.args-replace \
+                            -Dtests=false \
+                            -Dtests=true
+
+    test.run                yes
+    test.target             test
+}
+
 variant quartz conflicts x11 {
     require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
     require_active_variants path:lib/pkgconfig/pango.pc:pango quartz
 
-    configure.args-append   --enable-quartz-backend
+    configure.args-append \
+                            -Dx11_backend=false \
+                            -Dquartz_backend=true \
+                            -Dxinerama=no
 }
 
 variant x11 conflicts quartz {
     require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
     require_active_variants path:lib/pkgconfig/pango.pc:pango x11
 
-    depends_lib-append      port:xorg-libXi \
+    depends_lib-append \
+                            port:at-spi2-atk \
+                            port:fontconfig \
+                            port:libxkbcommon-x11 \
+                            port:xorg-libXi \
                             port:xorg-libXrandr \
                             port:xorg-libXcursor \
                             port:xorg-libXinerama \
                             port:xorg-libXdamage \
                             port:xorg-libXcomposite \
-                            port:xorg-libXfixes \
-                            port:at-spi2-atk
+                            port:xorg-libXfixes
 
-    configure.args-append   --enable-xinerama \
-                            --x-include=${prefix}/include \
-                            --x-lib=${prefix}/lib \
-                            --enable-x11-backend
+    configure.args-append \
+                            -Dx11_backend=true \
+                            -Dquartz_backend=false \
+                            -Dxinerama=yes
 }
 
 if {![variant_isset quartz]} {

diff --git a/gnome/gtk3-devel/files/patch-meson.build-x11-enabled.diff b/gnome/gtk3-devel/files/patch-meson.build-x11-enabled.diff
@@ -0,0 +1,11 @@
+--- meson.build.orig	2023-01-09 13:44:54.000000000 -0500
++++ meson.build	2023-01-09 13:45:30.000000000 -0500
+@@ -158,7 +158,7 @@
+
+ if os_darwin
+   wayland_enabled = false
+-  x11_enabled = false
++#  x11_enabled = false
+ else
+   quartz_enabled = false
+ endif