<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[149366] trunk/dports/aqua/qt5</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/149366">149366</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-06-15 07:36:45 -0700 (Wed, 15 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>qt5: as of 5.6.1, build fails if examples are not installed in very specific ways
see https://codereview.qt-project.org/#/c/156610/1
no revbump of qt5-qtenginio since it builds either successfully or not at all</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt5Portfile">trunk/dports/aqua/qt5/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt5filespatchqtenginio_examplesdiff">trunk/dports/aqua/qt5/files/patch-qtenginio_examples.diff</a></li>
<li><a href="#trunkdportsaquaqt5filespatchqtquick1_examplesdiff">trunk/dports/aqua/qt5/files/patch-qtquick1_examples.diff</a></li>
<li><a href="#trunkdportsaquaqt5filespatchqtwebkit_examplesdiff">trunk/dports/aqua/qt5/files/patch-qtwebkit_examples.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaqt5Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt5/Portfile (149365 => 149366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5/Portfile 2016-06-15 14:28:18 UTC (rev 149365)
+++ trunk/dports/aqua/qt5/Portfile 2016-06-15 14:36:45 UTC (rev 149366)
</span><span class="lines">@@ -14,12 +14,12 @@
</span><span class="cx"> The port ${subport} will be removed if it becomes unfeasible to maintain."
</span><span class="cx"> } elseif { ${subport} eq "qt5-qtquick1" } {
</span><span class="cx"> version 5.5.1
</span><del>- revision 3
</del><ins>+ revision 4
</ins><span class="cx"> notes-append "Qt Declarative is no longer supported upstream.
</span><span class="cx"> The port ${subport} will be removed if it becomes unfeasible to maintain."
</span><span class="cx"> } elseif { ${subport} eq "qt5-qtwebkit-examples" } {
</span><span class="cx"> version 5.5.1
</span><del>- revision 3
</del><ins>+ revision 4
</ins><span class="cx"> notes-append "Qt Webkit is no longer supported upstream.
</span><span class="cx"> The port ${subport} will be removed if it becomes unfeasible to maintain."
</span><span class="cx"> } else {
</span><span class="lines">@@ -786,14 +786,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # special case
</span><del>- if { ${subport} eq "${name}-qtwebkit-examples" && ![variant_isset examples] } {
- # create a dummy file so the port can be successfully activated
- post-destroot {
- xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${subport}
- set docfile [open ${destroot}${prefix}/share/doc/${subport}/README.txt "w"]
- puts ${docfile} "Without the examples variant, no examples are installed"
- puts ${docfile} "${long_description}"
- close ${docfile}
</del><ins>+ if { ${subport} eq "${name}-qtwebkit-examples" } {
+
+ # as of 5.6.1, avoid "... is lacking an install target"
+ # see https://codereview.qt-project.org/#/c/156610/1
+ patchfiles-append patch-qtwebkit_examples.diff
+
+ if { ![variant_isset examples] } {
+ # create a dummy file so the port can be successfully activated
+ post-destroot {
+ xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${subport}
+ set docfile [open ${destroot}${prefix}/share/doc/${subport}/README.txt "w"]
+ puts ${docfile} "Without the examples variant, no examples are installed"
+ puts ${docfile} "${long_description}"
+ close ${docfile}
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -833,6 +840,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # special case
</span><ins>+ if { ${subport} eq "${name}-qtenginio" } {
+ # as of 5.6.1, avoid "... is lacking an install target"
+ # see https://codereview.qt-project.org/#/c/156610/1
+ patchfiles-append patch-qtenginio_examples.diff
+ }
+
+ # special case
+ if { ${subport} eq "${name}-qtquick1" } {
+ # as of 5.6.1, avoid "... installs target to unexpected location"
+ # as of 5.6.1, avoid "... is lacking an install target"
+ # see https://codereview.qt-project.org/#/c/156610/1
+ patchfiles-append patch-qtquick1_examples.diff
+ }
+
+ # special case
</ins><span class="cx"> if { ${subport} eq "${name}-qtserialbus" } {
</span><span class="cx"> PortGroup cxx11 1.0
</span><span class="cx"> }
</span><span class="lines">@@ -954,6 +976,7 @@
</span><span class="cx"> patchfiles-append patch-pc_files.diff
</span><span class="cx">
</span><span class="cx"> # as of 5.6.1, avoid "... is lacking an install target"
</span><ins>+ # see https://codereview.qt-project.org/#/c/156610/1
</ins><span class="cx"> patchfiles-append patch-install_examples.diff
</span><span class="cx">
</span><span class="cx"> #-----------------------------------------------------------------------------
</span></span></pre></div>
<a id="trunkdportsaquaqt5filespatchqtenginio_examplesdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qt5/files/patch-qtenginio_examples.diff (0 => 149366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5/files/patch-qtenginio_examples.diff (rev 0)
+++ trunk/dports/aqua/qt5/files/patch-qtenginio_examples.diff 2016-06-15 14:36:45 UTC (rev 149366)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+--- examples/enginio/quick/todos/todos.pro.orig 2015-12-15 05:15:16.000000000 -0700
++++ examples/enginio/quick/todos/todos.pro 2016-06-14 05:05:10.000000000 -0700
+@@ -11,3 +11,7 @@
+
+ OTHER_FILES += todo.qml
+ RESOURCES += todo.qrc
++
++# install
++target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/todos
++INSTALLS += target
+--- examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro.orig 2015-12-15 05:15:16.000000000 -0700
++++ examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro 2016-06-14 05:10:38.000000000 -0700
+@@ -15,3 +15,7 @@
+ mainwindow.h \
+ imageobject.h \
+ imagemodel.h
++
++# install
++target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/image-gallery-cpp
++INSTALLS += target
+--- examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro.orig 2015-12-15 05:15:16.000000000 -0700
++++ examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro 2016-06-14 05:13:45.000000000 -0700
+@@ -16,3 +16,7 @@
+
+ FORMS += \
+ mainwindow.ui
++
++# install
++target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/cloudaddressbook
++INSTALLS += target
+--- examples/enginio/widgets/todos-cpp/todos-cpp.pro.orig 2015-12-15 05:15:16.000000000 -0700
++++ examples/enginio/widgets/todos-cpp/todos-cpp.pro 2016-06-14 05:15:26.000000000 -0700
+@@ -13,3 +13,7 @@
+ HEADERS += \
+ mainwindow.h \
+ todosmodel.h \
++
++# install
++target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/todos-cpp
++INSTALLS += target
+--- examples/enginio/quick/image-gallery/image-gallery.pro.orig 2015-12-15 05:15:16.000000000 -0700
++++ examples/enginio/quick/image-gallery/image-gallery.pro 2016-06-14 05:23:39.000000000 -0700
+@@ -13,3 +13,7 @@
+
+ RESOURCES += \
+ gallery.qrc
++
++# install
++target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/image-gallery
++INSTALLS += target
+--- examples/enginio/quick/users/users.pro.orig 2015-12-15 05:15:16.000000000 -0700
++++ examples/enginio/quick/users/users.pro 2016-06-14 05:18:56.000000000 -0700
+@@ -10,4 +10,8 @@
+ mac: CONFIG -= app_bundle
+
+ OTHER_FILES += users.qml Browse.qml Login.qml Register.qml
+-RESOURCES += users.qrc
+\ No newline at end of file
++RESOURCES += users.qrc
++
++# install
++target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/users
++INSTALLS += target
+--- examples/enginio/quick/socialtodos/socialtodos.pro.orig 2015-12-15 05:15:16.000000000 -0700
++++ examples/enginio/quick/socialtodos/socialtodos.pro 2016-06-14 05:36:02.000000000 -0700
+@@ -19,3 +19,7 @@
+ socialtodos.qml
+
+ RESOURCES += socialtodos.qrc
++
++# install
++target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/socialtodos
++INSTALLS += target
</ins></span></pre></div>
<a id="trunkdportsaquaqt5filespatchqtquick1_examplesdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qt5/files/patch-qtquick1_examples.diff (0 => 149366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5/files/patch-qtquick1_examples.diff (rev 0)
+++ trunk/dports/aqua/qt5/files/patch-qtquick1_examples.diff 2016-06-15 14:36:45 UTC (rev 149366)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+--- examples/declarative/cppextensions/imageprovider/imageprovider.pro.orig 2015-10-12 21:37:56.000000000 -0700
++++ examples/declarative/cppextensions/imageprovider/imageprovider.pro 2016-06-15 06:30:13.000000000 -0700
+@@ -7,11 +7,11 @@
+
+ SOURCES += imageprovider.cpp
+
+-target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider/ImageProviderCore
++target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider
+ qml.files = imageprovider-example.qml
+ qml.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider
+ qml2.files = ImageProviderCore/qmldir
+-qml2.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider/ImageProviderCore
++qml2.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider
+
+ INSTALLS = qml qml2 target
+
+--- examples/declarative/cppextensions/plugins/plugins.pro.orig 2015-10-12 21:37:56.000000000 -0700
++++ examples/declarative/cppextensions/plugins/plugins.pro 2016-06-15 06:45:36.000000000 -0700
+@@ -7,7 +7,7 @@
+
+ SOURCES += plugin.cpp
+
+-target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/org/qtproject/TimeExample
++target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins
+
+ qdeclarativesources.files += \
+ org/qtproject/TimeExample/qmldir \
+@@ -16,7 +16,7 @@
+ org/qtproject/TimeExample/Clock.qml \
+ org/qtproject/TimeExample/hour.png \
+ org/qtproject/TimeExample/minute.png
+-qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/org/qtproject/TimeExample
++qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins
+
+ qml.files += plugins.qml
+ qml.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins
+--- examples/declarative/cppextensions/qwidgets/qwidgets.pro.orig 2015-10-12 21:37:56.000000000 -0700
++++ examples/declarative/cppextensions/qwidgets/qwidgets.pro 2016-06-15 06:53:57.000000000 -0700
+@@ -10,9 +10,9 @@
+ qml.files = qwidgets.qml
+ qml.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qwidgets
+ qml2.files = QWidgets/qmldir
+-qml2.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/QWidgets
++qml2.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qwidgets
+
+-target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins
++target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qwidgets
+
+ INSTALLS += target qml qml2
+
+--- examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro.orig 2015-10-12 21:37:56.000000000 -0700
++++ examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro 2016-06-15 07:00:29.000000000 -0700
+@@ -2,3 +2,7 @@
+
+ SOURCES += main.cpp
+ RESOURCES += layoutitem.qrc
++
++# install
++target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qgraphicslayouts/layoutitem
++INSTALLS += target
+--- examples/declarative/animation/behaviors/wigglytext/wigglytext.pro.orig 2015-10-12 21:37:56.000000000 -0700
++++ examples/declarative/animation/behaviors/wigglytext/wigglytext.pro 2016-06-15 07:05:49.000000000 -0700
+@@ -26,7 +26,7 @@
+ SOURCES += main.cpp
+
+ # Please do not modify the following two lines. Required for deployment.
+-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/wigglytext/wigglytext
++desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/behaviors/wigglytext
+ exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
+ else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+ qtcAddDeployment()
+--- examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.pro.orig 2015-10-12 21:37:56.000000000 -0700
++++ examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.pro 2016-06-15 07:17:40.000000000 -0700
+@@ -15,3 +15,7 @@
+ SOURCES += directory.cpp \
+ file.cpp \
+ dialogPlugin.cpp
++
++# install
++target.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/gettingStarted/parts/part5/filedialog
++INSTALLS += target
</ins></span></pre></div>
<a id="trunkdportsaquaqt5filespatchqtwebkit_examplesdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qt5/files/patch-qtwebkit_examples.diff (0 => 149366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5/files/patch-qtwebkit_examples.diff (rev 0)
+++ trunk/dports/aqua/qt5/files/patch-qtwebkit_examples.diff 2016-06-15 14:36:45 UTC (rev 149366)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- examples/webkitwidgets/imageanalyzer/imageanalyzer.pro.orig 2015-10-12 21:37:32.000000000 -0700
++++ examples/webkitwidgets/imageanalyzer/imageanalyzer.pro 2016-06-14 07:41:43.000000000 -0700
+@@ -11,4 +11,6 @@
+
+ EXAMPLE_FILES += html/index.html ../webkit-bridge-tutorial.qdoc outline.txt
+
+-
++# install
++target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/imageanalyzer
++INSTALLS += target
</ins></span></pre>
</div>
</div>
</body>
</html>