[145359] users/devans/GNOME-3/stable/dports/gnome/girl

[devans at macports.org]

Revision: 145359
          https://trac.macports.org/changeset/145359
Author:   devans at macports.org
Date:     2016-02-02 14:37:40 -0800 (Tue, 02 Feb 2016)
Log Message:
-----------
GNOME-3/stable: girl, apply proposed patch from #50476.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/girl/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/girl/files/
    users/devans/GNOME-3/stable/dports/gnome/girl/files/autogen.sh
    users/devans/GNOME-3/stable/dports/gnome/girl/files/patch-enable-debug.diff
    users/devans/GNOME-3/stable/dports/gnome/girl/files/patch-src-girl-gui.c.diff

Modified: users/devans/GNOME-3/stable/dports/gnome/girl/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/girl/Portfile	2016-02-02 14:53:30 UTC (rev 145358)
+++ users/devans/GNOME-3/stable/dports/gnome/girl/Portfile	2016-02-02 22:37:40 UTC (rev 145359)
@@ -21,9 +21,18 @@
 
 use_xz              yes
 
-depends_lib         port:streamripper \
+depends_build       port:pkgconfig \
+                    port:intltool \
+                    port:gtk-doc \
+                    port:gnome-common \
+                    port:autoconf \
+                    port:automake \
+                    port:yelp-tools \
+                    port:itstool
+
+depends_lib         port:desktop-file-utils \
                     port:gtk2 \
-                    port:glib2 \
+                    path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:libgnome \
                     port:libgnomeui \
                     port:libxml2 \
@@ -31,8 +40,31 @@
                     port:totem \
                     port:zlib
 
+patchfiles          patch-src-girl-gui.c.diff
+
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
+
+post-patch {
+    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+}
+
+configure.cmd       ./autogen.sh
+
+configure.args      --disable-silent-rules
+
+variant debug description {Build with debug symbols and enable debug messages} {
+    patchfiles-append   patch-enable-debug.diff
+    configure.optflags  -O0 -g
+}
+
+variant record description {Enable recording using external streamripper (broken)} {
+    depends_lib-append      port:streamripper
+    configure.args-append   --with-recording
+}
+
+post-activate {
+   system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+   system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+}
+
 livecheck.type      gnome
-
-configure.args      --with-recording \
-                    --disable-silent-rules \
-                    --mandir=${prefix}/share/man

Added: users/devans/GNOME-3/stable/dports/gnome/girl/files/autogen.sh
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/girl/files/autogen.sh	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/girl/files/autogen.sh	2016-02-02 22:37:40 UTC (rev 145359)
@@ -0,0 +1,25 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+PKG_NAME="girl"
+
+(test -f $srcdir/src/girl.c) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
+
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from the GNOME CVS"
+    exit 1
+}
+
+REQUIRED_AUTOCONF_VERSION=2.59
+REQUIRED_AUTOMAKE_VERSION=1.15
+REQUIRED_INTLTOOL_VERSION=0.40.0
+REQUIRED_PKG_CONFIG_VERSION=0.16.0
+REQUIRED_GTK_DOC_VERSION=1.9
+USE_GNOME2_MACROS=1 . gnome-autogen.sh

Added: users/devans/GNOME-3/stable/dports/gnome/girl/files/patch-enable-debug.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/girl/files/patch-enable-debug.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/girl/files/patch-enable-debug.diff	2016-02-02 22:37:40 UTC (rev 145359)
@@ -0,0 +1,11 @@
+--- src/Makefile.am.orig	2016-01-31 02:54:15.000000000 -0800
++++ src/Makefile.am	2016-01-31 02:54:38.000000000 -0800
+@@ -36,7 +36,7 @@
+ girl_CFLAGS  = $(GIRL_CFLAGS) \
+ 	       -DGIRL_DATADIR=\"$(datadir)/girl\" \
+ 	       -DDATADIR=\"$(datadir)\" \
+-	       -DGIRL_DEBUG=1 \
++	       -DGIRL_DEBUG=0 \
+ 	       -DGIRL_CFG \
+ 	       -DGIRL_HELPER_PLAYER=\"$(GIRL_HELPER_PLAYER)\" \
+ 	       -DGIRL_HELPER_RECORD=\"$(GIRL_HELPER_RECORD)\" \

Added: users/devans/GNOME-3/stable/dports/gnome/girl/files/patch-src-girl-gui.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/girl/files/patch-src-girl-gui.c.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/girl/files/patch-src-girl-gui.c.diff	2016-02-02 22:37:40 UTC (rev 145359)
@@ -0,0 +1,11 @@
+--- src/girl-gui.c.orig	2016-02-01 13:53:13.000000000 -0800
++++ src/girl-gui.c	2016-02-01 13:55:57.000000000 -0800
+@@ -1061,7 +1061,7 @@
+ 	       girl->selected_streams_bitrate);
+ 	GIRL_DEBUG_MSG("girl->selected_streams_samplerate: %s\n",
+ 	       girl->selected_streams_samplerate);
+-	GIRL_DEBUG_MSG("girl->selected_channels: %s\n",
++	GIRL_DEBUG_MSG("girl->selected_channels: %0x\n",
+ 	       girl->selected_streams_channels);
+ 
+ 	gnome_config_pop_prefix();
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160202/6e1a74cd/attachment.html>