svn commit: r362938 - in head/devel: qt4-corelib qt4/files

[Raphael Kubo da Costa]

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