[149366] trunk/dports/aqua/qt5
mcalhoun at macports.org
mcalhoun at macports.org
Wed Jun 15 07:36:45 PDT 2016
Revision: 149366
https://trac.macports.org/changeset/149366
Author: mcalhoun at macports.org
Date: 2016-06-15 07:36:45 -0700 (Wed, 15 Jun 2016)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/dports/aqua/qt5/Portfile
Added Paths:
-----------
trunk/dports/aqua/qt5/files/patch-qtenginio_examples.diff
trunk/dports/aqua/qt5/files/patch-qtquick1_examples.diff
trunk/dports/aqua/qt5/files/patch-qtwebkit_examples.diff
Modified: trunk/dports/aqua/qt5/Portfile
===================================================================
--- 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)
@@ -14,12 +14,12 @@
The port ${subport} will be removed if it becomes unfeasible to maintain."
} elseif { ${subport} eq "qt5-qtquick1" } {
version 5.5.1
- revision 3
+ revision 4
notes-append "Qt Declarative is no longer supported upstream.
The port ${subport} will be removed if it becomes unfeasible to maintain."
} elseif { ${subport} eq "qt5-qtwebkit-examples" } {
version 5.5.1
- revision 3
+ revision 4
notes-append "Qt Webkit is no longer supported upstream.
The port ${subport} will be removed if it becomes unfeasible to maintain."
} else {
@@ -786,14 +786,21 @@
}
# special case
- 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}
+ 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}
+ }
}
}
@@ -833,6 +840,21 @@
}
# special case
+ 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
if { ${subport} eq "${name}-qtserialbus" } {
PortGroup cxx11 1.0
}
@@ -954,6 +976,7 @@
patchfiles-append patch-pc_files.diff
# as of 5.6.1, avoid "... is lacking an install target"
+ # see https://codereview.qt-project.org/#/c/156610/1
patchfiles-append patch-install_examples.diff
#-----------------------------------------------------------------------------
Added: trunk/dports/aqua/qt5/files/patch-qtenginio_examples.diff
===================================================================
--- 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)
@@ -0,0 +1,73 @@
+--- 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
Added: trunk/dports/aqua/qt5/files/patch-qtquick1_examples.diff
===================================================================
--- 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)
@@ -0,0 +1,81 @@
+--- 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
Added: trunk/dports/aqua/qt5/files/patch-qtwebkit_examples.diff
===================================================================
--- 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)
@@ -0,0 +1,10 @@
+--- 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160615/66fd61ca/attachment-0001.html>
More information about the macports-changes
mailing list