From 250de8a5d9b5c53b8dea7ccc574d5ba956dc9c41 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Mon, 22 Mar 2010 20:25:01 +0000 Subject: [PATCH] Version bump and cleaning old testing version Package-Manager: portage-2.1.7.17/cvs/Linux x86_64 --- x11-libs/gtk+/ChangeLog | 8 ++++- x11-libs/gtk+/Manifest | 12 ++++--- .../gtk+-2.18.9-notifications-gtkentry.patch | 36 +++++++++++++++++++ ...k+-2.18.7-r1.ebuild => gtk+-2.18.9.ebuild} | 6 ++-- 4 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 x11-libs/gtk+/files/gtk+-2.18.9-notifications-gtkentry.patch rename x11-libs/gtk+/{gtk+-2.18.7-r1.ebuild => gtk+-2.18.9.ebuild} (95%) diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 89ab30cbf6a9..999d66f6927d 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.447 2010/03/11 14:52:23 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.448 2010/03/22 20:25:00 pacho Exp $ + +*gtk+-2.18.9 (22 Mar 2010) + + 22 Mar 2010; Pacho Ramos -gtk+-2.18.7-r1.ebuild, + +gtk+-2.18.9.ebuild, +files/gtk+-2.18.9-notifications-gtkentry.patch: + Version bump with multiple bugfixes, cleaning old testing version *gtk+-2.18.7-r1 (11 Mar 2010) diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 08172f9a01ec..7576c9304abd 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -22,6 +22,7 @@ AUX gtk+-2.16.5-jpeg-backward-compatibility.patch 937 RMD160 f72974e2c5b6f7d0f9a AUX gtk+-2.16.6-fix-pltcheck-test.patch 567 RMD160 5f17d717cd7479fb477c8be407ce41f99b5e537f SHA1 49f802b744dc5775d889902c168f669a7710d432 SHA256 67b3649bc2e57de17af2919d49d759a0e358da878cb36f8d7b083dec2738ca5d AUX gtk+-2.18.5-macosx-aqua.patch 5521 RMD160 2f61c470952043229de027b23f67f634eaa86ffa SHA1 b0babc33bc3abca2069a5674996aeffd6fbf4120 SHA256 53cab4a8880c1add44304c7bdb83831adc16b69d938759ab3fc996d744d9e5b6 AUX gtk+-2.18.7-destroy-crash.patch 1236 RMD160 e266ee532854f01a7b6dbcf61626d83e2133d0b2 SHA1 76671cca0245d8b0e25acb43eb6f65442461a573 SHA256 61ead70a439f873cc66676ef8a0b4076d2c0f44534c1e5d8898c42ef3a659b33 +AUX gtk+-2.18.9-notifications-gtkentry.patch 1274 RMD160 d397d677b76be6ea2614b33c328dcd5d237423f1 SHA1 1f9b4de6827798f7358b38ede143d2d29482a06c SHA256 fd656e194d3e734d21b6afd0d8cf9e002679d8f41da73ec41790341a0d355798 AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 SHA1 e65e843c6f1beecee7a0e1f7ec3292596c2a65a4 SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd AUX gtk+-2.8.10-xinerama.patch 1083 RMD160 499801f3be2289bdc656563bb5c96797d14512f7 SHA1 7817e3c2bbec1058192d524d68e78635fa48beca SHA256 7786691d5f89588abc7174e97cbd374d8cbe98b4e8dfd27005eade03b047aa2d AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 @@ -34,6 +35,7 @@ DIST gtk+-2.16.6.tar.bz2 18518781 RMD160 1048704042ffbbabe0de60278f49f8b7700f2d1 DIST gtk+-2.18.5.tar.bz2 18126480 RMD160 712098237fc31dcb99189645f0320aa165855577 SHA1 ddb004f0f92f7c8e3b84237e05fcf0ef5affc79c SHA256 4986365bce2f164edae10be20a4d417eadca9534eedfd9e2176a0c45334b7bf4 DIST gtk+-2.18.6.tar.bz2 18137401 RMD160 1e9b36cd2de8a472a3e550a1995978a3b783e455 SHA1 6190838c6c5e5cd3b0499d2a59ae06e517598bc9 SHA256 5629944917b739152d89b69279aefcc3de9fe12a12fd7adb3ca39c840df9354d DIST gtk+-2.18.7.tar.bz2 18304767 RMD160 0ac304503a23eb6911254a64218e3fe6aed9ff69 SHA1 92a40180ef4a097a867dc2eca1f209328581c5b3 SHA256 602d4f8098e1620231788770e1d9b520d5824da3f01d86e3b4fb59f1d67e1464 +DIST gtk+-2.18.9.tar.bz2 18194639 RMD160 4499af3cef1c53cddda989f35aaf2e030aab5bcf SHA1 1f50dbc0de230e1b3df7d461bdfaeceedcc5f65b SHA256 5dcd8c406acbb8779c0b081a089fa87dfd7ab4d7d4c6075db478997ce96aa9b4 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b EBUILD gtk+-2.12.11.ebuild 4958 RMD160 940e8c7b465316386f7878590a274ce3b74b4593 SHA1 db01e240a5e17bc78c616c47f27b2bab8bbb0f23 SHA256 ac75435bc30144c72351b7075140719deeb9ba78bb1ae575d453ed337706e9d7 EBUILD gtk+-2.12.12.ebuild 4964 RMD160 96178ab4ded53396ba6c17fa8ed6d8d858046e61 SHA1 c8a3e1340574f3603f1a4ff335be2bbac802c20b SHA256 712d43258904b8254aab79598c1d9d25a92f5b8e671fdc3ce39063b60a352ca9 @@ -41,14 +43,14 @@ EBUILD gtk+-2.14.7-r2.ebuild 4837 RMD160 d4756b6e99afefee642f0939e645c9382983e1d EBUILD gtk+-2.16.6.ebuild 4831 RMD160 9075d2db529208d4bb9fbf49f3662d268e39a525 SHA1 66db2a66ad200ad7e2d740bcc898dc4d850841dc SHA256 78efc032b7dc0f442f132ffe1223288522b3cf2c7f13ab0f788a9ae9e5909d93 EBUILD gtk+-2.18.5.ebuild 5684 RMD160 0def12d4c0c32ccb7054109b3551b884fb729a60 SHA1 bd0e71c796cde19ebbf6056ab9726694fbaedf05 SHA256 6aeca6febb61ddb2680ea25241cab9cf1b072287429dfab965c15950c88a2886 EBUILD gtk+-2.18.6.ebuild 5691 RMD160 6a2f1186724e43292079df50be53b5a1166e66c3 SHA1 108143f5d6292ac63bc8d5c5ea1fc3dc522ca721 SHA256 2dd6207724c09e24454857a1a13ad7e58b287e852c437f8404781fe946f6351c -EBUILD gtk+-2.18.7-r1.ebuild 5981 RMD160 2bf31c8175c26b032a2d02a5e82ef2d1c62a8aa2 SHA1 d8ab35d304fd8ac45bc9626dc51c55e583a2cdbc SHA256 894fc028555ef39e9f371bcd49868d9cae839a404ac214c2e4bd309fc0009aaf EBUILD gtk+-2.18.7.ebuild 5887 RMD160 8098aa721d2cbd470b2a127da149b0028edf49c9 SHA1 cca0d81d5ddd05fec252a4c1a58eaab3e966b421 SHA256 9e4a947d5037ec074a3c6bc562a45c9685020c3a3206cfc7cb439a1f8c4b1da9 -MISC ChangeLog 65479 RMD160 c9429e8f74341020dfa0da6e30da83577e3f5353 SHA1 41efd6e779ff9873726d7b83b1b856fbc4ef82ad SHA256 dbd60291635ddcf5dc21a4f26d12133e6093f5fe444f293e52e011bed541244e +EBUILD gtk+-2.18.9.ebuild 6028 RMD160 a4c500b5b7e96868fe8e227bf2a4807b17d70dbe SHA1 ea6915a1f1cc1c7a7ecb522f9773449a5f5b36e5 SHA256 b993d9e69f761ee53aff857d7cbd0483db01f90df437741ee743a290665290c2 +MISC ChangeLog 65718 RMD160 ae3d208ea672fedb8798d12dd2fbd0aa840edf22 SHA1 23ad3c08b9b034345c3d6cfef3de333250cbd00b SHA256 dad950afb0b0b9584af586db55c92907c75ef82f9a8206c5afadfe167eead3ed MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuZA7AACgkQCaWpQKGI+9T9WwCfeJQc32f3t325kOzr18f+h3GC -QSkAn0kAWExrVC5x2hTc5QS4WLJtNL7/ -=DCZ2 +iEYEARECAAYFAkun0iYACgkQCaWpQKGI+9R9PgCfUyAAYd5uKiQ5l30hkRSanABO +RR0AnAq24/gvkaDopGQpDdL8qKcsLTJp +=EwPs -----END PGP SIGNATURE----- diff --git a/x11-libs/gtk+/files/gtk+-2.18.9-notifications-gtkentry.patch b/x11-libs/gtk+/files/gtk+-2.18.9-notifications-gtkentry.patch new file mode 100644 index 000000000000..9ce97f330308 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.18.9-notifications-gtkentry.patch @@ -0,0 +1,36 @@ +From 0fff51eab6427ca4d0ab679c1d994a2a36898a7d Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Sat, 20 Mar 2010 03:20:38 +0000 +Subject: Avoid spurious notifications from GtkEntry + +Using gtk_entry_set_buffer() in dispose() causes problematic +notifications, so just get rid of the buffer manually. See bug 613241. +(cherry picked from commit 5f29a679f8a31b6548f34179d65a39de9ec63535) +--- +diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c +index 4344449..0dafcf7 100644 +--- a/gtk/gtkentry.c ++++ b/gtk/gtkentry.c +@@ -2425,12 +2425,19 @@ static void + gtk_entry_dispose (GObject *object) + { + GtkEntry *entry = GTK_ENTRY (object); ++ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry); + + gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, NULL); + gtk_entry_set_icon_tooltip_markup (entry, GTK_ENTRY_ICON_PRIMARY, NULL); + gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_SECONDARY, NULL); + gtk_entry_set_icon_tooltip_markup (entry, GTK_ENTRY_ICON_SECONDARY, NULL); +- gtk_entry_set_buffer (entry, NULL); ++ ++ if (priv->buffer) ++ { ++ buffer_disconnect_signals (entry); ++ g_object_unref (priv->buffer); ++ priv->buffer = NULL; ++ } + + G_OBJECT_CLASS (gtk_entry_parent_class)->dispose (object); + } +-- +cgit v0.8.3.1 diff --git a/x11-libs/gtk+/gtk+-2.18.7-r1.ebuild b/x11-libs/gtk+/gtk+-2.18.9.ebuild similarity index 95% rename from x11-libs/gtk+/gtk+-2.18.7-r1.ebuild rename to x11-libs/gtk+/gtk+-2.18.9.ebuild index 8ff553e3b9da..c776ac0399a6 100644 --- a/x11-libs/gtk+/gtk+-2.18.7-r1.ebuild +++ b/x11-libs/gtk+/gtk+-2.18.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.18.7-r1.ebuild,v 1.1 2010/03/11 14:52:23 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.18.9.ebuild,v 1.1 2010/03/22 20:25:00 pacho Exp $ EAPI="2" @@ -86,8 +86,8 @@ src_prepare() { # add correct framework linking options, for aqua epatch "${FILESDIR}/${PN}-2.18.5-macosx-aqua.patch" - # Fix chromium crash, bug 308985 - epatch "${FILESDIR}/${PN}-2.18.7-destroy-crash.patch" + # Fix gtkentry setting its buffer to null on destroy, upstream bug 613241 + epatch "${FILESDIR}/${PN}-2.18.9-notifications-gtkentry.patch" # -O3 and company cause random crashes in applications. Bug #133469 replace-flags -O3 -O2 -- 2.26.2