From 99e0a71dc60e477cd05c865760a25d9224889914 Mon Sep 17 00:00:00 2001 From: Warren Block Date: Wed, 19 Sep 2012 16:59:39 +0000 Subject: [PATCH] Update porters handbook: Qt/KDE sections. PR: 171788 Submitted by: Max Brazhnikov --- .../books/porters-handbook/book.sgml | 200 ++++++++++++++---- 1 file changed, 159 insertions(+), 41 deletions(-) diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml index 7074ef0f68..22d6972a44 100644 --- a/en_US.ISO8859-1/books/porters-handbook/book.sgml +++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml @@ -6244,14 +6244,21 @@ USE_XORG= x11 xpm USE_QT_VER - The port uses the Qt toolkit. Possible values - are 3 and 4; - each specify the major version of Qt to use. + The port uses the Qt toolkit. The only + possible value is 3. Appropriate parameters are passed to configure script and make. + + USE_QT4 + Specify tool and library dependencies for ports + that use Qt 4. See Qt 4 component + selection for more details. + + QT_PREFIX Set to the path where Qt installed to @@ -6299,12 +6306,6 @@ USE_XORG= x11 xpm - - QT_COMPONENTS - Specify tool and library dependencies for Qt 4. - See below for details. - - UIC Set to the path of uic @@ -6323,12 +6324,36 @@ USE_XORG= x11 xpm qmake (read-only variable). + + + QMAKEFLAGS + Additional flags for + qmake. + + + + QT_INCDIR + Set to Qt 4 include directories (read-only + variable). + + + + QT_LIBDIR + Set to Qt 4 libraries path (read-only + variable). + + + + QT_PLUGINDIR + Set to Qt 4 plugins path (read-only + variable). + - When USE_QT_VER is set, some useful - settings are passed to configure + When USE_QT_VER is set to 3, + some useful settings are passed to the configure script: CONFIGURE_ARGS+= --with-qt-includes=${QT_PREFIX}/include \ @@ -6339,21 +6364,28 @@ CONFIGURE_ENV+= MOC="${MOC}" LIBS="${QTCFGLIBS}" \ QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}" CPPFLAGS+= ${QTCPPFLAGS} - If USE_QT_VER is set to - 4, the following settings are also - deployed: + If USE_QT4 is set, the following + settings are deployed: - CONFIGURE_ENV+= UIC="${UIC}" QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" -MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" + CONFIGURE_ARGS+= --with-qt-includes=${QT_INCDIR} \ + --with-qt-libraries=${QT_LIBDIR} \ + --with-extra-libs=${LOCALBASE}/lib \ + --with-extra-includes=${LOCALBASE}/include +CONFIGURE_ENV+= MOC="${MOC}" UIC="${UIC}" LIBS="${QTCFGLIBS}" \ + QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}" +MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" + +PLIST_SUB+= QT_INCDIR_REL=${QT_INCDIR_REL} \ + QT_LIBDIR_REL=${QT_LIBDIR_REL} \ + QT_PLUGINDIR_REL=${QT_PLUGINDIR_REL} Component Selection (Qt 4.x Only) - When USE_QT_VER is set to - 4, individual Qt 4 tool and library - dependencies can be specified in the - QT_COMPONENTS variable. Every component + Individual Qt 4 tool and library dependencies + must be specified in the USE_QT4 + variable. Every component can be suffixed by either _build or _run, the suffix indicating whether the component should be depended on at buildtime or runtime, @@ -6364,7 +6396,7 @@ MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" plugin components should be specified with the _run suffix. The most commonly used components are listed below (all available components are - listed in _QT_COMPONENTS_ALL in + listed in _USE_QT4_ALL in /usr/ports/Mk/bsd.qt.mk): @@ -6517,8 +6549,7 @@ MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" only needed at buildtime, thus they are specified with the _build suffix: - USE_QT_VER= 4 -QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build + USE_QT4= gui moc_build qmake_build rcc_build uic_build @@ -6534,7 +6565,7 @@ QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} PREFIX=${PREFIX} texmaker.pro + ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} texmaker.proNote the similarity to the qmake line from the provided BUILD.sh script. @@ -6560,7 +6591,7 @@ do-configure: the include and library search paths via the command line, for example: - ${QMAKE} PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \ + ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \ LIBS+=-L${LOCALBASE}/lib sillyapp.pro @@ -6641,11 +6672,6 @@ do-configure: - - baseapps - Basic applications for KDE Desktop - - kdehier Hierarchy of common KDE directories @@ -6664,13 +6690,13 @@ do-configure: - pimlibs - KDE-Pim libraries + sharedmime + MIME types database for KDE ports - workspace - KDE user environments + automoc4 + Automatic moc for Qt 4 packages @@ -6679,8 +6705,101 @@ do-configure: - automoc4 - Automatic moc for Qt 4 packages + soprano + Qt 4 RDF framework + + + + strigi + Desktop search daemon + + + + libkcddb + KDE CDDB library + + + + libkcompactdisc + KDE library for interfacing with audio + CDs + + + + libkdeedu + Libraries used by educational + applications + + + + libkdcraw + KDE LibRaw library + + + + libkexiv2 + KDE Exiv2 library + + + + libkipi + KDE Image Plugin Interface + + + + libkonq + Konqueror core library + + + + libksane + KDE SANE ("Scanner Access Now Easy") + library + + + + pimlibs + KDE-Pim libraries + + + + kate + Text editor framework + + + + marble + Virtual globe + + + + okular + Universal document viewer + + + + korundum + KDE Ruby bindings + + + + perlkde + KDE Perl bindings + + + + pykde4 + KDE Python bindings + + + + pykdeuic4 + PyKDE user interface compiler + + + + smokekde + KDE SMOKE libraries @@ -6709,14 +6828,13 @@ do-configure: Required KDE components and other dependencies can be determined through configure log. USE_KDE4 does not imply - USE_QT_VER. If a port requires some - Qt 4 components, USE_QT_VER should be - set and then needed components can be specified. + USE_QT4. If a port requires some + Qt 4 components, they should be specified in + USE_QT4.USE_CMAKE= yes USE_KDE4= kdelibs kdeprefix automoc4 -USE_QT_VER= 4 -QT_COMPONENTS= moc_build qmake_build rcc_build uic_build +USE_QT4= moc_build qmake_build rcc_build uic_build