Fix graphical corruption in window decorations with gtk+-3.4 (bug #411723 comment #3, thanks to Philipp Riegger).

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

4 files changed, 128 insertions, 6 deletions

diff --git a/x11-wm/muffin/ChangeLog b/x11-wm/muffin/ChangeLog
index b14a12894eda..871f4d627bef 100644
--- a/x11-wm/muffin/ChangeLog
+++ b/x11-wm/muffin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/muffin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/ChangeLog,v 1.3 2012/03/15 06:05:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/ChangeLog,v 1.4 2012/04/13 16:04:42 tetromino Exp $
+
+*muffin-1.0.2-r1 (13 Apr 2012)
+
+  13 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +muffin-1.0.2-r1.ebuild,
+  +files/muffin-1.0.2-frame-initialize-style-contexts.patch:
+  Fix graphical corruption in window decorations with gtk+-3.4 (bug #411723
+  comment #3, thanks to Philipp Riegger).
 
 *muffin-1.0.2 (15 Mar 2012)
 
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index a3b70e453146..2acf1c0f8655 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX muffin-1.0.2-frame-initialize-style-contexts.patch 1053 RMD160 2d7540ee760e0dbc489270a0f81007962040fe64 SHA1 c7ba47d8042d50d9ecc13199ae8f16c73c577c8b SHA256 1718f868b2e2f88519dfef69a67ecddcf411183579ea5497844cbbc11b324932
 DIST muffin-1.0.1.tar.gz 3120768 RMD160 bbc5d94d5e09abe9330e6a575c92912ead8d4c47 SHA1 2c227425bcc680c3ae6521c05f915e6364a5f925 SHA256 8fd972f08e3e51f5a66f9e8c026808235980fcf7a4f0da90591c98d009c72375
 DIST muffin-1.0.2.tar.gz 3127221 RMD160 d5dac9a7dd8eeb530667b6198e82da02441046e6 SHA1 3ce7bbdf30aaefafb2f0c9a5c2d9834b13fc5dad SHA256 a8ad2a0f45442f92d4864ab3fc9cc87dbba44f7ca558ddcbb0846da42a10b749
 EBUILD muffin-1.0.1.ebuild 1888 RMD160 0fa2ef95225a93cf15b93fd5e8baf497977c2838 SHA1 f045a7abb6075203d6bda58b24af854d5ebef7df SHA256 1f38e7e7b891411d52910d2be642ad28bb9803e21bcba73b1b3a43824a1c55ac
+EBUILD muffin-1.0.2-r1.ebuild 2064 RMD160 7fc819bb725ef9a01b200c98d8fb671a5da3792b SHA1 964fed613e1fd55f903fca5472950b3c394ad36a SHA256 9a2ba752f509e3277d65f6f3e9ba0b7e914025ebbf1a854a0623edb23248f8a4
 EBUILD muffin-1.0.2.ebuild 1888 RMD160 aa7b1bc678a731ffec5b2b813dea9b2fbc648820 SHA1 d0ca199cf658b560068702294099e6166809587e SHA256 1a1e017ff05ec71f1b6d3dbe6dabb288941af9a42bfadf7010baf2a0dc7cf8cf
-MISC ChangeLog 770 RMD160 4fefe6710ac779d6aa94f12d135c12aa94049d3b SHA1 1234c81dbb5052f173654eea68ca4a5b00c7899c SHA256 d5f5406a5544731d8d47af46533d8b0ac3b7e839e42c063d6bcf3208f5d15b1a
+MISC ChangeLog 1068 RMD160 01a493c3f6fbbed703af3af65c7dcacea1fec508 SHA1 6f3918594715a61dfe4188197f24ea9c608362be SHA256 3ffee43c433346209321d1685fd9097178a1c9516e3391a45d66898759d46b94
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk9hhp0ACgkQdjK8w9WeBnA+WQD/e1f+cxFkkCI6vOLf3+pLVfzJ
-o4+/W6yCxC0MOReYiN0A/0/krJYowxA2/xCiSIcGsGNijnGwb19OEJ+itQe4TT8j
-=9DrE
+iF4EAREIAAYFAk+ITp8ACgkQdjK8w9WeBnDM2wEAmvIYlZCmbIom/Iq7JYoeOtsf
+9NYsC5Kcyw9yj8s7su4A+wSuZCR+4AXgc+rikZvhCX+WzZBajgWDuJPDQkmBKxeq
+=0g2n
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/muffin/files/muffin-1.0.2-frame-initialize-style-contexts.patch b/x11-wm/muffin/files/muffin-1.0.2-frame-initialize-style-contexts.patch
new file mode 100644
index 000000000000..650501513cf6
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-1.0.2-frame-initialize-style-contexts.patch
@@ -0,0 +1,30 @@
+From 7253a75b18452f71db3f2d58d0b0e5ccc6ff16cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Sat, 10 Mar 2012 21:28:13 +0100
+Subject: [PATCH] frames: Explicitly initialize style contexts
+
+We were relying on GTK+ emitting GtkWidget::style-updated during
+widget initialization to create the GtkStyleContexts used for
+window decorations. A recent GTK+ update broke this assumption,
+so do the necessary initialization ourselves.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=671796
+---
+ src/ui/frames.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/ui/frames.c b/src/ui/frames.c
+index 0204f1a..1b4ef8d 100644
+--- a/src/ui/frames.c
++++ b/src/ui/frames.c
+@@ -273,6 +273,7 @@ meta_frames_init (MetaFrames *frames)
+ 
+   frames->style_variants = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                                   g_free, g_object_unref);
++  update_style_contexts (frames);
+ 
+   gtk_widget_set_double_buffered (GTK_WIDGET (frames), FALSE);
+ 
+-- 
+1.7.8.5
+
diff --git a/x11-wm/muffin/muffin-1.0.2-r1.ebuild b/x11-wm/muffin/muffin-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..5702f3fb5b71
--- /dev/null
+++ b/x11-wm/muffin/muffin-1.0.2-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/muffin/muffin-1.0.2-r1.ebuild,v 1.1 2012/04/13 16:04:42 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+
+SRC_URI="https://github.com/linuxmint/muffin/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.91.7:3[introspection?]
+	>=gnome-base/gconf-2:2
+	>=dev-libs/glib-2.14:2
+	>=media-libs/clutter-1.7.5:1.0
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/startup-notification-0.7
+	>=x11-libs/libXcomposite-0.2
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMON_DEPEND}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity"
+
+S="${WORKDIR}/linuxmint-muffin-08ffc65"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+	G2CONF="${G2CONF}
+		--disable-static
+		--enable-gconf
+		--enable-shape
+		--enable-sm
+		--enable-startup-notification
+		--enable-xsync
+		--enable-verbose-mode
+		--enable-compile-warnings=maximum
+		--with-libcanberra
+		$(use_enable introspection)
+		$(use_enable xinerama)"
+}
+
+src_prepare() {
+	# Patch from mutter-3.3.92, fixes window decorations with gtk+-3.4
+	epatch "${FILESDIR}/${P}-frame-initialize-style-contexts.patch"
+
+	gnome2_src_prepare
+}