<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/336e245212850ab0a5010ea8bee468088e103d06">https://github.com/macports/macports-ports/commit/336e245212850ab0a5010ea8bee468088e103d06</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 336e245 glib2, glib2-devel: Fix build on Tiger w/o gtk-doc
</span>336e245 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 336e245212850ab0a5010ea8bee468088e103d06
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Aug 30 16:29:32 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> glib2, glib2-devel: Fix build on Tiger w/o gtk-doc
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix build on Tiger when gtk-doc is not installed by using "command -v"
</span><span style='display:block; white-space:pre;color:#404040;'> instead of "which" in autogen.sh.
</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/57039
</span>---
devel/glib2-devel/Portfile | 3 ++-
devel/glib2-devel/files/which.patch | 25 +++++++++++++++++++++++++
devel/glib2/Portfile | 3 ++-
devel/glib2/files/which.patch | 25 +++++++++++++++++++++++++
4 files changed, 54 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/Portfile b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ce68eef..1f9ba6c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,8 @@ patchfiles libintl.patch \
</span> patch-get-launchd-dbus-session-address.diff \
patch-gmodule-gmodule-dl.c.diff \
patch-configure-switch-for-gappinfo-impl.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- universal.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ which.patch
</span>
depends_build port:autoconf \
port:automake \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/which.patch b/devel/glib2-devel/files/which.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..58eb6e9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/which.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use "command -v" instead of "which" to fix build on Tiger when gtk-doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is not installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/glib/merge_requests/277
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- autogen.sh.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,8 +7,7 @@ test -n "$srcdir" || srcdir=.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ olddir=`pwd`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "$srcdir"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GTKDOCIZE=$(which gtkdocize 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -z $GTKDOCIZE; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if ! command -v gtkdocize >/dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f gtk-doc.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat > gtk-doc.make <<EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,8 +18,7 @@ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtkdocize || exit $?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AUTORECONF=`which autoreconf`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -z $AUTORECONF; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if ! command -v autoreconf >/dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "*** No autoreconf found, please install it ***"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 57b0427..3cee9b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,8 @@ patchfiles libintl.patch \
</span> patch-get-launchd-dbus-session-address.diff \
patch-gmodule-gmodule-dl.c.diff \
patch-configure-switch-for-gappinfo-impl.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- universal.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ which.patch
</span>
depends_build port:autoconf \
port:automake \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/which.patch b/devel/glib2/files/which.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..58eb6e9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/which.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use "command -v" instead of "which" to fix build on Tiger when gtk-doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is not installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/glib/merge_requests/277
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- autogen.sh.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,8 +7,7 @@ test -n "$srcdir" || srcdir=.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ olddir=`pwd`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "$srcdir"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GTKDOCIZE=$(which gtkdocize 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -z $GTKDOCIZE; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if ! command -v gtkdocize >/dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f gtk-doc.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat > gtk-doc.make <<EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,8 +18,7 @@ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtkdocize || exit $?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AUTORECONF=`which autoreconf`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -z $AUTORECONF; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if ! command -v autoreconf >/dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "*** No autoreconf found, please install it ***"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span></pre><pre style='margin:0'>
</pre>