From 6e040fd9d4e92a248028912a66eb6fce50d77925 Mon Sep 17 00:00:00 2001
From: Sergey Fedorov <barracuda@macos-powerpc.org>
Date: Fri, 6 Sep 2024 19:17:18 +0800
Subject: [PATCH] gom: wip to update

---
 gnome/gom/Portfile           | 25 +++++++++++++------------
 gnome/grilo-plugins/Portfile | 12 +++++++++++-
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/gnome/gom/Portfile b/gnome/gom/Portfile
index 71988c7c9cad1..fc5f5e8acd4fc 100644
--- a/gnome/gom/Portfile
+++ b/gnome/gom/Portfile
@@ -5,7 +5,7 @@ PortGroup           python 1.0
 PortGroup           meson 1.0
 
 name                gom
-version             0.4
+version             0.5.3
 revision            0
 license             LGPL-2.1+
 set branch          [join [lrange [split ${version} .] 0 1] .]
@@ -14,19 +14,18 @@ long_description    ${description}
 
 maintainers         {devans @dbevans} openmaintainer
 categories          gnome
-platforms           darwin
 homepage            https://wiki.gnome.org/Gom
 master_sites        gnome:sources/${name}/${branch}/
 
 use_xz              yes
 
-checksums           rmd160  312e4b14a815e04fdc369b3f7cf47d899be05b6a \
-                    sha256  68d08006aaa3b58169ce7cf1839498f45686fba8115f09acecb89d77e1018a9d \
-                    size    102744
+checksums           rmd160  3450554cb61003f779afbe2bf18750246dc2a3ea \
+                    sha256  069d0909fbdc6b4d27edf7a879366194e3ab508b03548bf5b89ff63546d20177 \
+                    size    106204
 
-python.default_version 310
+python.default_version 312
 
-depends_build       port:pkgconfig \
+depends_build       path:bin/pkg-config:pkgconfig \
                     port:gtk-doc
 
 depends_lib         path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
@@ -35,15 +34,17 @@ depends_lib         path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
                     port:py${python.version}-gobject3 \
                     port:sqlite3
 
-patchfiles          use-g-add-private.patch \
-                    fix-trivial-doc-typo.patch
-
-patch.pre_args-replace  -p0 -p1
-
 use_configure       yes
 configure.args      -Denable-gtk-doc=true \
+                    -Denable-introspection=true \
                     -Dpygobject-override-dir="${python.pkgd}/gi/overrides"
 
+# gom-resource-group.c: error: ‘for’ loop initial declaration used outside C99 mode
+# But -std=c99 not sufficient:
+# gom-resource-group.c: error: ‘ItemData’ has no member named ‘resource’, etc.
+compiler.blacklist-append \
+                    *gcc-4.0 *gcc-4.2
+
 destroot.cmd        ${build.cmd}
 
 # gobject-introspection uses g-ir-scanner, which uses $CC from env
diff --git a/gnome/grilo-plugins/Portfile b/gnome/grilo-plugins/Portfile
index 14983d30c4fb4..a85ed3f0f3972 100644
--- a/gnome/grilo-plugins/Portfile
+++ b/gnome/grilo-plugins/Portfile
@@ -25,7 +25,7 @@ checksums           rmd160  0baffd5b1808ca6447505227c67a53ba1113c205 \
                     sha256  686844b34ec73b24931ff6cc4f6033f0072947a6db60acdc7fb3eaf157a581c8 \
                     size    1836512
 
-depends_build       port:pkgconfig \
+depends_build       path:bin/pkg-config:pkgconfig \
                     port:gettext \
                     port:itstool
 
@@ -63,6 +63,16 @@ variant tracker description {Enable optional tracker support} {
     configure.args-delete   -Denable-tracker=no
 }
 
+platform darwin {
+    if {${configure.cxx_stdlib} ne "libc++"} {
+        # gnome-online-accounts needs webkit2-gtk,
+        # which in turn needs libc++ on macOS.
+        depends_lib-delete  port:gnome-online-accounts
+        configure.args-append \
+                            -Denable-goa=no
+    }
+}
+
 # grilo expects plugin modules with .so extensions
 # make .so symlink for each plugin module built as .dylib
 post-destroot {