From 4064ea507c7fe01234e26b9d0900758a2ad56500 Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Tue, 27 Mar 2007 03:02:52 +0000 Subject: [PATCH] gnome 2.18.0 Package-Manager: portage-2.1.2.2 --- x11-libs/vte/ChangeLog | 8 ++- x11-libs/vte/Manifest | 26 +++++-- x11-libs/vte/files/digest-vte-0.16.0-r1 | 3 + .../vte/files/vte-0.16.0-expose-race.patch | 67 +++++++++++++++++++ x11-libs/vte/vte-0.16.0-r1.ebuild | 55 +++++++++++++++ 5 files changed, 151 insertions(+), 8 deletions(-) create mode 100644 x11-libs/vte/files/digest-vte-0.16.0-r1 create mode 100644 x11-libs/vte/files/vte-0.16.0-expose-race.patch create mode 100644 x11-libs/vte/vte-0.16.0-r1.ebuild diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog index 60464cd8b082..17c363160548 100644 --- a/x11-libs/vte/ChangeLog +++ b/x11-libs/vte/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/vte # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.143 2007/02/07 12:32:42 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.144 2007/03/27 03:02:52 dang Exp $ + +*vte-0.16.0-r1 (27 Mar 2007) + + 27 Mar 2007; Daniel Gryniewicz + +files/vte-0.16.0-expose-race.patch, +vte-0.16.0-r1.ebuild: + gnome 2.18.0 *vte-0.14.2 (07 Feb 2007) diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest index 8701f5a85ff8..14819d1a4f63 100644 --- a/x11-libs/vte/Manifest +++ b/x11-libs/vte/Manifest @@ -17,6 +17,10 @@ AUX vte-0.14.1-fbsd.patch 307 RMD160 4f819dbb3a7747a0a0098bedde4df42e5a70c455 SH MD5 e83373da40e4db9abcae7baeb5e552c5 files/vte-0.14.1-fbsd.patch 307 RMD160 4f819dbb3a7747a0a0098bedde4df42e5a70c455 files/vte-0.14.1-fbsd.patch 307 SHA256 74c78bd7e66de69f967cdbb7f928386bba8121f516861092a0a20f467171168b files/vte-0.14.1-fbsd.patch 307 +AUX vte-0.16.0-expose-race.patch 2374 RMD160 a0bbe54bd164288fa923cf605b3618f29e2c51f5 SHA1 16716639a2a69a335655896524ae97bc29c94a94 SHA256 42fa6eb567efbc607bfbf65ed0eae878cc4da4fe9e98fc5e944088766e121184 +MD5 f8454e6f65d63138133bbd3f456b99bc files/vte-0.16.0-expose-race.patch 2374 +RMD160 a0bbe54bd164288fa923cf605b3618f29e2c51f5 files/vte-0.16.0-expose-race.patch 2374 +SHA256 42fa6eb567efbc607bfbf65ed0eae878cc4da4fe9e98fc5e944088766e121184 files/vte-0.16.0-expose-race.patch 2374 AUX vte-line-scroll.patch 2234 RMD160 96dc248294da960119e6adb1012651803d9e0141 SHA1 bf3766828904091e778e1dcf6e15d52bdc97e7c0 SHA256 7b83355aa1b96afdd30506617614ec1e02de7dc81a170f1d1c702c99c2b9ab07 MD5 3805528034f3d01fa27e24f600618c0d files/vte-line-scroll.patch 2234 RMD160 96dc248294da960119e6adb1012651803d9e0141 files/vte-line-scroll.patch 2234 @@ -29,6 +33,7 @@ DIST vte-0.11.13.tar.bz2 952108 RMD160 4d51361121ccfd37023334a5175bd45f515a0356 DIST vte-0.12.2.tar.bz2 974551 RMD160 5ef474f9d4150df1f87459657a446b0d0fcfb32b SHA1 cc76a380dfe23cfc8aba606b146015a6954d67ae SHA256 41d22c945960feb1a924f58d2d237db2fbd1920cc48768ae0b4ac762245fcffb DIST vte-0.14.1.tar.bz2 1008999 RMD160 74b76a5632f790a71b606127767b06f0ce0b6597 SHA1 337868f308d0eed2a16f06c3c40d5496f672dbe9 SHA256 001b252018522a9dab890503a57949bd905d105dd317a2deca0e62f8cd16d6be DIST vte-0.14.2.tar.bz2 1031948 RMD160 e580abbe747ff806d32973d463c909283fcc3b12 SHA1 938e6ca0416191c6ac60745a96bfa84c5eb8519e SHA256 1ad92649f848064f903dd60a2d6d2b724d8fbe3c766bf5a4b6fcdbf1f2435088 +DIST vte-0.16.0.tar.bz2 1095254 RMD160 81b373d14ddfca0b489f5093533fd375c84f5b81 SHA1 a383bcfbcacf0e9fd036ba50b72cfc5866bb1102 SHA256 7f71faf8beb686f940f13125ff5fcc142c7b8ccde81cf80c8f278fdf4a0cacec EBUILD vte-0.11.13-r2.ebuild 1403 RMD160 9301fb707fb0cbaacccbe6a9b1846bdcb3324b81 SHA1 c15118c042f1ed236f9ce4480b00de0cba2dca33 SHA256 df949332a1d270e65e1b03e2f3bde5f079f5d4e7c90b550f68a7c01b7b05c540 MD5 7dd7c2b3c82a64d42c27385b8a5fd21e vte-0.11.13-r2.ebuild 1403 RMD160 9301fb707fb0cbaacccbe6a9b1846bdcb3324b81 vte-0.11.13-r2.ebuild 1403 @@ -45,10 +50,14 @@ EBUILD vte-0.14.2.ebuild 1237 RMD160 cf2236b538fb1e41c04e8299486bf9f1110549ae SH MD5 81e13eef14a171c6f375e39ac36e8822 vte-0.14.2.ebuild 1237 RMD160 cf2236b538fb1e41c04e8299486bf9f1110549ae vte-0.14.2.ebuild 1237 SHA256 7772ec9a0282ae3e1a32fcdfe04c650ad8f3bccb100b2cdf20d11f85c572753f vte-0.14.2.ebuild 1237 -MISC ChangeLog 16999 RMD160 ff9879135a16d8d6b5407dc368b72aaed812afbb SHA1 a2c62ccdf9728bdb2fe6929c5460c351e2c259e7 SHA256 e17ca6ed4dd4ddbfa687a96b27fb45fdead700acaeb54afa36f6585c9912b066 -MD5 65318d590158f76bf441b4951206399f ChangeLog 16999 -RMD160 ff9879135a16d8d6b5407dc368b72aaed812afbb ChangeLog 16999 -SHA256 e17ca6ed4dd4ddbfa687a96b27fb45fdead700acaeb54afa36f6585c9912b066 ChangeLog 16999 +EBUILD vte-0.16.0-r1.ebuild 1290 RMD160 5e4bf1b422f27757b45fa706e470cc8ed79e4fdc SHA1 e69198113abbc9bdb9d87194de667d7c6c658ff9 SHA256 2013d65564992eb0a6aa742bd63be284adf5fe5ee539c26d65cc7759d459643a +MD5 5359825d0bc6ed4a1720efcd068e0f65 vte-0.16.0-r1.ebuild 1290 +RMD160 5e4bf1b422f27757b45fa706e470cc8ed79e4fdc vte-0.16.0-r1.ebuild 1290 +SHA256 2013d65564992eb0a6aa742bd63be284adf5fe5ee539c26d65cc7759d459643a vte-0.16.0-r1.ebuild 1290 +MISC ChangeLog 17158 RMD160 e49b6a94fe4f47b27c19849a56405884e37c9900 SHA1 196430c6c54889a2b070a3d2370e76e8b5843bf4 SHA256 cce33db41be58436c1af3efd8f5978676dd55c93d23486d59370a1ce209272ce +MD5 f3e525870a87a9c25ac4427b6f5c32e5 ChangeLog 17158 +RMD160 e49b6a94fe4f47b27c19849a56405884e37c9900 ChangeLog 17158 +SHA256 cce33db41be58436c1af3efd8f5978676dd55c93d23486d59370a1ce209272ce ChangeLog 17158 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 @@ -65,10 +74,13 @@ SHA256 a9abe518a1fa6df543175ecd4c2f3c156c21280d43b179363f62601c04096255 files/di MD5 cb358ff1aab9078e7866f9f91e33ed4f files/digest-vte-0.14.2 238 RMD160 66f85e206fb56faf286223da6612631d8383f527 files/digest-vte-0.14.2 238 SHA256 ec8dc2a9068f5135280188fe2fb0ff902058d4b581f751ef444dc117ef6fb0b0 files/digest-vte-0.14.2 238 +MD5 06caa3f39116ff02deaafbef3f0e3a1d files/digest-vte-0.16.0-r1 238 +RMD160 0ccefd943b49face95b2f2e99cedf60f6710faf4 files/digest-vte-0.16.0-r1 238 +SHA256 6b92dc909d7b3bea5d7da8fac2dfd9fe2eb56b0d8e1d6a3aa41aa06676aab4bc files/digest-vte-0.16.0-r1 238 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF/GA98bi6rjpTunYRAkDgAJ99Ma1Psy9enfOD9V4EfIcaM33AdACfRz/k -SquPu4drd8/GUOwWQL7OXWk= -=j7G5 +iD8DBQFGCIkComPajV0RnrERAs5sAJwOxc7w29hkjPZ7Wl91wBiOJY3h0ACfVAqX +XANyzIJ86qCx2fUhIPf3Pis= +=ErGA -----END PGP SIGNATURE----- diff --git a/x11-libs/vte/files/digest-vte-0.16.0-r1 b/x11-libs/vte/files/digest-vte-0.16.0-r1 new file mode 100644 index 000000000000..049c2d0e0d20 --- /dev/null +++ b/x11-libs/vte/files/digest-vte-0.16.0-r1 @@ -0,0 +1,3 @@ +MD5 6b85967ba75ed574d0e5782697fbc79f vte-0.16.0.tar.bz2 1095254 +RMD160 81b373d14ddfca0b489f5093533fd375c84f5b81 vte-0.16.0.tar.bz2 1095254 +SHA256 7f71faf8beb686f940f13125ff5fcc142c7b8ccde81cf80c8f278fdf4a0cacec vte-0.16.0.tar.bz2 1095254 diff --git a/x11-libs/vte/files/vte-0.16.0-expose-race.patch b/x11-libs/vte/files/vte-0.16.0-expose-race.patch new file mode 100644 index 000000000000..3f12e483c93c --- /dev/null +++ b/x11-libs/vte/files/vte-0.16.0-expose-race.patch @@ -0,0 +1,67 @@ +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN vte-0.16.0.orig/src/vte.c vte-0.16.0/src/vte.c +--- vte-0.16.0.orig/src/vte.c 2007-03-08 11:47:15.000000000 -0500 ++++ vte-0.16.0/src/vte.c 2007-03-23 15:17:51.000000000 -0400 +@@ -1613,19 +1613,19 @@ vte_terminal_emit_adjustment_changed(Vte + } + + /* Queue an adjustment-changed signal to be delivered when convenient. */ +-static void ++static inline void + vte_terminal_queue_adjustment_changed(VteTerminal *terminal) + { + terminal->pvt->adjustment_changed_pending = TRUE; +- vte_terminal_start_processing (terminal); ++ add_update_timeout (terminal); + } +-static void ++static inline void + vte_terminal_queue_adjustment_value_changed(VteTerminal *terminal, glong v) + { + if (v != terminal->pvt->screen->scroll_delta) { + terminal->pvt->screen->scroll_delta = v; + terminal->pvt->adjustment_value_changed_pending = TRUE; +- vte_terminal_start_processing (terminal); ++ add_update_timeout (terminal); + } + } + +@@ -3643,7 +3643,7 @@ out: + } + + return !eof && +- (active_terminals ? g_list_length (active_terminals) : 1) * ++ g_list_length (active_terminals) * + terminal->pvt->input_bytes < terminal->pvt->max_input_bytes; + } + +@@ -3712,7 +3712,6 @@ vte_terminal_io_write(GIOChannel *channe + } + + if (_vte_buffer_length(terminal->pvt->outgoing) == 0) { +- _vte_terminal_disconnect_pty_write(terminal); + leave_open = FALSE; + } else { + leave_open = TRUE; +@@ -10130,14 +10129,19 @@ static gint + vte_terminal_expose(GtkWidget *widget, GdkEventExpose *event) + { + VteTerminal *terminal = VTE_TERMINAL (widget); ++ /* Beware the out of order events - ++ * do not even think about skipping exposes! */ + _vte_debug_print (VTE_DEBUG_WORK, "+"); +- if (terminal->pvt->visibility_state == GDK_VISIBILITY_FULLY_OBSCURED) { +- return FALSE; +- } + _vte_debug_print (VTE_DEBUG_EVENTS, "Expose (%d,%d)x(%d,%d)\n", + event->area.x, event->area.y, + event->area.width, event->area.height); + if (terminal->pvt->active != NULL && !in_update_timeout) { ++ /* fix up a race condition where we schedule a delayed update ++ * after an 'immediate' invalidate all */ ++ if (terminal->pvt->invalidated_all && ++ terminal->pvt->update_regions == NULL) { ++ terminal->pvt->invalidated_all = FALSE; ++ } + /* if we expect to redraw the widget soon, + * just add this event to the list */ + if (!terminal->pvt->invalidated_all) { diff --git a/x11-libs/vte/vte-0.16.0-r1.ebuild b/x11-libs/vte/vte-0.16.0-r1.ebuild new file mode 100644 index 000000000000..a51836429512 --- /dev/null +++ b/x11-libs/vte/vte-0.16.0-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.16.0-r1.ebuild,v 1.1 2007/03/27 03:02:52 dang Exp $ + +inherit eutils gnome2 autotools + +DESCRIPTION="Xft powered terminal widget" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug doc pcre python opengl" + +RDEPEND=">=dev-libs/glib-2.9 + >=x11-libs/gtk+-2.6 + >=x11-libs/pango-1.1 + >=media-libs/freetype-2.0.2 + media-libs/fontconfig + sys-libs/ncurses + opengl? ( + virtual/opengl + virtual/glu + ) + pcre? ( dev-libs/libpcre ) + python? ( + >=dev-python/pygtk-2.4 + >=dev-lang/python-2.2 + ) + || ( x11-libs/libX11 virtual/x11 ) + virtual/xft" + +DEPEND="${RDEPEND} + doc? ( >=dev-util/gtk-doc-1.0 ) + >=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.9 + sys-devel/gettext" + +DOCS="AUTHORS ChangeLog HACKING NEWS README" + +pkg_setup() { + G2CONF="$(use_enable debug debugging) $(use_enable python) \ + $(use_with opengl glX) $(use_with pcre) --with-xft2 --with-pangox" +} + +src_unpack() { + gnome2_src_unpack + + epatch ${FILESDIR}/${PN}-0.13.2-no-lazy-bindings.patch + + epatch "${FILESDIR}"/${P}-expose-race.patch + + cd ${S}/gnome-pty-helper + eautomake +} -- 2.26.2