public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/musl:master commit in: x11-libs/vte/files/, x11-libs/vte/
@ 2017-03-07 18:48 Aric Belsito
  0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2017-03-07 18:48 UTC (permalink / raw
  To: gentoo-commits

commit:     6b4f5032d1ea6d3c8f7c7ba02fd486eedcfea387
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Mar  7 18:48:18 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Mar  7 18:48:18 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=6b4f5032

x11-libs/vte: fix patch path

"PATCHES" only uses `patch -p1`

 x11-libs/vte/Manifest                              | 2 +-
 x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index ccb0b36..a58fb23 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,5 +1,5 @@
 AUX vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch 161 SHA256 bb8bfcb6d88f40dba0025e9ec95f579219db7e80654371a1c926fa39a38134b2 SHA512 bf8174189fe842d171c04633ce1f8b920f3a515108db48bfe1fff7e537960a88f7439a55b283b6ade6ebfe78ab8ff2473f3be2d062dc00aa74b93a13624b4d3c WHIRLPOOL 1df51a3ff3bd9e9bd76ddbf856236cb3872659c4a4771473409668a6214dd5ebe51d8bed77829b7075736ebf06aaccb6fc3863f260f630bd666af0fce3fa1b83
-AUX vte-0.28.2-add_HAVE_ROUND.patch 430 SHA256 0af936b79e7ecbee4fa14a7dd8853f261aeac82625c87aedeee32f260526e440 SHA512 ffef2c472c955bbab37fc068e842fd7c6ef8a98271c3a71cb26855ea0647e2d356c59e614ae13f66ccd884af269e24f0242ebbf5c94702e43839f9f568a2af5c WHIRLPOOL 73c8b43ab70ce8af6d6d32f72d52b0e8d403fd3fcf0afbbf7476ce17738551142121d54438e9f85bb42e7769fffc5637eacc5783c0506ad3cbde752afe5e497b
+AUX vte-0.28.2-add_HAVE_ROUND.patch 300 SHA256 1c93fe7743106db7920ad6c7bb4e741abe9ffb921b5c103226d96e5c9b07117d SHA512 e9ab770ecf4e41083cd08db48e8c970ac32a103e046b5b85812eef56115e6acb47d356a2a67b61add559a5cc768adf35658bf3697cdb181273fd6a35af41bff9 WHIRLPOOL 0dffb40a8b6f84f528f388cebb37c939519db86188b1b8a7fe684efd4979f2ee18ad8f9758b6940efc3d5278a2d65217bab8c952db6e6e4805ad328d7393685d
 AUX vte-0.28.2-interix.patch 1566 SHA256 0c3bd451d2a48dd38b375fc7d72b675bbfcbcda66f6fbcdd20eeee315727d518 SHA512 f02574f96355c6cedde05d0877d3bf50e7777d210484a80b6e95e597b0bb225f5968649e67f67d7f112f50302ae6566e4f3d8c59d7a5b65fc95601cac00868d7 WHIRLPOOL cd444a499735517fd523e358fa0ad39f9bd8771911da18f06ddb453cdabace3cdb20e2f9aa13428efb1e6b1227ff9e10b56eb3d27616714ac873eb2a64796ae4
 AUX vte-0.28.2-limit-arguments.patch 1477 SHA256 164af2b6756329f1ceb0cac77b5e6bc47d486e1bb0b4e5d3a6fc284e4e7f0ae9 SHA512 e5639d94fd455195c354d03cab04bbb73eff98bc540c813cccf4ab5eb793f4c8ae645fcf2bd502924ed4d38412101341deaf2d28ea8aaea3530a98ffbba8256d WHIRLPOOL a0d9b077d9748c4cfe26ea03c16d9b29ed7c62e994639ae6510b7b50c4cd91c5215337da9310297dbf2bd105fabe85c45453e998c0aa34445cdcdd7192307739
 AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 SHA256 95ff6eb5d17e7c209aa4751dfd150a1baa97d8b5d1b31658d7645751eb38cad6 SHA512 46a54c96889c3a0c5a293a097f777dd2e24e5a3025b808d7fb0bbfe71e8938f7d30ba26a05e67cb6b63ad59719eace57d0f6e0ff9f2860fbe9f12c36e022b8ec WHIRLPOOL 5aed1b127b364e02a127b4d90bdfcd4d2cdb5b646b0ca1097401f8037cc28d5c309c8138070982378ef30bd0bb4e20795bb14bea536cebbc7d3734c5a5c6355a

diff --git a/x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch b/x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch
index a0ebd51..2d97a10 100644
--- a/x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch
+++ b/x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch
@@ -1,6 +1,5 @@
-diff -ur a/vte-0.28.2/config.h.in b/vte-0.28.2/config.h.in
---- a/vte-0.28.2/config.h.in	2015-07-10 20:49:18.179999269 -0200
-+++ b/vte-0.28.2/config.h.in	2011-08-28 23:33:19.000000000 -0200
+--- vte-0.28.2.orig/config.h.in
++++ vte-0.28.2/config.h.in
 @@ -82,6 +82,9 @@
  /* Define if you have the recvmsg function. */
  #undef HAVE_RECVMSG


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-libs/vte/files/, x11-libs/vte/
@ 2020-11-13 15:35 Jory Pratt
  0 siblings, 0 replies; 4+ messages in thread
From: Jory Pratt @ 2020-11-13 15:35 UTC (permalink / raw
  To: gentoo-commits

commit:     adf500dcaf4a0d228747ce71a219aaa27d432e42
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 13 15:34:50 2020 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 15:34:50 2020 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=adf500dc

x11-libs/vte: sync with stable ::gentoo, cleanup old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 x11-libs/vte/Manifest                              |  5 +-
 .../vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch      | 10 ---
 x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch | 12 ---
 x11-libs/vte/files/vte-0.28.2-interix.patch        | 51 -------------
 .../vte/files/vte-0.28.2-limit-arguments.patch     | 40 ----------
 ...0.28.2-repaint-after-change-scroll-region.patch | 86 ----------------------
 x11-libs/vte/files/vte-0.30.1-alt-meta.patch       | 74 -------------------
 x11-libs/vte/vte-0.28.2-r209.ebuild                | 81 --------------------
 .../vte/{vte-0.58.3.ebuild => vte-0.60.3.ebuild}   | 20 +++--
 9 files changed, 14 insertions(+), 365 deletions(-)

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 006d314..f7f6f1d 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,3 +1,2 @@
-DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
-DIST vte-0.58.3-command-notify.patch.xz 4964 BLAKE2B f8414d3bf124bd3de4c08e22a051feabdb11fbded7562a0bf9858fb8b8cf6327a3fdf7e18592eacd9f3608af5b720fe9a0cb598092a12c816d37d36899d88f6b SHA512 0de06ec0019127ec2729950228f8cae3e61a306207e177b8427789d4f6477f102d78232bd7f1a6e02cc218f507474427ad8366bc3c16c8a305b432dba96ba685
-DIST vte-0.58.3.tar.xz 514844 BLAKE2B 1f48e95ec81397937c8a5a3d34ea9a7d1835d6cacec6e1b90b78568505d509b375f55678462428dd01da00e7290e4543bbab2dbb0aea46a322788fbaf022427b SHA512 b0a38eb1cd7d923b0431af943dbdb89932833f9a2b0b8fc1fa9ee728c87418c1f5a424b2ccee661721093a80c569f3b41c721b0ba2302ba0c3a42d4c5e31aa9a
+DIST vte-0.60.3-command-notify.patch.xz 6108 BLAKE2B 1f96788c097b003a3f9041529a0ff8ad083fe60597920632450e65ce13ad7181cb3bd4f2713ee19ab7d15154e3546720cdd0a72fabb3710ea7149c63cb159a1f SHA512 070d17fa2dfeed5ccb5ad67687bfb65a6a9dd79db300bb6e00f7d35b8ab3563c331e5f48bbecc32f8037475db319fb71f35e72108f260b6446fd2dd8e1a2897e
+DIST vte-0.60.3.tar.xz 535504 BLAKE2B c5556fdb91d876aa681d2a9466fa4f4c0ee6be630d076949fbd01878baffdf319e50ec75575729c49c09484914d9ee103d4d491861aedb678b0e336cd4ddcc2e SHA512 3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18

diff --git a/x11-libs/vte/files/vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch b/x11-libs/vte/files/vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch
deleted file mode 100644
index 3ca3983..0000000
--- a/x11-libs/vte/files/vte-0.28.2-GNU_SOURCE-for-ptsname_r.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- vte-0.28.2.orig/src/pty.c
-+++ vte-0.28.2/src/pty.c
-@@ -28,6 +28,7 @@
-  * Since: 0.26
-  */
- 
-+#define _GNU_SOURCE
- #include <config.h>
- 
- #include "vtepty.h"

diff --git a/x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch b/x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch
deleted file mode 100644
index 2d97a10..0000000
--- a/x11-libs/vte/files/vte-0.28.2-add_HAVE_ROUND.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- vte-0.28.2.orig/config.h.in
-+++ vte-0.28.2/config.h.in
-@@ -82,6 +82,9 @@
- /* Define if you have the recvmsg function. */
- #undef HAVE_RECVMSG
- 
-+/* Define to 1 if you have the `round' function. */
-+#undef HAVE_ROUND
-+
- /* Define to 1 if you have the `setpgid' function. */
- #undef HAVE_SETPGID
- 

diff --git a/x11-libs/vte/files/vte-0.28.2-interix.patch b/x11-libs/vte/files/vte-0.28.2-interix.patch
deleted file mode 100644
index c54d46e..0000000
--- a/x11-libs/vte/files/vte-0.28.2-interix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-reported upstream: https://bugzilla.gnome.org/show_bug.cgi?id=652290
-
-diff -ru vte-0.26.2.orig/configure.in vte-0.26.2/configure.in
---- vte-0.26.2.orig/configure.in	2011-08-17 08:30:55 +0200
-+++ vte-0.26.2/configure.in	2011-08-17 08:35:42 +0200
-@@ -362,7 +362,11 @@
- 	AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.])
- fi
- AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
--AC_CHECK_FUNCS([ceil floor])
-+dnl if the first check didn't find floor, it caches the "no" value,
-+dnl and doesn't recheck. this makes the below check fail always on
-+dnl systems with floor in -lm. thus we unset the chached result.
-+unset ac_cv_func_floor
-+AC_CHECK_FUNCS([ceil floor round])
- 
- # Look for tgetent
- 
---- vte-0.26.2.orig/configure	2012-04-30 20:02:55.000000000 +0200
-+++ vte-0.26.2/configure	2012-04-30 20:03:16.000000000 +0200
-@@ -13277,7 +13277,7 @@
- 
- fi
- 
--for ac_func in ceil floor
-+for ac_func in ceil floor round
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-diff -ru vte-0.26.2.orig/src/vte.c vte-0.26.2/src/vte.c
---- vte-0.26.2.orig/src/vte.c	2011-08-17 08:30:58 +0200
-+++ vte-0.26.2/src/vte.c	2011-08-17 08:38:09 +0200
-@@ -63,6 +63,18 @@
- #include <locale.h>
- #endif
- 
-+#ifndef HAVE_ROUND
-+# if defined(HAVE_CEIL) && defined(HAVE_FLOOR)
-+static inline double round(double x) {
-+	if(x - floor(x) < 0.5) {
-+		return floor(x);
-+	} else {
-+		return ceil(x);
-+	}
-+}
-+# endif
-+#endif
-+
- #if GTK_CHECK_VERSION (2, 90, 7)
- #define GDK_KEY(symbol) GDK_KEY_##symbol
- #else

