* [gentoo-commits] repo/gentoo:master commit in: x11-libs/vte/, x11-libs/vte/files/
@ 2016-12-09 18:44 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2016-12-09 18:44 UTC (permalink / raw
To: gentoo-commits
commit: 3396864d0ca5e0845ae8aa8a6ac298c7a0f5d385
Author: Dawid Jarosz <dawid.jarosz <AT> gmail <DOT> com>
AuthorDate: Thu Sep 1 12:47:11 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 9 18:44:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3396864d
x11-libs/vte: backport upstream repainting patch
If you are using gnome-terminal or xfce4-terminal, you may have hit a
bug in vte3. A fix is around since at least 2010, which found its way
into some (but not all) distribution packages, and even into upstream
(3 years later, but unchanged).
Bug: https://bugzilla.gnome.org/show_bug.cgi?=542087
Bug: https://github.com/mobile-shell/mosh/issues/660
Closes: https://github.com/gentoo/gentoo/pull/2444
Commit: https://git.gnome.org/browse/vte/commit/?id=88e8e89560a62d0981ce2b18974a230d0a07dbdd
Source: https://github.com/pld-linux/vte0/commit/1e8dce16b239e5d378b02e4d04a60e823df36257
...0.28.2-repaint-after-change-scroll-region.patch | 86 ++++++++++++++
x11-libs/vte/vte-0.28.2-r208.ebuild | 127 +++++++++++++++++++++
2 files changed, 213 insertions(+)
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
new file mode 100644
index 00000000..86e5471
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.28.2-repaint-after-change-scroll-region.patch
@@ -0,0 +1,86 @@
+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/vte-0.28.2-r208.ebuild b/x11-libs/vte/vte-0.28.2-r208.ebuild
new file mode 100644
index 00000000..b04cc4a
--- /dev/null
+++ b/x11-libs/vte/vte-0.28.2-r208.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="GNOME terminal widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug +introspection python"
+
+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:= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ )
+"
+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
+)
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+src_prepare() {
+ prepare_python() {
+ mkdir -p "${BUILD_DIR}" || die
+ }
+ if use python; then
+ python_foreach_impl prepare_python
+ fi
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ configure_python() {
+ ECONF_SOURCE="${S}" gnome2_src_configure --enable-python
+ }
+
+ if use python; then
+ python_foreach_impl run_in_build_dir configure_python
+ fi
+
+ 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_compile() {
+ gnome2_src_compile
+
+ compile_python() {
+ cd "${BUILD_DIR}"/python || die
+ ln -s "${S}"/src/libvte.la "${BUILD_DIR}"/src/ || die
+ mkdir -p "${BUILD_DIR}"/src/.libs || die
+ ln -s "${S}"/src/.libs/libvte.so "${BUILD_DIR}"/src/.libs/ || die
+ emake CPPFLAGS="${CPPFLAGS} -I${S}/src"
+ }
+
+ if use python; then
+ python_foreach_impl run_in_build_dir compile_python
+ fi
+}
+
+src_install() {
+ gnome2_src_install
+
+ install_python() {
+ cd "${BUILD_DIR}"/python || die
+ emake install DESTDIR="${D}" \
+ CPPFLAGS="${CPPFLAGS} -I${S}/src"
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir install_python
+ fi
+
+ rm -v "${ED}usr/libexec/gnome-pty-helper" || die
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/vte/, x11-libs/vte/files/
@ 2020-01-11 20:11 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2020-01-11 20:11 UTC (permalink / raw
To: gentoo-commits
commit: 3fdfbfc38675987b589e833f6a10c2c98a20a4b3
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 20:06:53 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 20:11:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fdfbfc3
x11-libs/vte: remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
x11-libs/vte/Manifest | 2 -
x11-libs/vte/files/0.54.4-vala-0.44-compat.patch | 29 --------
x11-libs/vte/vte-0.48.4.ebuild | 93 ------------------------
3 files changed, 124 deletions(-)
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 5d2be72556d..36ce84d3473 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,5 +1,3 @@
DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
-DIST vte-0.48.4-command-notify.patch.xz 5500 BLAKE2B 88b655403d2bef034604a283b173fece305af35f51b20f9d4811b33265b5a6eb83441e0b978539de501d118a8431c4a9a9a69a111a03c45adc87763b15b09fd2 SHA512 b8ba202aedb5d821962a7cdc89e6ef8ac8a3480dd7681bf8ce708ce511598f3335ba153750d40cb06e9a2c5bab5888b3daef9096458c2889d94028feaa394575
-DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b27109724fb318d28200220f1514fb23e4cdc90263a756914b5db442c947578c8854a535cb960a06f7bc03a77 SHA512 4b75bd881e58b5043bc44e391ef3a826a2c25d0f1bb5ffb890367e11a60b1bcbce091575ede6972a89ae043b39c51897f91fca1faf6872664d602e503d8020fc
DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
DIST vte-0.56.4.tar.xz 1100952 BLAKE2B 3c3ec69f4078bdb07a4501df4aeb31aaeb7f9fa5a4631152d486fbb2c950362612cd9dff4abe25b93da6c712a37a20ccbf050ad33d96ec7b997bb1409189f60b SHA512 5a6c79b30f07c1f5848ef59028864d893cc605b9ad8f49ae819958aaed962d2ff96baad379f126381b8bf00015003c5a6dc28c792e4e050ba35090338bd7dabb
diff --git a/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch b/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch
deleted file mode 100644
index 5da32bea838..00000000000
--- a/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 53690d5cee51bdb7c3f7680d3c22b316b1086f2c Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sat, 1 Dec 2018 19:04:59 +0100
-Subject: [PATCH] vala: Fix build with vala 0.43+ git master due to empty
- struct definition
-
-This should get a proper refactoring as the FIXME suggests.
-
-See https://gitlab.gnome.org/GNOME/vte/issues/76
----
- bindings/vala/app.vala | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala
-index 8663d63c..a534e76b 100644
---- a/bindings/vala/app.vala
-+++ b/bindings/vala/app.vala
-@@ -819,6 +819,8 @@ class App : Gtk.Application
-
- public struct Options
- {
-+ //FIXME Merge this struct into App class
-+ public int dummy;
- public static bool audible = false;
- public static string? command = null;
- private static string? cjk_ambiguous_width_string = null;
---
-2.20.1
-
diff --git a/x11-libs/vte/vte-0.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
deleted file mode 100644
index 5ffe7d62e34..00000000000
--- a/x11-libs/vte/vte-0.48.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.32"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
-
-LICENSE="LGPL-2+"
-SLOT="2.91"
-IUSE="+crypt debug glade +introspection vala vanilla"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-REQUIRED_USE="vala? ( introspection )"
-
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~eva/distfiles/${PN}/${P}-command-notify.patch.xz )"
-
-RDEPEND="
- >=dev-libs/glib-2.40:2
- >=dev-libs/libpcre2-10.21
- >=x11-libs/gtk+-3.16:3[introspection?]
- >=x11-libs/pango-1.22.0
-
- sys-libs/ncurses:0=
- sys-libs/zlib
-
- crypt? ( >=net-libs/gnutls-3.2.7:0= )
- glade? ( >=dev-util/glade-3.9:3.10 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
- dev-util/gperf
- dev-libs/libxml2
- >=dev-util/gtk-doc-am-1.13
- >=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/pkgconfig
-
- vala? ( $(vala_depend) )
-"
-RDEPEND="${RDEPEND}
- !x11-libs/vte:2.90[glade]
-"
-
-src_prepare() {
- if ! use vanilla; then
- # First half of http://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/vte291-command-notify-scroll-speed.patch
- # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
- eapply "${WORKDIR}"/${P}-command-notify.patch
- fi
-
- # Fix bindings test compilation with vala:0.44 and newer - https://gitlab.gnome.org/GNOME/vte/issues/76
- eapply "${FILESDIR}"/0.54.4-vala-0.44-compat.patch
-
- use vala && vala_src_prepare
-
- # build fails because of -Werror with gcc-5.x
- sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
-
- gnome2_src_prepare
-}
-
-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
-
- # Python bindings are via gobject-introspection
- # Ex: from gi.repository import Vte
- gnome2_src_configure \
- --disable-test-application \
- --disable-static \
- --with-gtk=3.0 \
- $(use_enable debug) \
- $(use_enable glade glade-catalogue) \
- $(use_with crypt gnutls) \
- $(use_enable introspection) \
- $(use_enable vala) \
- ${myconf}
-}
-
-src_install() {
- gnome2_src_install
- mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/vte/, x11-libs/vte/files/
@ 2022-04-22 0:46 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-04-22 0:46 UTC (permalink / raw
To: gentoo-commits
commit: c44771d1fa957cd2f04b42d79f900205575f0faa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 00:46:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 00:46:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c44771d1
x11-libs/vte: fix musl build
Closes: https://bugs.gentoo.org/835489
Closes: https://bugs.gentoo.org/554416
Thanks-to: Jory A. Pratt <anarchy <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../vte/files/vte-0.66.2-musl-W_EXITCODE.patch | 29 ++++++++++++++++++++++
x11-libs/vte/vte-0.66.2.ebuild | 2 ++
x11-libs/vte/vte-0.68.0.ebuild | 2 ++
3 files changed, 33 insertions(+)
diff --git a/x11-libs/vte/files/vte-0.66.2-musl-W_EXITCODE.patch b/x11-libs/vte/files/vte-0.66.2-musl-W_EXITCODE.patch
new file mode 100644
index 000000000000..b629613feaf6
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.66.2-musl-W_EXITCODE.patch
@@ -0,0 +1,29 @@
+https://gitlab.gnome.org/GNOME/vte/-/issues/72
+https://bugs.gentoo.org/835489
+https://bugs.gentoo/org/554416
+
+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
+
+--- 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);
+ }
+ }
diff --git a/x11-libs/vte/vte-0.66.2.ebuild b/x11-libs/vte/vte-0.66.2.ebuild
index 2fdbc105f8d7..9de97c89a24b 100644
--- a/x11-libs/vte/vte-0.66.2.ebuild
+++ b/x11-libs/vte/vte-0.66.2.ebuild
@@ -53,6 +53,8 @@ PATCHES=(
)
src_prepare() {
+ use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
+
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
diff --git a/x11-libs/vte/vte-0.68.0.ebuild b/x11-libs/vte/vte-0.68.0.ebuild
index 161fb49fb97e..36caed902924 100644
--- a/x11-libs/vte/vte-0.68.0.ebuild
+++ b/x11-libs/vte/vte-0.68.0.ebuild
@@ -56,6 +56,8 @@ src_prepare() {
use vala && vala_setup
xdg_environment_reset
+ use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
+
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/vte/, x11-libs/vte/files/
@ 2022-12-01 15:44 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2022-12-01 15:44 UTC (permalink / raw
To: gentoo-commits
commit: f3f872cf1888a65e0ce0fce669ff0fe72721f62d
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 15:41:05 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 15:44:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f872cf
x11-libs/vte: Delete SLOT="0"
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-libs/vte/Manifest | 1 -
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 | 77 -------------------
6 files changed, 329 deletions(-)
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 2ea547593f3d..8f9544563fb4 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,4 +1,3 @@
-DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
DIST vte-0.68.0-command-notify.patch.xz 9748 BLAKE2B de2d4c9b7f2c2b21518984f818d0052c0084398f5f4ee30d766a6adb9c4536fdec5027c753d3d710fb7432e67472b7f8ca44f1dd5f51aaef48d9124708975d24 SHA512 89be91cdba36749f97bac872f0f2196be7d36a58beaf94fa24a3ae9c266bdfbf4f4fbf1d10f43a276540653fff7062eb844107016e7f014437f2903d251dc1d7
DIST vte-0.68.0.tar.bz2 507598 BLAKE2B 10274d9e804f00bf071b7848633ca8de2953f4e91dc2967e33b7d6698bb304baac4f0e0431debae5a972c2c56c65efd1c5b92455a17db08cf254ddec56d3276e SHA512 785df7261b5075f166e59de7d3535b381564715ce65efd4837a130e153528691b610fc6160c00f0f17008f5f4ee94c23350d9a477b4b1d58da6ace083e5caae1
DIST vte-0.70.0-command-notify.patch.xz 9040 BLAKE2B 108dd05d00409af90b1fd3e9b5c3b0e5586ac80204cef8840fda935204cbc480fec1193e2a0a2782f98e2b094c3caebbfe61cf18631b16921df05cf3808afd22 SHA512 92123e7f5cb6ef876f2b2b108dbef59bce212efebd64cd790d49d9ee3215344acd848eec5d326fe2c3bd236846ed3b896148024390093491b2f6e2f7c46e2bd1
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 c54d46ebc3dc..000000000000
--- 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 fd454079390f..000000000000
--- 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 86e547103ad7..000000000000
--- 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 bd364be5846c..000000000000
--- 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 05034d5f7abb..000000000000
--- a/x11-libs/vte/vte-0.28.2-r209.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 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="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-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
-)
-
-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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/vte/, x11-libs/vte/files/
@ 2023-05-17 21:55 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2023-05-17 21:55 UTC (permalink / raw
To: gentoo-commits
commit: 8a7d8ee9937c046bdb0880a554445a6db392e8c9
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 21:15:17 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed May 17 21:54:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a7d8ee9
x11-libs/vte: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-libs/vte/Manifest | 3 -
...value-is-outside-the-valid-range-clang-16.patch | 47 ---------
x11-libs/vte/vte-0.70.3-r1.ebuild | 105 ---------------------
x11-libs/vte/vte-0.70.3.ebuild | 101 --------------------
x11-libs/vte/vte-0.70.4.ebuild | 105 ---------------------
x11-libs/vte/vte-0.72.0.ebuild | 101 --------------------
6 files changed, 462 deletions(-)
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 7785ba8c33da..77e615d36ced 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,7 +1,4 @@
DIST vte-0.68.0-command-notify.patch.xz 9748 BLAKE2B de2d4c9b7f2c2b21518984f818d0052c0084398f5f4ee30d766a6adb9c4536fdec5027c753d3d710fb7432e67472b7f8ca44f1dd5f51aaef48d9124708975d24 SHA512 89be91cdba36749f97bac872f0f2196be7d36a58beaf94fa24a3ae9c266bdfbf4f4fbf1d10f43a276540653fff7062eb844107016e7f014437f2903d251dc1d7
DIST vte-0.68.0.tar.bz2 507598 BLAKE2B 10274d9e804f00bf071b7848633ca8de2953f4e91dc2967e33b7d6698bb304baac4f0e0431debae5a972c2c56c65efd1c5b92455a17db08cf254ddec56d3276e SHA512 785df7261b5075f166e59de7d3535b381564715ce65efd4837a130e153528691b610fc6160c00f0f17008f5f4ee94c23350d9a477b4b1d58da6ace083e5caae1
DIST vte-0.70.0-command-notify.patch.xz 9040 BLAKE2B 108dd05d00409af90b1fd3e9b5c3b0e5586ac80204cef8840fda935204cbc480fec1193e2a0a2782f98e2b094c3caebbfe61cf18631b16921df05cf3808afd22 SHA512 92123e7f5cb6ef876f2b2b108dbef59bce212efebd64cd790d49d9ee3215344acd848eec5d326fe2c3bd236846ed3b896148024390093491b2f6e2f7c46e2bd1
-DIST vte-0.70.3.tar.bz2 502706 BLAKE2B 1fee46dee38618137781d62b27730893b0c6969cf3badfa157628621a608983be48e35ef4d8e58099c93b8be91434b257d120cab2e7a943cfecaf37ff7b3fd5d SHA512 5520bc58b0ad2f803da27985e30862de987ecc31c0137895c6945c53f99a7c16ee0281646b9e04362de934364ee7beaa1acf47dad9baf5a16ab9898d5f746d2d
-DIST vte-0.70.4.tar.bz2 502950 BLAKE2B d3152c939e0b90b542aad268b455085e04c194cc6d86e4d9352b6531cf74a19bdcd16351e1f3934b1835d1470815215c19b1301136cecf43d23a6951fd8bb889 SHA512 f899c99bf5a9593fa618016a31c93e249bcc01b8635e1b878ab236de71a24a5b3cf1a032bea96855e43d894d004b0e00f20cc2e08079e52d8e7cb709cc73a7af
-DIST vte-0.72.0.tar.bz2 503848 BLAKE2B 4c87f5648b17a269072a7fbe520e9cf086325d8740050b9868fd6e0d812ed78e240a3d3dc882729435bbae30fbbbfe35c0e92f36cd62e6aa8e581350b81a3f90 SHA512 198ea27d0991d825cc993746422e89b0e7b2b225e9cbdb072477dcf5b5866e79a27920233e8da63a412c5f270769e6d333470f5368d0b09b39e15d53ddbe6dd6
DIST vte-0.72.1.tar.bz2 504271 BLAKE2B 8ab39ab8d491757ab9402ad4bfc10ca733427d2efe895204c0db580e44107a9ab005c29ce2e6934ae27e8da7c27e39d1173fe787ddb8569938a29697eed2e2e1 SHA512 a5655d2d2602183cbda1050003d7cf883e427c8e00976af4ee2685f43530d87169e31a3b9597133d14dffdc95f20f9ca1488186d8463997a2672510f5a95d145
diff --git a/x11-libs/vte/files/vte-0.70-integer-value-is-outside-the-valid-range-clang-16.patch b/x11-libs/vte/files/vte-0.70-integer-value-is-outside-the-valid-range-clang-16.patch
deleted file mode 100644
index ab6aceae196c..000000000000
--- a/x11-libs/vte/files/vte-0.70-integer-value-is-outside-the-valid-range-clang-16.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-# From 9400d41660e6c27b672f9c77855d736581f499bf Mon Sep 17 00:00:00 2001
-# From: Khem Raj <raj.khem@gmail.com>
-# Date: Thu, 2 Mar 2023 22:57:00 +0100
-# Subject: [PATCH] pty: Do not typecast to GSpawnFlags
-#
-# GSpawnFlags is enum with max value 1 << 15 which means it fits into
-# a short, however here we are oring VTE_SPAWN_* as well which have
-# higher values (by design). This fixes a compile error on clang 16
-# with the -Wenum-constexpr-conversion flag.
-#
-# Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2618
-# (cherry picked from commit 9b41cd1014299d01111b64b705f013e28398821a)
-#
-# Also refer: https://gitlab.gnome.org/GNOME/vte/-/commit/9400d41660e6c27b672f9c77855d736581f499bf.patch
---- a/src/vtepty.cc
-+++ b/src/vtepty.cc
-@@ -574,18 +574,18 @@ catch (...)
- static constexpr inline auto
- all_spawn_flags() noexcept
- {
-- return GSpawnFlags(G_SPAWN_LEAVE_DESCRIPTORS_OPEN |
-- G_SPAWN_DO_NOT_REAP_CHILD |
-- G_SPAWN_SEARCH_PATH |
-- G_SPAWN_STDOUT_TO_DEV_NULL |
-- G_SPAWN_STDERR_TO_DEV_NULL |
-- G_SPAWN_CHILD_INHERITS_STDIN |
-- G_SPAWN_FILE_AND_ARGV_ZERO |
-- G_SPAWN_SEARCH_PATH_FROM_ENVP |
-- G_SPAWN_CLOEXEC_PIPES |
-- VTE_SPAWN_NO_PARENT_ENVV |
-- VTE_SPAWN_NO_SYSTEMD_SCOPE |
-- VTE_SPAWN_REQUIRE_SYSTEMD_SCOPE);
-+ return (G_SPAWN_LEAVE_DESCRIPTORS_OPEN |
-+ G_SPAWN_DO_NOT_REAP_CHILD |
-+ G_SPAWN_SEARCH_PATH |
-+ G_SPAWN_STDOUT_TO_DEV_NULL |
-+ G_SPAWN_STDERR_TO_DEV_NULL |
-+ G_SPAWN_CHILD_INHERITS_STDIN |
-+ G_SPAWN_FILE_AND_ARGV_ZERO |
-+ G_SPAWN_SEARCH_PATH_FROM_ENVP |
-+ G_SPAWN_CLOEXEC_PIPES |
-+ VTE_SPAWN_NO_PARENT_ENVV |
-+ VTE_SPAWN_NO_SYSTEMD_SCOPE |
-+ VTE_SPAWN_REQUIRE_SYSTEMD_SCOPE);
- }
-
- static constexpr inline auto
diff --git a/x11-libs/vte/vte-0.70.3-r1.ebuild b/x11-libs/vte/vte-0.70.3-r1.ebuild
deleted file mode 100644
index bd34041e7af6..000000000000
--- a/x11-libs/vte/vte-0.70.3-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-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"
-
-# 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" # vte_api_version in meson.build
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-REQUIRED_USE="
- gtk-doc? ( introspection )
- 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.70.0-command-notify.patch.xz )"
-
-DEPEND="
- >=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?]
-"
-RDEPEND="${DEPEND}
- ~gui-libs/vte-common-${PV}[systemd?]
-"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-libs/libxml2:2
- dev-util/glib-utils
- gtk-doc? ( dev-util/gi-docgen )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.70-integer-value-is-outside-the-valid-range-clang-16.patch
-)
-
-src_prepare() {
- default
- use vala && vala_setup
- xdg_environment_reset
-
- use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
-
- if ! use vanilla; then
- # Part of https://src.fedoraproject.org/rpms/vte291/raw/f37/f/vte291-cntnr-precmd-preexec-scroll.patch
- # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
- eapply "${WORKDIR}"/${PN}-0.70.0-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
- sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk3_api_name/' meson.build || die
-}
-
-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_install # not meson_src_install because this would include einstalldocs, which would result in file collisions with gui-libs/vte
- # Remove files that are provided by gui-libs/vte-common
- rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
- rm "${ED}"/etc/profile.d/vte.sh || die
- rm "${ED}"/etc/profile.d/vte.csh || die
- if use systemd; then
- rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
- fi
- if use gtk-doc; then
- mkdir -p "${ED}"/usr/share/gtk-doc/ || die
- mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/vte-${SLOT}-gtk3 || die
- fi
-}
diff --git a/x11-libs/vte/vte-0.70.3.ebuild b/x11-libs/vte/vte-0.70.3.ebuild
deleted file mode 100644
index d8082c2f253d..000000000000
--- a/x11-libs/vte/vte-0.70.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-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"
-
-# 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" # vte_api_version in meson.build
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-REQUIRED_USE="
- gtk-doc? ( introspection )
- 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.70.0-command-notify.patch.xz )"
-
-DEPEND="
- >=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?]
-"
-RDEPEND="${DEPEND}
- ~gui-libs/vte-common-${PV}[systemd?]
-"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-libs/libxml2:2
- dev-util/glib-utils
- gtk-doc? ( dev-util/gi-docgen )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- default
- use vala && vala_setup
- xdg_environment_reset
-
- use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
-
- if ! use vanilla; then
- # Part of https://src.fedoraproject.org/rpms/vte291/raw/f37/f/vte291-cntnr-precmd-preexec-scroll.patch
- # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
- eapply "${WORKDIR}"/${PN}-0.70.0-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
- sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk3_api_name/' meson.build || die
-}
-
-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_install # not meson_src_install because this would include einstalldocs, which would result in file collisions with gui-libs/vte
- # Remove files that are provided by gui-libs/vte-common
- rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
- rm "${ED}"/etc/profile.d/vte.sh || die
- rm "${ED}"/etc/profile.d/vte.csh || die
- if use systemd; then
- rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
- fi
- if use gtk-doc; then
- mkdir -p "${ED}"/usr/share/gtk-doc/ || die
- mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/vte-${SLOT}-gtk3 || die
- fi
-}
diff --git a/x11-libs/vte/vte-0.70.4.ebuild b/x11-libs/vte/vte-0.70.4.ebuild
deleted file mode 100644
index bd34041e7af6..000000000000
--- a/x11-libs/vte/vte-0.70.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-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"
-
-# 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" # vte_api_version in meson.build
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-REQUIRED_USE="
- gtk-doc? ( introspection )
- 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.70.0-command-notify.patch.xz )"
-
-DEPEND="
- >=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?]
-"
-RDEPEND="${DEPEND}
- ~gui-libs/vte-common-${PV}[systemd?]
-"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-libs/libxml2:2
- dev-util/glib-utils
- gtk-doc? ( dev-util/gi-docgen )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.70-integer-value-is-outside-the-valid-range-clang-16.patch
-)
-
-src_prepare() {
- default
- use vala && vala_setup
- xdg_environment_reset
-
- use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
-
- if ! use vanilla; then
- # Part of https://src.fedoraproject.org/rpms/vte291/raw/f37/f/vte291-cntnr-precmd-preexec-scroll.patch
- # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
- eapply "${WORKDIR}"/${PN}-0.70.0-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
- sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk3_api_name/' meson.build || die
-}
-
-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_install # not meson_src_install because this would include einstalldocs, which would result in file collisions with gui-libs/vte
- # Remove files that are provided by gui-libs/vte-common
- rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
- rm "${ED}"/etc/profile.d/vte.sh || die
- rm "${ED}"/etc/profile.d/vte.csh || die
- if use systemd; then
- rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
- fi
- if use gtk-doc; then
- mkdir -p "${ED}"/usr/share/gtk-doc/ || die
- mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/vte-${SLOT}-gtk3 || die
- fi
-}
diff --git a/x11-libs/vte/vte-0.72.0.ebuild b/x11-libs/vte/vte-0.72.0.ebuild
deleted file mode 100644
index 81fa4779bda4..000000000000
--- a/x11-libs/vte/vte-0.72.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-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"
-
-# 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" # vte_api_version in meson.build
-IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-REQUIRED_USE="
- gtk-doc? ( introspection )
- 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.70.0-command-notify.patch.xz )"
-
-DEPEND="
- >=x11-libs/gtk+-3.24.22:3[introspection?]
- >=dev-libs/fribidi-1.0.0
- >=dev-libs/glib-2.60: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?]
-"
-RDEPEND="${DEPEND}
- ~gui-libs/vte-common-${PV}[systemd?]
-"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-libs/libxml2:2
- dev-util/glib-utils
- gtk-doc? ( dev-util/gi-docgen )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- default
- use vala && vala_setup
- xdg_environment_reset
-
- use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
-
- if ! use vanilla; then
- # Part of https://src.fedoraproject.org/rpms/vte291/raw/f37/f/vte291-cntnr-precmd-preexec-scroll.patch
- # Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
- eapply "${WORKDIR}"/${PN}-0.70.0-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
- sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk3_api_name/' meson.build || die
-}
-
-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_install # not meson_src_install because this would include einstalldocs, which would result in file collisions with gui-libs/vte
- # Remove files that are provided by gui-libs/vte-common
- rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
- rm "${ED}"/etc/profile.d/vte.sh || die
- rm "${ED}"/etc/profile.d/vte.csh || die
- if use systemd; then
- rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
- fi
- if use gtk-doc; then
- mkdir -p "${ED}"/usr/share/gtk-doc/ || die
- mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/vte-${SLOT}-gtk3 || die
- fi
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-05-17 21:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-22 0:46 [gentoo-commits] repo/gentoo:master commit in: x11-libs/vte/, x11-libs/vte/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-05-17 21:55 Matt Turner
2022-12-01 15:44 Matt Turner
2020-01-11 20:11 Mart Raudsepp
2016-12-09 18:44 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox