svn commit: r378135 - in head/devel/qt5-core: . files
Raphael Kubo da Costa
rakuco at FreeBSD.org
Fri Jan 30 01:58:08 UTC 2015
Author: rakuco
Date: Fri Jan 30 01:58:06 2015
New Revision: 378135
URL: https://svnweb.freebsd.org/changeset/ports/378135
QAT: https://qat.redports.org/buildarchive/r378135/
Log:
Backport patch to fix the build of KWin 5.
The error looks like this:
/wrkdirs/usr/ports/x11-wm/kde5-kwin/work/kwin-5.2.0/kcmkwin/kwintabbox/layoutpreview.cpp:135:66: error: redefinition of 's' with a different type: 'const QString' vs 'const auto'
if (const auto s = KMimeTypeTrader::self()->preferredService(QStringLiteral("inode/directory"))) {
^
/usr/local/include/qt5/QtCore/qstring.h:170:23: note: expanded from macro 'QStringLiteral'
const QString s(holder); \
^
Added:
head/devel/qt5-core/files/
head/devel/qt5-core/files/patch-git_7ca54ce5 (contents, props changed)
Modified:
head/devel/qt5-core/Makefile
Modified: head/devel/qt5-core/Makefile
==============================================================================
--- head/devel/qt5-core/Makefile Fri Jan 30 01:03:22 2015 (r378134)
+++ head/devel/qt5-core/Makefile Fri Jan 30 01:58:06 2015 (r378135)
@@ -2,7 +2,7 @@
PORTNAME= core
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
PKGNAMEPREFIX= qt5-
Added: head/devel/qt5-core/files/patch-git_7ca54ce5
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/qt5-core/files/patch-git_7ca54ce5 Fri Jan 30 01:58:06 2015 (r378135)
@@ -0,0 +1,43 @@
+commit 7ca54ce5d964646a141acac82f468476f2d66c35
+Author: Kai Koehne <kai.koehne at digia.com>
+Date: Wed Oct 1 13:22:02 2014 +0200
+
+ Avoid naming clashes with QStringLiteral local variable
+
+ MSVC 2013 complains about the use of 's' if a variable 's' is already
+ defined in the context:
+
+ error C2373: 's' : redefinition; different type modifiers
+ error C3493: 's' cannot be implicitly captured because no default capture
+ mode has been specified
+
+ This looks like a compiler bug. Anyhow, it's easy to avoid the clash in
+ most cases by using a more distinctive name ...
+
+ Task-number: QTBUG-41706
+ Change-Id: Iaff1b6d37897fa8cf9e4913effa0498f9fd7bb07
+ Reviewed-by: hjk <hjk121 at nokiamail.com>
+ Reviewed-by: Olivier Goffart <ogoffart at woboq.com>
+ Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
+
+--- src/corelib/tools/qstring.h
++++ src/corelib/tools/qstring.h
+@@ -1,6 +1,6 @@
+ /****************************************************************************
+ **
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
+ **
+ ** This file is part of the QtCore module of the Qt Toolkit.
+@@ -167,8 +167,8 @@ Q_STATIC_ASSERT_X(sizeof(qunicodechar) == 2,
+ Q_STATIC_STRING_DATA_HEADER_INITIALIZER(Size), \
+ QT_UNICODE_LITERAL(str) }; \
+ QStringDataPtr holder = { qstring_literal.data_ptr() }; \
+- const QString s(holder); \
+- return s; \
++ const QString qstring_literal_temp(holder); \
++ return qstring_literal_temp; \
+ }()) \
+ /**/
+
More information about the svn-ports-head
mailing list