From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SC5Az-00027M-NN for garchives@archives.gentoo.org; Mon, 26 Mar 2012 08:21:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2FEBE058F; Mon, 26 Mar 2012 08:20:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B3DD6E058F for ; Mon, 26 Mar 2012 08:20:09 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED7A81B4066 for ; Mon, 26 Mar 2012 08:20:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7D27CE5430 for ; Mon, 26 Mar 2012 08:20:06 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1332749977.c254937bcd719a9a20158952fd3476e9d1264068.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-wm/mutter/, x11-wm/mutter/files/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-wm/mutter/files/mutter-3.2.1-ignore-shadow-and-padding.patch x11-wm/mutter/mutter-3.3.92.ebuild x11-wm/mutter/mutter-9999.ebuild X-VCS-Directories: x11-wm/mutter/ x11-wm/mutter/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: c254937bcd719a9a20158952fd3476e9d1264068 X-VCS-Branch: master Date: Mon, 26 Mar 2012 08:20:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 71ff0f8f-40b6-41e7-96a9-1b4511770dbb X-Archives-Hash: 7d38c5d188b927c2ce5f29d22ba4d63a commit: c254937bcd719a9a20158952fd3476e9d1264068 Author: Nirbheek Chauhan gentoo org> AuthorDate: Sun Mar 25 05:36:01 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Mar 26 08:19:37 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dc254937b Add x11-wm/mutter-3.3.92 --- .../mutter-3.2.1-ignore-shadow-and-padding.patch | 91 ++++++++++++++= ++++++ .../{mutter-9999.ebuild =3D> mutter-3.3.92.ebuild} | 15 +++- x11-wm/mutter/mutter-9999.ebuild | 15 +++- 3 files changed, 115 insertions(+), 6 deletions(-) diff --git a/x11-wm/mutter/files/mutter-3.2.1-ignore-shadow-and-padding.p= atch b/x11-wm/mutter/files/mutter-3.2.1-ignore-shadow-and-padding.patch new file mode 100644 index 0000000..bf4649e --- /dev/null +++ b/x11-wm/mutter/files/mutter-3.2.1-ignore-shadow-and-padding.patch @@ -0,0 +1,91 @@ +Patch author: Timo Kluck Wed, 21 Sep 2011 17:51:28 +0= 200 + +Patch to silently ignore padding and shadow tags in Ubuntu metacity them= es. + +https://bugs.launchpad.net/bugs/800315 +https://bugs.gentoo.org/show_bug.cgi?id=3D396673 + +diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c +index 9063541..63a881f 100644 +--- a/src/ui/theme-parser.c ++++ b/src/ui/theme-parser.c +@@ -90,7 +90,9 @@ typedef enum + STATE_WINDOW, + /* things we don't use any more but we can still parse: */ + STATE_MENU_ICON, +- STATE_FALLBACK ++ STATE_FALLBACK, ++ /* an ubuntu specific ignore-this-element state */ ++ UBUNTU_STATE_IGNORE =20 + } ParseState; +=20 + typedef struct +@@ -1306,7 +1308,19 @@ parse_toplevel_element (GMarkupParseContext *con= text, + */ + push_state (info, STATE_FALLBACK); + } +- else ++ else if (ELEMENT_IS ("shadow")) ++ { ++ /* ubuntu specific, workaround for light-themes: silently ignore= shadow tag. ++ */ ++ push_state (info, UBUNTU_STATE_IGNORE); ++ } ++ else if (ELEMENT_IS ("padding")) ++ { ++ /* ubuntu specific, workaround for light-themes: silently ignore= padding tag. ++ */ ++ push_state (info, UBUNTU_STATE_IGNORE); ++ } ++ else + { + set_error (error, context, + G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, +@@ -3027,6 +3041,18 @@ parse_style_element (GMarkupParseContext *contex= t, + =20 + push_state (info, STATE_BUTTON); + } ++ else if (ELEMENT_IS ("shadow")) ++ { ++ /* ubuntu specific, workaround for light-themes: silently ignore= shadow tag. ++ */ ++ push_state (info, UBUNTU_STATE_IGNORE); ++ } ++ else if (ELEMENT_IS ("padding")) ++ { ++ /* ubuntu specific, workaround for light-themes: silently ignore= padding tag. ++ */ ++ push_state (info, UBUNTU_STATE_IGNORE); ++ } + else + { + set_error (error, context, +@@ -3671,6 +3697,8 @@ start_element_handler (GMarkupParseContext *contex= t, + _("Element <%s> is not allowed inside a <%s> element")= , + element_name, "fallback"); + break; ++ case UBUNTU_STATE_IGNORE: ++ break; + } + } +=20 +@@ -3960,6 +3988,9 @@ end_element_handler (GMarkupParseContext *context, + pop_state (info); + g_assert (peek_state (info) =3D=3D STATE_THEME); + break; ++ case UBUNTU_STATE_IGNORE: ++ pop_state (info); ++ break; + } +=20 + pop_required_version (info); +@@ -4165,6 +4196,9 @@ text_handler (GMarkupParseContext *context, + case STATE_FALLBACK: + NO_TEXT ("fallback"); + break; ++ case UBUNTU_STATE_IGNORE: ++ NO_TEXT ("ignored_element"); ++ break; + } + } +=20 diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-3.3.= 92.ebuild similarity index 82% copy from x11-wm/mutter/mutter-9999.ebuild copy to x11-wm/mutter/mutter-3.3.92.ebuild index 143a423..414bbe3 100644 --- a/x11-wm/mutter/mutter-9999.ebuild +++ b/x11-wm/mutter/mutter-3.3.92.ebuild @@ -26,13 +26,15 @@ fi COMMON_DEPEND=3D">=3Dx11-libs/pango-1.2[X,introspection?] >=3Dx11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 - >=3Dx11-libs/gtk+-2.91.7:3[introspection?] + >=3Dx11-libs/gtk+-3.3.7:3[introspection?] >=3Dgnome-base/gconf-2:2 - >=3Ddev-libs/glib-2.14:2 - >=3Dmedia-libs/clutter-1.7.5:1.0 + >=3Ddev-libs/glib-2.25.11:2 + >=3Dmedia-libs/clutter-1.9.10:1.0 + >=3Dmedia-libs/cogl-1.9.6:1.0 >=3Dmedia-libs/libcanberra-0.26[gtk3] >=3Dx11-libs/startup-notification-0.7 >=3Dx11-libs/libXcomposite-0.2 + >=3Dgnome-base/gsettings-desktop-schemas-3.3.0 =20 x11-libs/libICE x11-libs/libSM @@ -76,3 +78,10 @@ pkg_setup() { $(use_enable introspection) $(use_enable xinerama)" } + +src_prepare() { + # Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes) + epatch "${FILESDIR}/${PN}-3.2.1-ignore-shadow-and-padding.patch" + + gnome2_src_prepare +} diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999= .ebuild index 143a423..414bbe3 100644 --- a/x11-wm/mutter/mutter-9999.ebuild +++ b/x11-wm/mutter/mutter-9999.ebuild @@ -26,13 +26,15 @@ fi COMMON_DEPEND=3D">=3Dx11-libs/pango-1.2[X,introspection?] >=3Dx11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 - >=3Dx11-libs/gtk+-2.91.7:3[introspection?] + >=3Dx11-libs/gtk+-3.3.7:3[introspection?] >=3Dgnome-base/gconf-2:2 - >=3Ddev-libs/glib-2.14:2 - >=3Dmedia-libs/clutter-1.7.5:1.0 + >=3Ddev-libs/glib-2.25.11:2 + >=3Dmedia-libs/clutter-1.9.10:1.0 + >=3Dmedia-libs/cogl-1.9.6:1.0 >=3Dmedia-libs/libcanberra-0.26[gtk3] >=3Dx11-libs/startup-notification-0.7 >=3Dx11-libs/libXcomposite-0.2 + >=3Dgnome-base/gsettings-desktop-schemas-3.3.0 =20 x11-libs/libICE x11-libs/libSM @@ -76,3 +78,10 @@ pkg_setup() { $(use_enable introspection) $(use_enable xinerama)" } + +src_prepare() { + # Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes) + epatch "${FILESDIR}/${PN}-3.2.1-ignore-shadow-and-padding.patch" + + gnome2_src_prepare +}