public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: x11-wm/metacity/, x11-wm/metacity/files/
@ 2011-04-14 21:19 Gilles Dartiguelongue
  0 siblings, 0 replies; 3+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-14 21:19 UTC (permalink / raw
  To: gentoo-commits

commit:     9bb91c77dd6b7b6af34eaff2ed5833b7e09886d9
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 21:19:11 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 21:19:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9bb91c77

x11-wm/metacity: moved to gentoo-x86

---
 .../files/metacity-2.28.0-sys-wait-header.patch    |   19 -----
 .../files/metacity-2.28.1-wif_macros.patch         |   16 ----
 x11-wm/metacity/metacity-2.34.0.ebuild             |   82 --------------------
 3 files changed, 0 insertions(+), 117 deletions(-)

diff --git a/x11-wm/metacity/files/metacity-2.28.0-sys-wait-header.patch b/x11-wm/metacity/files/metacity-2.28.0-sys-wait-header.patch
deleted file mode 100644
index 5d7f4a1..0000000
--- a/x11-wm/metacity/files/metacity-2.28.0-sys-wait-header.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Alexis Ballier <aballier@gentoo.org>
-Date: Thu, 5 Nov 2009 19:48:41 +0100
-Subject: Include sys/wait.h instead of only wait.h as described in POSIX specs. Fixes build on FreeBSD.
-
----
- src/core/main.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -58,7 +58,7 @@
- 
- #include <stdlib.h>
- #include <sys/types.h>
--#include <wait.h>
-+#include <sys/wait.h>
- #include <stdio.h>
- #include <string.h>
- #include <signal.h>

diff --git a/x11-wm/metacity/files/metacity-2.28.1-wif_macros.patch b/x11-wm/metacity/files/metacity-2.28.1-wif_macros.patch
deleted file mode 100644
index 4ce382e..0000000
--- a/x11-wm/metacity/files/metacity-2.28.1-wif_macros.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-WIFEXITED and friends are defined in sys/wait.h
-Fixes a build failure on BSD.
-
-https://bugs.gentoo.org/show_bug.cgi?id=309443
-https://bugzilla.gnome.org/show_bug.cgi?id=605460
-
---- metacity-2.28.1/src/core/delete.c.old	2010-03-15 07:46:52.000000000 +0100
-+++ metacity-2.28.1/src/core/delete.c	2010-03-15 07:47:12.000000000 +0100
-@@ -32,6 +32,7 @@
- #include "workspace.h"
- 
- #include <sys/types.h>
-+#include <sys/wait.h> /* WIF* macros */
- #include <signal.h>
- #include <unistd.h>
- #include <errno.h>

diff --git a/x11-wm/metacity/metacity-2.34.0.ebuild b/x11-wm/metacity/metacity-2.34.0.ebuild
deleted file mode 100644
index 9aa4808..0000000
--- a/x11-wm/metacity/metacity-2.34.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.30.3.ebuild,v 1.7 2011/03/27 13:04:59 nirbheek Exp $
-
-EAPI="3"
-GNOME2_LA_PUNT="yes"
-# debug only changes CFLAGS
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME default window manager"
-HOMEPAGE="http://blogs.gnome.org/metacity/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test xinerama"
-
-# XXX: libgtop is automagic, hard-enabled instead
-RDEPEND=">=x11-libs/gtk+-2.20.0:2
-	>=x11-libs/pango-1.2[X]
-	>=gnome-base/gconf-2:2
-	>=dev-libs/glib-2.6:2
-	>=x11-libs/startup-notification-0.7
-	>=x11-libs/libXcomposite-0.2
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXdamage
-	x11-libs/libXcursor
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libSM
-	x11-libs/libICE
-	media-libs/libcanberra[gtk]
-	gnome-base/libgtop
-	gnome-extra/zenity
-
-	xinerama? ( x11-libs/libXinerama )
-
-	!x11-misc/expocity"
-DEPEND="${RDEPEND}
-	>=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"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-canberra
-		--enable-compositor
-		--enable-gconf
-		--enable-render
-		--enable-shape
-		--enable-sm
-		--enable-startup-notification
-		--enable-xsync
-		--with-gtk=2.0
-		$(use_enable xinerama)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Use sys/wait.h header instead of wait.h as described in posix specs,
-	# bug 292009
-	epatch "${FILESDIR}/${PN}-2.28.0-sys-wait-header.patch"
-
-	# WIFEXITED and friends are defined in sys/wait.h
-	# Fixes a build failure on BSD.
-	# https://bugs.gentoo.org/show_bug.cgi?id=309443
-	# https://bugzilla.gnome.org/show_bug.cgi?id=605460
-	epatch "${FILESDIR}/${PN}-2.28.1-wif_macros.patch"
-}



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-wm/metacity/, x11-wm/metacity/files/
@ 2014-10-09 22:41 Gilles Dartiguelongue
  0 siblings, 0 replies; 3+ messages in thread
