/[gentoo-x86]/eclass/qt4-build.eclass
Gentoo

Diff of /eclass/qt4-build.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.132 Revision 1.139
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2012 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.132 2012/06/07 15:36:49 pesa Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.139 2012/11/12 09:28:53 pesa Exp $
4 4
5# @ECLASS: qt4-build.eclass 5# @ECLASS: qt4-build.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Qt herd <qt@gentoo.org> 7# Qt herd <qt@gentoo.org>
8# @BLURB: Eclass for Qt4 split ebuilds. 8# @BLURB: Eclass for Qt4 split ebuilds.
9# @DESCRIPTION: 9# @DESCRIPTION:
10# This eclass contains various functions that are used when building Qt4. 10# This eclass contains various functions that are used when building Qt4.
11 11
12case ${EAPI} in 12case ${EAPI} in
13 2|3|4) : ;; 13 3|4|5) : ;;
14 *) die "qt4-build.eclass requires EAPI 2, 3 or 4." ;; 14 *) die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
15esac 15esac
16 16
17inherit base eutils flag-o-matic multilib toolchain-funcs versionator 17inherit eutils flag-o-matic multilib toolchain-funcs versionator
18 18
19if [[ ${PV} == *9999* ]]; then 19if [[ ${PV} == *9999* ]]; then
20 QT4_BUILD_TYPE="live" 20 QT4_BUILD_TYPE="live"
21 inherit git-2 21 inherit git-2
22else 22else
23 QT4_BUILD_TYPE="release" 23 QT4_BUILD_TYPE="release"
24fi 24fi
25 25
26HOMEPAGE="http://qt-project.org/ http://qt.nokia.com/" 26HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
27LICENSE="|| ( LGPL-2.1 GPL-3 )" 27LICENSE="|| ( LGPL-2.1 GPL-3 )"
28 28
29MY_PV=${PV/_/-} 29MY_PV=${PV/_/-}
30MY_P=qt-everywhere-opensource-src-${MY_PV} 30MY_P=qt-everywhere-opensource-src-${MY_PV}
31 31
32case ${QT4_BUILD_TYPE} in 32case ${QT4_BUILD_TYPE} in
33 live) 33 live)
34 EGIT_REPO_URI="git://gitorious.org/qt/qt.git 34 EGIT_REPO_URI="git://gitorious.org/qt/qt.git
35 https://git.gitorious.org/qt/qt.git" 35 https://git.gitorious.org/qt/qt.git"
36 EGIT_BRANCH="${PV%.9999}" 36 EGIT_BRANCH=${PV%.9999}
37 ;; 37 ;;
38 release) 38 release)
39 if version_is_at_least 4.8.1; then 39 if version_is_at_least 4.8.1; then
40 SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz" 40 SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz"
41 else 41 else
43 fi 43 fi
44 ;; 44 ;;
45esac 45esac
46 46
47IUSE="aqua debug pch" 47IUSE="aqua debug pch"
48if [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]]; then 48[[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && IUSE+=" +exceptions"
49 IUSE+=" +exceptions"
50fi
51if version_is_at_least 4.8; then 49if version_is_at_least 4.8; then
52 IUSE+=" c++0x qpa" 50 [[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x"
51 version_is_at_least 4.8.3 || IUSE+=" qpa"
53fi 52fi
54 53
55DEPEND="virtual/pkgconfig" 54DEPEND="virtual/pkgconfig"
56if [[ ${QT4_BUILD_TYPE} == live ]]; then 55if [[ ${QT4_BUILD_TYPE} == live ]]; then
57 DEPEND+=" dev-lang/perl" 56 DEPEND+=" dev-lang/perl"
100 99
101# @FUNCTION: qt4-build_pkg_setup 100# @FUNCTION: qt4-build_pkg_setup
102# @DESCRIPTION: 101# @DESCRIPTION:
103# Sets up PATH and LD_LIBRARY_PATH. 102# Sets up PATH and LD_LIBRARY_PATH.
104qt4-build_pkg_setup() { 103qt4-build_pkg_setup() {
105 [[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
106
107 # Protect users by not allowing downgrades between releases 104 # Protect users by not allowing downgrades between releases.
108 # Downgrading revisions within the same release should be allowed 105 # Downgrading revisions within the same release should be allowed.
109 if has_version ">${CATEGORY}/${P}-r9999:4"; then 106 if has_version ">${CATEGORY}/${P}-r9999:4"; then
110 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then 107 if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
111 eerror
112 eerror "Sanity check to keep you from breaking your system:" 108 eerror " *** Sanity check to keep you from breaking your system ***"
113 eerror " Downgrading Qt is completely unsupported and will break your system!" 109 eerror "Downgrading Qt is completely unsupported and will break your system!"
114 eerror
115 die "aborting to save your system" 110 die "aborting to save your system"
116 else 111 else
117 ewarn "Downgrading Qt is completely unsupported and will break your system!" 112 ewarn "Downgrading Qt is completely unsupported and will break your system!"
118 fi 113 fi
119 fi
120
121 if [[ ${PN} == qt-webkit ]]; then
122 eshopts_push -s extglob
123 if is-flagq '-g?(gdb)?([1-9])'; then
124 echo
125 ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
126 ewarn "You may experience really long compilation times and/or increased memory usage."
127 ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
128 ewarn "For more info check out bug #307861"
129 echo
130 fi
131 eshopts_pop
132 fi 114 fi
133 115
134 PATH="${S}/bin${PATH:+:}${PATH}" 116 PATH="${S}/bin${PATH:+:}${PATH}"
135 if [[ ${CHOST} != *-darwin* ]]; then 117 if [[ ${CHOST} != *-darwin* ]]; then
136 LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" 118 LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
141 # avoid extract failure. 123 # avoid extract failure.
142 [[ ${CHOST} == *-apple-darwin* ]] && \ 124 [[ ${CHOST} == *-apple-darwin* ]] && \
143 QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm 125 QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm
144 ${QT4_EXTRACT_DIRECTORIES}" 126 ${QT4_EXTRACT_DIRECTORIES}"
145 fi 127 fi
146
147 if ! version_is_at_least 4.1 $(gcc-version); then
148 ewarn "Using a GCC version lower than 4.1 is not supported."
149 fi
150} 128}
129
130# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
131# @DEFAULT_UNSET
132# @DESCRIPTION:
133# Space-separated list including the directories that will be extracted from
134# Qt tarball.
151 135
152# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES 136# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
137# @DEFAULT_UNSET
153# @DESCRIPTION: 138# @DESCRIPTION:
154# Arguments for build_target_directories. Takes the directories in which the 139# Arguments for build_target_directories. Takes the directories in which the
155# code should be compiled. This is a space-separated list. 140# code should be compiled. This is a space-separated list.
156
157# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
158# @DESCRIPTION:
159# Space-separated list including the directories that will be extracted from
160# Qt tarball.
161 141
162# @FUNCTION: qt4-build_src_unpack 142# @FUNCTION: qt4-build_src_unpack
163# @DESCRIPTION: 143# @DESCRIPTION:
164# Unpacks the sources. 144# Unpacks the sources.
165qt4-build_src_unpack() { 145qt4-build_src_unpack() {
166 setqtenv 146 setqtenv
147
148 if ! version_is_at_least 4.1 $(gcc-version); then
149 ewarn "Using a GCC version lower than 4.1 is not supported."
150 fi
151
152 if [[ ${PN} == qt-webkit ]]; then
153 eshopts_push -s extglob
154 if is-flagq '-g?(gdb)?([1-9])'; then
155 echo
156 ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
157 ewarn "You may experience really long compilation times and/or increased memory usage."
158 ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
159 ewarn "For more info check out https://bugs.gentoo.org/307861"
160 echo
161 fi
162 eshopts_pop
163 fi
167 164
168 case ${QT4_BUILD_TYPE} in 165 case ${QT4_BUILD_TYPE} in
169 live) 166 live)
170 git-2_src_unpack 167 git-2_src_unpack
171 ;; 168 ;;
189# @DEFAULT_UNSET 186# @DEFAULT_UNSET
190# @DESCRIPTION: 187# @DESCRIPTION:
191# PATCHES array variable containing all various patches to be applied. 188# PATCHES array variable containing all various patches to be applied.
192# This variable is expected to be defined in global scope of ebuild. 189# This variable is expected to be defined in global scope of ebuild.
193# Make sure to specify the full path. This variable is utilised in 190# Make sure to specify the full path. This variable is utilised in
194# src_unpack/src_prepare phase, based on EAPI. 191# src_prepare() phase.
195# 192#
196# @CODE 193# @CODE
197# PATCHES=( "${FILESDIR}/mypatch.patch" 194# PATCHES=( "${FILESDIR}/mypatch.patch"
198# "${FILESDIR}/patches_folder/" ) 195# "${FILESDIR}/patches_folder/" )
199# @CODE 196# @CODE
207 204
208 if [[ ${QT4_BUILD_TYPE} == live ]]; then 205 if [[ ${QT4_BUILD_TYPE} == live ]]; then
209 QTDIR="." ./bin/syncqt || die "syncqt failed" 206 QTDIR="." ./bin/syncqt || die "syncqt failed"
210 fi 207 fi
211 208
212 if version_is_at_least 4.7; then
213 # fix libX11 dependency on non X packages 209 # avoid X11 dependency in non-gui packages
214 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns" 210 local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
215 has ${PN} ${nolibx11_pkgs} && qt_nolibx11 211 has ${PN} ${nolibx11_pkgs} && qt_nolibx11
216
217 qt_assistant_cleanup
218 fi
219 212
220 if use aqua; then 213 if use aqua; then
221 # provide a proper macx-g++-64 214 # provide a proper macx-g++-64
222 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir) 215 use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
223 216
243 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS" 236 ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
244 append-flags -fno-gcse 237 append-flags -fno-gcse
245 fi 238 fi
246 239
247 if use_if_iuse c++0x; then 240 if use_if_iuse c++0x; then
248 echo
249 ewarn "You are about to build Qt4 using the C++11 standard. Even though"
250 ewarn "this is an official standard, some of the reverse dependencies"
251 ewarn "may fail to compile or link againt the Qt4 libraries. Before"
252 ewarn "reporting a bug, make sure your bug is reproducible with c++0x"
253 ewarn "disabled."
254 echo
255 append-flags -std=c++0x 241 append-cxxflags -std=c++0x
256 fi 242 fi
257 243
258 # Unsupported old gcc versions - hardened needs this :( 244 # Unsupported old gcc versions - hardened needs this :(
259 if [[ $(gcc-major-version) -lt 4 ]]; then 245 if [[ $(gcc-major-version) -lt 4 ]]; then
260 ewarn "Appending -fno-stack-protector to CXXFLAGS" 246 ewarn "Appending -fno-stack-protector to CXXFLAGS"
274 sed -e "/^SYSTEM_VARIABLES=/i \ 260 sed -e "/^SYSTEM_VARIABLES=/i \
275 CC='$(tc-getCC)'\n\ 261 CC='$(tc-getCC)'\n\
276 CXX='$(tc-getCXX)'\n\ 262 CXX='$(tc-getCXX)'\n\
277 CFLAGS='${CFLAGS}'\n\ 263 CFLAGS='${CFLAGS}'\n\
278 CXXFLAGS='${CXXFLAGS}'\n\ 264 CXXFLAGS='${CXXFLAGS}'\n\
279 LDFLAGS='${LDFLAGS}'\n" \ 265 LDFLAGS='${LDFLAGS}'\n\
266 QMakeVar set QMAKE_CFLAGS_RELEASE\n\
267 QMakeVar set QMAKE_CFLAGS_DEBUG\n\
268 QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
269 QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
270 QMakeVar set QMAKE_LFLAGS_RELEASE\n\
271 QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
280 -i configure \ 272 -i configure \
281 || die "sed SYSTEM_VARIABLES failed" 273 || die "sed SYSTEM_VARIABLES failed"
282 274
283 # Respect CC, CXX, LINK and *FLAGS in config.tests 275 # Respect CC, CXX, LINK and *FLAGS in config.tests
284 find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \ 276 find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
360 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die 352 sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
361 # do not flirt with non-Prefix stuff, we're quite possessive 353 # do not flirt with non-Prefix stuff, we're quite possessive
362 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \ 354 sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
363 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die 355 mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
364 356
365 base_src_prepare 357 # apply patches
358 [[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
359 epatch_user
366} 360}
367 361
368# @FUNCTION: qt4-build_src_configure 362# @FUNCTION: qt4-build_src_configure
369# @DESCRIPTION: 363# @DESCRIPTION:
370# Default configure phase 364# Default configure phase
376 -bindir ${QTBINDIR} 370 -bindir ${QTBINDIR}
377 -libdir ${QTLIBDIR} 371 -libdir ${QTLIBDIR}
378 -docdir ${QTDOCDIR} 372 -docdir ${QTDOCDIR}
379 -headerdir ${QTHEADERDIR} 373 -headerdir ${QTHEADERDIR}
380 -plugindir ${QTPLUGINDIR} 374 -plugindir ${QTPLUGINDIR}
381 $(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR}) 375 -importdir ${QTIMPORTDIR}
382 -datadir ${QTDATADIR} 376 -datadir ${QTDATADIR}
383 -translationdir ${QTTRANSDIR} 377 -translationdir ${QTTRANSDIR}
384 -sysconfdir ${QTSYSCONFDIR} 378 -sysconfdir ${QTSYSCONFDIR}
385 -examplesdir ${QTEXAMPLESDIR} 379 -examplesdir ${QTEXAMPLESDIR}
386 -demosdir ${QTDEMOSDIR} 380 -demosdir ${QTDEMOSDIR}
550 544
551# @FUNCTION: qt4-build_src_install 545# @FUNCTION: qt4-build_src_install
552# @DESCRIPTION: 546# @DESCRIPTION:
553# Perform the actual installation including some library fixes. 547# Perform the actual installation including some library fixes.
554qt4-build_src_install() { 548qt4-build_src_install() {
555 [[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
556 setqtenv 549 setqtenv
557 550
558 install_directories ${QT4_TARGET_DIRECTORIES} 551 install_directories ${QT4_TARGET_DIRECTORIES}
559 install_qconfigs 552 install_qconfigs
560 fix_library_files 553 fix_library_files
561 fix_includes 554 fix_includes
562 555
563 # remove .la files since we are building only shared Qt libraries 556 # remove .la files since we are building only shared libraries
564 find "${D}"${QTLIBDIR} -type f -name '*.la' -print0 | xargs -0 rm -f 557 prune_libtool_files
565} 558}
566 559
567# @FUNCTION: setqtenv 560# @FUNCTION: setqtenv
568# @INTERNAL 561# @INTERNAL
569setqtenv() { 562setqtenv() {
570 # Set up installation directories 563 # Set up installation directories
571 QTPREFIXDIR=${EPREFIX}/usr 564 QTPREFIXDIR=${EPREFIX}/usr
572 QTBINDIR=${EPREFIX}/usr/bin 565 QTBINDIR=${QTPREFIXDIR}/bin
573 QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4 566 QTLIBDIR=${QTPREFIXDIR}/$(get_libdir)/qt4
574 QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig 567 QTPCDIR=${QTPREFIXDIR}/$(get_libdir)/pkgconfig
575 QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV} 568 QTDOCDIR=${QTPREFIXDIR}/share/doc/qt-${PV}
576 QTHEADERDIR=${EPREFIX}/usr/include/qt4 569 QTHEADERDIR=${QTPREFIXDIR}/include/qt4
577 QTPLUGINDIR=${QTLIBDIR}/plugins 570 QTPLUGINDIR=${QTLIBDIR}/plugins
578 QTIMPORTDIR=${QTLIBDIR}/imports 571 QTIMPORTDIR=${QTLIBDIR}/imports
579 QTDATADIR=${EPREFIX}/usr/share/qt4 572 QTDATADIR=${QTPREFIXDIR}/share/qt4
580 QTTRANSDIR=${QTDATADIR}/translations 573 QTTRANSDIR=${QTDATADIR}/translations
581 QTSYSCONFDIR=${EPREFIX}/etc/qt4 574 QTSYSCONFDIR=${EPREFIX}/etc/qt4
582 QTEXAMPLESDIR=${QTDATADIR}/examples 575 QTEXAMPLESDIR=${QTDATADIR}/examples
583 QTDEMOSDIR=${QTDATADIR}/demos 576 QTDEMOSDIR=${QTDATADIR}/demos
584 QMAKE_LIBDIR_QT=${QTLIBDIR} 577 QMAKE_LIBDIR_QT=${QTLIBDIR}
585 QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
586 578
587 PLATFORM=$(qt_mkspecs_dir) 579 PLATFORM=$(qt_mkspecs_dir)
588 unset QMAKESPEC 580 unset QMAKESPEC
589 581
590 export XDG_CONFIG_HOME="${T}" 582 export XDG_CONFIG_HOME="${T}"
594# @USAGE: < directories > 586# @USAGE: < directories >
595# @INTERNAL 587# @INTERNAL
596# @DESCRIPTION: 588# @DESCRIPTION:
597# Generates Makefiles for the given list of directories. 589# Generates Makefiles for the given list of directories.
598prepare_directories() { 590prepare_directories() {
591 # avoid running over the maximum argument number, bug #299810
592 {
593 echo "${S}"/mkspecs/common/*.conf
594 find "${S}" -name '*.pr[io]'
595 } | xargs sed -i \
596 -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
597 -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
598 || die
599
599 for x in "$@"; do 600 for x in "$@"; do
600 pushd "${S}"/${x} >/dev/null || die 601 pushd "${S}"/${x} >/dev/null || die
601 einfo "Running qmake in: ${x}" 602 einfo "Running qmake in: ${x}"
602 # avoid running over the maximum argument number, bug #299810 603 "${S}"/bin/qmake \
603 { 604 "LIBS+=-L${QTLIBDIR}" \
604 echo "${S}"/mkspecs/common/*.conf 605 "CONFIG+=nostrip" \
605 find "${S}" -name '*.pr[io]' 606 || die "qmake failed"
606 } | xargs sed -i \
607 -e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
608 -e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
609 || die
610 "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
611 popd >/dev/null || die 607 popd >/dev/null || die
612 done 608 done
613} 609}
614
615 610
616# @FUNCTION: build_directories 611# @FUNCTION: build_directories
617# @USAGE: < directories > 612# @USAGE: < directories >
618# @INTERNAL 613# @INTERNAL
619# @DESCRIPTION: 614# @DESCRIPTION:
620# Compiles the code in the given list of directories. 615# Compiles the code in the given list of directories.
621build_directories() { 616build_directories() {
622 for x in "$@"; do 617 for x in "$@"; do
623 pushd "${S}"/${x} >/dev/null || die 618 pushd "${S}"/${x} >/dev/null || die
619 emake \
620 AR="$(tc-getAR) cqs" \
624 emake CC="$(tc-getCC)" \ 621 CC="$(tc-getCC)" \
625 CXX="$(tc-getCXX)" \ 622 CXX="$(tc-getCXX)" \
626 LINK="$(tc-getCXX)" || die "emake failed" 623 LINK="$(tc-getCXX)" \
624 RANLIB=":" \
625 STRIP=":" \
626 || die "emake failed"
627 popd >/dev/null || die 627 popd >/dev/null || die
628 done 628 done
629} 629}
630 630
631# @FUNCTION: install_directories 631# @FUNCTION: install_directories
870 fi 870 fi
871 871
872 echo "${spec}" 872 echo "${spec}"
873} 873}
874 874
875# @FUNCTION: qt_assistant_cleanup
876# @INTERNAL
877# @DESCRIPTION:
878# Tries to clean up tools.pro for qt-assistant ebuilds.
879# Meant to be called in src_prepare().
880# Since Qt 4.7.4 this function is a no-op.
881qt_assistant_cleanup() {
882 # apply patching to qt-assistant ebuilds only
883 [[ ${PN} != qt-assistant ]] && return
884
885 # no longer needed for 4.7.4 and later
886 version_is_at_least 4.7.4 && return
887
888 # different versions (and branches...) may need different handling,
889 # add a case if you need special handling
890 case "${MY_PV_EXTRA}" in
891 *kde-qt*)
892 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
893 -e "/mac/,/^embedded.*makeqpf$/d" \
894 -i tools/tools.pro || die "patching tools.pro failed"
895 ;;
896 *)
897 sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
898 -e "/mac/,/^embedded.*makeqpf$/d" \
899 -e "s/^\([ \t]*pixeltool\) /\1 qdoc3 /" \
900 -i tools/tools.pro || die "patching tools.pro failed"
901 ;;
902 esac
903}
904
905# @FUNCTION: qt_nolibx11 875# @FUNCTION: qt_nolibx11
906# @INTERNAL 876# @INTERNAL
907# @DESCRIPTION: 877# @DESCRIPTION:
908# Ignore X11 tests for packages that don't need X libraries installed. 878# Ignore X11 tests for packages that don't need X libraries installed.
909qt_nolibx11() { 879qt_nolibx11() {

Legend:
Removed from v.1.132  
changed lines
  Added in v.1.139

  ViewVC Help
Powered by ViewVC 1.1.20