[46431] trunk/dports/x11/qt4-x11
Jeremy Huddleston
jeremyhu at macports.org
Mon Apr 13 17:51:27 PDT 2009
So where is qt4_select? I see it mentioned in qt4-{x11,mac,kde}, and
I see the files in ${prefix}/opt/local/etc/select/qt4, but I don't see
any documentation about how to use them... either as a user or in a
Portfile to ensure a particular flavor.
On Feb 4, 2009, at 14:15, mcalhoun at macports.org wrote:
> Revision: 46431
> http://trac.macports.org/changeset/46431
> Author: mcalhoun at macports.org
> Date: 2009-02-04 14:15:24 -0800 (Wed, 04 Feb 2009)
> Log Message:
> -----------
> qt4-x11: Fix linking of dbus and openssl libraries.
> Remove fix for Leopard OpenGL since it has been fixed in XCode for a
> while.
> Install necessary files for qt4_select.
>
> Modified Paths:
> --------------
> trunk/dports/x11/qt4-x11/Portfile
>
> Added Paths:
> -----------
> trunk/dports/x11/qt4-x11/files/qt4-x11
>
> Modified: trunk/dports/x11/qt4-x11/Portfile
> ===================================================================
> --- trunk/dports/x11/qt4-x11/Portfile 2009-02-04 22:11:31 UTC (rev
> 46430)
> +++ trunk/dports/x11/qt4-x11/Portfile 2009-02-04 22:15:24 UTC (rev
> 46431)
> @@ -5,7 +5,7 @@
>
> name qt4-x11
> version 4.4.3
> -revision 1
> +revision 2
> categories x11
> maintainers mcalhoun
> homepage http://www.trolltech.com/
> @@ -66,7 +66,12 @@
>
> # -I${prefix}/include should be set in ${configure.args}, but
> # we instead patch -isystem ${prefix}/include into the configure
> -# script to avoid conflicts with other ports (e.g. PCRE).
> +# script to avoid conflicts with other ports (e.g. iconv).
> +# See http://trac.macports.org/ticket/16862
> +#
> +# -dbus-linked prevends qt4 from trying to dynamically load
> libdbus-1,
> +# which it is not able to find in ${prefix}
> +# -openssl-linked ensures that the MacPorts openssl is used
> configure.args \
> -v \
> -confirm-license \
> @@ -75,6 +80,8 @@
> -examplesdir ${prefix}/share/${name}/examples \
> -demosdir ${prefix}/share/${name}/demos \
> -system-sqlite \
> + -openssl-linked \
> + -dbus-linked \
> -I${prefix}/include/mysql5/mysql \
> -I${prefix}/include/postgresql83 \
> -L${prefix}/lib \
> @@ -103,17 +110,6 @@
> depends_build-append port:cups-headers
> }
>
> -platform darwin 9 {
> - post-patch {
> - # See http://trac.macports.org/wiki/LeopardProblems
> - set dylibFile \
> - /System/Library/Frameworks/OpenGL.framework/Versions/A/
> Libraries/libGL.dylib
> - reinplace -E \
> - "s|^(QMAKE_LFLAGS\[ \t\]*=\[ \t\]*)|\\1 -Wl,-dylib_file,
> ${dylibFile}:${dylibFile}|g" \
> - ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
> - }
> -}
> -
> post-patch {
> reinplace -E "s|^I_FLAGS=\$|I_FLAGS=-isystem${prefix}/include|" \
> ${worksrcpath}/configure
> @@ -254,6 +250,8 @@
> foreach bin [glob ${destroot}${prefix}/bin/*] {
> file rename ${bin} ${bin}-x11
> }
> + # qtconfig is not installed by qt4-mac
> + file rename ${destroot}${prefix}/bin/qtconfig-x11 ${destroot}$
> {prefix}/bin/qtconfig
>
> # Fix the .pc and .prl files by removing ${destroot}
> foreach fixfile [glob -nocomplain -directory ${destroot} $
> {qt_dir}/lib/pkgconfig/*.pc ${qt_dir}/lib/*.prl ${prefix}/share/$
> {name}/demos/shared/*.prl] {
> @@ -262,10 +260,9 @@
> ${fixfile}
> }
>
> - # move pkgconfig dir to another directory to avoid conflict
> with qt4-mac
> - # pkg-config should still find it, but qt4-mac will take
> precedence
> - xinstall -m 755 -d ${destroot}${prefix}/share/
> - move ${destroot}${qt_dir}/lib/pkgconfig ${destroot}${prefix}/
> share/
> + # install select file for qt4_select
> + xinstall -m 755 -d ${destroot}${prefix}/etc/select/qt4
> + xinstall -m 644 ${filespath}/${name} ${destroot}${prefix}/etc/
> select/qt4/
> }
>
> variant webkit description {Use WebKit as html rendering engine in
> Assistant} {
>
> Added: trunk/dports/x11/qt4-x11/files/qt4-x11
> ===================================================================
> --- trunk/dports/x11/qt4-x11/files/qt4-x11
> (rev 0)
> +++ trunk/dports/x11/qt4-x11/files/qt4-x11 2009-02-04 22:15:24 UTC
> (rev 46431)
> @@ -0,0 +1,42 @@
> +libexec/qt4-x11/bin/assistant
> +libexec/qt4-x11/bin/assistant_adp
> +libexec/qt4-x11/bin/designer
> +libexec/qt4-x11/bin/linguist
> +libexec/qt4-x11/bin/lrelease
> +libexec/qt4-x11/bin/lupdate
> +libexec/qt4-x11/bin/moc
> +libexec/qt4-x11/bin/pixeltool
> +libexec/qt4-x11/bin/qcollectiongenerator
> +libexec/qt4-x11/bin/qdbus
> +libexec/qt4-x11/bin/qdbuscpp2xml
> +libexec/qt4-x11/bin/qdbusviewer
> +libexec/qt4-x11/bin/qdbusxml2cpp
> +libexec/qt4-x11/bin/qhelpconverter
> +libexec/qt4-x11/bin/qhelpgenerator
> +libexec/qt4-x11/bin/qmake
> +libexec/qt4-x11/bin/qt3to4
> +libexec/qt4-x11/bin/qtdemo
> +libexec/qt4-x11/bin/rcc
> +libexec/qt4-x11/bin/uic
> +libexec/qt4-x11/bin/uic3
> +libexec/qt4-x11/bin/xmlpatterns
> +libexec/qt4-x11/lib/pkgconfig/Qt3Support.pc
> +libexec/qt4-x11/lib/pkgconfig/QtAssistant.pc
> +libexec/qt4-x11/lib/pkgconfig/QtCLucene.pc
> +libexec/qt4-x11/lib/pkgconfig/QtCore.pc
> +libexec/qt4-x11/lib/pkgconfig/QtDBus.pc
> +libexec/qt4-x11/lib/pkgconfig/QtDesigner.pc
> +libexec/qt4-x11/lib/pkgconfig/QtDesignerComponents.pc
> +libexec/qt4-x11/lib/pkgconfig/QtGui.pc
> +libexec/qt4-x11/lib/pkgconfig/QtHelp.pc
> +libexec/qt4-x11/lib/pkgconfig/QtNetwork.pc
> +libexec/qt4-x11/lib/pkgconfig/QtOpenGL.pc
> +libexec/qt4-x11/lib/pkgconfig/QtScript.pc
> +libexec/qt4-x11/lib/pkgconfig/QtSql.pc
> +libexec/qt4-x11/lib/pkgconfig/QtSvg.pc
> +libexec/qt4-x11/lib/pkgconfig/QtTest.pc
> +libexec/qt4-x11/lib/pkgconfig/QtUiTools.pc
> +libexec/qt4-x11/lib/pkgconfig/QtWebKit.pc
> +libexec/qt4-x11/lib/pkgconfig/QtXml.pc
> +libexec/qt4-x11/lib/pkgconfig/QtXmlPatterns.pc
> +libexec/qt4-x11/lib/pkgconfig/phonon.pc
> _______________________________________________
> macports-changes mailing list
> macports-changes at lists.macosforge.org
> http://lists.macosforge.org/mailman/listinfo.cgi/macports-changes
More information about the macports-dev
mailing list