<!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>[153195] trunk/dports/irc/hexchat</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/153195">153195</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-09-26 15:56:08 -0700 (Mon, 26 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>irc/hexchat: fix build failures
Reorder includes to avoid picking up previously installed headers
opportunistically, closes #52384
Fix build on OS X <= 10.9, closes #52385
Disable silent rules for better log files.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsirchexchatPortfile">trunk/dports/irc/hexchat/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsirchexchatfilespatchincludeorderdiff">trunk/dports/irc/hexchat/files/patch-include-order.diff</a></li>
<li><a href="#trunkdportsirchexchatfilespatchsysinfopluginon109andlowerdiff">trunk/dports/irc/hexchat/files/patch-sysinfo-plugin-on-10.9-and-lower.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsirchexchatPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/irc/hexchat/Portfile (153194 => 153195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/irc/hexchat/Portfile 2016-09-26 21:11:19 UTC (rev 153194)
+++ trunk/dports/irc/hexchat/Portfile 2016-09-26 22:56:08 UTC (rev 153195)
</span><span class="lines">@@ -37,6 +37,9 @@
</span><span class="cx"> port:libnotify \
</span><span class="cx"> port:gettext
</span><span class="cx">
</span><ins>+patchfiles patch-include-order.diff \
+ patch-sysinfo-plugin-on-10.9-and-lower.diff
+
</ins><span class="cx"> # reconfigure for intltool 0.51 compatibility
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.cmd ./autogen.sh
</span><span class="lines">@@ -50,6 +53,7 @@
</span><span class="cx"> port:libtool
</span><span class="cx">
</span><span class="cx"> configure.args --disable-dependency-tracking \
</span><ins>+ --disable-silent-rules \
</ins><span class="cx"> --enable-minimal-flags \
</span><span class="cx"> --disable-python \
</span><span class="cx"> --disable-lua \
</span></span></pre></div>
<a id="trunkdportsirchexchatfilespatchincludeorderdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/irc/hexchat/files/patch-include-order.diff (0 => 153195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/irc/hexchat/files/patch-include-order.diff (rev 0)
+++ trunk/dports/irc/hexchat/files/patch-include-order.diff 2016-09-26 22:56:08 UTC (rev 153195)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+--- plugins/checksum/Makefile.am.orig 2016-09-27 00:20:57.000000000 +0200
++++ plugins/checksum/Makefile.am 2016-09-27 00:21:13.000000000 +0200
+@@ -4,4 +4,5 @@
+ checksum_la_SOURCES = checksum.c
+ checksum_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+ checksum_la_LIBADD = $(GLIB_LIBS)
+-checksum_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
++checksum_la_CPPFLAGS = -I$(top_srcdir)/src/common
++checksum_la_CFLAGS = $(GLIB_CFLAGS)
+--- plugins/doat/Makefile.am.orig 2016-09-27 00:21:13.000000000 +0200
++++ plugins/doat/Makefile.am 2016-09-27 00:22:41.000000000 +0200
+@@ -4,5 +4,6 @@
+ doat_la_SOURCES = doat.c
+ doat_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+ doat_la_LIBADD = $(GLIB_LIBS)
+-doat_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
++doat_la_CPPFLAGS = -I$(top_srcdir)/src/common
++doat_la_CFLAGS = $(GLIB_CFLAGS)
+
+--- plugins/fishlim/Makefile.am.orig 2016-09-27 00:22:41.000000000 +0200
++++ plugins/fishlim/Makefile.am 2016-09-27 00:22:47.000000000 +0200
+@@ -6,4 +6,5 @@
+ fishlim_la_SOURCES = fish.c irc.c keystore.c plugin_hexchat.c
+ fishlim_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+ fishlim_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
+-fishlim_la_CFLAGS = $(GLIB_CFLAGS) $(OPENSSL_CFLAGS) -I$(top_srcdir)/src/common
++fishlim_la_CPPFLAGS = -I$(top_srcdir)/src/common
++fishlim_la_CFLAGS = $(GLIB_CFLAGS) $(OPENSSL_CFLAGS)
+--- plugins/perl/Makefile.am.orig 2016-09-27 00:22:52.000000000 +0200
++++ plugins/perl/Makefile.am 2016-09-27 00:22:56.000000000 +0200
+@@ -8,7 +8,8 @@
+ perl_la_SOURCES = perl.c
+ perl_la_LDFLAGS = $(PERL_LDFLAGS) $(PLUGIN_LDFLAGS) -module
+ perl_la_LIBADD = $(GLIB_LIBS)
+-perl_la_CFLAGS = $(PERL_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
++perl_la_CPPFLAGS = -I$(top_srcdir)/src/common
++perl_la_CFLAGS = $(PERL_CFLAGS) $(GLIB_CFLAGS)
+
+ BUILT_SOURCES = hexchat.pm.h irc.pm.h
+ CLEANFILES = $(BUILT_SOURCES)
+--- plugins/python/Makefile.am.orig 2016-09-27 00:22:56.000000000 +0200
++++ plugins/python/Makefile.am 2016-09-27 00:23:08.000000000 +0200
+@@ -4,6 +4,6 @@
+ python_la_SOURCES = python.c
+ python_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+ python_la_LIBADD = $(PYTHON_LIBS) $(GLIB_LIBS)
+-python_la_CPPFLAGS = $(PYTHON_CPPFLAGS)
+-python_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
++python_la_CPPFLAGS = -I$(top_srcdir)/src/common $(PYTHON_CPPFLAGS)
++python_la_CFLAGS = $(GLIB_CFLAGS)
+
+--- plugins/sysinfo/Makefile.am.orig 2016-09-27 00:23:08.000000000 +0200
++++ plugins/sysinfo/Makefile.am 2016-09-27 00:23:33.000000000 +0200
+@@ -14,4 +14,4 @@
+ sysinfo_la_SOURCES = $(sources)
+ sysinfo_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+ sysinfo_la_LIBADD = $(LIBPCI_LIBS) $(GLIB_LIBS)
+-AM_CPPFLAGS = $(LIBPCI_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/src/common -I$(srcdir)/shared
++AM_CPPFLAGS = -I$(top_srcdir)/src/common -I$(srcdir)/shared $(LIBPCI_CFLAGS) $(GLIB_CFLAGS)
+--- src/common/dbus/Makefile.am.orig 2016-09-27 00:23:33.000000000 +0200
++++ src/common/dbus/Makefile.am 2016-09-27 00:23:41.000000000 +0200
+@@ -15,7 +15,7 @@
+
+ CLEANFILES = $(BUILT_SOURCES)
+
+-AM_CPPFLAGS = $(COMMON_CFLAGS) $(DBUS_CFLAGS) -I$(top_srcdir)/src/common
++AM_CPPFLAGS = -I$(top_srcdir)/src/common $(COMMON_CFLAGS) $(DBUS_CFLAGS)
+
+ noinst_PROGRAMS = example
+ example_SOURCES = example.c
+--- src/fe-gtk/Makefile.am.orig 2016-09-27 00:23:41.000000000 +0200
++++ src/fe-gtk/Makefile.am 2016-09-27 00:23:54.000000000 +0200
+@@ -45,7 +45,7 @@
+ maingui.c notifygui.c $(notify_c) palette.c pixmaps.c plugin-tray.c $(plugingui_c) \
+ plugin-notification.c rawlog.c servlistgui.c setup.c $(iso_codes_c) \
+ sexy-spell-entry.c textgui.c urlgrab.c userlistgui.c xtext.c
+-hexchat_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/common
++hexchat_CPPFLAGS = -I$(top_builddir)/src/common $(AM_CPPFLAGS)
+
+ resources_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/data --generate-dependencies $(top_srcdir)/data/hexchat.gresource.xml)
+
</ins></span></pre></div>
<a id="trunkdportsirchexchatfilespatchsysinfopluginon109andlowerdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/irc/hexchat/files/patch-sysinfo-plugin-on-10.9-and-lower.diff (0 => 153195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/irc/hexchat/files/patch-sysinfo-plugin-on-10.9-and-lower.diff (rev 0)
+++ trunk/dports/irc/hexchat/files/patch-sysinfo-plugin-on-10.9-and-lower.diff 2016-09-26 22:56:08 UTC (rev 153195)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+--- plugins/sysinfo/osx/backend.m
++++ plugins/sysinfo/osx/backend.m
+@@ -78,10 +78,22 @@ get_os (void)
+ static char *
+ get_os_fallback (void)
+ {
++#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_9
++ SInt32 ver_major = 0,
++ ver_minor = 0,
++ ver_patch = 0;
++
++ Gestalt (gestaltSystemVersionMajor, &ver_major);
++ Gestalt (gestaltSystemVersionMinor, &ver_minor);
++ Gestalt (gestaltSystemVersionBugFix, &ver_patch);
++
++ return g_strdup_printf ("OS X %d.%d.%d", ver_major, ver_minor, ver_patch);
++#else
+ NSProcessInfo *info = [NSProcessInfo processInfo];
+ NSOperatingSystemVersion version = [info operatingSystemVersion];
+
+ return g_strdup_printf ("OS X %ld.%ld.%ld", version.majorVersion, version.minorVersion, version.patchVersion);
++#endif
+ }
+ char *
+ sysinfo_backend_get_os(void)
</ins></span></pre>
</div>
</div>
</body>
</html>