diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-12-10 19:18:39 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-12-10 19:18:39 +0000 |
| commit | 47827296044908706f259ec9635a6c1e2bafcf05 (patch) | |
| tree | 198de98ea62c521302a883e573922b29c2bb7676 /x11-libs/qt-gui | |
| parent | Version bump (diff) | |
| download | gentoo-2-47827296044908706f259ec9635a6c1e2bafcf05.tar.gz gentoo-2-47827296044908706f259ec9635a6c1e2bafcf05.tar.bz2 gentoo-2-47827296044908706f259ec9635a6c1e2bafcf05.zip | |
Fix installation of private headers for OSX Framework builds, bug #346221
(Portage version: 2.2.01.17304-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'x11-libs/qt-gui')
| -rw-r--r-- | x11-libs/qt-gui/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt-gui/qt-gui-4.7.1-r1.ebuild | 26 |
2 files changed, 24 insertions, 7 deletions
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index 314ea60e0e5a..2615944756a7 100644 --- a/x11-libs/qt-gui/ChangeLog +++ b/x11-libs/qt-gui/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-gui # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.134 2010/12/05 22:10:16 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.135 2010/12/10 19:18:39 grobian Exp $ + + 10 Dec 2010; Fabian Groffen <grobian@gentoo.org> qt-gui-4.7.1-r1.ebuild: + Fix installation of private headers for OSX Framework builds, bug #346221 05 Dec 2010; Alex Alexander <wired@gentoo.org> -qt-gui-4.6.3-r1.ebuild, -qt-gui-4.7.0.ebuild, -qt-gui-4.7.1.ebuild: diff --git a/x11-libs/qt-gui/qt-gui-4.7.1-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.7.1-r1.ebuild index 516397566822..ab626f8fa9d5 100644 --- a/x11-libs/qt-gui/qt-gui-4.7.1-r1.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.7.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.1-r1.ebuild,v 1.3 2010/12/05 19:53:27 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.1-r1.ebuild,v 1.4 2010/12/10 19:18:39 grobian Exp $ EAPI="3" inherit confutils qt4-build @@ -129,8 +129,11 @@ src_install() { qt4-build_src_install - # remove some unnecessary headers - rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/{qmacstyle_mac.h,qwindowdefs_win.h} \ + # remove unnecessary Windows headers + rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/qwindowdefs_win.h + # remove Mac OS X headers + use aqua || rm -f \ + "${D}${QTHEADERDIR}"/{Qt,QtGui}/qmacstyle_mac.h \ "${D}${QTHEADERDIR}"/QtGui/QMacStyle # qt-creator @@ -140,15 +143,26 @@ src_install() { # which are located under tools/designer/src/lib/* # So instead of installing both, we create the private folder # and drop tools/designer/src/lib/* headers in it. - dodir /usr/include/qt4/QtDesigner/private/ || die - insinto /usr/include/qt4/QtDesigner/private/ + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then + insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/ + else + insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/ + fi doins "${S}"/tools/designer/src/lib/shared/* || die doins "${S}"/tools/designer/src/lib/sdk/* || die #install private headers if use private-headers; then - insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then + insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/ + else + insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private + fi find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \; fi + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then + # rerun to get links to headers right + fix_includes + fi # install correct designer and linguist icons, bug 241208 doicon tools/linguist/linguist/images/icons/linguist-128-32.png \ |