<!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>[136132] trunk/dports/gnome/yelp</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/136132">136132</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-05-11 13:07:13 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>yelp: update to version 3.16.0, reconfigure using upstream autogen.sh for intltool 0.51 compatibility, minimize compile warnings.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomeyelpPortfile">trunk/dports/gnome/yelp/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomeyelpfilespatchm4ax_compiler_flags_ldflagsm4diff">trunk/dports/gnome/yelp/files/patch-m4-ax_compiler_flags_ldflags.m4.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomeyelpfilespatchconfigureacdiff">trunk/dports/gnome/yelp/files/patch-configure.ac.diff</a></li>
<li><a href="#trunkdportsgnomeyelpfilespatchsrcyelpapplicationcdiff">trunk/dports/gnome/yelp/files/patch-src-yelp-application.c.diff</a></li>
<li><a href="#trunkdportsgnomeyelpfilespatchyelpdesktopinindiff">trunk/dports/gnome/yelp/files/patch-yelp.desktop.in.in.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomeyelp">trunk/dports/gnome/yelp/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomeyelp"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/yelp</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/stable/dports/gnome/yelp:108269-127493
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/yelp:114069-118154,121400-125723
</span><span class="cx">/users/rmstonecipher/gnome/yelp:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/yelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/yelp:108269-136044
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/yelp:114069-118154,121400-125723,133231-134389
</span><span class="cx">/users/rmstonecipher/gnome/yelp:102363-103172
</span><a id="trunkdportsgnomeyelpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/yelp/Portfile (136131 => 136132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/yelp/Portfile 2015-05-11 20:07:11 UTC (rev 136131)
+++ trunk/dports/gnome/yelp/Portfile 2015-05-11 20:07:13 UTC (rev 136132)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name yelp
</span><del>-version 3.14.1
</del><ins>+version 3.16.0
</ins><span class="cx"> license GPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Help browser for GNOME.
</span><span class="lines">@@ -20,13 +20,17 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 2799875fb4760877f0f7fb4c3fa85850fc6fda8b \
- sha256 1df24b0afa000fd7b003b43448be5227d72757e95e678a7be1832ebea685f072
</del><ins>+checksums rmd160 58a9a74028a53cf6d4d4b0469f44ce5c611c0fd7 \
+ sha256 238baa442a8ffe8db2e3d423329409a4e3bc9436d5f63f520c64fc875e70e22b
</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><ins>+ port:gnome-common \
+ port:autoconf \
+ port:automake \
+ port:libtool \
+ port:gtk-doc
</ins><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gtk3 \
</span><span class="lines">@@ -45,17 +49,15 @@
</span><span class="cx"> port:gnome-getting-started-docs \
</span><span class="cx"> port:gnome-settings-daemon
</span><span class="cx">
</span><del>-# update m4/intltool.m4 and autoreconf
</del><ins>+patchfiles patch-m4-ax_compiler_flags_ldflags.m4.diff
</ins><span class="cx">
</span><del>-pre-configure {
- copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
-}
</del><ins>+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</ins><span class="cx">
</span><del>-use_autoreconf yes
-autoreconf.args -fvi
</del><ins>+configure.cmd ./autogen.sh
</ins><span class="cx">
</span><span class="cx"> configure.args --x-includes=${prefix}/include \
</span><span class="cx"> --x-libraries=${prefix}/lib \
</span><ins>+ --enable-compile-warnings=minimum \
</ins><span class="cx"> --disable-schemas-compile \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --enable-debug
</span></span></pre></div>
<a id="trunkdportsgnomeyelpfilespatchconfigureacdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/yelp/files/patch-configure.ac.diff (136131 => 136132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/yelp/files/patch-configure.ac.diff 2015-05-11 20:07:11 UTC (rev 136131)
+++ trunk/dports/gnome/yelp/files/patch-configure.ac.diff 2015-05-11 20:07:13 UTC (rev 136132)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>---- configure.ac.orig 2013-06-29 08:34:42.000000000 -0700
-+++ configure.ac 2013-06-29 08:35:10.000000000 -0700
-@@ -29,6 +29,7 @@ PKG_CHECK_MODULES(YELP,
- [
- gio-2.0 >= 2.25.10
- gio-unix-2.0
-+ gthread-2.0
- gtk+-unix-print-2.0
- gtk+-2.0 >= 2.18.0
- libxml-2.0 >= 2.6.5
</del></span></pre></div>
<a id="trunkdportsgnomeyelpfilespatchm4ax_compiler_flags_ldflagsm4difffromrev136044usersdevansGNOME3stabledportsgnomeyelpfilespatchm4ax_compiler_flags_ldflagsm4diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/yelp/files/patch-m4-ax_compiler_flags_ldflags.m4.diff (from rev 136044, users/devans/GNOME-3/stable/dports/gnome/yelp/files/patch-m4-ax_compiler_flags_ldflags.m4.diff) (0 => 136132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/yelp/files/patch-m4-ax_compiler_flags_ldflags.m4.diff (rev 0)
+++ trunk/dports/gnome/yelp/files/patch-m4-ax_compiler_flags_ldflags.m4.diff 2015-05-11 20:07:13 UTC (rev 136132)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- m4/ax_compiler_flags_ldflags.m4.orig 2015-03-11 16:01:32.000000000 -0700
++++ m4/ax_compiler_flags_ldflags.m4 2015-03-11 16:06:33.000000000 -0700
+@@ -49,7 +49,6 @@
+
+ # Base flags
+ AX_APPEND_COMPILE_FLAGS([ dnl
+- -Wl,--no-as-needed dnl
+ $3 dnl
+ ],ax_warn_ldflags_variable,[$ax_compiler_flags_test])
+
</ins></span></pre></div>
<a id="trunkdportsgnomeyelpfilespatchsrcyelpapplicationcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/yelp/files/patch-src-yelp-application.c.diff (136131 => 136132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/yelp/files/patch-src-yelp-application.c.diff 2015-05-11 20:07:11 UTC (rev 136131)
+++ trunk/dports/gnome/yelp/files/patch-src-yelp-application.c.diff 2015-05-11 20:07:13 UTC (rev 136132)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- src/yelp-application.c.orig 2012-09-19 13:42:52.000000000 -0700
-+++ src/yelp-application.c 2012-09-19 13:44:43.000000000 -0700
-@@ -224,7 +224,7 @@
- gchar *keyfile = g_build_filename (g_get_user_config_dir (),
- "yelp", "yelp.cfg",
- NULL);
-- priv->backend = g_keyfile_settings_backend_new (keyfile);
-+ priv->backend = g_keyfile_settings_backend_new (keyfile, "/apps/yelp/", "yelp");
- priv->gsettings = g_settings_new_with_backend ("org.gnome.yelp",
- priv->backend);
- g_free (keyfile);
</del></span></pre></div>
<a id="trunkdportsgnomeyelpfilespatchyelpdesktopinindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/yelp/files/patch-yelp.desktop.in.in.diff (136131 => 136132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/yelp/files/patch-yelp.desktop.in.in.diff 2015-05-11 20:07:11 UTC (rev 136131)
+++ trunk/dports/gnome/yelp/files/patch-yelp.desktop.in.in.diff 2015-05-11 20:07:13 UTC (rev 136132)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>---- yelp.desktop.in.in.orig 2013-06-23 12:34:44.000000000 -0700
-+++ yelp.desktop.in.in 2013-06-23 12:36:10.000000000 -0700
-@@ -2,13 +2,14 @@
- _Name=Help
- _Comment=Get help with GNOME
- OnlyShowIn=GNOME;
--Exec=yelp
-+Exec=yelp %u
- Icon=help-browser
- StartupNotify=true
- Terminal=false
- Type=Application
--Categories=GNOME;GTK;Core;Documentation;
-+Categories=GNOME;GTK;Core;Documentation;Utility;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=Yelp
- X-GNOME-Bugzilla-Component=general
- X-GNOME-Bugzilla-Version=@VERSION@
-+MimeType=x-scheme-handler/ghelp;x-scheme-handler/help;x-scheme-handler/info;x-scheme-handler/man;
</del></span></pre>
</div>
</div>
</body>
</html>