<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ec1940f09abbdcd0b01b97e34a4262a82d1377a9">https://github.com/macports/macports-ports/commit/ec1940f09abbdcd0b01b97e34a4262a82d1377a9</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 ec1940f girl: update to version 9.7.1
</span>ec1940f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ec1940f09abbdcd0b01b97e34a4262a82d1377a9
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Jan 19 22:54:52 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> girl: update to version 9.7.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * freshen autogen.sh from upstream git
</span><span style='display:block; white-space:pre;color:#404040;'> * disable optimization to avoid crash on selecting station
</span><span style='display:block; white-space:pre;color:#404040;'> * now uses embedded gstreamer1 based player instead of totem
</span><span style='display:block; white-space:pre;color:#404040;'> * optional streamripper recording functionality removed, +record variant removed
</span><span style='display:block; white-space:pre;color:#404040;'> * generally works although a few stations have issues
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/52993
</span>---
gnome/girl/Portfile | 23 +++++++++++++----------
gnome/girl/files/autogen.sh | 2 +-
gnome/girl/files/patch-enable-debug.diff | 10 +++++-----
3 files changed, 19 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/girl/Portfile b/gnome/girl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ed68656..d161c45 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/girl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/girl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name girl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 9.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 9.7.1
</span> set branch [join [lrange [split $version .] 0 1] .]
categories gnome
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,11 +15,11 @@ long_description Locate Internet Radio Stations
</span> homepage http://people.gnome.org/~ole/girl/
master_sites gnome:sources/${name}/${branch}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 50f2554179325c7cb97eff1d9331424dd3661340 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a18b1803600a7f94ff8577276dd7094b858af970262d67486eb8828d4d39bd87
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_xz yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8f855ff39d1998cf53e76471d41a6b626e1f1704 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 35cab81d5342b54d2c352d834c75aaea8b6bfbd6e6fe9a26b239a7d59c6f2af7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:pkgconfig \
port:intltool \
port:gtk-doc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +36,14 @@ depends_lib port:desktop-file-utils \
</span> port:libgnomeui \
port:libxml2 \
port:gnome-vfs \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:totem \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gstreamer1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gstreamer1-gst-plugins-base \
</span> port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:gstreamer1-gst-plugins-good \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gstreamer1-gst-plugins-bad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gstreamer1-gst-plugins-ugly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # reconfigure using autogen.sh from upstream git for intltool 0.51 compatibility
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +52,9 @@ post-patch {
</span>
configure.cmd ./autogen.sh
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# building with optimization greater than -O0 causes crash on selecting station
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/52993
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.optflags -O0
</span> configure.args --disable-silent-rules
variant debug description {Build with debug symbols and enable debug messages} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,11 +62,6 @@ variant debug description {Build with debug symbols and enable debug messages} {
</span> configure.optflags -O0 -g
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant record description {Enable recording using external streamripper (broken)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:streamripper
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-recording
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-activate {
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/girl/files/autogen.sh b/gnome/girl/files/autogen.sh
</span><span style='display:block; white-space:pre;color:#808080;'>index 452c6c8..b579eac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/girl/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/girl/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ which gnome-autogen.sh || {
</span> }
REQUIRED_AUTOCONF_VERSION=2.59
<span style='display:block; white-space:pre;background:#ffe0e0;'>-REQUIRED_AUTOMAKE_VERSION=1.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+REQUIRED_AUTOMAKE_VERSION=1.14
</span> REQUIRED_INTLTOOL_VERSION=0.40.0
REQUIRED_PKG_CONFIG_VERSION=0.16.0
REQUIRED_GTK_DOC_VERSION=1.9
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/girl/files/patch-enable-debug.diff b/gnome/girl/files/patch-enable-debug.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f59a2ce..99a06b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/girl/files/patch-enable-debug.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/girl/files/patch-enable-debug.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.am.orig 2016-01-31 02:54:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.am 2016-01-31 02:54:38.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.am.orig 2017-01-17 09:45:54.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.am 2017-01-18 15:50:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@
</span> girl_CFLAGS = $(GIRL_CFLAGS) \
-DGIRL_DATADIR=\"$(datadir)/girl\" \
-DDATADIR=\"$(datadir)\" \
- -DGIRL_DEBUG=1 \
+ -DGIRL_DEBUG=0 \
-DGIRL_CFG \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGIRL_HELPER_PLAYER=\"$(GIRL_HELPER_PLAYER)\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGIRL_HELPER_RECORD=\"$(GIRL_HELPER_RECORD)\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGNOMELOCALEDIR=\"$(datadir)/locale\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>