1 |
commit: f302c8e9de129d5d8a6b2cd23e93c0c1bdfb6408 |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Mar 2 18:38:31 2017 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Mar 2 18:40:07 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f302c8e9 |
7 |
|
8 |
x11-libs/vte: version bump to 0.28.2-r208 |
9 |
|
10 |
appease repoman |
11 |
|
12 |
x11-libs/vte/Manifest | 6 +- |
13 |
...0.28.2-repaint-after-change-scroll-region.patch | 86 ++++++++++++++++++++++ |
14 |
x11-libs/vte/metadata.xml | 3 - |
15 |
x11-libs/vte/vte-0.28.2-r207.ebuild | 7 +- |
16 |
...e-0.28.2-r207.ebuild => vte-0.28.2-r208.ebuild} | 34 +++++---- |
17 |
5 files changed, 112 insertions(+), 24 deletions(-) |
18 |
|
19 |
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest |
20 |
index 4da657d..ccb0b36 100644 |
21 |
--- a/x11-libs/vte/Manifest |
22 |
+++ b/x11-libs/vte/Manifest |
23 |
@@ -2,7 +2,9 @@ AUX vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch 161 SHA256 bb8bfcb6d88f40dba0025e9 |
24 |
AUX vte-0.28.2-add_HAVE_ROUND.patch 430 SHA256 0af936b79e7ecbee4fa14a7dd8853f261aeac82625c87aedeee32f260526e440 SHA512 ffef2c472c955bbab37fc068e842fd7c6ef8a98271c3a71cb26855ea0647e2d356c59e614ae13f66ccd884af269e24f0242ebbf5c94702e43839f9f568a2af5c WHIRLPOOL 73c8b43ab70ce8af6d6d32f72d52b0e8d403fd3fcf0afbbf7476ce17738551142121d54438e9f85bb42e7769fffc5637eacc5783c0506ad3cbde752afe5e497b |
25 |
AUX vte-0.28.2-interix.patch 1566 SHA256 0c3bd451d2a48dd38b375fc7d72b675bbfcbcda66f6fbcdd20eeee315727d518 SHA512 f02574f96355c6cedde05d0877d3bf50e7777d210484a80b6e95e597b0bb225f5968649e67f67d7f112f50302ae6566e4f3d8c59d7a5b65fc95601cac00868d7 WHIRLPOOL cd444a499735517fd523e358fa0ad39f9bd8771911da18f06ddb453cdabace3cdb20e2f9aa13428efb1e6b1227ff9e10b56eb3d27616714ac873eb2a64796ae4 |
26 |
AUX vte-0.28.2-limit-arguments.patch 1477 SHA256 164af2b6756329f1ceb0cac77b5e6bc47d486e1bb0b4e5d3a6fc284e4e7f0ae9 SHA512 e5639d94fd455195c354d03cab04bbb73eff98bc540c813cccf4ab5eb793f4c8ae645fcf2bd502924ed4d38412101341deaf2d28ea8aaea3530a98ffbba8256d WHIRLPOOL a0d9b077d9748c4cfe26ea03c16d9b29ed7c62e994639ae6510b7b50c4cd91c5215337da9310297dbf2bd105fabe85c45453e998c0aa34445cdcdd7192307739 |
27 |
+AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 SHA256 95ff6eb5d17e7c209aa4751dfd150a1baa97d8b5d1b31658d7645751eb38cad6 SHA512 46a54c96889c3a0c5a293a097f777dd2e24e5a3025b808d7fb0bbfe71e8938f7d30ba26a05e67cb6b63ad59719eace57d0f6e0ff9f2860fbe9f12c36e022b8ec WHIRLPOOL 5aed1b127b364e02a127b4d90bdfcd4d2cdb5b646b0ca1097401f8037cc28d5c309c8138070982378ef30bd0bb4e20795bb14bea536cebbc7d3734c5a5c6355a |
28 |
AUX vte-0.30.1-alt-meta.patch 2490 SHA256 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430 WHIRLPOOL bc51d9467bb13d627e7355872db5777e3d39ca07753dda9237110f8857d16bca5f8bc4334f9d97df54a2fcbc9234f123247ec8f40508e8120f00ffc46ff0a570 |
29 |
DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c |
30 |
-EBUILD vte-0.28.2-r207.ebuild 2783 SHA256 f496d33402c8f4d2ca1ccae69ed1a7b1da7466be587bd2be11499829448611e3 SHA512 b1cc15d36eb99a1eed8ffa8beb475f01074053d419741106cb5485a53eb2bd4116eafc4d55a1d7d51cdc2a88fdbbefa5fa0b1cf4f5e4d29461e2f140605ee422 WHIRLPOOL 302ad598d4e8499fe1871b87e4853258597f4db7451421b99c1f8d753dbdd636e4b6d5bd12f00d9168d9dbfa386d42a01d27874b8587eac033aaa912a7b3b1c8 |
31 |
-MISC metadata.xml 348 SHA256 e70b7fc4a21f1a7caba00ef2dcc656a7e79e15e0459519e260a27136fb6f0d88 SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4 WHIRLPOOL 15b683c11d7ab6a5648686b2b6a66dd1cf6034a612504a83f96b81253e3089a278bb7c70681ebe543e6904aab9e9f3d3579505cec4caf3df5ed44b34391a4138 |
32 |
+EBUILD vte-0.28.2-r207.ebuild 2889 SHA256 3a79b6ff9c6a211ab77f5f0f6d3996ce9cdfaeffd8d587c4bbf548920ff3cbd4 SHA512 6f085527f189a682112ee0102bad17c5c646bf79b824b2bc1efd6f6d3aeed3166537211c597ce348e09b982048e99fbfcd9d153855d5743ef6d822317b557a95 WHIRLPOOL 5b382ee38aa1e7f3052fec25a58b5894cee280bad1c4d9f08c9de1d57c4dd2e63357d2e33097972aba26a15b26f6841485d026d2e31dbb8173e126def8ce3964 |
33 |
+EBUILD vte-0.28.2-r208.ebuild 3065 SHA256 e6daea3be6ea7818f5ae2293d568520f6d4b8e67c19b9e5f874987a858068321 SHA512 3c2f4253db9e5675e3d43d37a1a1a8f674502e8f1f79439aaf05f51248c96e99b981fbf656f56343bcc5d2b07e1590837977e756ae4bc8e510448be9807c5cc1 WHIRLPOOL 1307cbaae55afc42d1534f896dd56073c5e0d8b7d77c053cd82f4267553f23547680bba6d8e5ee85c7c5f44d521beb66488c4f52da8e042b7389a583c7b2c5ef |
34 |
+MISC metadata.xml 253 SHA256 8f92439176f4cd2ba6a060c523c6b29ab210cd9aab7903b6db6eecc6654b1e21 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 WHIRLPOOL d5d853bd8a39a54c45728e16a1aa295e014e0a3a105a01ec6b3c93a4f53d7b7055644708301751b7f5be68543056d3f0bd611d5ce0be442eb5d06f5e032fe154 |
35 |
|
36 |
diff --git a/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch b/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch |
37 |
new file mode 100644 |
38 |
index 0000000..86e5471 |
39 |
--- /dev/null |
40 |
+++ b/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch |
41 |
@@ -0,0 +1,86 @@ |
42 |
+https://git.gnome.org/browse/vte/commit/?id=88e8e89560a62d0981ce2b18974a230d0a07dbdd |
43 |
+ |
44 |
+From 88e8e89560a62d0981ce2b18974a230d0a07dbdd Mon Sep 17 00:00:00 2001 |
45 |
+From: Micah Cowan <micah@×××××.name> |
46 |
+Date: Tue, 22 Oct 2013 23:30:43 +0200 |
47 |
+Subject: widget: Fix invalidation region |
48 |
+ |
49 |
+When the sequence handler moves the cursor into the restricted scrolling region, |
50 |
+the bbox needs to be reset, too. |
51 |
+Fixes glitches with interspersing writes to the bottom line with scrolls of the |
52 |
+upper region, and also fixes missing screen redraws when using mosh. |
53 |
+ |
54 |
+https://bugzilla.gnome.org/show_bug.cgi?id=542087 |
55 |
+https://bugzilla.gnome.org/show_bug.cgi?id=686097 |
56 |
+ |
57 |
+diff --git a/src/vte.c b/src/vte.c |
58 |
+index 9f6d7d8..a4d9d25 100644 |
59 |
+--- a/src/vte.c |
60 |
++++ b/src/vte.c |
61 |
+@@ -4077,6 +4077,7 @@ vte_terminal_process_incoming(VteTerminal *terminal) |
62 |
+ long wcount, start, delta; |
63 |
+ gboolean leftovers, modified, bottom, again; |
64 |
+ gboolean invalidated_text; |
65 |
++ gboolean in_scroll_region; |
66 |
+ GArray *unichars; |
67 |
+ struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL; |
68 |
+ |
69 |
+@@ -4096,6 +4097,10 @@ vte_terminal_process_incoming(VteTerminal *terminal) |
70 |
+ cursor = screen->cursor_current; |
71 |
+ cursor_visible = terminal->pvt->cursor_visible; |
72 |
+ |
73 |
++ in_scroll_region = screen->scrolling_restricted |
74 |
++ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) |
75 |
++ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); |
76 |
++ |
77 |
+ /* We should only be called when there's data to process. */ |
78 |
+ g_assert(terminal->pvt->incoming || |
79 |
+ (terminal->pvt->pending->len > 0)); |
80 |
+@@ -4194,6 +4199,8 @@ skip_chunk: |
81 |
+ * points to the first character which isn't part of this |
82 |
+ * sequence. */ |
83 |
+ if ((match != NULL) && (match[0] != '\0')) { |
84 |
++ gboolean new_in_scroll_region; |
85 |
++ |
86 |
+ /* Call the right sequence handler for the requested |
87 |
+ * behavior. */ |
88 |
+ _vte_terminal_handle_sequence(terminal, |
89 |
+@@ -4204,12 +4211,21 @@ skip_chunk: |
90 |
+ start = (next - wbuf); |
91 |
+ modified = TRUE; |
92 |
+ |
93 |
+- /* if we have moved during the sequence handler, restart the bbox */ |
94 |
++ new_in_scroll_region = screen->scrolling_restricted |
95 |
++ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) |
96 |
++ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); |
97 |
++ |
98 |
++ delta = screen->scroll_delta; /* delta may have changed from sequence. */ |
99 |
++ |
100 |
++ /* if we have moved greatly during the sequence handler, or moved |
101 |
++ * into a scroll_region from outside it, restart the bbox. |
102 |
++ */ |
103 |
+ if (invalidated_text && |
104 |
+- (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || |
105 |
+- screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || |
106 |
+- screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || |
107 |
+- screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) { |
108 |
++ ((new_in_scroll_region && !in_scroll_region) || |
109 |
++ (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || |
110 |
++ screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || |
111 |
++ screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || |
112 |
++ screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) { |
113 |
+ /* Clip off any part of the box which isn't already on-screen. */ |
114 |
+ bbox_topleft.x = MAX(bbox_topleft.x, 0); |
115 |
+ bbox_topleft.y = MAX(bbox_topleft.y, delta); |
116 |
+@@ -4229,6 +4245,8 @@ skip_chunk: |
117 |
+ bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT; |
118 |
+ bbox_topleft.x = bbox_topleft.y = G_MAXINT; |
119 |
+ } |
120 |
++ |
121 |
++ in_scroll_region = new_in_scroll_region; |
122 |
+ } else |
123 |
+ /* Second, we have a NULL match, and next points to the very |
124 |
+ * next character in the buffer. Insert the character which |
125 |
+-- |
126 |
+cgit v0.10.2 |
127 |
+ |
128 |
|
129 |
diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml |
130 |
index e72feac..996e7ca 100644 |
131 |
--- a/x11-libs/vte/metadata.xml |
132 |
+++ b/x11-libs/vte/metadata.xml |
133 |
@@ -5,7 +5,4 @@ |
134 |
<email>gnome@g.o</email> |
135 |
<name>Gentoo GNOME Desktop</name> |
136 |
</maintainer> |
137 |
- <use> |
138 |
- <flag name="glade">Provide integration with <pkg>dev-util/glade</pkg>.</flag> |
139 |
- </use> |
140 |
</pkgmetadata> |
141 |
|
142 |
diff --git a/x11-libs/vte/vte-0.28.2-r207.ebuild b/x11-libs/vte/vte-0.28.2-r207.ebuild |
143 |
index bd17758..f28f678 100644 |
144 |
--- a/x11-libs/vte/vte-0.28.2-r207.ebuild |
145 |
+++ b/x11-libs/vte/vte-0.28.2-r207.ebuild |
146 |
@@ -1,6 +1,5 @@ |
147 |
-# Copyright 1999-2016 Gentoo Foundation |
148 |
+# Copyright 1999-2017 Gentoo Foundation |
149 |
# Distributed under the terms of the GNU General Public License v2 |
150 |
-# $Id$ |
151 |
|
152 |
EAPI="5" |
153 |
GCONF_DEBUG="no" |
154 |
@@ -13,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE" |
155 |
|
156 |
LICENSE="LGPL-2+" |
157 |
SLOT="0" |
158 |
-KEYWORDS="amd64 arm ~mips ppc x86" |
159 |
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris" |
160 |
IUSE="debug +introspection python" |
161 |
|
162 |
RDEPEND=" |
163 |
@@ -21,7 +20,7 @@ RDEPEND=" |
164 |
>=x11-libs/gtk+-2.20:2[introspection?] |
165 |
>=x11-libs/pango-1.22.0 |
166 |
|
167 |
- sys-libs/ncurses |
168 |
+ sys-libs/ncurses:0= |
169 |
x11-libs/libX11 |
170 |
x11-libs/libXft |
171 |
|
172 |
|
173 |
diff --git a/x11-libs/vte/vte-0.28.2-r207.ebuild b/x11-libs/vte/vte-0.28.2-r208.ebuild |
174 |
similarity index 75% |
175 |
copy from x11-libs/vte/vte-0.28.2-r207.ebuild |
176 |
copy to x11-libs/vte/vte-0.28.2-r208.ebuild |
177 |
index bd17758..27a7ec3 100644 |
178 |
--- a/x11-libs/vte/vte-0.28.2-r207.ebuild |
179 |
+++ b/x11-libs/vte/vte-0.28.2-r208.ebuild |
180 |
@@ -1,19 +1,17 @@ |
181 |
-# Copyright 1999-2016 Gentoo Foundation |
182 |
+# Copyright 1999-2017 Gentoo Foundation |
183 |
# Distributed under the terms of the GNU General Public License v2 |
184 |
-# $Id$ |
185 |
|
186 |
-EAPI="5" |
187 |
-GCONF_DEBUG="no" |
188 |
+EAPI="6" |
189 |
PYTHON_COMPAT=( python2_7 ) |
190 |
|
191 |
-inherit eutils gnome2 python-r1 |
192 |
+inherit gnome2 python-r1 |
193 |
|
194 |
DESCRIPTION="GNOME terminal widget" |
195 |
HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE" |
196 |
|
197 |
LICENSE="LGPL-2+" |
198 |
SLOT="0" |
199 |
-KEYWORDS="amd64 arm ~mips ppc x86" |
200 |
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris" |
201 |
IUSE="debug +introspection python" |
202 |
|
203 |
RDEPEND=" |
204 |
@@ -21,7 +19,7 @@ RDEPEND=" |
205 |
>=x11-libs/gtk+-2.20:2[introspection?] |
206 |
>=x11-libs/pango-1.22.0 |
207 |
|
208 |
- sys-libs/ncurses |
209 |
+ sys-libs/ncurses:0= |
210 |
x11-libs/libX11 |
211 |
x11-libs/libXft |
212 |
|
213 |
@@ -39,22 +37,28 @@ DEPEND="${RDEPEND} |
214 |
" |
215 |
PDEPEND="x11-libs/gnome-pty-helper" |
216 |
|
217 |
-src_prepare() { |
218 |
- DOCS="AUTHORS ChangeLog HACKING NEWS README" |
219 |
- |
220 |
+PATCHES=( |
221 |
# https://bugzilla.gnome.org/show_bug.cgi?id=663779 |
222 |
- epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch" |
223 |
+ "${FILESDIR}"/${PN}-0.30.1-alt-meta.patch |
224 |
|
225 |
# https://bugzilla.gnome.org/show_bug.cgi?id=652290 |
226 |
- epatch "${FILESDIR}"/${PN}-0.28.2-interix.patch |
227 |
+ "${FILESDIR}"/${PN}-0.28.2-interix.patch |
228 |
|
229 |
# Fix CVE-2012-2738, upstream bug #676090 |
230 |
- epatch "${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch |
231 |
+ "${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch |
232 |
+ |
233 |
+ # Fix https://bugzilla.gnome.org/show_bug.cgi?id=542087 |
234 |
+ # Patch from https://github.com/pld-linux/vte0/commit/1e8dce16b239e5d378b02e4d04a60e823df36257 |
235 |
+ "${FILESDIR}"/${PN}-0.28.2-repaint-after-change-scroll-region.patch |
236 |
|
237 |
# Fix musl issues, bug #554416 |
238 |
- epatch "${FILESDIR}"/${PN}-0.28.2-add_HAVE_ROUND.patch |
239 |
- epatch "${FILESDIR}"/${PN}-0.28.2-GNU_SOURCE-for-ptsname_r.patch |
240 |
+ "${FILESDIR}"/${PN}-0.28.2-add_HAVE_ROUND.patch |
241 |
+ "${FILESDIR}"/${PN}-0.28.2-GNU_SOURCE-for-ptsname_r.patch |
242 |
+) |
243 |
|
244 |
+DOCS="AUTHORS ChangeLog HACKING NEWS README" |
245 |
+ |
246 |
+src_prepare() { |
247 |
prepare_python() { |
248 |
mkdir -p "${BUILD_DIR}" || die |
249 |
} |