diff --git a/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch b/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch
deleted file mode 100644
index fd45407..0000000
--- a/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From feeee4b5832b17641e505b7083e0d299fdae318e Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Sat, 19 May 2012 17:36:09 +0000
-Subject: emulation: Limit integer arguments to 65535
-
-To guard against malicious sequences containing excessively big numbers,
-limit all parsed numbers to 16 bit range. Doing this here in the parsing
-routine is a catch-all guard; this doesn't preclude enforcing
-more stringent limits in the handlers themselves.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=676090
----
-diff --git a/src/table.c b/src/table.c
-index 140e8c8..85cf631 100644
---- a/src/table.c
-+++ b/src/table.c
-@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array,
- 		if (G_UNLIKELY (*array == NULL)) {
- 			*array = g_value_array_new(1);
- 		}
--		g_value_set_long(&value, total);
-+		g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));
- 		g_value_array_append(*array, &value);
- 	} while (i++ < arginfo->length);
- 	g_value_unset(&value);
-diff --git a/src/vteseq.c b/src/vteseq.c
-index 457c06a..46def5b 100644
---- a/src/vteseq.c
-+++ b/src/vteseq.c
-@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal,
-                               GValueArray *params,
-                               VteTerminalSequenceHandler handler)
- {
--        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);
-+        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT);
- }
- 
- static void
---
-cgit v0.9.0.2

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
deleted file mode 100644
index 86e5471..0000000
--- a/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-https://git.gnome.org/browse/vte/commit/?id=88e8e89560a62d0981ce2b18974a230d0a07dbdd
-
-From 88e8e89560a62d0981ce2b18974a230d0a07dbdd Mon Sep 17 00:00:00 2001
-From: Micah Cowan <micah@cowan.name>
-Date: Tue, 22 Oct 2013 23:30:43 +0200
-Subject: widget: Fix invalidation region
-
-When the sequence handler moves the cursor into the restricted scrolling region,
-the bbox needs to be reset, too.
-Fixes glitches with interspersing writes to the bottom line with scrolls of the
-upper region, and also fixes missing screen redraws when using mosh.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=542087
-https://bugzilla.gnome.org/show_bug.cgi?id=686097
-
-diff --git a/src/vte.c b/src/vte.c
-index 9f6d7d8..a4d9d25 100644
---- a/src/vte.c
-+++ b/src/vte.c
-@@ -4077,6 +4077,7 @@ vte_terminal_process_incoming(VteTerminal *terminal)
- 	long wcount, start, delta;
- 	gboolean leftovers, modified, bottom, again;
- 	gboolean invalidated_text;
-+	gboolean in_scroll_region;
- 	GArray *unichars;
- 	struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL;
- 
-@@ -4096,6 +4097,10 @@ vte_terminal_process_incoming(VteTerminal *terminal)
- 	cursor = screen->cursor_current;
- 	cursor_visible = terminal->pvt->cursor_visible;
- 
-+	in_scroll_region = screen->scrolling_restricted
-+	    && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
-+	    && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
-+
- 	/* We should only be called when there's data to process. */
- 	g_assert(terminal->pvt->incoming ||
- 		 (terminal->pvt->pending->len > 0));
-@@ -4194,6 +4199,8 @@ skip_chunk:
- 		 * points to the first character which isn't part of this
- 		 * sequence. */
- 		if ((match != NULL) && (match[0] != '\0')) {
-+			gboolean new_in_scroll_region;
-+
- 			/* Call the right sequence handler for the requested
- 			 * behavior. */
- 			_vte_terminal_handle_sequence(terminal,
-@@ -4204,12 +4211,21 @@ skip_chunk:
- 			start = (next - wbuf);
- 			modified = TRUE;
- 
--			/* if we have moved during the sequence handler, restart the bbox */
-+			new_in_scroll_region = screen->scrolling_restricted
-+			    && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
-+			    && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
-+
-+			delta = screen->scroll_delta;	/* delta may have changed from sequence. */
-+
-+			/* if we have moved greatly during the sequence handler, or moved
-+                         * into a scroll_region from outside it, restart the bbox.
-+                         */
- 			if (invalidated_text &&
--					(screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
--					 screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK     ||
--					 screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
--					 screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) {
-+					((new_in_scroll_region && !in_scroll_region) ||
-+					 (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
-+					  screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK     ||
-+					  screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
-+					  screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) {
- 				/* Clip off any part of the box which isn't already on-screen. */
- 				bbox_topleft.x = MAX(bbox_topleft.x, 0);
- 				bbox_topleft.y = MAX(bbox_topleft.y, delta);
-@@ -4229,6 +4245,8 @@ skip_chunk:
- 				bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT;
- 				bbox_topleft.x = bbox_topleft.y = G_MAXINT;
- 			}
-+
-+			in_scroll_region = new_in_scroll_region;
- 		} else
- 		/* Second, we have a NULL match, and next points to the very
- 		 * next character in the buffer.  Insert the character which
--- 
-cgit v0.10.2
-

diff --git a/x11-libs/vte/files/vte-0.30.1-alt-meta.patch b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
deleted file mode 100644
index bd364be..0000000
--- a/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 15 Nov 2011 03:06:40 -0500
-Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2
- compatibility
-
-Also, since VTE_META_MASK is now a mask with multiple bits set, code that
-compares gdk key modifiers to VTE_META_MASK by numerical equality is no
-longer guaranteed to work. Therefore, for such comparisons a new function,
-vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits
-matching matching VTE_META_MASK are set, then all are set.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=663779
----
- src/keymap.c |   15 +++++++++++++--
- src/keymap.h |    2 +-
- 2 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/src/keymap.c b/src/keymap.c
-index 9a21669..95b4c5b 100644
---- a/src/keymap.c
-+++ b/src/keymap.c
-@@ -990,6 +990,17 @@ static const struct _vte_keymap_group {
- 	{GDK_KEY (F35),		_vte_keymap_GDK_F35},
- };
- 
-+/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK,
-+ * despite being a compound mask, is treated as indivisible. */
-+GdkModifierType
-+_vte_keymap_fixup_modifiers(GdkModifierType modifiers,
-+		GdkModifierType mask)
-+{
-+	if (modifiers & VTE_META_MASK)
-+		modifiers |= VTE_META_MASK;
-+	return modifiers & mask;
-+}
-+
- /* Map the specified keyval/modifier setup, dependent on the mode, to either
-  * a literal string or a capability name. */
- void
-@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval,
- 	} else {
- 		fkey_mode = fkey_default;
- 	}
--	modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
-+	modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
- 
- 	/* Search for the conditions. */
- 	for (i = 0; entries[i].normal_length || entries[i].special[0]; i++)
-@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
- 		return;
- 	}
- 
--	switch (modifiers & significant_modifiers) {
-+	switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) {
- 	case 0:
- 		modifier = 0;
- 		break;
-diff --git a/src/keymap.h b/src/keymap.h
-index 243e22e..21d9b8e 100644
---- a/src/keymap.h
-+++ b/src/keymap.h
-@@ -27,7 +27,7 @@
- 
- G_BEGIN_DECLS
- 
--#define VTE_META_MASK		GDK_META_MASK
-+#define VTE_META_MASK		(GDK_META_MASK | GDK_MOD1_MASK)
- #define VTE_NUMLOCK_MASK	GDK_MOD2_MASK
- 
- /* Map the specified keyval/modifier setup, dependent on the mode, to either
--- 
-1.7.8.rc3
-

diff --git a/x11-libs/vte/vte-0.28.2-r209.ebuild b/x11-libs/vte/vte-0.28.2-r209.ebuild
deleted file mode 100644
index 0728488..0000000
--- a/x11-libs/vte/vte-0.28.2-r209.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit gnome2
-
-DESCRIPTION="GNOME terminal widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc64 x86"
-IUSE="debug +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=x11-libs/gtk+-2.20:2[introspection?]
-	>=x11-libs/pango-1.22.0
-
-	sys-libs/ncurses:0=
-	x11-libs/libX11
-	x11-libs/libXft
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-PDEPEND="x11-libs/gnome-pty-helper"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=663779
-	"${FILESDIR}"/${PN}-0.30.1-alt-meta.patch
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=652290
-	"${FILESDIR}"/${PN}-0.28.2-interix.patch
-
-	# Fix CVE-2012-2738, upstream bug #676090
-	"${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch
-
-	# Fix https://bugzilla.gnome.org/show_bug.cgi?id=542087
-	# Patch from https://github.com/pld-linux/vte0/commit/1e8dce16b239e5d378b02e4d04a60e823df36257
-	"${FILESDIR}"/${PN}-0.28.2-repaint-after-change-scroll-region.patch
-
-	# Fix musl issues, bug #554416
-	"${FILESDIR}"/${PN}-0.28.2-add_HAVE_ROUND.patch
-	"${FILESDIR}"/${PN}-0.28.2-GNU_SOURCE-for-ptsname_r.patch
-)
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_configure() {
-	local myconf=""
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		myconf="${myconf} --disable-Bsymbolic"
-
-		# interix stropts.h is empty...
-		export ac_cv_header_stropts_h=no
-	fi
-
-	# Do not disable gnome-pty-helper, bug #401389
-	gnome2_src_configure --disable-python \
-		--disable-deprecation \
-		--disable-glade-catalogue \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		--with-gtk=2.0 \
-		${myconf}
-}
-
-src_install() {
-	gnome2_src_install
-
-	rm -v "${ED}usr/libexec/gnome-pty-helper" || die
-}

diff --git a/x11-libs/vte/vte-0.58.3.ebuild b/x11-libs/vte/vte-0.60.3.ebuild
similarity index 77%
rename from x11-libs/vte/vte-0.58.3.ebuild
rename to x11-libs/vte/vte-0.60.3.ebuild
index abdbca2..9605876 100644
--- a/x11-libs/vte/vte-0.58.3.ebuild
+++ b/x11-libs/vte/vte-0.60.3.ebuild
@@ -12,19 +12,21 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 
 LICENSE="LGPL-3+ GPL-3+"
 SLOT="2.91"
-IUSE="+crypt debug gtk-doc +introspection +vala vanilla"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc64 x86"
+IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 REQUIRED_USE="vala? ( introspection )"
 
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.58.3-command-notify.patch.xz )"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.60.3-command-notify.patch.xz )"
 
 RDEPEND="
-	>=x11-libs/gtk+-3.16:3[introspection?]
+	>=x11-libs/gtk+-3.24.14:3[introspection?]
 	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.40:2
+	>=dev-libs/glib-2.52:2
 	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	icu? ( dev-libs/icu:= )
 	>=x11-libs/pango-1.22.0
 	>=dev-libs/libpcre2-10.21
+	systemd? ( >=sys-apps/systemd-220:= )
 	sys-libs/zlib
 	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
 	x11-libs/pango[introspection?]
@@ -45,10 +47,10 @@ src_prepare() {
 	if ! use vanilla; then
 		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch
 		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
-		eapply "${WORKDIR}"/${PN}-0.58.3-command-notify.patch
+		eapply "${WORKDIR}"/${PN}-0.60.3-command-notify.patch
 	fi
 
-	eapply "${FILESDIR}/${PN}-0.54.2-musl-remove-W_EXITCODE.patch"
+	use elibc_musl &&  eapply "${FILESDIR}/${PN}-0.54.2-musl-remove-W_EXITCODE.patch"
 
 	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
 	sed -e '/ggdb3/d' -i meson.build || die
@@ -59,6 +61,7 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
+		-Da11y=true
 		$(meson_use debug debugg)
 		$(meson_use gtk-doc docs)
 		$(meson_use introspection gir)
@@ -66,7 +69,8 @@ src_configure() {
 		$(meson_use crypt gnutls)
 		-Dgtk3=true
 		-Dgtk4=false
-		-Diconv=true
+		$(meson_use icu)
+		$(meson_use systemd _systemd)
 		$(meson_use vala vapi)
 	)
 	meson_src_configure


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-libs/vte/files/, x11-libs/vte/
@ 2021-03-12 14:47 Jory Pratt
  0 siblings, 0 replies; 4+ messages in thread
From: Jory Pratt @ 2021-03-12 14:47 UTC (permalink / raw
  To: gentoo-commits

commit:     1918ff8157424496c591704f3cf782205f7d5737
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 14:47:12 2021 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 14:47:12 2021 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=1918ff81

x11-libs/vte: sync with ::gentoo, update patch to apply cleanly

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 x11-libs/vte/Manifest                              |  2 +
 .../files/vte-0.62.3-musl-remove-W_EXITCODE.patch  | 34 +++++++++
 x11-libs/vte/vte-0.62.3.ebuild                     | 82 ++++++++++++++++++++++
 3 files changed, 118 insertions(+)

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index f7f6f1d..e0b2e27 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,2 +1,4 @@
 DIST vte-0.60.3-command-notify.patch.xz 6108 BLAKE2B 1f96788c097b003a3f9041529a0ff8ad083fe60597920632450e65ce13ad7181cb3bd4f2713ee19ab7d15154e3546720cdd0a72fabb3710ea7149c63cb159a1f SHA512 070d17fa2dfeed5ccb5ad67687bfb65a6a9dd79db300bb6e00f7d35b8ab3563c331e5f48bbecc32f8037475db319fb71f35e72108f260b6446fd2dd8e1a2897e
 DIST vte-0.60.3.tar.xz 535504 BLAKE2B c5556fdb91d876aa681d2a9466fa4f4c0ee6be630d076949fbd01878baffdf319e50ec75575729c49c09484914d9ee103d4d491861aedb678b0e336cd4ddcc2e SHA512 3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18
+DIST vte-0.62.1-command-notify.patch.xz 4844 BLAKE2B 22301fdc5f1969beb2ad9b316fea8972f696f0e54e1a24d5eceedec71162afc2991b7963a71ce8925a94f6c40e5303d3db760b872d0eebbdc6d05b22d3c59ecc SHA512 491e241b0f5aae50e59d25751e95579d40c47e7e4c7f2b279522347f7f2f7f00c92bdf5fa4a651e4146bcfa9439f03b6311b4061fb20c5679c09b97a4924dcf1
+DIST vte-0.62.3.tar.xz 447152 BLAKE2B 2c55430490af577cdbad8bbcbb53902ccc4ab8d9643d5e8b3279e96b4285347e652e761644c957961732eeb50d12e33fa3d3c735be9899ad14c1e2f35377f2a7 SHA512 0475e2813b305bf1b5d48ece5959f2feb10e89b589fa3b75032ae466fd5254bf5c2fc6085dc296d65c5df84790a38892534ff401109843bf964ae62a8c540a81

diff --git a/x11-libs/vte/files/vte-0.62.3-musl-remove-W_EXITCODE.patch b/x11-libs/vte/files/vte-0.62.3-musl-remove-W_EXITCODE.patch
new file mode 100644
index 0000000..49633be
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.62.3-musl-remove-W_EXITCODE.patch
@@ -0,0 +1,34 @@
+From 1c1de9e9119cf1e0ef45a594ca9bbf306d2209cb Mon Sep 17 00:00:00 2001
+From:
+Date: Fri, 12 Mar 2021 08:41:13 -0600
+Subject: [PATCH] Expanded non-standard W_EXITCODE macro for Musl compatibility
+
+---
+ src/widget.cc | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/widget.cc b/src/widget.cc
+index 44a2271..109ff5f 100644
+--- a/src/widget.cc
++++ b/src/widget.cc
+@@ -20,8 +20,6 @@
+ 
+ #include "widget.hh"
+ 
+-#include <sys/wait.h> // for W_EXITCODE
+-
+ #include <exception>
+ #include <new>
+ #include <string>
+@@ -235,7 +233,7 @@ void
+ Widget::dispose() noexcept
+ {
+         if (m_terminal->terminate_child()) {
+-                int status = W_EXITCODE(0, SIGKILL);
++                int status = (0) << 8 | (SIGKILL); // W_EXITCODE(ret, sig)
+                 emit_child_exited(status);
+         }
+ }
+-- 
+2.26.2
+

diff --git a/x11-libs/vte/vte-0.62.3.ebuild b/x11-libs/vte/vte-0.62.3.ebuild
new file mode 100644
index 0000000..e263de4
--- /dev/null
+++ b/x11-libs/vte/vte-0.62.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91"
+IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+REQUIRED_USE="vala? ( introspection )"
+
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.62.1-command-notify.patch.xz )"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.24.14:3[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.52:2
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	icu? ( dev-libs/icu:= )
+	>=x11-libs/pango-1.22.0
+	>=dev-libs/libpcre2-10.21
+	systemd? ( >=sys-apps/systemd-220:= )
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	x11-libs/pango[introspection?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.13
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	if ! use vanilla; then
+		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.62.1-command-notify.patch
+	fi
+
+	use elibc_musl &&  eapply "${FILESDIR}/${PN}-0.62.3-musl-remove-W_EXITCODE.patch"
+
+	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
+	sed -e '/ggdb3/d' -i meson.build || die
+
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Da11y=true
+		$(meson_use debug debugg)
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dfribidi=true # pulled in by pango anyhow
+		$(meson_use crypt gnutls)
+		-Dgtk3=true
+		-Dgtk4=false
+		$(meson_use icu)
+		$(meson_use systemd _systemd)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-libs/vte/files/, x11-libs/vte/
@ 2022-04-25 17:40 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-04-25 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     4cefb8f49efdfa9e0445e14d3d9950f3d9f944a7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 17:40:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 17:40:30 2022 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=4cefb8f4

x11-libs/vte: treeclean

Bug: https://bugs.gentoo.org/840583
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-libs/vte/Manifest                              |  4 -
 .../files/vte-0.62.3-musl-remove-W_EXITCODE.patch  | 34 --------
 ...python-explicitly-to-honor-downstream-pyt.patch | 48 -----------
 x11-libs/vte/metadata.xml                          |  8 --
 x11-libs/vte/vte-0.64.2.ebuild                     | 91 ---------------------
 x11-libs/vte/vte-0.66.2.ebuild                     | 92 ----------------------
 6 files changed, 277 deletions(-)

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
deleted file mode 100644
index 82d36fbc..00000000
--- a/x11-libs/vte/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST vte-0.64.1-command-notify.patch.xz 4880 BLAKE2B d6ff5f4acac161980c8c18245e65795c7f0ea3d0819748894b055306ecd731d698cac578eff2750795a9180a9b17d79f220e814083012d5a04f4f351ff2a0e36 SHA512 174397aeca00399b138286fd4cc88941add041a1f2596fd42222d44c886c2e35b2a33041b58a102ee3acbcddc0cc40fcfde39d72ec46b640ee1db22d8ae684c4
-DIST vte-0.64.2.tar.bz2 486837 BLAKE2B 3e127d61e4018607ca2df170108aef65b224a48df4d57545c98cbdb9753cbe7b9821e91a5bccd09d8c39af95d747a2ff01c69320e9245f5a82e7887b62c32c97 SHA512 6cbc1ee25a0ef2b00bcf26c07042eccc14fdea323e4445123db9fad05bf2e799579d723f6147c08712aec9b94e17003ce8f9e6ebe65278fdb3832cf77cba5be5
-DIST vte-0.66.2-command-notify.patch.xz 9672 BLAKE2B 8153a250f571f491845041627029065029bd32ab63c127aacc0852f42abee0834c716d63248120a49011857901d775b75fc0c31a513cfb113563e8ffb599e478 SHA512 d491f8332fbd21e8dfe225636ca035339ab1da3bd7dc74436cdd2f3de3c5f24f609f9825c4eb0b816c9f60862da62b97f36381c5cc5af0203b3698d56fc77d3e
-DIST vte-0.66.2.tar.bz2 503503 BLAKE2B 174a0d9bfdaf2318255e62041ed94aa53f8fc110ed55f3e7b24baa70dd01a4851306ac47cc3f1d6699341c9ab41f85aee57c460b9f96bfd14618f0f40e4bd657 SHA512 6e9e2cc03b72c2d04aa3d7633dcf86649dcef39fdfecbe7a0c4b063eaccdb2ea83207f592edf348fad5a36f091d9261cc46fd0a4e9e5db6006fcecb0d01a6ccc

diff --git a/x11-libs/vte/files/vte-0.62.3-musl-remove-W_EXITCODE.patch b/x11-libs/vte/files/vte-0.62.3-musl-remove-W_EXITCODE.patch
deleted file mode 100644
index 49633bed..00000000
--- a/x11-libs/vte/files/vte-0.62.3-musl-remove-W_EXITCODE.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1c1de9e9119cf1e0ef45a594ca9bbf306d2209cb Mon Sep 17 00:00:00 2001
-From:
-Date: Fri, 12 Mar 2021 08:41:13 -0600
-Subject: [PATCH] Expanded non-standard W_EXITCODE macro for Musl compatibility
-
----
- src/widget.cc | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/widget.cc b/src/widget.cc
-index 44a2271..109ff5f 100644
---- a/src/widget.cc
-+++ b/src/widget.cc
-@@ -20,8 +20,6 @@
- 
- #include "widget.hh"
- 
--#include <sys/wait.h> // for W_EXITCODE
--
- #include <exception>
- #include <new>
- #include <string>
-@@ -235,7 +233,7 @@ void
- Widget::dispose() noexcept
- {
-         if (m_terminal->terminate_child()) {
--                int status = W_EXITCODE(0, SIGKILL);
-+                int status = (0) << 8 | (SIGKILL); // W_EXITCODE(ret, sig)
-                 emit_child_exited(status);
-         }
- }
--- 
-2.26.2
-

diff --git a/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch b/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
deleted file mode 100644
index 79171d29..00000000
--- a/x11-libs/vte/files/vte-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://gitlab.gnome.org/GNOME/vte/-/issues/350
-
-From d459d32126119c8d78f8239b8b857a255e6005d7 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sat, 1 May 2021 08:31:45 -0400
-Subject: [PATCH] meson: Find python explicitly to honor downstream python
- choice
-
----
- meson.build     | 1 +
- src/meson.build | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 4f5a7c57..6404802f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -461,6 +461,7 @@ pango_dep    = dependency('pango',      version: '>=' + pango_req_version)
- pcre2_dep    = dependency('libpcre2-8', version: '>=' + pcre2_req_version)
- pthreads_dep = dependency('threads')
- zlib_dep     = dependency('zlib')
-+python       = import('python').find_installation('python3')
- 
- if get_option('fribidi')
-   fribidi_dep = dependency('fribidi', version: '>=' + fribidi_req_version)
-diff --git a/src/meson.build b/src/meson.build
-index a1440da5..4ac6a7f2 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -60,6 +60,7 @@ modes_sources = files(
- modes_sources += custom_target(
-   'modes',
-   command: [
-+    python,
-     files('modes.py'),
-     '--destdir', '@OUTDIR@',
-   ],
-@@ -92,6 +93,7 @@ parser_sources = files(
- parser_sources += custom_target(
-   'parser-seq',
-   command: [
-+    python,
-     files('parser-seq.py'),
-     '--destdir', '@OUTDIR@',
-   ],
--- 
-2.26.3
-

diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml
deleted file mode 100644
index 996e7cac..00000000
--- a/x11-libs/vte/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-</pkgmetadata>

diff --git a/x11-libs/vte/vte-0.64.2.ebuild b/x11-libs/vte/vte-0.64.2.ebuild
deleted file mode 100644
index cd0ca0fb..00000000
--- a/x11-libs/vte/vte-0.64.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.32"
-
-inherit gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
-
-LICENSE="LGPL-3+ GPL-3+"
-SLOT="2.91"
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
-REQUIRED_USE="vala? ( introspection )"
-
-# Upstream is hostile and refuses to upload tarballs.
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.64.1-command-notify.patch.xz )"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.24.14:3[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.52:2
-	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0
-	>=dev-libs/libpcre2-10.21
-	systemd? ( >=sys-apps/systemd-220:= )
-	sys-libs/zlib
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	x11-libs/pango[introspection?]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.13
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
-)
-
-src_prepare() {
-	if ! use vanilla; then
-		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch
-		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
-		eapply "${WORKDIR}"/${PN}-0.64.1-command-notify.patch
-	fi
-
-	use elibc_musl &&  eapply "${FILESDIR}/${PN}-0.62.3-musl-remove-W_EXITCODE.patch"
-
-	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
-	sed -e '/ggdb3/d' -i meson.build || die
-
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Da11y=true
-		$(meson_use debug debugg)
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection gir)
-		-Dfribidi=true # pulled in by pango anyhow
-		-Dglade=true
-		$(meson_use crypt gnutls)
-		-Dgtk3=true
-		-Dgtk4=false
-		$(meson_use icu)
-		$(meson_use systemd _systemd)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}

diff --git a/x11-libs/vte/vte-0.66.2.ebuild b/x11-libs/vte/vte-0.66.2.ebuild
deleted file mode 100644
index 491fcb6b..00000000
--- a/x11-libs/vte/vte-0.66.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.48"
-
-inherit gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte"
-
-# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
-LICENSE="LGPL-3+ GPL-3+"
-SLOT="2.91"
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="amd64 arm arm64 ~mips ~ppc ~ppc64 x86"
-REQUIRED_USE="vala? ( introspection )"
-
-# Upstream is hostile and refuses to upload tarballs.
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.66.2-command-notify.patch.xz )"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.24.22:3[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=dev-libs/glib-2.52:2
-	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
-	icu? ( dev-libs/icu:= )
-	>=x11-libs/pango-1.22.0
-	>=dev-libs/libpcre2-10.21
-	systemd? ( >=sys-apps/systemd-220:= )
-	sys-libs/zlib
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	x11-libs/pango[introspection?]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.13
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.64.1-meson-Find-python-explicitly-to-honor-downstream-pyt.patch
-)
-
-src_prepare() {
-	if ! use vanilla; then
-		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f31/f/vte291-cntnr-precmd-preexec-scroll.patch
-		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
-		eapply "${WORKDIR}"/${PN}-0.66.2-command-notify.patch
-	fi
-
-	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
-	sed -e '/ggdb3/d' -i meson.build || die
-
-	use elibc_musl &&  eapply "${FILESDIR}/${PN}-0.62.3-musl-remove-W_EXITCODE.patch"
-
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Da11y=true
-		$(meson_use debug debugg)
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection gir)
-		-Dfribidi=true # pulled in by pango anyhow
-		-Dglade=true
-		$(meson_use crypt gnutls)
-		-Dgtk3=true
-		-Dgtk4=false
-		$(meson_use icu)
-		$(meson_use systemd _systemd)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-04-25 17:40 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-25 17:40 [gentoo-commits] proj/musl:master commit in: x11-libs/vte/files/, x11-libs/vte/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2021-03-12 14:47 Jory Pratt
2020-11-13 15:35 Jory Pratt
2017-03-07 18:48 Aric Belsito

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox