<!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>[149348] 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/149348">149348</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-06-14 03:21:47 -0700 (Tue, 14 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>qt5: update version 5.6.0->5.6.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt5Portfile">trunk/dports/aqua/qt5/Portfile</a></li>
<li><a href="#trunkdportsaquaqt5filespatchconfigurediff">trunk/dports/aqua/qt5/files/patch-configure.diff</a></li>
<li><a href="#trunkdportsaquaqt5filespatchpc_filesdiff">trunk/dports/aqua/qt5/files/patch-pc_files.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt5filespatchfontconfigdiff">trunk/dports/aqua/qt5/files/patch-fontconfig.diff</a></li>
<li><a href="#trunkdportsaquaqt5filespatchinstall_examplesdiff">trunk/dports/aqua/qt5/files/patch-install_examples.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt5filespatchexample_installdiff">trunk/dports/aqua/qt5/files/patch-example_install.diff</a></li>
<li><a href="#trunkdportsaquaqt5filespatchfontfinddiff">trunk/dports/aqua/qt5/files/patch-fontfind.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 (149347 => 149348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5/Portfile 2016-06-14 03:00:55 UTC (rev 149347)
+++ trunk/dports/aqua/qt5/Portfile 2016-06-14 10:21:47 UTC (rev 149348)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><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><del>- version 5.6.0
</del><ins>+ version 5.6.1
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # get Qt's version numbers
</span><span class="lines">@@ -123,8 +123,8 @@
</span><span class="cx"> ###############################################################################
</span><span class="cx"> array set modules {
</span><span class="cx"> qt3d {
</span><del>- 3f1ba4b025e271f3cf5f07a695d7897bab1831c4
- b961789daecebed030ad36568301d1fe6c1ad97e9a2726fad5bd96ad603f439d
</del><ins>+ 03d9f6c85f2fedcb1480a6a23e0191c7e6e859fb
+ ad93015165b1ab1a8b458e08503c8f4c8450c2b58024a3ac074281a1a90ea80d
</ins><span class="cx"> ""
</span><span class="cx"> "port:assimp"
</span><span class="cx"> "qtbase qtxmlpatterns qtdeclarative qtimageformats"
</span><span class="lines">@@ -133,8 +133,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtbase {
</span><del>- 93d2fad2d45baff8ff6268a2f28321dd78985092
- 6efa8a5c559e92b2e526d48034e858023d5fd3c39115ac1bfd3bb65834dbd67a
</del><ins>+ 3811f2b945e05870ede6ae4eed237e8ba65a4f05
+ d01cc1ee2be9ecdb169be3aea9dc9fc019c1c6d0bb87e0c88bb95b5b3dce7264
</ins><span class="cx"> ""
</span><span class="cx"> "port:zlib port:libpng port:jpeg port:fontconfig port:freetype path:bin/dbus-daemon:dbus path:lib/libssl.dylib:openssl port:tiff port:libmng path:lib/pkgconfig/glib-2.0.pc:glib2 port:icu port:pcre port:libiconv port:harfbuzz"
</span><span class="cx"> ""
</span><span class="lines">@@ -143,8 +143,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtcanvas3d {
</span><del>- 5b94a6984199bbf06d3ece5819a72961b64809b2
- 66add59e826a0161f4a4dc3ec0b44c17fad1451390b4f7c67af23ee7429d9ecf
</del><ins>+ 139dcfd920ded3db43b2dd5cd1191b20171ebf2d
+ 191e2cde0ac8b1ef6616263aac27f12f40335fed2bd60e29987724242b872760
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtdeclarative"
</span><span class="lines">@@ -153,8 +153,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtconnectivity {
</span><del>- 819cb4003d0e2db2b0005b0b9efc851522271acf
- 0c5cb0c100006759b6954a36e7dc66f8f1ac2b61b3f639152cf6ecb8d48a40eb
</del><ins>+ 79b26da05686ec6cc57188e87383f9f97c309f10
+ 5a35abf6b515091e4b181b78d0ed82249972bf93f227d52c70531417c448d919
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtdeclarative qtxmlpatterns"
</span><span class="lines">@@ -163,8 +163,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtdeclarative {
</span><del>- 6997601e480d7ef350922c1f6a5f37482a027bb6
- 8c55f053f0e348577b56da541af74d02d0f2b61c9a6c15152b03dad03dfde04c
</del><ins>+ 9a938dd7041a5b542db300491d839ea3bd20fafb
+ 12fcfd4bc4bad469f07f8c5404d98646f88f61200b014d4fbcb3a0d9e70942b4
</ins><span class="cx"> "port:python27"
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtxmlpatterns"
</span><span class="lines">@@ -183,8 +183,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtgraphicaleffects {
</span><del>- f9d47a38f39328641044de93b446a0d410fd233d
- 01e911fdcf85a13b927cba341d15a0baeead3eba85c4532b1b45bb5c334416e8
</del><ins>+ 16dc294725e0b513ba4afd3e1e6308e85aee54b2
+ 57e97155da33a8a4023d1b33bc6f7bdef68a64640d04f45ef3db9dec721311d8
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtdeclarative qtxmlpatterns"
</span><span class="lines">@@ -193,8 +193,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtimageformats {
</span><del>- 4a2c2f83bfb5cbb714a34ea5cb99a5e0925b6405
- 2c854275a689a513ba24f4266cc6017d76875336671c2c8801b4b7289081bada
</del><ins>+ d5b695518bd94df2bb3411b9c2466527014f186a
+ 74f3bce4f9df0f1a94d41877a91405560ce79e4359fc831ee97f0c8248081b08
</ins><span class="cx"> ""
</span><span class="cx"> "port:jasper port:libmng port:tiff port:webp"
</span><span class="cx"> "qtbase"
</span><span class="lines">@@ -203,8 +203,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtlocation {
</span><del>- a409f44805869bd0043a54e30f64d9d7b56d7a4b
- 360e1519d0fcafe4f86923d224e76d56dd785dfb0e1a19fd2e2b0016799653c9
</del><ins>+ 932c886d3d900f5cc064cc79fd967c3e36ef8909
+ d3b5768cf68945cd00c9df32fb87ca3bf85f5364dc2e441780840e2bd4d15061
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtxmlpatterns qtdeclarative qtquickcontrols qtserialport"
</span><span class="lines">@@ -213,8 +213,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtmacextras {
</span><del>- 692dff2950b62e7af9b6d0ed94fb63d347118779
- 12d2422d1d98bdbd33b45a0fb124b1cc29063b952b373e436ed5efabeee575ca
</del><ins>+ 91727829f4f415907cb4e9e4f4cdb2b3889f56ca
+ e3b0567be15965244dbe7677abf1610d338f7e373c62e7f254ca83e5ce86fe90
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase"
</span><span class="lines">@@ -223,8 +223,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtmultimedia {
</span><del>- 9760bee92b3260df88f1a47f48addebac357364f
- 103f99d6cd266f5c4485546a75ef0c6ee7e88dc901a0be21447cf89159370686
</del><ins>+ c80dde261404b0d7797f633e0357d34677b1466f
+ d24b5b5fc9f296cc8446c27f1306a47ce5699b65cf1b821d6a43652cd8100515
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtxmlpatterns qtdeclarative"
</span><span class="lines">@@ -243,8 +243,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtquickcontrols {
</span><del>- ac3ebe977dbc4e98e4340759c2747eb1fc408466
- ec0896792f2a08d109ab3791aa4e47747aab22ebfad281005c4bf8f26f9f788b
</del><ins>+ 04fe72a97db226ee179cbfaee93e6e8f52ea69a8
+ 012aa6c4a697f352a9dc1373d8c1f37e33a6d956b6d14be7d1f9e4637d46a691
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtdeclarative qtxmlpatterns qtgraphicaleffects"
</span><span class="lines">@@ -253,8 +253,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtquickcontrols2 {
</span><del>- 4a8baf8c83c4c4779ee1ceabff9e5a7b8f399a76
- 59ec6ea2282931bc0d0748b3979a52e1a322e7ef8d1e5490b8a34931e8b9fee0
</del><ins>+ 4bc99827e8d249f8ffb57f3cd05ef0cb651fa175
+ bba0ddcf1a66c8dec3faeb9c84119992bb1ead09a674aae475d19c35cc8eeb8f
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtxmlpatterns qtdeclarative qtquickcontrols qtgraphicaleffects"
</span><span class="lines">@@ -263,8 +263,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtscript {
</span><del>- b7158a2573c6d10f16e9a5a6cd054b72ba162c74
- ac7475197d9a0f3c7284f002390e2427fef84ec90dc590630431a848099c5042
</del><ins>+ 0a00616ff731512e8960f792c206598590768f11
+ 1cb2ef87aeff3d8d05685279b521c332b752e4559f8e2138fd36d3eb682bf79f
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase"
</span><span class="lines">@@ -273,8 +273,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtsensors {
</span><del>- 31447c16b0b7d88a5a66a106f777838e8d7494fd
- 518f392fec5e01aaa7f95e9141678cc99b02ed067ebbd24c38c1420067c59c2e
</del><ins>+ b0fff836c9e4ad90829f79a3a6edd34e4904d382
+ c724cd14efc62d935ca822147bf9771e735995032c7b3b13e2e8156d283d942e
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtxmlpatterns qtdeclarative"
</span><span class="lines">@@ -283,8 +283,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtserialbus {
</span><del>- ec67e98bd59969be6ae31e2aabf0665a5aa0de2e
- 8cca530ee53f19672f57ffee6f2f28866d5c84b8cb3dbbd67c05d27893ac0b8e
</del><ins>+ 5edc4ad2daf573d4cbdc87b04165557989291e59
+ bf453fd114131ff64b7ff9a412ef13f6e158d1b5cbebf8fa6b5938bb671bc8c0
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtserialport"
</span><span class="lines">@@ -293,8 +293,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtserialport {
</span><del>- 4d326e73606d543fd1fdafeb47cfc3879a506326
- 16ee7fb66bb997df674a12a7a5a1450e2a2b860c8d34d237f3631d9f60853c1f
</del><ins>+ ea20c30f1dbb1357d8b30eb6303eb9e5ff5dbc47
+ 0b74a2e85e34163c92b076a9af2bbb2c832516839f060266f0465f881f1be6c2
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase"
</span><span class="lines">@@ -303,8 +303,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtsvg {
</span><del>- d19366a29671ade1b1a24f581bda45ae884bfa01
- 798799319138bb40b6187f4ecc1099956a0d62148f78512e9cb085d1fa5f641f
</del><ins>+ 9b001db2902268f74cab86136054e1fb4bfcb800
+ f12e4fd4f169123f7648e45c593b2c5a4556a9b2db3a798467aa9c67c82b8a21
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase"
</span><span class="lines">@@ -313,8 +313,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qttools {
</span><del>- 03c7b7cccfc26aac6b0db39d608ecc8b40bbd6b5
- 0d244c61bbe5505cb94310e980b06ef13dd573511e80ccbdc060f71d5462219d
</del><ins>+ 209d58f39a1818a320e45efffb6201d11dff4c4b
+ 77a38895ee2d3fe2d0df4a5e1bbef4d3f8870fe20cd3b2cea27bd2d380c17f71
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtxmlpatterns qtdeclarative"
</span><span class="lines">@@ -323,8 +323,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qttranslations {
</span><del>- 3ddf4d09dfce47076b988dbd5ae56f87cc552efe
- 9809351f0922b2d91aeb5d8e5756665eea0b2cbcaab74a570f6e5bf08574cd49
</del><ins>+ 1fecf04943e743091cb0dc4350e93f91751b015b
+ 69d52da2691e4c2be7bd5d5a39bdd948bc9dd1c118d417af09e1e30ac0f41c01
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qttools"
</span><span class="lines">@@ -333,8 +333,8 @@
</span><span class="cx"> "variant overrides: ~examples ~tests ~debug noarch"
</span><span class="cx"> }
</span><span class="cx"> qtwebchannel {
</span><del>- c7c1a1f20585183dfa94f09a9a048d50cb4d9deb
- c25424935e866e77f31e5ebc50fc97eaedd4d77f6e967bfc59ce7fa6a7b4c14f
</del><ins>+ 0d27b8c82727fd1c2fb7948545f355723729c551
+ f82cb5d1bc7af79453da8327464d800469dc40d92446051b4404047542020807
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtwebsockets qtdeclarative"
</span><span class="lines">@@ -343,8 +343,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtwebengine {
</span><del>- b1feb200f3c18a4b54f8df6f109facdf2aba64dc
- 8aa2b5ad6c9f98a781aa99303eab3a40bbe74d26a543eea6b4145f5f47c76a03
</del><ins>+ 8038846361b3ec4a3374fd0f6981f135e5d0f9c4
+ bdf0ac04b5162502b1c43d0763233c12d5cb73625bec4d90755e73ffa863607b
</ins><span class="cx"> "port:python27 port:py27-ply"
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtwebchannel"
</span><span class="lines">@@ -353,8 +353,8 @@
</span><span class="cx"> "variant overrides: ~universal"
</span><span class="cx"> }
</span><span class="cx"> qtwebsockets {
</span><del>- 82301dc779436dffcb5f6e887398a2720babd645
- 268ab869fe3d0d22abd9668851155db79aff2f386bc448051b6ef477841d719f
</del><ins>+ 24aabb801f6f651ec3e5df115779639728082d9b
+ 551e3a6b8d945a3b1d707755c3d4d5fd6a86808ced492709aecf444fa228723a
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtdeclarative"
</span><span class="lines">@@ -363,8 +363,8 @@
</span><span class="cx"> "variant overrides: "
</span><span class="cx"> }
</span><span class="cx"> qtwebview {
</span><del>- dc9b1c83d534df1e302b1cb56d2256e590076a89
- a48fa53e9e012102774c3faa6c99113918442f891952cd97ef67e05544800b57
</del><ins>+ eddc015d18b61e091e43366efe1affc3365b8b12
+ aa5dfef803ed30d5ff017fbd68acc71da1ae7d227ff0508a6e2dee60284f0661
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase qtdeclarative qtwebengine"
</span><span class="lines">@@ -393,8 +393,8 @@
</span><span class="cx"> "variant overrides: ++examples"
</span><span class="cx"> }
</span><span class="cx"> qtxmlpatterns {
</span><del>- 324b5a3b3ff416bd937694de4728ce27114791f7
- baed1b3bd3f010b8c4a96b4ca7a595b665d43d2e5758b55a364dbc9f2ac819d4
</del><ins>+ fe41b133743a852c75f001d4b9e08f4bdfed0d4f
+ 64f46e22aa17f26fe0542069932efdef84ce5d846a5db40ad8e7ad3eb6148160
</ins><span class="cx"> ""
</span><span class="cx"> ""
</span><span class="cx"> "qtbase"
</span><span class="lines">@@ -507,8 +507,8 @@
</span><span class="cx"> distname qt-everywhere-opensource-src-${version}
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 bea243ed30c720fc5f92028b82b14fb3a49b6b5f \
- sha256 76a95cf6c1503290f75a641aa25079cd0c5a8fcd7cff07ddebff80a955b07de7
</del><ins>+ rmd160 ee7a838aba61a34e7aa5fdce608d8e1809cf0a21 \
+ sha256 0d3cc75d2368ad988c9ec6bcbed6362dbaa8e03fdfd04e679284f4b9af91e565
</ins><span class="cx">
</span><span class="cx"> description Documentation for Qt Tool Kit ${qt_major}
</span><span class="cx"> long_description Documentation for Qt Tool Kit ${qt_major}
</span><span class="lines">@@ -518,6 +518,11 @@
</span><span class="cx">
</span><span class="cx"> build.target docs
</span><span class="cx"> destroot.target install_docs
</span><ins>+
+ # if part of qtwebengine gets built, at least build correctly
+ # UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
+ build.env-append CXX=${configure.cxx}
+ build.env-append CC=${configure.cc}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # see http://doc.qt.io/qt-5/sql-driver.html for info on building SQL Database Drivers
</span><span class="lines">@@ -764,12 +769,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # special case
</span><del>- if { ${subport} eq "${name}-qtsvg" } {
- # install file in the correct location
- patchfiles-append patch-example_install.diff
- }
-
- # special case
</del><span class="cx"> if { ${subport} eq "${name}-qtwebengine" || ${subport} eq "${name}-qtdeclarative" || ${subport} eq "${name}-qtwebkit" } {
</span><span class="cx"> # version 5.5.1 (at least) of qtwebengine must find a python version in the interval [2.7, 3)
</span><span class="cx"> # (see tools/qmake/mkspecs/features/functions.prf)
</span><span class="lines">@@ -938,8 +937,9 @@
</span><span class="cx"> # https://codereview.qt-project.org/#/c/141654/
</span><span class="cx"> patchfiles-append patch-add_sdk.diff
</span><span class="cx">
</span><del>- # https://codereview.qt-project.org/#/c/124643/
- patchfiles-append patch-fontfind.diff
</del><ins>+ # see http://lists.qt-project.org/pipermail/interest/2015-January/thread.html#14954
+ # see http://comments.gmane.org/gmane.comp.lib.qt.user/21422
+ patchfiles-append patch-fontconfig.diff
</ins><span class="cx">
</span><span class="cx"> # the build system automatically uses OpenGL frameworks (-framework OpenGL -framework AGL)
</span><span class="cx"> # the build system also uses pkgconfig to look for an OpenGL installation (gl.pc)
</span><span class="lines">@@ -948,12 +948,14 @@
</span><span class="cx"> # Undefined symbols: "_CGLGetCurrentContext"
</span><span class="cx"> patchfiles-append patch-configure.diff
</span><span class="cx">
</span><del>-
</del><span class="cx"> # undo part of https://codereview.qt-project.org/#/c/140954/
</span><span class="cx"> # .pc files still needed by some port
</span><del>- # see https://github.com/Homebrew/legacy-homebrew/blob/master/Library/Formula/qt5.rb
</del><ins>+ # see https://github.com/Homebrew/homebrew-core/blob/master/Formula/qt5.rb
</ins><span class="cx"> patchfiles-append patch-pc_files.diff
</span><span class="cx">
</span><ins>+ # as of 5.6.1, avoid "... is lacking an install target"
+ patchfiles-append patch-install_examples.diff
+
</ins><span class="cx"> #-----------------------------------------------------------------------------
</span><span class="cx"> # qtbase is used for:
</span><span class="cx"> # 1) building qtbase
</span></span></pre></div>
<a id="trunkdportsaquaqt5filespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt5/files/patch-configure.diff (149347 => 149348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5/files/patch-configure.diff 2016-06-14 03:00:55 UTC (rev 149347)
+++ trunk/dports/aqua/qt5/files/patch-configure.diff 2016-06-14 10:21:47 UTC (rev 149348)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- configure.orig 2015-10-12 21:35:07.000000000 -0700
</span><span class="cx"> +++ configure 2015-10-18 12:19:26.000000000 -0700
</span><del>-@@ -4294,7 +4294,7 @@
</del><ins>+@@ -4301,7 +4301,7 @@
</ins><span class="cx">
</span><span class="cx"> local incdir_raw incdir_mod cflags
</span><span class="cx"> local libdir_raw libdir_mod libs
</span></span></pre></div>
<a id="trunkdportsaquaqt5filespatchexample_installdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/aqua/qt5/files/patch-example_install.diff (149347 => 149348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5/files/patch-example_install.diff 2016-06-14 03:00:55 UTC (rev 149347)
+++ trunk/dports/aqua/qt5/files/patch-example_install.diff 2016-06-14 10:21:47 UTC (rev 149348)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>---- examples/svg/richtext/textobject/textobject.pro.orig 2016-01-19 01:50:20.000000000 -0700
-+++ examples/svg/richtext/textobject/textobject.pro 2016-05-02 20:55:45.000000000 -0700
-@@ -13,5 +13,5 @@
- INSTALLS += target
-
- filesToDeploy.files = files/*.svg
--filesToDeploy.path = files
-+filesToDeploy.path = $$[QT_INSTALL_EXAMPLES]/svg/richtext/textobject/files
- DEPLOYMENT += filesToDeploy
</del></span></pre></div>
<a id="trunkdportsaquaqt5filespatchfontconfigdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qt5/files/patch-fontconfig.diff (0 => 149348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5/files/patch-fontconfig.diff (rev 0)
+++ trunk/dports/aqua/qt5/files/patch-fontconfig.diff 2016-06-14 10:21:47 UTC (rev 149348)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+--- src/platformsupport/fontdatabases/fontdatabases.pri.orig 2016-05-25 08:46:17.000000000 -0700
++++ src/platformsupport/fontdatabases/fontdatabases.pri 2016-06-12 07:50:11.000000000 -0700
+@@ -1,8 +1,8 @@
+-!win32|contains(QT_CONFIG, freetype):!mac {
++!win32|contains(QT_CONFIG, freetype) {
+ include($$PWD/basic/basic.pri)
+ }
+
+-unix:!mac {
++unix {
+ CONFIG += qpa/genericunixfontdatabase
+ include($$PWD/genericunix/genericunix.pri)
+ contains(QT_CONFIG,fontconfig) {
+--- .//src/platformsupport/fontdatabases/mac/coretext.pri.oirg 2016-05-25 08:46:17.000000000 -0700
++++ .//src/platformsupport/fontdatabases/mac/coretext.pri 2016-06-12 07:50:19.000000000 -0700
+@@ -1,13 +1,6 @@
+ HEADERS += $$PWD/qcoretextfontdatabase_p.h $$PWD/qfontengine_coretext_p.h
+ OBJECTIVE_SOURCES += $$PWD/qfontengine_coretext.mm $$PWD/qcoretextfontdatabase.mm
+
+-contains(QT_CONFIG, freetype) {
+- include($$QT_SOURCE_TREE/src/3rdparty/freetype_dependency.pri)
+- HEADERS += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft_p.h
+- SOURCES += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp
+- CONFIG += opentype
+-}
+-
+ ios: \
+ # On iOS CoreText and CoreGraphics are stand-alone frameworks
+ LIBS_PRIVATE += -framework CoreText -framework CoreGraphics
</ins></span></pre></div>
<a id="trunkdportsaquaqt5filespatchfontfinddiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/aqua/qt5/files/patch-fontfind.diff (149347 => 149348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5/files/patch-fontfind.diff 2016-06-14 03:00:55 UTC (rev 149347)
+++ trunk/dports/aqua/qt5/files/patch-fontfind.diff 2016-06-14 10:21:47 UTC (rev 149348)
</span><span class="lines">@@ -1,66 +0,0 @@
</span><del>-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Sat, 29 Aug 2015 00:25:28 +0000 (-0700)
-Subject: OS X: Fix build when system-freetype is detected
-X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=commitdiff_plain;h=a9599be2d86dd534f37b46ab38a970ad88619c08;hp=2baeeb4026e55955a329480b2550a4353291f8ca
-
-OS X: Fix build when system-freetype is detected
-
-We need to pass the correct include paths that configure detected.
-
-Change-Id: I9832b93d3f2a07776f793c92355d764603d48c0d
----
-
-diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
-index 05299ed..93d09e3 100644
---- config.tests/unix/freetype/freetype.pri
-+++ config.tests/unix/freetype/freetype.pri
-@@ -1,4 +1,4 @@
--!cross_compile {
-+!cross_compile:isEmpty(QMAKE_CFLAGS_FONTCONFIG) {
- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
- # LSB doesn't allow using headers from /include or /usr/include
- linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-@@ -10,6 +10,15 @@
- } else {
- # If we are cross-compiling, then there is still a remote possibility that
- # configure detected font-config & freetype, stored in these variables.
-- QMAKE_CFLAGS += $$QMAKE_CFLAGS_FONTCONFIG
-- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_FONTCONFIG
-+ for(i, QMAKE_CFLAGS_FONTCONFIG) {
-+ contains(i, "-I.*") {
-+ i ~= s/^-I//
-+ INCLUDEPATH += $$i
-+ } else {
-+ QMAKE_CFLAGS += $$i
-+ QMAKE_CXXFLAGS += $$i
-+ }
-+ }
- }
-+
-+LIBS += $$QMAKE_LIBS_FONTCONFIG
-\ No newline at end of file
-diff --git a/src/platformsupport/fontdatabases/mac/coretext.pri b/src/platformsupport/fontdatabases/mac/coretext.pri
-index ebb64d1..3e64f94 100644
---- src/platformsupport/fontdatabases/mac/coretext.pri
-+++ src/platformsupport/fontdatabases/mac/coretext.pri
-@@ -1,7 +1,7 @@
- HEADERS += $$PWD/qcoretextfontdatabase_p.h $$PWD/qfontengine_coretext_p.h
- OBJECTIVE_SOURCES += $$PWD/qfontengine_coretext.mm $$PWD/qcoretextfontdatabase.mm
-
--contains(QT_CONFIG, freetype) {
-+contains(QT_CONFIG, freetype)|contains(QT_CONFIG, system-freetype) {
- include($$QT_SOURCE_TREE/src/3rdparty/freetype_dependency.pri)
- HEADERS += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft_p.h
- SOURCES += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp
-diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro
-index ba0e6b0..f6c2bdb 100644
---- src/plugins/platforms/cocoa/cocoa.pro
-+++ src/plugins/platforms/cocoa/cocoa.pro
-@@ -85,6 +85,7 @@ contains(QT_CONFIG, opengl.*) {
- RESOURCES += qcocoaresources.qrc
-
- LIBS += -framework Cocoa -framework Carbon -framework IOKit -lcups
-+CONFIG += qpa/basicunixfontdatabase
-
- QT += core-private gui-private platformsupport-private
-
</del></span></pre></div>
<a id="trunkdportsaquaqt5filespatchinstall_examplesdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qt5/files/patch-install_examples.diff (0 => 149348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5/files/patch-install_examples.diff (rev 0)
+++ trunk/dports/aqua/qt5/files/patch-install_examples.diff 2016-06-14 10:21:47 UTC (rev 149348)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+--- examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro.orig 2016-05-25 08:46:17.000000000 -0700
++++ examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro 2016-06-13 06:37:56.000000000 -0700
+@@ -5,3 +5,6 @@
+
+ QT += widgets
+
++# install
++target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mac/qmaccocoaviewcontainer
++INSTALLS += target
+--- examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro.orig 2016-05-25 08:46:17.000000000 -0700
++++ examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro 2016-06-13 06:39:47.000000000 -0700
+@@ -5,3 +5,7 @@
+
+ QT += widgets
+ #QT += widgets-private gui-private core-private
++
++# install
++target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mac/qmacnativewidget
++INSTALLS += target
</ins></span></pre></div>
<a id="trunkdportsaquaqt5filespatchpc_filesdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt5/files/patch-pc_files.diff (149347 => 149348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt5/files/patch-pc_files.diff 2016-06-14 03:00:55 UTC (rev 149347)
+++ trunk/dports/aqua/qt5/files/patch-pc_files.diff 2016-06-14 10:21:47 UTC (rev 149348)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> index bb28af97..36bb6483 100644
</span><span class="cx"> --- mkspecs/features/qt_module.prf
</span><span class="cx"> +++ mkspecs/features/qt_module.prf
</span><del>-@@ -245,7 +245,7 @@ load(qt_installs)
</del><ins>+@@ -244,7 +244,7 @@ load(qt_installs)
</ins><span class="cx"> load(qt_targets)
</span><span class="cx">
</span><span class="cx"> # this builds on top of qt_common
</span></span></pre>
</div>
</div>
</body>
</html>