From bbb354228820ce3f4051c17f39bada426d00ea11 Mon Sep 17 00:00:00 2001 From: Nicholas Fish Date: Tue, 9 Jul 2019 12:47:47 +0200 Subject: x11-libs/vte: Add 0.56.3 with vte-ng patch Signed-off-by: Nicholas Fish --- x11-libs/vte/Manifest | 18 ++-- x11-libs/vte/files/vte-ng-0.56.2.patch | 174 +++++++++++++++++++++++++++++++++ x11-libs/vte/vte-0.56.3.ebuild | 92 +++++++++++++++++ 3 files changed, 277 insertions(+), 7 deletions(-) create mode 100644 x11-libs/vte/files/vte-ng-0.56.2.patch create mode 100644 x11-libs/vte/vte-0.56.3.ebuild diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest index cd830c2..18e9aa2 100644 --- a/x11-libs/vte/Manifest +++ b/x11-libs/vte/Manifest @@ -1,7 +1,11 @@ -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 -AUX vte-0.30.1-alt-meta.patch 2490 SHA256 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430 WHIRLPOOL bc51d9467bb13d627e7355872db5777e3d39ca07753dda9237110f8857d16bca5f8bc4334f9d97df54a2fcbc9234f123247ec8f40508e8120f00ffc46ff0a570 -DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c -EBUILD vte-0.28.2-r208.ebuild 3108 SHA256 f7a895e7ac4e166c2227eb41d26ebd1876661e1e9e3d86d89cb768e25a6e3569 SHA512 4ec546d18bd142c798806ca547545997860df422b7ed5668e4d1ec2a2730b9a7d817deef222406fa6c441ad51077fccbdf42a63155cf50e758ef34bccd1db472 WHIRLPOOL a6ec091299634d87128efacb71d64249d346657bfc4f3a454bb4f5b3bbbb88685a6c273dba3954f6a2db6f1eb51243ada39e11e963f701d2f780cc79fb500896 -MISC metadata.xml 348 SHA256 e70b7fc4a21f1a7caba00ef2dcc656a7e79e15e0459519e260a27136fb6f0d88 SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4 WHIRLPOOL 15b683c11d7ab6a5648686b2b6a66dd1cf6034a612504a83f96b81253e3089a278bb7c70681ebe543e6904aab9e9f3d3579505cec4caf3df5ed44b34391a4138 +AUX vte-0.28.2-interix.patch 1566 BLAKE2B 1d6b4b7cfc1fee464779e3efb8de09554c9e52f562d90d280e03493f01d8f44e468260b4c92327006a2358688414cf04d9639eea1162808597c590eeb6c21af0 SHA512 f02574f96355c6cedde05d0877d3bf50e7777d210484a80b6e95e597b0bb225f5968649e67f67d7f112f50302ae6566e4f3d8c59d7a5b65fc95601cac00868d7 +AUX vte-0.28.2-limit-arguments.patch 1477 BLAKE2B 329e8eb93156244526ebe3ccb3c2a75234da7a57a994c2c1b42e283a65011d6245133f858778571efefec18bf18bc7db9afe5aeded0df0cec35a72a31507671b SHA512 e5639d94fd455195c354d03cab04bbb73eff98bc540c813cccf4ab5eb793f4c8ae645fcf2bd502924ed4d38412101341deaf2d28ea8aaea3530a98ffbba8256d +AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 BLAKE2B d57f20415193bf9bc283399bcae4e3c2a23ff7f2f8ffee08e8a67c3af2956b137f788322e26bf2537e785c0d0ce6266b56269abe5a18e2e881ea548b5c1b4625 SHA512 46a54c96889c3a0c5a293a097f777dd2e24e5a3025b808d7fb0bbfe71e8938f7d30ba26a05e67cb6b63ad59719eace57d0f6e0ff9f2860fbe9f12c36e022b8ec +AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c3d4f97fa8d6b4ecfbaec8a35bf1989c0461c1ec1d31e1b22c9d35688775a30f34134028bcd4fdcae1b7d40129c4 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430 +AUX vte-ng-0.56.2.patch 5166 BLAKE2B a4b03685eae1755ef021f0a8b374c621737455bd3cdcceaaa9924e0b8208b6a4a2796f9d332454d5a16e19f146e53a796ca4a37b712d279de31a3de14e188bc9 SHA512 1d7e2da3ca28127d8f8558226c3e8fb22af9e6e0d00fbff538db700b46288c084bf9de488a4c1d6e6f6ef7d5d799593ed3d2e3f61e8fbf8a9aff9c1d8f33410b +DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 +DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c +DIST vte-0.56.3.tar.xz 1100584 BLAKE2B 7fd1e041c52aab93d95d6ce91f6dd7d4bc9080e22cb82041d1636946973f1eee86e257f2c357af93417eeec52142edcb7df3bdbcf90727e40fb61a1e4b2d9292 SHA512 f78b3d532ca47e53c1bb51db6780697ce4692d493c0030d2dc4beb63a2595e44a43eb409ee31b94e4551eae259ac1baa8f06825a02fd66df8352e192f4ea1988 +EBUILD vte-0.28.2-r208.ebuild 3108 BLAKE2B 10f333485bef9d4fdb6f037096366430910cde1e95c86a134b99bcbe88394c929726094d351b841d279ade3e0bccdd33559e8774c144f00b34301edeaa5edc2d SHA512 4ec546d18bd142c798806ca547545997860df422b7ed5668e4d1ec2a2730b9a7d817deef222406fa6c441ad51077fccbdf42a63155cf50e758ef34bccd1db472 +EBUILD vte-0.56.3.ebuild 2387 BLAKE2B c4c18e6842726f858b06a2601ad7bfc6bbdc25a43e9242151ee0f295482c56f3795f431d85cd9bfb7dfd0c2859bf901a7173b828aeec0caa2fb4316459833c4e SHA512 b3d88d1fe6f1461921c2484b2df58fd840054873bfb03bf31acbb17ee9853a180852fcb172ea7d785a847e9d1b099245b969362fb19c2fec6a0dd8ab1e9da3a9 +MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4 diff --git a/x11-libs/vte/files/vte-ng-0.56.2.patch b/x11-libs/vte/files/vte-ng-0.56.2.patch new file mode 100644 index 0000000..7dc626e --- /dev/null +++ b/x11-libs/vte/files/vte-ng-0.56.2.patch @@ -0,0 +1,174 @@ +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index 26ac236e..01a07900 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -175,6 +175,12 @@ void vte_terminal_feed_child_binary(VteTerminal *terminal, + const guint8 *data, + gsize length) _VTE_GNUC_NONNULL(1); + ++_VTE_PUBLIC ++void vte_terminal_connect_pty_read(VteTerminal *terminal); ++ ++_VTE_PUBLIC ++void vte_terminal_disconnect_pty_read(VteTerminal *terminal); ++ + /* Copy currently-selected text to the clipboard, or from the clipboard to + * the terminal. */ + _VTE_PUBLIC +@@ -190,6 +196,17 @@ _VTE_PUBLIC + void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + _VTE_PUBLIC + void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++_VTE_PUBLIC ++gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++_VTE_PUBLIC ++void vte_terminal_set_selection_block_mode(VteTerminal *terminal, ++ gboolean block_mode) _VTE_GNUC_NONNULL(1); ++_VTE_PUBLIC ++void vte_terminal_select_text(VteTerminal *terminal, long start_col, long start_row, ++ long end_col, long end_row) _VTE_GNUC_NONNULL(1); ++_VTE_PUBLIC ++char * ++vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + + /* By-word selection */ + _VTE_PUBLIC +@@ -372,6 +389,11 @@ _VTE_PUBLIC + void vte_terminal_get_cursor_position(VteTerminal *terminal, + glong *column, + glong *row) _VTE_GNUC_NONNULL(1); ++_VTE_PUBLIC ++void vte_terminal_set_cursor_position(VteTerminal *terminal, ++ glong column, ++ glong row) _VTE_GNUC_NONNULL(1); ++ + + _VTE_PUBLIC + char *vte_terminal_hyperlink_check_event(VteTerminal *terminal, +diff --git a/src/vtegtk.cc b/src/vtegtk.cc +index ea8b3208..bc776cdb 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -2389,6 +2389,58 @@ vte_terminal_unselect_all(VteTerminal *terminal) + + IMPL(terminal)->deselect_all(); + } ++/** ++ * vte_terminal_get_selection_block_mode: ++ * @terminal: a #VteTerminal ++ * ++ * Checks whether or not block selection is enabled. ++ * ++ * Returns: %TRUE if block selection is enabled, %FALSE if not ++ */ ++ ++gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) { ++ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE); ++ return IMPL(terminal)->m_selection_block_mode; ++} ++/** ++ * vte_terminal_set_selection_block_mode: ++ * @terminal: a #VteTerminal ++ * @block_mode: whether block selection is enabled ++ * ++ * Sets whether or not block selection is enabled. ++ */ ++void ++vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) { ++ g_return_if_fail (VTE_IS_TERMINAL (terminal)); ++ IMPL(terminal)->m_selection_block_mode = block_mode; ++} ++ ++/** ++ * vte_terminal_select_text: ++ * @terminal: a #VteTerminal ++ * @start_col: the starting column for the selection ++ * @start_row: the starting row for the selection ++ * @end_col: the end column for the selection ++ * @end_row: the end row for the selection ++ * ++ * Sets the current selection region. ++ */ ++void ++vte_terminal_select_text(VteTerminal *terminal, ++ long start_col, long start_row, ++ long end_col, long end_row) ++{ ++ g_return_if_fail (VTE_IS_TERMINAL (terminal)); ++ ++ IMPL(terminal)->select_text(start_col, start_row, end_col, end_row); ++} ++ ++char * ++vte_terminal_get_selection(VteTerminal *terminal) ++{ ++ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); ++ return g_strdup (IMPL(terminal)->m_selection[VTE_SELECTION_PRIMARY]->str); ++} + + /** + * vte_terminal_get_cursor_position: +@@ -2415,6 +2467,30 @@ vte_terminal_get_cursor_position(VteTerminal *terminal, + } + } + ++/** ++ * vte_terminal_set_cursor_position ++ * @terminal: a #VteTerminal ++ * @column: the new cursor column ++ * @row: the new cursor row ++ * ++ * Set the location of the cursor. ++ */ ++void ++vte_terminal_set_cursor_position(VteTerminal *terminal, ++ long column, long row) ++{ ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); ++ ++ auto impl = IMPL(terminal); ++ impl->invalidate_cursor_once(FALSE); ++ impl->m_screen->cursor.col = column; ++ impl->m_screen->cursor.row = row; ++ impl->invalidate_cursor_once(FALSE); ++ impl->check_cursor_blink(); ++ impl->queue_cursor_moved(); ++ ++} ++ + /** + * vte_terminal_pty_new_sync: + * @terminal: a #VteTerminal +@@ -2780,6 +2856,32 @@ vte_terminal_feed_child(VteTerminal *terminal, + IMPL(terminal)->feed_child(text, length); + } + ++/** ++ * vte_terminal_connect_pty_read: ++ * @terminal: a #VteTerminal ++ * ++ * Unpause output ++ */ ++void ++vte_terminal_connect_pty_read(VteTerminal *terminal) ++{ ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); ++ IMPL(terminal)->connect_pty_read(); ++} ++ ++/** ++ * vte_terminal_disconnect_pty_read: ++ * @terminal: a #VteTerminal ++ * ++ * Pause output ++ */ ++void ++vte_terminal_disconnect_pty_read(VteTerminal *terminal) ++{ ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); ++ IMPL(terminal)->disconnect_pty_read(); ++} ++ + /** + * vte_terminal_feed_child_binary: + * @terminal: a #VteTerminal diff --git a/x11-libs/vte/vte-0.56.3.ebuild b/x11-libs/vte/vte-0.56.3.ebuild new file mode 100644 index 0000000..af2cefc --- /dev/null +++ b/x11-libs/vte/vte-0.56.3.ebuild @@ -0,0 +1,92 @@ +# 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 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +REQUIRED_USE="vala? ( introspection )" + +SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-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-libs/libxml2:2 + dev-util/glib-utils + >=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}"/${PN}-0.54.1-command-notify.patch + fi + + 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" + + # Expose additional APIs from VTE. + # See https://github.com/Thestinger/termite#dependencies for more information. + eapply "${FILESDIR}"/${PN}-ng-0.56.2.patch.patch + + 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 + + gnome2_src_configure \ + --disable-static \ + --with-gtk=3.0 \ + --with-iconv \ + $(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 +} -- cgit v1.2.3-65-gdbad