Gentoo Archives: gentoo-commits

From: "Alex Alexander (wired)" <wired@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-themes/qtcurve-qt4/files: qtcurve-qt4-1.1.0-no-kde-fail.patch
Date: Tue, 23 Feb 2010 08:08:12
Message-Id: E1NjpoQ-0004kn-Hk@stork.gentoo.org
1 wired 10/02/23 08:08:10
2
3 Added: qtcurve-qt4-1.1.0-no-kde-fail.patch
4 Log:
5 [x11-themes/qtcurve-qt4] version bump, patch to fix -kde compilation
6 (Portage version: 2.2_rc63/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.0-no-kde-fail.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.0-no-kde-fail.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.0-no-kde-fail.patch?rev=1.1&content-type=text/plain
13
14 Index: qtcurve-qt4-1.1.0-no-kde-fail.patch
15 ===================================================================
16 --- style/qtcurve.cpp.old 2010-02-23 00:15:27.000000000 +0200
17 +++ style/qtcurve.cpp 2010-02-23 10:04:39.547860699 +0200
18 @@ -7445,7 +7445,8 @@
19
20 opt.state=State_Horizontal|State_Enabled|State_Raised|(active ? State_Active : State_None);
21
22 -#if KDE_IS_VERSION(4, 3, 0)
23 +#ifndef QTC_QT_ONLY
24 + #if KDE_IS_VERSION(4, 3, 0)
25 QPainterPath path(opts.round<ROUND_SLIGHT
26 ? QPainterPath()
27 : buildPath(QRectF(state&QtC_StateKWinNoBorder ? r : r.adjusted(1, 1, -1, 0)),
28 @@ -7454,6 +7455,9 @@
29 (opts.round>ROUND_SLIGHT /*&& kwin*/
30 ? 6.0
31 : 2.0)-(state&QtC_StateKWinNoBorder ? 0.0 : 1.0)));
32 + #else
33 + QPainterPath path;
34 + #endif
35 #else
36 QPainterPath path;
37 #endif