diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2009-10-29 22:41:44 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2009-10-29 22:41:44 +0000 |
commit | d285a373e75c64643d18e9e8a9d216baff06a990 (patch) | |
tree | a8b6711b2c74b158d02a8710e8c246a9e7aef33c /x11-wm/metacity | |
parent | New version for GNOME 2.28. Clean up old revision. (diff) | |
download | historical-d285a373e75c64643d18e9e8a9d216baff06a990.tar.gz historical-d285a373e75c64643d18e9e8a9d216baff06a990.tar.bz2 historical-d285a373e75c64643d18e9e8a9d216baff06a990.zip |
New version for GNOME 2.28. Clean up old revisions.
Package-Manager: portage-2.2_rc46/cvs/Linux x86_64
Diffstat (limited to 'x11-wm/metacity')
-rw-r--r-- | x11-wm/metacity/ChangeLog | 9 | ||||
-rw-r--r-- | x11-wm/metacity/Manifest | 16 | ||||
-rw-r--r-- | x11-wm/metacity/files/metacity-2.28.0-restartstylehint-when-replace.patch | 139 | ||||
-rw-r--r-- | x11-wm/metacity/metacity-2.28.0.ebuild (renamed from x11-wm/metacity/metacity-2.26.0.ebuild) | 16 |
4 files changed, 176 insertions, 4 deletions
diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog index 4d6f2838985d..4b95dc5c66d5 100644 --- a/x11-wm/metacity/ChangeLog +++ b/x11-wm/metacity/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-wm/metacity # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.237 2009/10/24 16:30:20 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.238 2009/10/29 22:41:43 eva Exp $ + +*metacity-2.28.0 (29 Oct 2009) + + 29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> + -metacity-2.26.0.ebuild, +metacity-2.28.0.ebuild, + +files/metacity-2.28.0-restartstylehint-when-replace.patch: + New version for GNOME 2.28. Clean up old revisions. 24 Oct 2009; nixnut <nixnut@gentoo.org> metacity-2.26.0-r1.ebuild: ppc stable #281427 diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest index 6e7d17ad52ca..b81501a03f16 100644 --- a/x11-wm/metacity/Manifest +++ b/x11-wm/metacity/Manifest @@ -1,12 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX metacity-2.24.0-crash-login.patch 1381 RMD160 43f4622195e22971a2b806d9f4e4bb042479d818 SHA1 1c1e722322f18735b95b31fad9d02186f939ecb6 SHA256 c1d2ae0e5e425dd8daca501da654db0e979421a0502441d69b5ce0318b863254 AUX metacity-2.24.0-fbsd.patch 454 RMD160 b105d90b271710930ba56adb0d26a881e808265f SHA1 bfd3101b865ee4d0ad1d425a50141b498df0a8df SHA256 4bb15fd9b0a9db418dd50dedd99a1cb1ec75a39a0608c8c39ccad9b8bbcd6e74 AUX metacity-2.24.0-gslist-leak.patch 760 RMD160 18264a62e94ce8528c7b34b8c859207fdd3159e1 SHA1 81d0f88e3d43166b0962142fe9a9ecab5aa86203 SHA256 56bdf2afeadda49d38b0c99c903ba7dc543e627921995c3565314e074ee0c820 AUX metacity-2.24.0-string-leak.patch 573 RMD160 fb139a74e26f75a1ecfa44c34efd791841a2f550 SHA1 30c8a1d76196c4708175932527b1a6059d26dec0 SHA256 e2ebb8487f275461a28acdb9004d69dd6869bfe234b749b4093a024a8a6abad4 AUX metacity-2.26.0-panel-behavior.patch 3374 RMD160 1793a72ce7e6e1904746c1c4d4113a2a66271ee2 SHA1 58bf8a33abb86026abc80d8e1dc04133f6fccc29 SHA256 02ad2a002af64ebc107a5481744e946a1e34402a10cf8ada12fb03fa846ebdb8 +AUX metacity-2.28.0-restartstylehint-when-replace.patch 4709 RMD160 da983b21c50dbacd8f5df06f50d233eef6c25331 SHA1 248f8dce5fc3b88ce43e796ba7995bf0d76a9d99 SHA256 3a7e484ec2eb97e7b7f1baaa33e5d925e67a35c84e49c5abe6c32cf2c25f16eb DIST metacity-2.24.0.tar.bz2 2160557 RMD160 758c26e163fdc84dcee1e386ab8cbefc38cdd7a5 SHA1 0b2e37e372498e26a6926fbb68e96556c6db6497 SHA256 90eed0a36aae302db52af12220c4cf863c9cccebd233015104f2d88cb17ec076 DIST metacity-2.26.0.tar.bz2 2289848 RMD160 26b75abb9b705f9fd7711dfbbff134e600dcfd56 SHA1 70593f69148960a0248527c8ae8d442a3d251d08 SHA256 29ba16411899d963bae69a4d72d37dec38a33e62412fe769d497de4555559078 +DIST metacity-2.28.0.tar.bz2 2288241 RMD160 0eec1900fad87604bc531757d0e878d2da8cb89d SHA1 d64dc861ac00fffc503bf9acdc705b67b772d772 SHA256 0621553a6f21fcf40c5dc4c7907b5745c6d853e6b7637bb45b863ec39f595545 EBUILD metacity-2.24.0-r2.ebuild 1513 RMD160 a007c6d28f0184533086d6114202ceea6e3f489a SHA1 a8871bcb693b9b6e193170399c93c3e397ecd46c SHA256 d789c688ac30fbb9a4a6c5c5682c9c80d31cfad5880b67ef7e71ed56cfb03a28 EBUILD metacity-2.26.0-r1.ebuild 1624 RMD160 1d2a14f432e8fac8cb548f3654dbf731e7900dc7 SHA1 9ac4764dd41866974b923cfd4802afb8b37de675 SHA256 59ab508d110879bf19182889448833ec9ba3658b085f8df07a363198c785b841 -EBUILD metacity-2.26.0.ebuild 1524 RMD160 e822b58660487f1ad5ac80ad40a1b5f927f560ad SHA1 0f1e42a94942915ce54888b7402b32458d28be59 SHA256 df5efdb37755d02abe8a2cf4d35d1e7be424814edeb0c020b07c1f0ffbc435c8 -MISC ChangeLog 28159 RMD160 f4cb00e3e30ba4d8b24a91c8d73ea75dbdee44a1 SHA1 ae615fe403769f5e0b8ab714c6dbb8ce4e9495a5 SHA256 ceb812347f6849ecaec8b619ac9cd5df6936a43812246e3489a4cb8e35bd8ddd +EBUILD metacity-2.28.0.ebuild 2115 RMD160 9ab140dd2183b3a64e15826045d2a1a1a75e5da3 SHA1 32f06a668081c5011ed823fc6ae86d592e3216f3 SHA256 be8d7fc398613ed2fec3bbe1d39ac1145fca88786810c52bf6c785ca90df8b0d +MISC ChangeLog 28411 RMD160 4f0deea8623aeffb4f4ee9beef7f73536332ab29 SHA1 c265065f5f0132d68946970583c292f9ce70a8f3 SHA256 43b43b468777a280765bac5f60a4861ca8c22db9913110db054adc00cfe90fed MISC metadata.xml 409 RMD160 cd76d1e78c03fb5379abca2a1e136cba116eacae SHA1 703d6a46d96d2734062f1496880b983b89f837c9 SHA256 cbc77bb6077444f8b66e4f8a4cd4cf1af7dbbe8d410b4819ef5e1af049378218 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkrqGiwACgkQ1fmVwcYIWAbRvACgyocsXDdsvtiZ/ju4ly57oMga +dUoAmwd0xo3L9dy5Zhdtx7HsYyk6l4HB +=Qx0D +-----END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..54dd79e02198 --- /dev/null +++ b/x11-wm/metacity/files/metacity-2.28.0-restartstylehint-when-replace.patch @@ -0,0 +1,139 @@ +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.26.0.ebuild b/x11-wm/metacity/metacity-2.28.0.ebuild index fce90794c229..fa180c41e28d 100644 --- a/x11-wm/metacity/metacity-2.26.0.ebuild +++ b/x11-wm/metacity/metacity-2.28.0.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.26.0.ebuild,v 1.1 2009/05/04 22:46:39 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.28.0.ebuild,v 1.1 2009/10/29 22:41:43 eva Exp $ EAPI="2" +# debug only changes CFLAGS +GCONF_DEBUG="no" inherit eutils gnome2 @@ -14,6 +16,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="test xinerama" +# XXX: libgtop is automagic, hard-enabled instead RDEPEND=">=x11-libs/gtk+-2.10 >=x11-libs/pango-1.2[X] >=gnome-base/gconf-2 @@ -30,6 +33,8 @@ RDEPEND=">=x11-libs/gtk+-2.10 x11-libs/libXrandr x11-libs/libSM x11-libs/libICE + media-libs/libcanberra[gtk] + gnome-base/libgtop gnome-extra/zenity !x11-misc/expocity" DEPEND="${RDEPEND} @@ -59,6 +64,15 @@ pkg_setup() { src_prepare() { gnome2_src_prepare + # Fix intltoolize broken file, see upstream #577133 + sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ + || die "sed failed" + # Remove stupid CFLAGS, bug #259179 sed "s:-Werror::g" -i configure.in configure || die "sed failed" + # 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}/${P}-restartstylehint-when-replace.patch" } |