From 40a1f9d3fb9efefcd8a8285bd435f6571b05cb4a Mon Sep 17 00:00:00 2001 From: Stephen Klimaszewski Date: Sun, 4 Apr 2010 13:52:04 +0000 Subject: [PATCH] Add patch to fix a segfault. Fixes bug #310295. Thanks to Simon and Lars for their work on this. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- x11-terms/tilda/ChangeLog | 8 +++++++- x11-terms/tilda/Manifest | 15 +++------------ .../tilda/files/tilda-0.9.6-gdk_resources.patch | 12 ++++++++++++ x11-terms/tilda/tilda-0.9.6.ebuild | 10 +++++++++- 4 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch diff --git a/x11-terms/tilda/ChangeLog b/x11-terms/tilda/ChangeLog index 5e690601e53e..01351c3e5994 100644 --- a/x11-terms/tilda/ChangeLog +++ b/x11-terms/tilda/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-terms/tilda # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/tilda/ChangeLog,v 1.22 2010/01/06 19:34:14 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/tilda/ChangeLog,v 1.23 2010/04/04 13:52:04 steev Exp $ + + 04 Apr 2010; tilda-0.9.6.ebuild, + +files/tilda-0.9.6-gdk_resources.patch: + Add patch to fix a segfault. Fixes bug #310295. Thanks to Simon + and Lars for their work on + this. 06 Jan 2010; Christian Faulhammer tilda-0.9.6.ebuild: Transfer Prefix keywords diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest index 81b0c5924c66..b7b917aac23f 100644 --- a/x11-terms/tilda/Manifest +++ b/x11-terms/tilda/Manifest @@ -1,16 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX tilda-0.9.6-gdk_resources.patch 624 RMD160 eb0ff92fdd1d4b80474cc0ccf4aca44dc671a7ab SHA1 17dc2caa1a8c62c3494f5e20899b0ef908b2bc2c SHA256 39f255a190218c2df0d202dac94acc3496936e22ee24a0dd0484d1f8f27bc267 DIST tilda-0.9.5.tar.gz 269163 RMD160 2decee6dce8a2bf87c3430c5d14f90def41ebdee SHA1 90606e3686a0518a35b587fbd14cc63e1d7cd560 SHA256 bf345fa53bc6ded8050402c94742a89c9e04b8263834d434fbdcbb5d86ef4d7a DIST tilda-0.9.6.tar.gz 307517 RMD160 b52d3269b2af1d7061f3cb849d7cdc02c5628270 SHA1 bb16b78d1622311bf6de9f91db32ea5dc2019ca6 SHA256 b3bd0f63eb83a5001ef26056ca116e5f8005d454f8f82a94f334868862068411 EBUILD tilda-0.9.5.ebuild 676 RMD160 609a032fab2922140d093230184984a65d32fc7b SHA1 e70ba917f0c5bdbfc67ae461ba6e1d30d90b4473 SHA256 78ef77169ac8d1731fbadb7f8ddceaf383ee708be37b881cfb75622c01d98ced -EBUILD tilda-0.9.6.ebuild 745 RMD160 a1a5385029390e79171e4945594e57491e885290 SHA1 5bf3cab315f8ca8cdc638fdec6a98217f54fdfc1 SHA256 4847639dd7bf4739b9696049e3507fdc7c3235043f56b5ca188d55efd38bc848 -MISC ChangeLog 3457 RMD160 293a64e9a36b96ba8fd33fd424bc44cd18ea2e76 SHA1 0591d6157402650931852c9384cf84756e502fce SHA256 c029edc0c22bdd5073139c936d497f9bdcdfa610f22a5b773e72874168e6c36b +EBUILD tilda-0.9.6.ebuild 857 RMD160 a9b147bbdadb0e2e49506c7bc44880fed79761d2 SHA1 a8541b1e2fd77fcb6d5113a0d5cec270820eee5e SHA256 10243e0bd769c5f415e801735c83cb13cd2060e1e4b11750cdacea8d896db9c6 +MISC ChangeLog 3701 RMD160 b4089ddcbba10c0f585e4a2132788b919378e532 SHA1 ae4582490819d6833bf9eb6603931fba94c76757 SHA256 06b6ffeaf4ccc829d8261e7014eb412392ebbd8e02949bb2773cbe8ebd9590a0 MISC metadata.xml 221 RMD160 2fc5995011b7eceab1c03208c0092f186ef0b0f8 SHA1 8c8f09c56b97b0023bd1d6969b405c897483c981 SHA256 aa82e7a6c255f93f57f6024df47b9489d6ec4b34184c7778e9dd0f96c4b4f887 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAktE5bcACgkQNQqtfCuFneOSeACfXOCo0/3tVxT+3N4JfWYt2Ws8 -JzEAn1RJ4A/yf4bTp2/erG13CzRgVgAL -=jtSA ------END PGP SIGNATURE----- diff --git a/x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch b/x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch new file mode 100644 index 000000000000..a26ba91f5ec0 --- /dev/null +++ b/x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch @@ -0,0 +1,12 @@ +--- src/tilda_window.c 2008-01-17 23:07:39.000000000 +0100 ++++ src/tilda_window.c 2010-03-19 22:30:31.000000000 +0100 +@@ -427,6 +427,9 @@ + gtk_window_move (GTK_WINDOW(tw->window), config_getint ("x_pos"), config_getint ("y_pos")); + gtk_window_set_default_size (GTK_WINDOW(tw->window), config_getint ("max_width"), config_getint ("max_height")); + gtk_window_resize (GTK_WINDOW(tw->window), config_getint ("max_width"), config_getint ("max_height")); ++ /* Create GDK resources now, to prevent crashes later on */ ++ gtk_widget_realize (tw->window); ++ + generate_animation_positions (tw); + + return tw; diff --git a/x11-terms/tilda/tilda-0.9.6.ebuild b/x11-terms/tilda/tilda-0.9.6.ebuild index 6a844c3fbd54..6aba02370411 100644 --- a/x11-terms/tilda/tilda-0.9.6.ebuild +++ b/x11-terms/tilda/tilda-0.9.6.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/tilda/tilda-0.9.6.ebuild,v 1.6 2010/01/06 19:34:14 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/tilda/tilda-0.9.6.ebuild,v 1.7 2010/04/04 13:52:04 steev Exp $ + +inherit eutils DESCRIPTION="A drop down terminal, similar to the consoles found in first person shooters" HOMEPAGE="http://tilda.sourceforge.net" @@ -18,6 +20,12 @@ RDEPEND="x11-libs/vte DEPEND="${RDEPEND} dev-util/pkgconfig" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-0.9.6-gdk_resources.patch +} + src_install() { emake DESTDIR="${D}" install || die "emake install failed." dodoc AUTHORS ChangeLog README TODO -- 2.26.2