From: Gilles Dartiguelongue @ 2014-10-09 22:41 UTC (permalink / raw
  To: gentoo-commits

commit:     1da6a81ec0d4851f2619608621baba1044872753
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  9 22:39:25 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Oct  9 22:39:25 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1da6a81e

x11-wm/metacity: 2.34.13 → 3.14.0

Patch included in this release.

---
 .../files/metacity-2.28.1-wif_macros.patch         | 16 --------
 ...metacity-9999.ebuild => metacity-3.14.0.ebuild} | 44 ++++++----------------
 x11-wm/metacity/metacity-9999.ebuild               | 27 +++++--------
 3 files changed, 22 insertions(+), 65 deletions(-)

diff --git a/x11-wm/metacity/files/metacity-2.28.1-wif_macros.patch b/x11-wm/metacity/files/metacity-2.28.1-wif_macros.patch
deleted file mode 100644
index 4ce382e..0000000
--- a/x11-wm/metacity/files/metacity-2.28.1-wif_macros.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-WIFEXITED and friends are defined in sys/wait.h
-Fixes a build failure on BSD.
-
-https://bugs.gentoo.org/show_bug.cgi?id=309443
-https://bugzilla.gnome.org/show_bug.cgi?id=605460
-
---- metacity-2.28.1/src/core/delete.c.old	2010-03-15 07:46:52.000000000 +0100
-+++ metacity-2.28.1/src/core/delete.c	2010-03-15 07:47:12.000000000 +0100
-@@ -32,6 +32,7 @@
- #include "workspace.h"
- 
- #include <sys/types.h>
-+#include <sys/wait.h> /* WIF* macros */
- #include <signal.h>
- #include <unistd.h>
- #include <errno.h>

diff --git a/x11-wm/metacity/metacity-9999.ebuild b/x11-wm/metacity/metacity-3.14.0.ebuild
similarity index 61%
copy from x11-wm/metacity/metacity-9999.ebuild
copy to x11-wm/metacity/metacity-3.14.0.ebuild
index 6cfa917..1ba0edd 100644
--- a/x11-wm/metacity/metacity-9999.ebuild
+++ b/x11-wm/metacity/metacity-3.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,25 +7,19 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
+inherit gnome2
 
 DESCRIPTION="GNOME default window manager"
 HOMEPAGE="http://blogs.gnome.org/metacity/"
 
 LICENSE="GPL-2"
 SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test xinerama"
 
 # XXX: libgtop is automagic, hard-enabled instead
-RDEPEND=">=x11-libs/gtk+-2.24:2
+RDEPEND="
+	>=x11-libs/gtk+-3.8:3
 	>=x11-libs/pango-1.2[X]
 	>=dev-libs/glib-2.25.10:2
 	>=gnome-base/gsettings-desktop-schemas-3.3
@@ -40,11 +34,12 @@ RDEPEND=">=x11-libs/gtk+-2.24:2
 	x11-libs/libXrandr
 	x11-libs/libSM
 	x11-libs/libICE
-	media-libs/libcanberra[gtk]
-	gnome-base/libgtop
+	media-libs/libcanberra[gtk3]
+	gnome-base/libgtop:2=
 	gnome-extra/zenity
 	xinerama? ( x11-libs/libXinerama )
-	!x11-misc/expocity"
+	!x11-misc/expocity
+"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
@@ -52,25 +47,10 @@ DEPEND="${RDEPEND}
 	test? ( app-text/docbook-xml-dtd:4.5 )
 	xinerama? ( x11-proto/xineramaproto )
 	x11-proto/xextproto
