From owner-svn-ports-all@FreeBSD.ORG Fri Jul 25 22:24:41 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3A3048F8; Fri, 25 Jul 2014 22:24:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 26BD52457; Fri, 25 Jul 2014 22:24:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6PMOf9S007935; Fri, 25 Jul 2014 22:24:41 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6PMOeVa007933; Fri, 25 Jul 2014 22:24:40 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201407252224.s6PMOeVa007933@svn.freebsd.org> From: Raphael Kubo da Costa Date: Fri, 25 Jul 2014 22:24:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362938 - in head/devel: qt4-corelib qt4/files X-SVN-Group: ports-head 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.18 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: Fri, 25 Jul 2014 22:24:41 -0000 Author: rakuco Date: Fri Jul 25 22:24:40 2014 New Revision: 362938 URL: http://svnweb.freebsd.org/changeset/ports/362938 QAT: https://qat.redports.org/buildarchive/r362938/ Log: Update the patch introduced in r362770. Change a preprocessor line with no directive to a normal line with a comment. While most preprocessors work fine with a line like # /* no directive in this line */ devel/smokegen's fails, and breaks devel/smokeqt. PR: 192095 Modified: head/devel/qt4-corelib/Makefile head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h Modified: head/devel/qt4-corelib/Makefile ============================================================================== --- head/devel/qt4-corelib/Makefile Fri Jul 25 21:57:14 2014 (r362937) +++ head/devel/qt4-corelib/Makefile Fri Jul 25 22:24:40 2014 (r362938) @@ -3,7 +3,7 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel PKGNAMEPREFIX= qt4- Modified: head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h ============================================================================== --- head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h Fri Jul 25 21:57:14 2014 (r362937) +++ head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h Fri Jul 25 22:24:40 2014 (r362938) @@ -70,7 +70,7 @@ index 158ef78..4f1384b 100644 /* Clang also masquerades as GCC 4.2.1 */ # define Q_CC_CLANG +# if !defined(__has_extension) -+# /* Compatibility with older Clang versions */ ++ /* Compatibility with older Clang versions */ +# define __has_extension __has_feature +# endif # endif