<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b811b7d09f312df15621e6668168428a48468c9d">https://github.com/macports/macports-ports/commit/b811b7d09f312df15621e6668168428a48468c9d</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 b811b7d09f3 libcanberra: fix port
</span>b811b7d09f3 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit b811b7d09f312df15621e6668168428a48468c9d
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Sun May 26 20:08:08 2024 +0400

<span style='display:block; white-space:pre;color:#404040;'>    libcanberra: fix port
</span>---
 audio/libcanberra/Portfile              | 64 +++++++++++++++++++++++++--------
 audio/libcanberra/files/patch-path.diff | 22 ++++++++++++
 2 files changed, 72 insertions(+), 14 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libcanberra/Portfile b/audio/libcanberra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 86c52481c36..daf9176cbc5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libcanberra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libcanberra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           active_variants 1.1
</span> 
 name                libcanberra
 version             0.30
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            10
</span> 
 categories          audio devel
 license             LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,14 +14,14 @@ description         XDG sound theme and naming implementation
</span> long_description    libcanberra is an implementation of the XDG Sound Theme \
                     and Name Specifications, for generating event sounds on \
                     free desktops, such as GNOME.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            http://0pointer.de/lennart/projects/libcanberra/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            https://0pointer.de/lennart/projects/libcanberra
</span> 
 master_sites        ${homepage}
 use_xz              yes
 
 checksums           rmd160  f5a800f50ae185d9ec12c284298c20fd60f70a8c \
                     sha256  c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size 318960
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    318960
</span> 
 depends_build-append \
                     path:bin/pkg-config:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,10 +33,11 @@ depends_lib-append \
</span> depends_run-append \
                     port:sound-theme-freedesktop
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   patch-gtkquartz.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   LC_CTYPE.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-path.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-gtkquartz.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    LC_CTYPE.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    dynamic_lookup-11.patch
</span> 
 configure.args-append \
                     --disable-alsa \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,21 +52,55 @@ configure.args-append \
</span>                     --disable-tdb \
                     --disable-udev
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant x11 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    path:lib/pkgconfig/gtk+-3.0.pc:gtk3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gtk2 description {Enable GTK2 support} {
</span>     configure.args-replace \
                     --disable-gtk \
                     --enable-gtk
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        require_active_variants path:lib/pkgconfig/gtk+-2.0.pc:gtk2 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        require_active_variants path:lib/pkgconfig/gtk+-2.0.pc:gtk2 x11
</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:#e0ffe0;'>+variant gtk3 description {Enable GTK3 support} {
</span>     configure.args-replace \
                     --disable-gtk3 \
                     --enable-gtk3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-3.0.pc:gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        require_active_variants path:lib/pkgconfig/gtk+-3.0.pc:gtk3 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        require_active_variants path:lib/pkgconfig/gtk+-3.0.pc:gtk3 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz conflicts x11 {
</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;'>+variant x11 conflicts quartz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:xorg-libX11
</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;'>+default_variants    +gtk2 +gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset gtk2] || [variant_isset gtk3]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        default_variants +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        default_variants +quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![variant_isset quartz] && ![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            return -code error "Either +x11 or +quartz is required"
</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> 
 livecheck.type      regex
 livecheck.regex     libcanberra-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libcanberra/files/patch-path.diff b/audio/libcanberra/files/patch-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cef9cce4c6f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libcanberra/files/patch-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.in.orig   2012-09-25 04:27:23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.in        2024-05-26 19:42:33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -683,7 +683,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gnomeautostartdir = $(datadir)/gnome/autostart
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdmautostartdir = $(datadir)/gdm/autostart/LoginWindow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gsdgtkmodulesdir = $(libdir)/gnome-settings-daemon-3.0/gtk-modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AM_CFLAGS = $(WARNINGFLAGS) $(PTHREAD_CFLAGS) -DCA_PLUGIN_PATH=\"$(plugindir)\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AM_CFLAGS = $(WARNINGFLAGS) $(PTHREAD_CFLAGS) -DCA_PLUGIN_PATH=\"$(plugindir)\" -DCA_DATA_DIR=\"$(datadir)\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #AM_CFLAGS = $(WARNINGFLAGS) $(PTHREAD_CFLAGS) -DCA_PLUGIN_PATH=\"/home/lennart/projects/libcanberra/src/.libs\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CXXFLAGS = $(WARNINGFLAGS) $(PTHREAD_CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_LDADD = $(PTHREAD_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/sound-theme-spec.c.orig    2010-02-20 03:39:40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/sound-theme-spec.c 2024-05-26 19:43:54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -321,7 +321,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         const char *g;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if (!(g = getenv("XDG_DATA_DIRS")) || *g == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                return "/usr/local/share:/usr/share";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                return CA_DATA_DIR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return g;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>

</pre>