-	x11-proto/xproto"
-
-src_prepare() {
-	# WIFEXITED and friends are defined in sys/wait.h
-	# Fixes a build failure on BSD.
-	# https://bugs.gentoo.org/show_bug.cgi?id=309443
-	# https://bugzilla.gnome.org/show_bug.cgi?id=605460
-	epatch "${FILESDIR}/${PN}-2.28.1-wif_macros.patch"
-
-	gnome2_src_prepare
-}
+	x11-proto/xproto
+"
 
 src_configure() {
-	local myconf=""
-
-	if [[ ${PV} != 9999 ]]; then
-		myconf="${myconf} ITSTOOL=$(type -P true)"
-	fi
-
 	DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
 	gnome2_src_configure \
 		--disable-static \
@@ -83,5 +63,5 @@ src_configure() {
 		--enable-xsync \
 		--enable-themes-documentation \
 		$(use_enable xinerama) \
-		${myconf}
+		ITSTOOL=$(type -P true)
 }
\ No newline at end of file

diff --git a/x11-wm/metacity/metacity-9999.ebuild b/x11-wm/metacity/metacity-9999.ebuild
index 6cfa917..df2b6b6 100644
--- a/x11-wm/metacity/metacity-9999.ebuild
+++ b/x11-wm/metacity/metacity-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,7 +7,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -25,7 +25,8 @@ fi
 IUSE="test xinerama"
 
 # XXX: libgtop is automagic, hard-enabled instead
-RDEPEND=">=x11-libs/gtk+-2.24:2
+RDEPEND="
+	>=x11-libs/gtk+-3.8:3
 	>=x11-libs/pango-1.2[X]
 	>=dev-libs/glib-2.25.10:2
 	>=gnome-base/gsettings-desktop-schemas-3.3
@@ -40,11 +41,12 @@ RDEPEND=">=x11-libs/gtk+-2.24:2
 	x11-libs/libXrandr
 	x11-libs/libSM
 	x11-libs/libICE
-	media-libs/libcanberra[gtk]
-	gnome-base/libgtop
+	media-libs/libcanberra[gtk3]
+	gnome-base/libgtop:2=
 	gnome-extra/zenity
 	xinerama? ( x11-libs/libXinerama )
-	!x11-misc/expocity"
+	!x11-misc/expocity
+"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
@@ -52,17 +54,8 @@ DEPEND="${RDEPEND}
 	test? ( app-text/docbook-xml-dtd:4.5 )
 	xinerama? ( x11-proto/xineramaproto )
 	x11-proto/xextproto
-	x11-proto/xproto"
-
-src_prepare() {
-	# WIFEXITED and friends are defined in sys/wait.h
-	# Fixes a build failure on BSD.
-	# https://bugs.gentoo.org/show_bug.cgi?id=309443
-	# https://bugzilla.gnome.org/show_bug.cgi?id=605460
-	epatch "${FILESDIR}/${PN}-2.28.1-wif_macros.patch"
-
-	gnome2_src_prepare
-}
+	x11-proto/xproto
+"
 
 src_configure() {
 	local myconf=""


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-wm/metacity/, x11-wm/metacity/files/
@ 2011-04-05  0:57 Nirbheek Chauhan
  0 siblings, 0 replies; 3+ messages in thread
From: Nirbheek Chauhan @ 2011-04-05  0:57 UTC (permalink / raw
  To: gentoo-commits

commit:     069ff498dcf02e65f84620bd8254789d6dc69f4a
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 22:33:43 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 00:29:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=069ff498

x11-wm/metacity: 2.30.3-r1 → 2.34.0

---
 ...city-2.28.0-restartstylehint-when-replace.patch |  139 --------------------
 ...ity-2.30.3-r1.ebuild => metacity-2.34.0.ebuild} |   16 +--
 2 files changed, 5 insertions(+), 150 deletions(-)

diff --git a/x11-wm/metacity/files/metacity-2.28.0-restartstylehint-when-replace.patch b/x11-wm/metacity/files/metacity-2.28.0-restartstylehint-when-replace.patch
deleted file mode 100644
index 54dd79e..0000000
--- a/x11-wm/metacity/files/metacity-2.28.0-restartstylehint-when-replace.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From a3de65d5d1861f755ced7cad291fbbd4f1b8ef51 Mon Sep 17 00:00:00 2001
-From: Owen W. Taylor <otaylor@fishsoup.net>
-Date: Sat, 22 Aug 2009 15:00:57 -0400
-Subject: [PATCH] Should set RestartStyleHint to RestartIfRunning when replaced
-
-This reverts most of commit abbd057eb967e6ab462ffe305f41b2b04d417b25;
-
- - It's fine to call meta_session_shutdown() after the display
-   is closed, since it's talking over the ICE connection
- - We should not call warn_about_lame_clients_and_finish_interact()
-   unless we are interacting with the window manager in a session
-   save.
-
-However, the part of abbd057 that fixed accessing freed memory was
-fixing a real problem; this patches does the same thing in a simpler
-way by fixing an obvious type in meta_display_close() where it was
-NULL'ing out the local variable 'display' rather than the global
-variable 'the_display' and adding keeping the check in meta_finalize()
-that was added in abbd057.
-
-The order of calling meta_session_shutdown() and
-calling meta_display_close() is reverted back to the old order to
-make it clear that it's OK if the display way already closed previously.
-
-http://bugzilla.gnome.org/show_bug.cgi?id=588119
----
- src/core/display-private.h |    2 +-
- src/core/display.c         |   16 ++++------------
- src/core/main.c            |    5 ++---
- src/core/session.c         |    8 --------
- 4 files changed, 7 insertions(+), 24 deletions(-)
-
-diff --git a/src/core/display-private.h b/src/core/display-private.h
-index 19287f3..9c8ebc6 100644
---- a/src/core/display-private.h
-+++ b/src/core/display-private.h
-@@ -329,7 +329,7 @@ MetaScreen*   meta_display_screen_for_xwindow  (MetaDisplay *display,
- void          meta_display_grab                (MetaDisplay *display);
- void          meta_display_ungrab              (MetaDisplay *display);
- 
--void          meta_display_unmanage_screen     (MetaDisplay **display,
-+void          meta_display_unmanage_screen     (MetaDisplay *display,
-                                                 MetaScreen  *screen,
-                                                 guint32      timestamp);
- 
-diff --git a/src/core/display.c b/src/core/display.c
-index 55c374a..8e35a35 100644
---- a/src/core/display.c
-+++ b/src/core/display.c
-@@ -926,7 +926,7 @@ meta_display_close (MetaDisplay *display,
-     meta_compositor_destroy (display->compositor);
-   
-   g_free (display);
--  display = NULL;
-+  the_display = NULL;
- 
-   meta_quit (META_EXIT_SUCCESS);
- }
-@@ -4762,13 +4762,10 @@ process_selection_clear (MetaDisplay   *display,
-       meta_verbose ("Got selection clear for screen %d on display %s\n",
-                     screen->number, display->name);
-       
--      meta_display_unmanage_screen (&display, 
-+      meta_display_unmanage_screen (display, 
-                                     screen,
-                                     event->xselectionclear.time);
- 
--      if (!display)
--        the_display = NULL;
--
-       /* display and screen may both be invalid memory... */
-       
-       return;
-@@ -4790,12 +4787,10 @@ process_selection_clear (MetaDisplay   *display,
- }
- 
- void
--meta_display_unmanage_screen (MetaDisplay **displayp,
-+meta_display_unmanage_screen (MetaDisplay *display,
-                               MetaScreen  *screen,
-                               guint32      timestamp)
- {
--  MetaDisplay *display = *displayp;
--
-   meta_verbose ("Unmanaging screen %d on display %s\n",
-                 screen->number, display->name);
-   
-@@ -4805,10 +4800,7 @@ meta_display_unmanage_screen (MetaDisplay **displayp,
-   display->screens = g_slist_remove (display->screens, screen);
- 
-   if (display->screens == NULL)
--    {
--      meta_display_close (display, timestamp);
--      *displayp = NULL;
--    }
-+    meta_display_close (display, timestamp);
- }
- 
- void
-diff --git a/src/core/main.c b/src/core/main.c
-index a36a396..44d317e 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -361,12 +361,11 @@ static void
- meta_finalize (void)
- {
-   MetaDisplay *display = meta_get_display();
--
--  meta_session_shutdown ();
--
-   if (display)
-     meta_display_close (display,
-                         CurrentTime); /* I doubt correct timestamps matter here */
-+
-+  meta_session_shutdown ();
- }
- 
- static void
-diff --git a/src/core/session.c b/src/core/session.c
-index 7e3b389..0d69350 100644
---- a/src/core/session.c
-+++ b/src/core/session.c
-@@ -376,14 +376,6 @@ meta_session_shutdown (void)
-   SmProp *props[1];
-   char hint = SmRestartIfRunning;
- 
--  if (!meta_get_display ())
--    {
--      meta_verbose ("Cannot close session because there is no display");
--      return;
--    }
--
--  warn_about_lame_clients_and_finish_interact (FALSE);
--
-   if (session_connection == NULL)
-     return;
-   
--- 
-1.6.4
\ No newline at end of file

diff --git a/x11-wm/metacity/metacity-2.30.3-r1.ebuild b/x11-wm/metacity/metacity-2.34.0.ebuild
similarity index 81%
rename from x11-wm/metacity/metacity-2.30.3-r1.ebuild
rename to x11-wm/metacity/metacity-2.34.0.ebuild
index d404649..9aa4808 100644
--- a/x11-wm/metacity/metacity-2.30.3-r1.ebuild
+++ b/x11-wm/metacity/metacity-2.34.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-in
 IUSE="test xinerama"
 
 # XXX: libgtop is automagic, hard-enabled instead
-RDEPEND=">=x11-libs/gtk+-2.20:2
+RDEPEND=">=x11-libs/gtk+-2.20.0:2
 	>=x11-libs/pango-1.2[X]
 	>=gnome-base/gconf-2:2
 	>=dev-libs/glib-2.6:2
@@ -29,7 +29,6 @@ RDEPEND=">=x11-libs/gtk+-2.20:2
 	x11-libs/libXdamage
 	x11-libs/libXcursor
 	x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )
 	x11-libs/libXext
 	x11-libs/libXrandr
 	x11-libs/libSM
@@ -37,6 +36,9 @@ RDEPEND=">=x11-libs/gtk+-2.20:2
 	media-libs/libcanberra[gtk]
 	gnome-base/libgtop
 	gnome-extra/zenity
+
+	xinerama? ( x11-libs/libXinerama )
+
 	!x11-misc/expocity"
 DEPEND="${RDEPEND}
 	>=app-text/gnome-doc-utils-0.8
@@ -53,6 +55,7 @@ DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
 pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
+		--enable-canberra
 		--enable-compositor
 		--enable-gconf
 		--enable-render
@@ -67,12 +70,6 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# Should set RestartStyleHint to RestartIfRunning when replaced,
-	# this fix a strange issue with gnome-session (100% of the CPU,
-	# and try to restart metacity infinitively when compiz is started)
-	# patch import from upstream bug #588119.
-	epatch "${FILESDIR}/${PN}-2.28.0-restartstylehint-when-replace.patch"
-
 	# Use sys/wait.h header instead of wait.h as described in posix specs,
 	# bug 292009
 	epatch "${FILESDIR}/${PN}-2.28.0-sys-wait-header.patch"
@@ -82,7 +79,4 @@ src_prepare() {
 	# https://bugs.gentoo.org/show_bug.cgi?id=309443
 	# https://bugzilla.gnome.org/show_bug.cgi?id=605460
 	epatch "${FILESDIR}/${PN}-2.28.1-wif_macros.patch"
-
-	# Use Adwaita as the default theme instead of clearlooks
-	sed -e 's/Clearlooks/Adwaita/g' -i src/metacity.schemas* || die
 }



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-10-09 22:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-14 21:19 [gentoo-commits] proj/gnome:master commit in: x11-wm/metacity/, x11-wm/metacity/files/ Gilles Dartiguelongue
  -- strict thread matches above, loose matches on Subject: below --
2014-10-09 22:41 Gilles Dartiguelongue
2011-04-05  0:57 Nirbheek Chauhan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox