Add patch to fix cairo rendering problem, bug #436742

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

4 files changed, 66 insertions, 13 deletions

diff --git a/x11-themes/gtk-engines-qtcurve/ChangeLog b/x11-themes/gtk-engines-qtcurve/ChangeLog
index de35972c80ca..8f0babae0bf6 100644
--- a/x11-themes/gtk-engines-qtcurve/ChangeLog
+++ b/x11-themes/gtk-engines-qtcurve/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/gtk-engines-qtcurve
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/ChangeLog,v 1.122 2012/08/22 12:19:55 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/ChangeLog,v 1.123 2012/11/14 08:48:15 yngwin Exp $
+
+*gtk-engines-qtcurve-1.8.15-r1 (14 Nov 2012)
+
+  14 Nov 2012; Ben de Groot <yngwin@gentoo.org>
+  +files/gtk-engines-qtcurve-1.8.15-cairo.patch,
+  +gtk-engines-qtcurve-1.8.15-r1.ebuild:
+  Add patch to fix cairo rendering problem, bug #436742
 
   22 Aug 2012; Michael Weber <xmw@gentoo.org> gtk-engines-qtcurve-1.8.15.ebuild:
   ppc stable (bug 411845).
diff --git a/x11-themes/gtk-engines-qtcurve/Manifest b/x11-themes/gtk-engines-qtcurve/Manifest
index 053cdc0abab2..25a854c619f1 100644
--- a/x11-themes/gtk-engines-qtcurve/Manifest
+++ b/x11-themes/gtk-engines-qtcurve/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX gtk-engines-qtcurve-1.8.15-cairo.patch 360 SHA256 f49862dd1a4cf877a67a31b716bd1fc5e78bc398a057549c8909bfbf421aadbf SHA512 c7202e8cd0f7d81399acd9fa3200c3dd0b6c1d433a25fcd9eb7fc3f961ff9c871be62937355bd8ccceb4da83bccc61e6b1be5afad182920ce5f10037b3273a16 WHIRLPOOL e91011606085e0960bd4cd899a2dc42b7bc8203f69887e6d9c023507538c384ab447d058e6266e5c9fd7546e93daf226e9e525736731389cbc3475f824bbb15a
 DIST QtCurve-Gtk2-1.6.4.tar.bz2 142767 SHA256 cada5fbba041a050ddc34ca4059bbb9221f5585a003c1488b4878d32e51b7328
-DIST QtCurve-Gtk2-1.8.15.tar.bz2 184361 SHA256 ee7f75ba6052b4c70924b70191856fac3cc93df5b69deef2b424514c88b85abf
+DIST QtCurve-Gtk2-1.8.15.tar.bz2 184361 SHA256 ee7f75ba6052b4c70924b70191856fac3cc93df5b69deef2b424514c88b85abf SHA512 d814f8851e3979b2dd40f7702fc24569e51bd35a937049aa3825dfc282db05bf443f9ce345c1bcc03f70b240ef2f339befee58a4fa76579446327a51d6d92431 WHIRLPOOL 6b8c9c99056d9af7f5d7b54ad2b13daf78a8e12c0fc11b3ef2146ea204f3a6aaca80c3468d7ec68ec3143148bf0093342a8f5aad3285ef94be8c06052c18579a
 EBUILD gtk-engines-qtcurve-1.6.4.ebuild 1098 SHA256 d39b5d6613dcfd48bf481ef6659177679f2e5d7dea02468086aa6d3302371bef SHA512 03669ac68406f84ae61fc77a96b1d672e0bf046c5aeeaac4edf2e4eaea244055a460284e76f06be1ec1dae8d73116fefd79fde718306885545434e8dda78c7a2 WHIRLPOOL 8a6eeffccaaa0e4d2aa2f78af5f6e9c798eca95ed68fbac0db05f868fc5d805ff1fc81a507afb8299e3cbcaa1be756359c32c2cdd13d4c2fd7981edf8d3eb30a
+EBUILD gtk-engines-qtcurve-1.8.15-r1.ebuild 1106 SHA256 36d223390ce9173dbc981fd9ea1f62d3aa26042478c1bcb00d3627d61514de2d SHA512 d98bb62b974dbf1a2c003484bf41d442364c34115cbcdaf4fc04554fad10efaf9823392c8b1814547a8d5e5a27535311761b0b1ac96b1b1a1b38612565b1586f WHIRLPOOL 5636aedc7e59e10278d33a7fa4e4f7f8a657dc07f9c488e0bd71a2857bd165123f0d8d62885eeb249eccc361a31c306f43b6b11b8a92ae96ebf70e8fdbbf9991
 EBUILD gtk-engines-qtcurve-1.8.15.ebuild 1014 SHA256 e22e52c00bd3bf60348a93cd1937357ae68b29773f5bc7e6743bc20c008b95fa SHA512 9e4561a05363643800f754d4a819586463b1faff35ae32b099d349cd1d4516d70d678c6755260a0d7b6fe8ffc19b93cc3b192c084247046f6b87728fb065be0e WHIRLPOOL 64c16e63588a4951ff0d35e6195079933841b9515a29a5b77b10c0b29b31a989c38e0bfbef6ebc70dc8d9c74dcb51356d14a01fca349eae0ca50b98b6cd7d5a9
-MISC ChangeLog 8097 SHA256 513d144708a298208d17216b972b1dc46fd939fe4a0b53a3e9f0990b74a0a45a SHA512 8600aa3fa6a8c7100d9380645be5dc66e442faa212920aa3af01cfa995e5fa5a8439f5b02e3ce74deb18ff32b8e269a00a230f12c030c75bdae148dd7ce9ce7b WHIRLPOOL 42c52863bb96456856df9e8d00aef4891047dbd1fba569112631715e9d50e07b267619eceb093e4f62605f926b17b9abf0a35727de247b50d7bbd451a93432e0
+MISC ChangeLog 8341 SHA256 c059bde9fcd4176f6878de45f9e4496c03e3d3f03d21b2c194d54535c0024cdc SHA512 432c5ad9c02da7e7ec86d6dade55b6b8291514269728611e5ed68a97c636c8d7fac80b2070bfb9b507b5afe0b0edf75a86162c0c74ca1ceb794b877ede1d3e37 WHIRLPOOL 41d9e3b288f540565a0ff301307d600479c3d7bf38c56aebb5e7506177e17c32c8bd623beed6ad61fda1b5e44304daf5180a08d5c3b27184899c574dcb1d0906
 MISC metadata.xml 614 SHA256 abf24345d71c8024681c614c2da0710461f49c2105b9dcb89518e17528085317 SHA512 615aa3755023c6c886dc885a9be9a9d71fd088c7a35d27883c78cb535c99c9b0758d702d510f5d4f16dfb02015e3761eae141fe6d1b0f090dda83667c953cf03 WHIRLPOOL 9430e92e5b79d90c8bfd22c7c7940d739274ce7888705fba45dbd0247bf575eaed609865211288514fe0e86483f61098e5cbad52ca830109dd657f9cbf2b05c4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF4EAREIAAYFAlA0znYACgkQknrdDGLu8JBFSwD+M7/DS9IeJbH02MA6dHEMJ/CK
-Lp6TsXbFmvyRcoJ/UFwA/jePCaGpUkz9JWJimW8IhKQ5BwAFRF5BO8wAnykt5bM/
-=7RCP
------END PGP SIGNATURE-----
diff --git a/x11-themes/gtk-engines-qtcurve/files/gtk-engines-qtcurve-1.8.15-cairo.patch b/x11-themes/gtk-engines-qtcurve/files/gtk-engines-qtcurve-1.8.15-cairo.patch
new file mode 100644
index 000000000000..8ed758050b74
--- /dev/null
+++ b/x11-themes/gtk-engines-qtcurve/files/gtk-engines-qtcurve-1.8.15-cairo.patch
@@ -0,0 +1,10 @@
+--- style/shadowhelper.c.orig	2012-11-14 16:28:32.763379377 +0800
++++ style/shadowhelper.c	2012-11-14 16:30:51.966615332 +0800
+@@ -58,6 +58,7 @@
+         cairo_rectangle(cr, 0, 0, shadowSize, shadowSize);
+         cairo_fill(cr);
+         cairo_destroy(cr);
++        cairo_surface_destroy(dest);
+         g_object_unref(pixbuf);
+         return pixmap;
+     }
diff --git a/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.15-r1.ebuild b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.15-r1.ebuild
new file mode 100644
index 000000000000..661d0e821c70
--- /dev/null
+++ b/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.15-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtcurve/gtk-engines-qtcurve-1.8.15-r1.ebuild,v 1.1 2012/11/14 08:48:15 yngwin Exp $
+
+EAPI=4
+inherit cmake-utils
+
+MY_P=${P/gtk-engines-qtcurve/QtCurve-Gtk2}
+
+DESCRIPTION="A set of widget styles for GTK2 based apps, also available for Qt4/KDE4"
+HOMEPAGE="http://www.kde-look.org/content/show.php?content=40492"
+SRC_URI="http://craigd.wikispaces.com/file/view/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="mozilla"
+
+CDEPEND="x11-libs/cairo
+	x11-libs/gtk+:2"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	mozilla? ( || (
+		>=www-client/firefox-3.0
+		>=www-client/firefox-bin-3.0
+		>=www-client/icecat-3.0
+	) )"
+
+S=${WORKDIR}/${MY_P}
+DOCS="ChangeLog README TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-cairo.patch"
+	epatch_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DQTC_OLD_MOZILLA=OFF"
+		$(cmake-utils_use mozilla QTC_MODIFY_MOZILLA)
+	)
+	cmake-utils_src_configure
+}