diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2009-02-25 07:02:42 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2009-02-25 07:02:42 +0000 |
| commit | 2fd136a84bdf6a189cefdb650707ef86dc75741e (patch) | |
| tree | ff2a759c908c5fbf69ca889e6dcef0be10758f54 /x11-themes/qtcurve-qt4 | |
| parent | version bump (diff) | |
| download | gentoo-2-2fd136a84bdf6a189cefdb650707ef86dc75741e.tar.gz gentoo-2-2fd136a84bdf6a189cefdb650707ef86dc75741e.tar.bz2 gentoo-2-2fd136a84bdf6a189cefdb650707ef86dc75741e.zip | |
Add fix for compilation with Qt 4.5, thanks to Alex Alexander.
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'x11-themes/qtcurve-qt4')
| -rw-r--r-- | x11-themes/qtcurve-qt4/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.2.ebuild | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/x11-themes/qtcurve-qt4/ChangeLog b/x11-themes/qtcurve-qt4/ChangeLog index 9016bb4f39ad..1978d26de645 100644 --- a/x11-themes/qtcurve-qt4/ChangeLog +++ b/x11-themes/qtcurve-qt4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-themes/qtcurve-qt4 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.54 2009/02/24 23:30:05 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.55 2009/02/25 07:02:42 yngwin Exp $ + + 25 Feb 2009; Ben de Groot <yngwin@gentoo.org> qtcurve-qt4-0.61.2: + Add fix for compilation with Qt 4.5, thanks to Alex Alexander. Move sedding + to src_prepare. *qtcurve-qt4-0.61.2 (24 Feb 2009) diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.2.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.2.ebuild index 94705dc3e1e3..3ff39f8c3b6e 100644 --- a/x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.2.ebuild +++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.2.ebuild,v 1.1 2009/02/24 23:30:05 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.2.ebuild,v 1.2 2009/02/25 07:02:42 yngwin Exp $ EAPI="2" inherit flag-o-matic cmake-utils @@ -22,10 +22,12 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" DOCS="ChangeLog README TODO" -src_compile() { +src_prepare() { + if has_version '>=x11-libs/qt-gui-4.5.0_rc1'; then + sed -i "s/QStyleOptionTabV2/QStyleOptionTabV3/" "${S}"/style/qtcurve.cpp + fi if use !kde ; then append-cppflags "-DQTC_NO_KDE4_LINKING=true -DQTC_DISABLE_KDEFILEDIALOG_CALLS=true"; sed -i "s/find_package(KDE4)/#&/" "${S}"/CMakeLists.txt fi - cmake-utils_src_compile } |