summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Alexander <wired@gentoo.org>2010-06-29 15:50:40 +0000
committerAlex Alexander <wired@gentoo.org>2010-06-29 15:50:40 +0000
commit3dc150acfa2e4cca85ebedaffb545c1ed837372f (patch)
tree60adaad5742a32c29eeb6547e7269a68e39e1a38 /x11-themes/qtcurve-qt4
parentFix building with -Wl,--as-needed wrt #276506 by Kacper Kowalik. (diff)
downloadgentoo-2-3dc150acfa2e4cca85ebedaffb545c1ed837372f.tar.gz
gentoo-2-3dc150acfa2e4cca85ebedaffb545c1ed837372f.tar.bz2
gentoo-2-3dc150acfa2e4cca85ebedaffb545c1ed837372f.zip
qtcurve-qt4: fixed bug #326017
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-themes/qtcurve-qt4')
-rw-r--r--x11-themes/qtcurve-qt4/ChangeLog5
-rw-r--r--x11-themes/qtcurve-qt4/qtcurve-qt4-1.5.0.ebuild11
2 files changed, 14 insertions, 2 deletions
diff --git a/x11-themes/qtcurve-qt4/ChangeLog b/x11-themes/qtcurve-qt4/ChangeLog
index cf1cb01cc0dd..038ff5c3349e 100644
--- a/x11-themes/qtcurve-qt4/ChangeLog
+++ b/x11-themes/qtcurve-qt4/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-themes/qtcurve-qt4
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.105 2010/06/28 11:39:34 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/ChangeLog,v 1.106 2010/06/29 15:50:40 wired Exp $
+
+ 29 Jun 2010; Alex Alexander <wired@gentoo.org> qtcurve-qt4-1.5.0.ebuild:
+ fixed bug #326017
*qtcurve-qt4-1.5.0 (28 Jun 2010)
diff --git a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.5.0.ebuild b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.5.0.ebuild
index bd5b1b9ff061..b1f40a151d84 100644
--- a/x11-themes/qtcurve-qt4/qtcurve-qt4-1.5.0.ebuild
+++ b/x11-themes/qtcurve-qt4/qtcurve-qt4-1.5.0.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-themes/qtcurve-qt4/qtcurve-qt4-1.5.0.ebuild,v 1.1 2010/06/28 11:39:34 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qtcurve-qt4/qtcurve-qt4-1.5.0.ebuild,v 1.2 2010/06/29 15:50:40 wired Exp $
EAPI="2"
KDE_REQUIRED="optional"
@@ -31,6 +31,15 @@ pkg_setup() {
use kde && kde4-base_pkg_setup
}
+src_prepare() {
+ if use kde && ! use windeco; then
+ sed -e "/#include <kdecoration.h>/d" \
+ -e "s/if(KDecorationDefines::BorderTiny==size)/if(0==size)/" \
+ -i "${S}"/kwin/qtcurveconfig.cpp ||
+ die "sed failed"
+ fi
+}
+
src_configure() {
if use kde; then
kde4-base_src_configure