<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[145799] trunk/dports/gnome/metacity</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/145799">145799</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-02-17 09:11:55 -0800 (Wed, 17 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>metacity: update to version 3.18.2, update autogen.sh from upstream git, no longer requires gnome-common to build, disable compile warnings.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomemetacityPortfile">trunk/dports/gnome/metacity/Portfile</a></li>
<li><a href="#trunkdportsgnomemetacityfilesautogensh">trunk/dports/gnome/metacity/files/autogen.sh</a></li>
<li><a href="#trunkdportsgnomemetacityfilespatchnoasneededdiff">trunk/dports/gnome/metacity/files/patch-no-as-needed.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomemetacity">trunk/dports/gnome/metacity/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomemetacity"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/metacity</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/metacity:132297-140567
</span><span class="cx"> + /users/devans/GNOME-3/stable/dports/gnome/metacity:121414-145798
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/metacity:132297-140567
</span><a id="trunkdportsgnomemetacityPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/metacity/Portfile (145798 => 145799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/metacity/Portfile 2016-02-17 17:09:40 UTC (rev 145798)
+++ trunk/dports/gnome/metacity/Portfile 2016-02-17 17:11:55 UTC (rev 145799)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name metacity
</span><del>-version 3.18.1
</del><ins>+version 3.18.2
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description A window manager for the adult in you.
</span><span class="cx"> long_description ${description}
</span><span class="lines">@@ -18,13 +18,12 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 79f5f1b8b87f68e5167770d71d64bef6c7dec2fe \
- sha256 5ccb2343413b6ba4d75f300b494524bde7fe77ec818f7f73e3b232777ce6dad8
</del><ins>+checksums rmd160 9efd4f7415831b3e804b4e853e1da45818d2cf3a \
+ sha256 e3ef981d0f159c57a8bf23f04755a5fe34f634aaada52fb30cd7b05dd43243dc
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="cx"> port:itstool \
</span><del>- port:gnome-common \
</del><span class="cx"> port:autoconf \
</span><span class="cx"> port:automake \
</span><span class="cx"> port:libtool
</span><span class="lines">@@ -63,6 +62,7 @@
</span><span class="cx"> configure.args --x-includes=${prefix}/include \
</span><span class="cx"> --x-libraries=${prefix}/lib \
</span><span class="cx"> --enable-debug \
</span><ins>+ --disable-compile-warnings \
</ins><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --disable-schemas-compile \
</span><span class="cx"> --disable-themes-documentation \
</span></span></pre></div>
<a id="trunkdportsgnomemetacityfilesautogensh"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/metacity/files/autogen.sh (145798 => 145799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/metacity/files/autogen.sh 2016-02-17 17:09:40 UTC (rev 145798)
+++ trunk/dports/gnome/metacity/files/autogen.sh 2016-02-17 17:11:55 UTC (rev 145799)
</span><span class="lines">@@ -1,22 +1,40 @@
</span><del>-#!/bin/bash
</del><ins>+#!/bin/sh
+#
</ins><span class="cx"> # Run this to generate all the initial makefiles, etc.
</span><span class="cx">
</span><del>-srcdir=`dirname $0`
</del><ins>+srcdir=$(dirname "$0")
</ins><span class="cx"> test -z "$srcdir" && srcdir=.
</span><span class="cx">
</span><del>-REQUIRED_AUTOMAKE_VERSION=1.10
</del><ins>+if [ ! -f $srcdir/configure.ac ]; then
+ echo "**Error**: Directory "\'$srcdir\'" does not look like the top-level" \
+ "project directory."
+ exit 1
+fi
</ins><span class="cx">
</span><del>-(test -f $srcdir/configure.ac \
- && test -d $srcdir/src) || {
- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level metacity directory"
- exit 1
-}
</del><ins>+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' "$srcdir/configure.ac")
</ins><span class="cx">
</span><del>-which gnome-autogen.sh || {
- echo "You need to install gnome-common from GNOME Subversion (or from"
- echo "your distribution's package manager)."
- exit 1
-}
</del><ins>+if [ "$#" = 0 ] && [ -z "$NOCONFIGURE" ]; then
+ echo "**Warning**: I am going to run 'configure' with no arguments." >&2
+ echo "If you wish to pass any to it, please specify them on the '$0'" \
+ "command line." >&2
+fi
</ins><span class="cx">
</span><del>-. gnome-autogen.sh
</del><ins>+set -x
+aclocal --install || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install -Wno-portability || exit 1
+{ set +x; } 2>/dev/null
+
+if [ -z "$NOCONFIGURE" ]; then
+ set -x
+ $srcdir/configure "$@" || exit 1
+ { set +x; } 2>/dev/null
+
+ if [ "$1" = "--help" ]; then
+ exit 0
+ else
+ echo "Now type 'make' to compile $PKG_NAME." || exit 1
+ fi
+else
+ echo "Skipping configure process."
+fi
</ins></span></pre></div>
<a id="trunkdportsgnomemetacityfilespatchnoasneededdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/metacity/files/patch-no-as-needed.diff (145798 => 145799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/metacity/files/patch-no-as-needed.diff 2016-02-17 17:09:40 UTC (rev 145798)
+++ trunk/dports/gnome/metacity/files/patch-no-as-needed.diff 2016-02-17 17:11:55 UTC (rev 145799)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>---- m4/ax_compiler_flags_ldflags.m4.orig 2015-09-23 10:00:56.000000000 -0700
-+++ m4/ax_compiler_flags_ldflags.m4 2015-09-23 10:01:22.000000000 -0700
</del><ins>+--- m4/ax_compiler_flags_ldflags.m4.orig 2016-02-15 12:40:48.000000000 -0800
++++ m4/ax_compiler_flags_ldflags.m4 2016-02-17 08:51:43.000000000 -0800
</ins><span class="cx"> @@ -49,7 +49,6 @@
</span><span class="cx">
</span><span class="cx"> # Base flags
</span><del>- AX_APPEND_COMPILE_FLAGS([ dnl
</del><ins>+ AX_APPEND_LINK_FLAGS([ dnl
</ins><span class="cx"> - -Wl,--no-as-needed dnl
</span><span class="cx"> $3 dnl
</span><span class="cx"> ],ax_warn_ldflags_variable,[$ax_compiler_flags_test])
</span></span></pre>
</div>
</div>
</body>
</html>