svn commit: r461948 - in head/irc/kvirc: . files

[Tobias C. Berner]

Author: tcberner
Date: Thu Feb 15 20:17:58 2018
New Revision: 461948
URL: https://svnweb.freebsd.org/changeset/ports/461948

Log:
  irc/kvirc and irc/kvirc-qt4, fix build with clang6

Added:
  head/irc/kvirc/files/patch-debian_git-5d45ef   (contents, props changed)
Modified:
  head/irc/kvirc/Makefile

Modified: head/irc/kvirc/Makefile
==============================================================================
--- head/irc/kvirc/Makefile	Thu Feb 15 19:38:35 2018	(r461947)
+++ head/irc/kvirc/Makefile	Thu Feb 15 20:17:58 2018	(r461948)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kvirc
 PORTVERSION=	4.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	irc kde
 MASTER_SITES=	ftp://ftp.kvirc.de/pub/kvirc/%SUBDIR%/ \
 		http://kvirc.gmake.de/pub/kvirc/%SUBDIR%/ \
@@ -81,5 +81,10 @@ pre-fetch-PERL-on:
 post-patch:
 	${REINPLACE_CMD} -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \
 		${WRKSRC}/CMakeLists.txt
+	# Fix error: invalid suffix on literal; C++11 requires a space between literal and identifier
+	${REINPLACE_CMD} -e 's|"KVI_OPTIONS_WIDGET_KEYWORDS|" KVI_OPTIONS_WIDGET_KEYWORDS|g' \
+		${WRKSRC}/src/modules/options/OptionsInstanceManager.cpp
+	${REINPLACE_CMD} -e 's|"KVI_PATH_SEPARATOR|" KVI_PATH_SEPARATOR|g' \
+		${WRKSRC}/src/kvirc/kernel/KviApplication_filesystem.cpp
 
 .include <bsd.port.mk>

Added: head/irc/kvirc/files/patch-debian_git-5d45ef
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/kvirc/files/patch-debian_git-5d45ef	Thu Feb 15 20:17:58 2018	(r461948)
@@ -0,0 +1,30 @@
+Description: Fixes FTBFS with gcc 6.
+ Fixes invalid conversion errors. Also fixes two wrong flag operations, already
+ fixed upstream (in 0d14434b and 934fa2e1).
+Author: Andrey Rahmatullin <wrar at debian.org>
+Bug-Debian: https://bugs.debian.org/811908
+Last-Update: 2016-11-04
+
+diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp
+index f925ca7..1266b46 100644
+--- src/kvirc/kernel/KviIrcConnection.cpp
++++ src/kvirc/kernel/KviIrcConnection.cpp
+@@ -669,7 +669,8 @@ void KviIrcConnection::closeAllChannels()
+ 	while(m_pChannelList->first())
+ 	{
+ 		m_pChannelList->first()->close();
+-		QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers & QEventLoop::ExcludeUserInputEvents);
++		QEventLoop::ProcessEventsFlags f(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeUserInputEvents);
++		QApplication::processEvents(f);
+ 	}
+ }
+ 
+@@ -678,7 +679,8 @@ void KviIrcConnection::closeAllQueries()
+ 	while(m_pQueryList->first())
+ 	{
+ 		m_pQueryList->first()->close();
+-		QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers & QEventLoop::ExcludeUserInputEvents);
++		QEventLoop::ProcessEventsFlags f(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeUserInputEvents);
++		QApplication::processEvents(f);
+ 	}
+ }