<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4a4c1313f89fdffe49e7ed37b238df7db954389b">https://github.com/macports/macports-ports/commit/4a4c1313f89fdffe49e7ed37b238df7db954389b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4a4c1313f89fdffe49e7ed37b238df7db954389b
</span>Author: Chih-Hsuan Yen <yan12125@macports.org>
AuthorDate: Mon Mar 18 23:26:59 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> qt4-x11: removed as qt4-mac works just fine
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Ref: https://trac.macports.org/ticket/20309#comment:43
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/20986
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/35740
</span>---
x11/qt4-x11/Portfile | 280 ------------------------------
x11/qt4-x11/files/patch-compile.test.diff | 13 --
x11/qt4-x11/files/qt4-x11 | 124 -------------
3 files changed, 417 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/qt4-x11/Portfile b/x11/qt4-x11/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5946b40..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/qt4-x11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,280 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup select 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set select_group qt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set select_branch x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set select_port ${select_group}_select
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set select_name ${select_group}-${select_branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-select.group ${select_group}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-select.file ${filespath}/${select_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name ${select_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.4.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license {GPL-2 GPL-3 OpenSSLException}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://qt.nokia.com/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Qt Tool Kit (X11 Version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Qt is a cross-platform application and UI framework for writing \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cross-platform GUI applications. This version uses the X11 UI. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- For a native Aqua version, see the port qt4-mac.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites trolltech
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname qt-x11-opensource-src-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 376c003317c4417326ba2116370227d0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 a883e913e69a418e3cfcfecefe4f82c4e091c4bd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 49de53663a86785f88236bdeca6db8ee96a37db8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig port:${select_port}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:giflib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libmng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/dbus-daemon:dbus \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:unixODBC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/mysql_config5:mysql5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:postgresql83 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fontconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xrender \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXrandr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mesa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gstreamer010 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gstreamer010-gst-plugins-base \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-compile.test.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# --prefix is not recognized
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args-delete --prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -I${prefix}/include and -L${prefix}/lib must be set in ${configure.args}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# or else some generated Makefiles will not seem them
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSOURCE_CXXFLAGS=-D__USE_WS_X11__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set qt_dir ${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -I${prefix}/include should be set in ${configure.args}, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# we instead patch -isystem ${prefix}/include into the configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# script to avoid conflicts with other ports (e.g. iconv).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See http://trac.macports.org/ticket/16862
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -dbus-linked prevends qt4 from trying to dynamically load libdbus-1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# which it is not able to find in ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -openssl-linked ensures that the MacPorts openssl is used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -v \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -confirm-license \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -prefix ${qt_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -docdir ${qt_dir}/share/doc/${name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -examplesdir ${qt_dir}/share/${name}/examples \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -demosdir ${qt_dir}/share/${name}/demos \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -system-sqlite \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -openssl-linked \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -dbus-linked \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include/mysql5/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include/postgresql83 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib/mysql5/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib/postgresql83 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -liconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lresolv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include/gstreamer-0.10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include/glib-2.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/lib/glib-2.0/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include/libxml2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# default: -no-nas-sound
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# default: -nomake demos -nomake examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# default: -iconv -svg -webkit -phonon -phonon-backend -xmlpatterns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# default: -no-assistant-webkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target first
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.destdir INSTALL_ROOT="${destroot}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|^I_FLAGS=\$|I_FLAGS=-isystem${prefix}/include|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # macosx seems to be a special architecture to accommodate universal builds, but here is no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${worksrcpath}/include/QtCore/qatomic_macosx.h file, which causes an error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|CFG_HOST_ARCH=macosx|CFG_HOST_ARCH=`uname -p`|g" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ensure the correct MacPorts X11 is used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/X11R6|${prefix}|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Avoid having to call "install_name_tool -change" after destroot.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|install_name\$\${LITERAL_WHITESPACE}|install_name\$\${LITERAL_WHITESPACE}\$\$\[QT_INSTALL_LIBS\]/|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ensure that MacPorts compilers are used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s| cc\$| ${configure.cc}|" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s| c++\$| ${configure.cxx}|" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Q_OS_MAC, Q_OS_MACX, and Q_OS_DARWIN is set for all Mac systems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Q_WS_MAC is NOT set for the X11 version of QT.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # It is not clear why so many of these had to be changed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Excluded:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${worksrcpath}/src/corelib/global/qglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${worksrcpath}/src/network/kernel/qhostinfo_unix.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach file {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qmake/generators/mac/pbuilder_pbx.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/global/qglobal.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/io/qfile.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/io/qfsfileengine_unix.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/plugin/qlibrary.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/thread/qthread_unix.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/tools/qlocale.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/network/ssl/qsslsocket_openssl_symbols.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/porting/src/qt3headers1.resource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/qvfb/qlock.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C "s|Q_OS_DARWIN|Q_WS_MAC|g" ${worksrcpath}/${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Excluded:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${worksrcpath}/src/corelib/global/qglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach file {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/tools/qdumper.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/qt3support/other/q3accel.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/qt3support/other/q3process_unix.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/porting/src/qt3headers1.resource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/porting/src/qt3headers3.resource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C "s|Q_OS_MACX|Q_WS_MAC|g" ${worksrcpath}/${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Edited from command:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # grep -rl "\(Q_OS_MAC\$\|Q_OS_MAC[^X]\)" * | grep -v \.resource\$ | grep -v ^doc/ | grep -v src/corelib/global/qglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Excluded:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${worksrcpath}/src/corelib/global/qglobal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${worksrcpath}/tools/assistant/lib/fulltextsearch/qclucene-config_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${worksrcpath}/src/script/qscriptengine_p.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${worksrcpath}/src/corelib/io/qprocess.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${worksrcpath}/src/corelib/io/qfilesystemwatcher.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${worksrcpath}/src/corelib/concurrent/qtconcurrentiteratekernel.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach file {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- demos/mediaplayer/mediaplayer.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- demos/qtdemo/colors.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- demos/qtdemo/menumanager.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- examples/dialogs/standarddialogs/dialog.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- examples/help/remotecontrol/remotecontrol.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- examples/help/simpletextviewer/assistant.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- examples/tools/echoplugin/echowindow/echowindow.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- examples/tools/plugandpaint/mainwindow.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qmake/main.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qmake/option.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/codecs/qiconvcodec.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/codecs/qiconvcodec_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/global/qglobal.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/global/qlibraryinfo.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/global/qnamespace.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/io/qdir.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/io/qfsfileengine_unix.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/io/qprocess_unix.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/io/qsettings.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/io/qsettings_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/kernel/qcoreapplication.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/kernel/qcoreapplication_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/plugin/qlibrary.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/plugin/qlibrary_unix.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/thread/qthread_unix.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/thread/qthread.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/tools/qlocale.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/tools/qpoint.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/tools/qrect.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/tools/qstring.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/corelib/xml/qxmlstream.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/dialogs/qfilesystemmodel.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/dialogs/qprintdialog.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/itemviews/qdirmodel.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/itemviews/qfileiconprovider.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/kernel/qapplication.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/kernel/qapplication_p.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/text/qfont.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/text/qfontdatabase.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gui/widgets/qdockwidget.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/plugins/accessible/widgets/simplewidgets.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/qt3support/other/q3polygonscanner.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/qt3support/text/q3textedit.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/sql/drivers/odbc/qsql_odbc.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/tools/uic/cpp/cppwriteinitialization.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/tools/uic/cpp/cppwriteinitialization.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/assistant/compat/lib/qassistantclient.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/assistant/lib/qhelpsearchresultwidget.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/assistant/tools/assistant/bookmarkmanager.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/assistant/tools/assistant/centralwidget.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/assistant/tools/assistant/indexwindow.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/assistant/tools/assistant/mainwindow.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/designer/src/designer/assistantclient.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/designer/src/designer/qdesigner_actions.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/designer/src/lib/uilib/abstractformbuilder.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/linguist/linguist/trwindow.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/linguist/shared/proparserutils.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/shared/findwidget/findwidget.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|Q_OS_MAC|Q_WS_MAC|g" ${worksrcpath}/${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix the .pc and .prl files by removing ${destroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach fixfile [glob -nocomplain -directory ${destroot} ${qt_dir}/lib/pkgconfig/*.pc ${qt_dir}/lib/*.prl ${qt_dir}/share/${name}/demos/shared/*.prl] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|${worksrcpath}/lib|${qt_dir}/lib|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${fixfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach doc { GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT INSTALL LICENSE.GPL2 LICENSE.GPL3 OPENSOURCE-NOTICE.TXT README } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -c -m 644 ${worksrcpath}/$doc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${qt_dir}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If this is the first qt4-* installed, select it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set current_select [exec ${prefix}/bin/${select_port} -s]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${current_select} == "none"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${prefix}/bin/${select_port} ${select_name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${current_select} != ${select_name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Print out the 'select' info.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Port ${current_select} is already selected.\n \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-To fully complete this installation and make ${name} the default,\n \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-please run:\n \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\tsudo ${select_port} ${select_name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant webkit description {Use WebKit as html rendering engine in Assistant} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -assistant-webkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://get.qt.nokia.com/qt/source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "qt-x11-opensource-src-(4(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/qt4-x11/files/patch-compile.test.diff b/x11/qt4-x11/files/patch-compile.test.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8e3cd2b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/qt4-x11/files/patch-compile.test.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.tests/unix/compile.test.orig 2008-10-31 13:17:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.tests/unix/compile.test 2008-10-31 13:20:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,6 +28,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L*|-l*|-pthread)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LFLAGS="$LFLAGS $PARAM"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -isystem*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ INC=`echo $PARAM | sed -e 's/^-isystem//'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ INCLUDEPATH="$INCLUDEPATH $INC"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INC=`echo $PARAM | sed -e 's/^-I//'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDEPATH="$INCLUDEPATH $INC"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/qt4-x11/files/qt4-x11 b/x11/qt4-x11/files/qt4-x11
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 783b590..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/qt4-x11/files/qt4-x11
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,124 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/assistant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/assistant_adp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/designer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/linguist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/pixeltool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/qdbusviewer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/qhelpconverter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/qtdemo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/lrelease
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/lupdate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/moc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/qcollectiongenerator
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/qdbus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/qdbuscpp2xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/qdbusxml2cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/qdoc3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/qhelpgenerator
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/qmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/qt3to4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/qtconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/rcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/uic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/uic3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/bin/xmlpatterns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/Qt3Support.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtAssistantClient.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtCLucene.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtCore.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtDBus.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtDesigner.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtDesignerComponents.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtGui.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtHelp.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtNetwork.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtOpenGL.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtScript.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtSql.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtSvg.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtTest.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtUiTools.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtWebKit.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtXml.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/QtXmlPatterns.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/lib/pkgconfig/phonon.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/share/doc/qt4-x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11/share/qt4-x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexec/qt4-x11
</span></pre><pre style='margin:0'>
</pre>