svn commit: r372513 - head/x11-toolkits/qt5-quick/files

Raphael Kubo da Costa rakuco at FreeBSD.org
Thu Nov 13 08:56:09 UTC 2014


Author: rakuco
Date: Thu Nov 13 08:56:08 2014
New Revision: 372513
URL: https://svnweb.freebsd.org/changeset/ports/372513
QAT: https://qat.redports.org/buildarchive/r372513/

Log:
  Copy patch from lang/qt5-qml to fix the build with base GCC.
  
  Since r372179 we are using the QML headers from the tarball, not the ones
  installed system-wide by qt5-qml.
  
  While this is not a problem and is kind of intended, it also means we need
  to apply patches like this one to both ports now.

Added:
  head/x11-toolkits/qt5-quick/files/
  head/x11-toolkits/qt5-quick/files/patch-git_b84f08c8
     - copied unchanged from r372371, head/lang/qt5-qml/files/patch-git_b84f08c8

Copied: head/x11-toolkits/qt5-quick/files/patch-git_b84f08c8 (from r372371, head/lang/qt5-qml/files/patch-git_b84f08c8)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-toolkits/qt5-quick/files/patch-git_b84f08c8	Thu Nov 13 08:56:08 2014	(r372513, copy of r372371, head/lang/qt5-qml/files/patch-git_b84f08c8)
@@ -0,0 +1,23 @@
+Fixes the build with base GCC.
+
+commit b84f08c8b7c91a979bd74840561af2391ef20666
+Author: Lars Knoll <lars.knoll at digia.com>
+Date:   Tue May 6 13:30:31 2014 +0200
+
+    Fix compiler warning
+
+    Change-Id: I26df4f1b8417c6b075d81eaf118669a4103503e2
+    Reviewed-by: Simon Hausmann <simon.hausmann at digia.com>
+
+--- src/qml/jsruntime/qv4object_p.h
++++ src/qml/jsruntime/qv4object_p.h
+@@ -168,7 +168,8 @@ struct Q_QML_EXPORT Object: Managed {
+     void defineReadonlyProperty(const StringRef name, ValueRef value);
+ 
+     void insertMember(const StringRef s, const ValueRef v, PropertyAttributes attributes = Attr_Data) {
+-        insertMember(s, Property(*v), attributes);
++        Property p(*v);
++        insertMember(s, p, attributes);
+     }
+     void insertMember(const StringRef s, const Property &p, PropertyAttributes attributes);
+ 


More information about the svn-ports-head mailing list