From: Alex Alexander <wired@gentoo.org>
Date: Tue, 29 Jun 2010 15:50:40 +0000 (+0000)
Subject: qtcurve-qt4: fixed bug #326017
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=dd17103f9964aefcf618846d923ab0f32b3f5eb4;p=gentoo.git

qtcurve-qt4: fixed bug #326017
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

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/Manifest b/x11-themes/qtcurve-qt4/Manifest
index c0a518365387..b7664b8d819e 100644
--- a/x11-themes/qtcurve-qt4/Manifest
+++ b/x11-themes/qtcurve-qt4/Manifest
@@ -18,23 +18,23 @@ EBUILD qtcurve-qt4-1.4.0.ebuild 1116 RMD160 db6c6ece526c003e600a49efef094fb3b7b6
 EBUILD qtcurve-qt4-1.4.1.ebuild 1116 RMD160 526b7b8d9c8b70f115fa705b1f29c2c8d3c8ad6b SHA1 b952a62e903d57ef0675e7281b4d8e28818b1610 SHA256 f236b10f84d5d1baf40ec927278a80971fc2a14a3027de4e855cae4a343c9ca2
 EBUILD qtcurve-qt4-1.4.2.ebuild 1116 RMD160 c91b521c955d1520662a7980e1ecda3995e826cf SHA1 290461f579928a3640358bd6387df8cf80408782 SHA256 38edd07ec9ec360e40b71bd13c14ae5b68dd5ff2fd7d8b1592f7d59e0d9c9a56
 EBUILD qtcurve-qt4-1.4.3.ebuild 1116 RMD160 05b14fe2a606767ccc36ac7c6640ddd51e1337d7 SHA1 9e6de1d3493e6cb1fb835ec5be3ef6edeecd9eb8 SHA256 a473eae9e39e597c8ae6428acb29446a5e2c94ff5334f8ffbdf6c101ae6d0b65
-EBUILD qtcurve-qt4-1.5.0.ebuild 1116 RMD160 56cd34f5a22b3433958c1e952f1c01f46c87dabc SHA1 d2d330c51a750b695e3e2f10366bd6894e1760eb SHA256 25c8ee986f923bf73555425d64a3ffd2a94e604b2840aa11c139f000d13c9c77
-MISC ChangeLog 16720 RMD160 041744aae55fec0a83ad9c1068ac8cdbda3d767a SHA1 498ebe2be90abc7207f3e708dfcd2f634004896a SHA256 63ff014003047344632a29a8f8f3b2c624fc25284d6ec912ef642abe32219b4f
+EBUILD qtcurve-qt4-1.5.0.ebuild 1341 RMD160 432d61888eef650ce280ecb1e7399d61e78c829e SHA1 a4e563418a2a2fbb6829885e07480d617459c5af SHA256 ab48f6b9858a663011e6294763da68383aa47ef81c5cfebf08371dcb7fa076d4
+MISC ChangeLog 16816 RMD160 5c01bc4eada438ac282de4a329f51f508cca8d22 SHA1 3b9e90fff7dc6db1219d4d1c8920adcc1d0902bd SHA256 79de25bc8f39efa68eef1ce01f469b33ef036a527292d4f8d276071ea6d708c7
 MISC metadata.xml 364 RMD160 f675a6f801000baeba8948174e3fa294b302dfef SHA1 df345953fedf8b7c1ed7a426619765b73da4804d SHA256 71fd09f777a8111528c40a781e949f94e14d73a1264d5d0a60b25c81a262e32b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iQIcBAEBCAAGBQJMKIq4AAoJEDZF8K7rm0r6ZhYP/3GFETDpjIshSqRzDoeSpAfE
-QEzUIdYMnUwwenVOByQ9Q0INpQpE0+URFNkKlUi7Gpb2J+0tDhZRe37fGxDibN13
-LMoX5JJrRH3GS8/QxVRf4AW2mFNNw95Xtr8QK7yJC9FGoP7rF57VUNT1FEmSQWXh
-TrR4Fo3K98w7n3yl6siSaSAECwqPduYgETYZ3g/XhGyfFqq8HrHpVSnVmOzFmEr3
-fCL2Em9G49Sv72l6gtSP5n4nZ6oVP1YHUtc3/64afjhq77d3eTQWrFy17V9LYGAM
-zYQhnw7xLJWJT1UzCLifPqy5Ku7r1w5WA8lbDJ2Ld014WIPbeO6837sk7fBvPKlr
-Rnm8lyDiWEjWqPSyxw+J+yaY7hbsnUzhiSIDVW8Qban8vJxzp/qqM8/n9Lu6CoOJ
-zneXX3FyBKdo5FFRxFB587xsTcyHcfBHoO0BC9J/x4qm6KjCZzsWr+GPb0wsXz1J
-z9bGJpJj6B+OOkpN+d8I2sXNM013rAgq4hm6fcdIIPpD+Muf9krTztUrnkIODmPS
-PBBhbABm48GdMTp9fgXIL4BS1VuuZfInbqG3pC3oQvymuFCXLfQVyXOJv/qOiQv4
-H2tdjkErf6SKSoz9vHmVCSNN/LUP7CcPPZ93REYmWRc6ttB+kxMv+aFT1u3yS3q5
-wnb1iEN6cCZ0PPkAjkJX
-=nWpk
+iQIcBAEBCAAGBQJMKhcbAAoJEDZF8K7rm0r6XcIQAKy0RYPQoMIhZt2z25shptNc
+w1v9oC8aWrhRBF2Kj4usgtw0jll1rYSky7wynhxSpzz7vQ4cEP90Wt+cYqcYcVEy
+BqePA4GOoeEpApDsSLMLFYZpdoOqtWI8lwyL5U1D0rGOC47G7mzTCkVzcAnAlwby
+4xbeNbBMkiYSoq9ESVLzoCFbBpeUttiIZTDsf1JmIoK9oL7NrmvtrWJO5YpmZ86q
+KJziSu8ryx+bORDLQGTYqB984ii71U8emPlAcAWXwIZzGnUj6+xLIw2rGNa1wnSF
++fvodqLx0SMGIfsHkttIWDjRKn82XzbepvnP2HTykWqyy+IOQ/qFBkxAhd8tOOdP
+aXWSHsJn5OX3DUxjHDSVR3zNPkNUB2TMvt0Iu+KMYjJV1SkLoDv7hefFy4YG9+mf
+N4fy8HbrrmS4lq1Cez3QTyj82gHbutrWQNjxyG/E3YSGm8T8AaSwcYg5IvLCcCbU
+X4+ANp7ODgMXKEWz19GdgdZDT2L58CZYGEg0JEFWcSJDYfJYas4kj5Fyncp+97Vj
+MM1GHI77k9Kp6eOiUAlQmljYFvmUfPA84r+wIXAx2OKiphKg86WzIsaOG1eJOmzr
+06WaAn2FWHQb9Eu6vCRPCmT+FsET/2N0ev5PBzfTwz/kLCyk7/6Up70AqFrBWjtb
++p+I/6wOIT5nbtDE2GIH
+=yiWw
 -----END PGP SIGNATURE-----
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