<!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>[62458] trunk/dports/aqua/qt4-mac</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="http://trac.macports.org/changeset/62458">62458</a></dd>
<dt>Author</dt> <dd>sharky@macports.org</dd>
<dt>Date</dt> <dd>2010-01-08 09:20:20 -0800 (Fri, 08 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>qt4-mac: update to version 4.6.0 (#22743)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt4macPortfile">trunk/dports/aqua/qt4-mac/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt4macfilespatchconfigurediff">trunk/dports/aqua/qt4-mac/files/patch-configure.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqt4macfilespatchqt3supportforcocoadiff">trunk/dports/aqua/qt4-mac/files/patch-qt3support-for-cocoa.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaqt4macPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qt4-mac/Portfile (62457 => 62458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt4-mac/Portfile 2010-01-08 16:54:25 UTC (rev 62457)
+++ trunk/dports/aqua/qt4-mac/Portfile 2010-01-08 17:20:20 UTC (rev 62458)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name qt4-mac
</span><span class="cx"> conflicts qt4-mac-devel kdelibs3 libevent
</span><del>-version 4.5.3
-revision 1
</del><ins>+version 4.6.0
</ins><span class="cx"> categories aqua
</span><span class="cx"> platforms macosx
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -16,55 +15,48 @@
</span><span class="cx"> long_description This is Qt, TrollTech's C++ toolkit for writing cross-platform GUI applications. \
</span><span class="cx"> This version uses the native Aqua UI. For a X11 version, see qt4-x11.
</span><span class="cx"> master_sites trolltech
</span><del>-distname qt-mac-opensource-src-${version}
</del><ins>+distname qt-everywhere-opensource-src-${version}
</ins><span class="cx">
</span><del>-checksums \
- md5 484e3739fdc51540218ed92f4b732881 \
- sha1 566a9c45b261447c07c784b9317c9b5aae1ccbd8 \
- rmd160 290fecbe8698ead4f884617ae4dd20b37663545e
</del><ins>+checksums md5 2a7b5126f2450d8525af355fc4c12ad6 \
+ sha1 c2cbbde83f1ebac3b8dd13a112fcad757d395041 \
+ rmd160 7842b9f4a5364016677fc2162dfd31f1440bb05d
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><del>-depends_lib \
- port:zlib \
- port:tiff \
- port:libpng \
- port:libmng \
- port:jpeg \
- port:dbus \
- port:openssl \
- port:sqlite3
</del><ins>+depends_lib port:zlib port:dbus port:openssl port:sqlite3 \
+ port:tiff port:libpng port:libmng port:jpeg
</ins><span class="cx">
</span><span class="cx"> # Build plugins as bundle files instead of dylib files.
</span><span class="cx"> # Test for Precompiled-headers support requires a C++ compiler, but configure calls it, by default, with a C compiler.
</span><del>-# Use unixODBC provided by MacPorts instead of iODBC provided my Mac OS.
</del><span class="cx"> # Ensure that securesocketclient demo is built even with configure option -openssl-linked.
</span><del>-patchfiles \
- patch-mac.conf.diff \
- patch-precomp.test.diff \
- patch-odbc.diff \
- patch-network.pro.diff \
- patch-qt3support-for-cocoa.diff
</del><ins>+patchfiles patch-mac.conf.diff \
+ patch-configure.diff \
+ patch-precomp.test.diff \
+ patch-network.pro.diff
</ins><span class="cx">
</span><span class="cx"> # The build process uses -fconstant-cfstrings.
</span><span class="cx"> # configure.compiler should therefore not be one of the MacPorts compilers.
</span><span class="cx">
</span><span class="cx"> # --prefix is not recognized.
</span><span class="cx"> configure.pre_args-delete --prefix=${prefix}
</span><del>-# -I${prefix}/include and -L${prefix}/lib must be set in ${configure.args}
-# or else some generated Makefiles will not see them.
-configure.cppflags
-configure.ldflags
</del><span class="cx">
</span><span class="cx"> ################################################################################
</span><span class="cx"> # We do not want flags of any kind -- QT is smart enough to set up its own. #
</span><span class="cx"> ################################################################################
</span><span class="cx">
</span><ins>+configure.cflags
+configure.cppflags
+configure.cxxflags
+configure.ldflags
+
</ins><span class="cx"> configure.universal_cflags
</span><span class="cx"> configure.universal_cppflags
</span><span class="cx"> configure.universal_cxxflags
</span><span class="cx"> configure.universal_ldflags
</span><span class="cx">
</span><ins>+configure.cc_archflags
+configure.cxx_archflags
+
</ins><span class="cx"> set dirname qt4-mac
</span><span class="cx"> set qt_dir ${prefix}/libexec/${dirname}
</span><span class="cx">
</span><span class="lines">@@ -182,7 +174,7 @@
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> # Install documentation.
</span><del>- foreach doc { FAQ.txt INSTALL LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL README } {
</del><ins>+ foreach doc { INSTALL LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL README } {
</ins><span class="cx"> xinstall -c -m 644 ${worksrcpath}/$doc ${destroot}${prefix}/share/doc/${name}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsaquaqt4macfilespatchconfigurediff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qt4-mac/files/patch-configure.diff (0 => 62458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt4-mac/files/patch-configure.diff (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-configure.diff 2010-01-08 17:20:20 UTC (rev 62458)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- configure.orig 2009-10-13 17:34:09.000000000 +0200
++++ configure 2009-11-03 17:46:54.000000000 +0100
+@@ -131,7 +131,7 @@
+ cat >conftest.cpp <<EOF
+ int main() { return 0; }
+ EOF
+- "$TEST_COMPILER" "$@" -o /dev/null conftest.cpp
++ "$TEST_COMPILER" "$@" -o conftest.o conftest.cpp
+ ret=$?
+ rm -f conftest.cpp conftest.o
+ return $ret
</ins></span></pre></div>
<a id="trunkdportsaquaqt4macfilespatchqt3supportforcocoadiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/aqua/qt4-mac/files/patch-qt3support-for-cocoa.diff (62457 => 62458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qt4-mac/files/patch-qt3support-for-cocoa.diff 2010-01-08 16:54:25 UTC (rev 62457)
+++ trunk/dports/aqua/qt4-mac/files/patch-qt3support-for-cocoa.diff 2010-01-08 17:20:20 UTC (rev 62458)
</span><span class="lines">@@ -1,154 +0,0 @@
</span><del>-From 106d7a210be1e6d52946b575a262e2c76c5e51e6 Mon Sep 17 00:00:00 2001
-From: Morten Sorvig <msorvig@trolltech.com>
-Date: Thu, 10 Sep 2009 11:53:31 +0200
-Subject: [PATCH] Enable Qt3Support for Qt/Cocoa on Mac OS X.
-
-Qt on Mac OS X should not be the only desktop platform
-without Qt3Support once the Carpon port is dropped. This
-will also make the switch from Carbon to Cocoa-based Qt
-as smooth as possible.
-
-This is a minimal port, with some code removed:
-Q3FileDialog is gone.
-Q3MainWindow won't get the "hide toolbar" button.
-Q3ScrollView might to more updates than structly neccesary.
-
-The rest is there, including the QT3_SUPPORT functions
-in QtCore and QtGui.
----
- configure | 1 -
- src/qt3support/dialogs/q3filedialog.cpp | 5 ++++-
- src/qt3support/dialogs/q3filedialog.h | 4 ++++
- src/qt3support/dialogs/q3filedialog_mac.cpp | 4 ++++
- src/qt3support/widgets/q3mainwindow.cpp | 4 ++--
- src/qt3support/widgets/q3scrollview.cpp | 4 ++++
- 6 files changed, 18 insertions(+), 4 deletions(-)
-
-diff --git configure configure
-index 719db32..43aa739 100755
---- configure
-+++ configure
-@@ -5859,7 +5859,6 @@ case "$PLATFORM,$CFG_MAC_COCOA" in
- macx*,yes)
- # Cocoa
- QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5
-- CFG_QT3SUPPORT="no"
- ;
- macx*,no)
- # gcc, Carbon
-diff --git src/qt3support/dialogs/q3filedialog.cpp src/qt3support/dialogs/q3filedialog.cpp
-index 66ace5d..c14ff5c 100644
---- src/qt3support/dialogs/q3filedialog.cpp
-+++ src/qt3support/dialogs/q3filedialog.cpp
-@@ -116,6 +116,8 @@
-
- QT_BEGIN_NAMESPACE
-
-+#ifndef QT_MAC_USE_COCOA
-+
- /* XPM */
- static const char * const start_xpm[]={
- "16 15 8 1",
-@@ -6051,7 +6053,8 @@ Q3FilePreview::Q3FilePreview()
- function to provide file previewing.
- */
-
--
-+#endif // QT_MAC_USE_COCOA
-+
- QT_END_NAMESPACE
-
- #include "moc_q3filedialog.cpp"
-diff --git src/qt3support/dialogs/q3filedialog.h src/qt3support/dialogs/q3filedialog.h
-index f6a7950..8644b4c 100644
---- src/qt3support/dialogs/q3filedialog.h
-+++ src/qt3support/dialogs/q3filedialog.h
-@@ -69,6 +69,8 @@ class QUrlInfo;
-
- #ifndef QT_NO_FILEDIALOG
-
-+#ifndef QT_MAC_USE_COCOA
-+
- class Q_COMPAT_EXPORT Q3FileIconProvider : public QObject
- {
- Q_OBJECT
-@@ -337,6 +339,8 @@ private:
- #endif
- };
-
-+#endif // QT_MAC_USE_COCOA
-+
- #endif // QT_NO_FILEDIALOG
-
- QT_END_NAMESPACE
-diff --git src/qt3support/dialogs/q3filedialog_mac.cpp src/qt3support/dialogs/q3filedialog_mac.cpp
-index a36274d..585fa8f 100644
---- src/qt3support/dialogs/q3filedialog_mac.cpp
-+++ src/qt3support/dialogs/q3filedialog_mac.cpp
-@@ -60,6 +60,8 @@
-
- QT_BEGIN_NAMESPACE
-
-+#ifndef QT_MAC_USE_COCOA
-+
- /*****************************************************************************
- Externals
- *****************************************************************************/
-@@ -564,6 +566,8 @@ QString Q3FileDialog::macGetSaveFileName(const QString &start, const QString &fi
- return retstr;
- }
-
-+#endif // QT_MAC_USE_COCOA
-+
- QT_END_NAMESPACE
-
- #endif
-diff --git src/qt3support/widgets/q3mainwindow.cpp src/qt3support/widgets/q3mainwindow.cpp
-index b7fc486..e02d890 100644
---- src/qt3support/widgets/q3mainwindow.cpp
-+++ src/qt3support/widgets/q3mainwindow.cpp
-@@ -1042,7 +1042,7 @@ void Q3MainWindow::addDockWindow(Q3DockWindow *dockWindow,
- Qt::Dock edge, bool newLine)
- {
- Q_D(Q3MainWindow);
--#ifdef Q_WS_MAC
-+#if defined (Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
- extern WindowPtr qt_mac_window_for(const QWidget*); //qwidget_mac.cpp
- if(isWindow() && edge == Qt::DockTop) {
- d->createWinId();
-@@ -1217,7 +1217,7 @@ void Q3MainWindow::removeDockWindow(Q3DockWindow * dockWindow)
- {
- Q_D(Q3MainWindow);
-
--#ifdef Q_WS_MAC
-+#if defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
- extern WindowPtr qt_mac_window_for(const QWidget*); //qwidget_mac.cpp
- if(isWindow() && dockWindow->area() == topDock() && !dockWindows(Qt::DockTop).count())
- ChangeWindowAttributes(qt_mac_window_for(this), 0, kWindowToolbarButtonAttribute);
-diff --git src/qt3support/widgets/q3scrollview.cpp src/qt3support/widgets/q3scrollview.cpp
-index 1178047..3be0145 100644
---- src/qt3support/widgets/q3scrollview.cpp
-+++ src/qt3support/widgets/q3scrollview.cpp
-@@ -870,15 +870,19 @@ void Q3ScrollView::updateScrollBars()
- mac_need_scroll = true;
- } else {
- QWidget *tlw = window();
-+#ifndef QT_MAC_USE_COCOA
- QPoint tlw_br = QPoint(tlw->width(), tlw->height()),
- my_br = qt_mac_posInWindow(this) + QPoint(w, h);
- if(my_br.x() >= tlw_br.x() - 3 && my_br.y() >= tlw_br.y() - 3)
-+#endif
- mac_need_scroll = true;
- }
- if(mac_need_scroll) {
-+#ifndef QT_MAC_USE_COCOA
- WindowAttributes attr;
- GetWindowAttributes((WindowPtr)handle(), &attr);
- mac_need_scroll = (attr & kWindowResizableAttribute);
-+#endif
- }
- if(mac_need_scroll) {
- showc = true;
---
-1.6.1
-
</del></span></pre>
</div>
</div>
</body>
</html>