From owner-svn-ports-all@freebsd.org Thu Feb 15 20:17:59 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3227EF16E35; Thu, 15 Feb 2018 20:17:59 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DA3506DDB8; Thu, 15 Feb 2018 20:17:58 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B6DB823806; Thu, 15 Feb 2018 20:17:58 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1FKHwwf062412; Thu, 15 Feb 2018 20:17:58 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1FKHweA062410; Thu, 15 Feb 2018 20:17:58 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201802152017.w1FKHweA062410@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Thu, 15 Feb 2018 20:17:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461948 - in head/irc/kvirc: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/irc/kvirc: . files X-SVN-Commit-Revision: 461948 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2018 20:17:59 -0000 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 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 +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); + } + }