- Fix build with gcc 4.9 [1]

- Use option helper

PR:		204395 [1]
Reported by:	gerald [1]

2 files changed, 12 insertions, 5 deletions

diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index df0ee97cfa6e..10b4a0c444cc 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -53,10 +53,7 @@ GG_EMOTS_DESC=	GG-compatible emoticons
 GG_EMOTS_DISTFILES=	${GG6_EMOTS_DISTFILE}:additions \
 			${GG7_EMOTS_DISTFILE}:additions
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MGG_EMOTS}
+post-install-GG_EMOTS-on:
 	@${MKDIR} ${WRKSRC}/varia/themes/emoticons
 	@cd ${WRKSRC}/varia/themes/emoticons && \
 	${TAR} -zxf ${_DISTDIR}/${GG6_EMOTS_DISTFILE} && \
@@ -64,6 +61,5 @@ post-install:
 	cd gg6_compatible && ${TAR} -zxf ${_DISTDIR}/${GG7_EMOTS_DISTFILE}
 	@cd ${WRKSRC}/varia/themes/emoticons && \
 	${COPYTREE_SHARE} gg6_compatible ${STAGEDIR}${DATADIR}/themes/emoticons
-.endif
 
 .include <bsd.port.mk>
diff --git a/polish/kadu/files/patch-kadu-core_execution-arguments_execution-arguments-parser.h b/polish/kadu/files/patch-kadu-core_execution-arguments_execution-arguments-parser.h
new file mode 100644
index 000000000000..203e4756b569
--- /dev/null
+++ b/polish/kadu/files/patch-kadu-core_execution-arguments_execution-arguments-parser.h
@@ -0,0 +1,11 @@
+--- kadu-core/execution-arguments/execution-arguments-parser.h.orig	2015-11-09 20:19:32 UTC
++++ kadu-core/execution-arguments/execution-arguments-parser.h
+@@ -20,7 +20,7 @@
+ #pragma once
+ 
+ #include "exports.h"
+-
++#include <cstdio>
+ #include <QtCore/QStringList>
+ 
+ class ExecutionArguments;