| 1 |
yngwin 09/02/25 07:02:42 |
| 2 |
|
| 3 |
Modified: ChangeLog qtcurve-qt4-0.61.2.ebuild |
| 4 |
Log: |
| 5 |
Add fix for compilation with Qt 4.5, thanks to Alex Alexander. |
| 6 |
(Portage version: 2.2_rc23/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.55 x11-themes/qtcurve-qt4/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog?rev=1.55&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog?rev=1.55&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog?r1=1.54&r2=1.55 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v |
| 18 |
retrieving revision 1.54 |
| 19 |
retrieving revision 1.55 |
| 20 |
diff -u -r1.54 -r1.55 |
| 21 |
--- ChangeLog 24 Feb 2009 23:30:05 -0000 1.54 |
| 22 |
+++ ChangeLog 25 Feb 2009 07:02:42 -0000 1.55 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for x11-themes/qtcurve-qt4 |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.54 2009/02/24 23:30:05 yngwin Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.55 2009/02/25 07:02:42 yngwin Exp $ |
| 28 |
+ |
| 29 |
+ 25 Feb 2009; Ben de Groot <yngwin@g.o> qtcurve-qt4-0.61.2: |
| 30 |
+ Add fix for compilation with Qt 4.5, thanks to Alex Alexander. Move sedding |
| 31 |
+ to src_prepare. |
| 32 |
|
| 33 |
*qtcurve-qt4-0.61.2 (24 Feb 2009) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.2.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.2.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.2.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.2.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: qtcurve-qt4-0.61.2.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-0.61.2.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- qtcurve-qt4-0.61.2.ebuild 24 Feb 2009 23:30:05 -0000 1.1 |
| 51 |
+++ qtcurve-qt4-0.61.2.ebuild 25 Feb 2009 07:02:42 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2009 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $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 $ |
| 56 |
+# $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 $ |
| 57 |
|
| 58 |
EAPI="2" |
| 59 |
inherit flag-o-matic cmake-utils |
| 60 |
@@ -22,10 +22,12 @@ |
| 61 |
S="${WORKDIR}/${MY_P}" |
| 62 |
DOCS="ChangeLog README TODO" |
| 63 |
|
| 64 |
-src_compile() { |
| 65 |
+src_prepare() { |
| 66 |
+ if has_version '>=x11-libs/qt-gui-4.5.0_rc1'; then |
| 67 |
+ sed -i "s/QStyleOptionTabV2/QStyleOptionTabV3/" "${S}"/style/qtcurve.cpp |
| 68 |
+ fi |
| 69 |
if use !kde ; then |
| 70 |
append-cppflags "-DQTC_NO_KDE4_LINKING=true -DQTC_DISABLE_KDEFILEDIALOG_CALLS=true"; |
| 71 |
sed -i "s/find_package(KDE4)/#&/" "${S}"/CMakeLists.txt |
| 72 |
fi |
| 73 |
- cmake-utils_src_compile |
| 74 |
} |
Archives