[153195] trunk/dports/irc/hexchat

Mon Sep 26 15:56:08 PDT 2016

Revision: 153195
          https://trac.macports.org/changeset/153195
Author:   raimue at macports.org
Date:     2016-09-26 15:56:08 -0700 (Mon, 26 Sep 2016)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/dports/irc/hexchat/Portfile

Added Paths:
-----------
    trunk/dports/irc/hexchat/files/patch-include-order.diff
    trunk/dports/irc/hexchat/files/patch-sysinfo-plugin-on-10.9-and-lower.diff

Modified: trunk/dports/irc/hexchat/Portfile
===================================================================

--- 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)
@@ -37,6 +37,9 @@
                     port:libnotify \
                     port:gettext
 
+patchfiles          patch-include-order.diff \
+                    patch-sysinfo-plugin-on-10.9-and-lower.diff 
+
 # reconfigure for intltool 0.51 compatibility
 use_autoreconf      yes
 autoreconf.cmd      ./autogen.sh
@@ -50,6 +53,7 @@
                     port:libtool
 
 configure.args      --disable-dependency-tracking \
+                    --disable-silent-rules \
                     --enable-minimal-flags \
                     --disable-python \
                     --disable-lua \

Added: trunk/dports/irc/hexchat/files/patch-include-order.diff
===================================================================
--- 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)
@@ -0,0 +1,81 @@
+--- 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)
+ 

Added: trunk/dports/irc/hexchat/files/patch-sysinfo-plugin-on-10.9-and-lower.diff
===================================================================
--- 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)
@@ -0,0 +1,25 @@
+--- 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160926/87257f94/attachment.html>
