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 | 0bdc2b55c20a166df4acde91123aee750a8e0ab8 (patch) | |
| tree | 49d9f18f4f346d4687e4ba72565c9c334ad4cb73 /x11-themes | |
| parent | version bump (diff) | |
| download | historical-0bdc2b55c20a166df4acde91123aee750a8e0ab8.tar.gz historical-0bdc2b55c20a166df4acde91123aee750a8e0ab8.tar.bz2 historical-0bdc2b55c20a166df4acde91123aee750a8e0ab8.zip | |
Add fix for compilation with Qt 4.5, thanks to Alex Alexander.
Package-Manager: portage-2.2_rc23/cvs/Linux i686
Diffstat (limited to 'x11-themes')
| -rw-r--r-- | x11-themes/qtcurve-qt4/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-themes/qtcurve-qt4/Manifest | 4 | ||||
| -rw-r--r-- | x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.2.ebuild | 8 |
3 files changed, 12 insertions, 6 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/Manifest b/x11-themes/qtcurve-qt4/Manifest index 7c84d42d7c6a..7f63ae1e434c 100644 --- a/x11-themes/qtcurve-qt4/Manifest +++ b/x11-themes/qtcurve-qt4/Manifest @@ -8,6 +8,6 @@ EBUILD qtcurve-qt4-0.59.6-r1.ebuild 1108 RMD160 5cb1397e358e9141e779766c79e130d6 EBUILD qtcurve-qt4-0.59.6.ebuild 906 RMD160 7802c2f6c3714bc1dcf0779911a236937d2b2137 SHA1 f7e6dc3b09e7ca952200188f18a0412ceff8a572 SHA256 bd55fa7a4348cacc75bdc0529b2712ad940b311202db182a40c74ff84a7a17a5 EBUILD qtcurve-qt4-0.60.0.ebuild 971 RMD160 91e1431937294a2edf1b7cc69e385cd6881acda9 SHA1 727a3c30d70dceea76fd3367b12354d150c3f022 SHA256 2cbc14aab216d0ce6cc6fd59ab25460648b06d4180ea2e9a33d42a1734804003 EBUILD qtcurve-qt4-0.61.1.ebuild 971 RMD160 ba61864df7b94d623c9f946ad4f6fd6df6117bf9 SHA1 356987ac3683e0647c887ad7d3e9537518d93334 SHA256 d92c2efeb4a15eff6b44c5b8a76a002976f5faf2648cf3da1976a5501ede9a72 -EBUILD qtcurve-qt4-0.61.2.ebuild 971 RMD160 7be366370d26fcd2cd1d2543ba4a7cc1f626400e SHA1 fd3f55c80c92c0db6533da0e2aac05057a770a7d SHA256 e941c6eccbba3702612ecb1296f86d9e13115ea11b1d93ebbc0b1a8d41f0f842 -MISC ChangeLog 8330 RMD160 a923b15871d90396f4c416aca41f9ede7ffc2145 SHA1 ea05bda9e206bb670b6b9747c1504597854c0a60 SHA256 f8fe880e6378a48e2b67625db33a57355fce5de947eb1a478d4e753f33ae3edc +EBUILD qtcurve-qt4-0.61.2.ebuild 1077 RMD160 c3fe9ed751ae839d30a13a7987072c68434efd5d SHA1 96e0c13bd6055c2633e827e00cc04936a8f93a33 SHA256 d0f233e93fc7ca1e313e5bdbc287880ebecdc12af533eeb0307d615911f8adb4 +MISC ChangeLog 8495 RMD160 ad0eff43c9efb04a9da61a713af295e5b2fbdca8 SHA1 67284ab6820cfd9ff6c7b6e613b59c62f644523e SHA256 f0057bef6a742bed4cb89966eabac7c755c74d439dd42dc4b813146d1ac2165f MISC metadata.xml 408 RMD160 d14e2e25aad4cb4eb93661caf199a8c1eccc48c2 SHA1 aee2e1f5d8ab8bddfa6eaaa7516cf92ced698c81 SHA256 5d88cffd9d81f495104cdea9a4036e448d06c35387ef9c034cd009ba2639db3d 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 } |