diff options
Diffstat (limited to 'x11-libs/vte')
| -rw-r--r-- | x11-libs/vte/Manifest | 13 | ||||
| -rw-r--r-- | x11-libs/vte/files/0.54.4-vala-0.44-compat.patch | 29 | ||||
| -rw-r--r-- | x11-libs/vte/files/vte-0.56.2-ds-mc.diff | 82 | ||||
| -rw-r--r-- | x11-libs/vte/vte-0.56.2.ebuild | 94 |
4 files changed, 214 insertions, 4 deletions
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest index ed66318..995d988 100644 --- a/x11-libs/vte/Manifest +++ b/x11-libs/vte/Manifest @@ -1,4 +1,9 @@ -AUX vte-0.30.1-alt-meta.patch 2490 RMD160 33e285f9288bf9f320e3e6d247b15abca20b55c0 SHA1 5f611947b0c7de2e21ab3f8f3f4387f32160e56a SHA256 31a46fee8fe59bd1d6df54bc502b608fe80da57bf3786e2dc6e9856a4e793ed6 -AUX vte-0.30.1-ds-mc.diff 1477 RMD160 3ea015dd3dec285f4acfa5b8ca75d3ece52b3c7d SHA1 ec9ec963d39599c07dcba927e6a202b82e05f3bc SHA256 01e56bf5a801ce641ff3873b34b01a073b6daf2ca4fb112801ad810a405f7418 -DIST vte-0.30.1.tar.xz 951688 RMD160 f4de2cf9a1fdeb583cb849eed3d231ae8450369c SHA1 e8d4894f3acb572519e59baf621856e7ffb3e1fa SHA256 bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64 -EBUILD vte-0.30.1-r3.ebuild 1501 RMD160 dfa92453aa8059b76860247bff3aef2c652fcc33 SHA1 aa08a9b365cf35af440b105709ecfe4ef7a876ad SHA256 3ff50d644c744067e2498f7035f1f74ed66780015a587b965f65c1a4769321c3 +AUX 0.54.4-vala-0.44-compat.patch 883 BLAKE2B ecf653b7d37d731eace38d8bd1b52d9b6420fa46c67ce0090e0d0e2d4c48aa03f1951438db6bfe62a5e0094d080605d0cb51d71247d133307d47c98b6bd45f7a SHA512 9aa4961497931d7d18f7107b6101aa04dbbc034e45313272154e7e685166e565022e025e407ff56a95661e7c1bf135d68023ed0d513ceb0a6b6f83a43292d161 +AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c3d4f97fa8d6b4ecfbaec8a35bf1989c0461c1ec1d31e1b22c9d35688775a30f34134028bcd4fdcae1b7d40129c4 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430 +AUX vte-0.30.1-ds-mc.diff 1477 BLAKE2B 21d43cb4dda44f546936e37c2e59a750e8786efa539b2d42c538aa10998dd3395677ed6e71ccb72cc0361dbcb860cfd1e9efed875cfc8208a1b47cbc7c29e2d8 SHA512 f734e6ace70067f339a32ad1aff2021e964913be5e9ebf2359e46228877843346d7f4853c139343c9931509c74f07bd4179c665dc799831b37f92868dbc10767 +AUX vte-0.56.2-ds-mc.diff 2939 BLAKE2B f1f9e04f1811748587c9e09f1910a2db683a731509c28026a38a6959bcc52d220d713fd9a5addf3096ebcceaf2e46ab6fd4f58344dbf021d6f75ee2c4194ae86 SHA512 bb8be88ca0dd909c09e81fc8e11485da488a4c1875d7c9e82c129d6dbab884ee2de45a5ecbbbc4aa316822d278552875586e4d40acfe4131b4f25be2ee63bafb +DIST vte-0.30.1.tar.xz 951688 BLAKE2B eb9ccec9f9b8757aaa7c8ead0e5aaebaa092fa3c89d5dfbc1fb13e3644baadce39bd50d2e2bcacc6b6c3b156bffad3b0a85e8342082d897a29755904cfd8736e SHA512 b7e601f207fe87c56826b093904a27f90e51e8992707d5978ec058fb91c1c790287af8bc2594b8149f4a69223cff2f2c73bf13a43507f4ac37df7c3faee69e60 +DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c +DIST vte-0.56.2.tar.xz 1099972 BLAKE2B 137d30b90ff8d955acb87b6262e171531c0720f102f8c07b4ee3758323bf7ff9f50b4032f5ebeee573b00a7836a78fa0d6fe0469b7e0deeeb27da94e6ee7e294 SHA512 8327a77abdfd97d7feda358e767046054ee24f9302c9187f2979e22c0034d4a6e9bf271fc327b866a43b404d7fe50ac36d1a4aebd58340744bdde24ecaa415ad +EBUILD vte-0.30.1-r3.ebuild 1501 BLAKE2B f85e07c8881861da95f37d4aacbee0b229d8f3fafcfaad9841cfd66944cb03b4984644d06b7a1d3ea54279a27fcf8ef4da8db25703dd03ffab8c53e995e015ea SHA512 6639c6c3e2a6d65bdf76b2c9fd1e8908eb84b08290314c60c5df52b89f070adbed1ecb2b01dec91e4a0c7cf290ef2850d97878d46461362b69173df9adfbdfba +EBUILD vte-0.56.2.ebuild 2444 BLAKE2B e59678d92461acace4c3c141887aa7e70f31e4319e4279f816758c3200e036914eaaab2bd2a80942ed0038746fcee42495239cc8e505fab9a6461f3e8f313346 SHA512 33c2f6763c8cea42f8e98de4ecfaf068f90094b702a2b756e40d7f1b842a4b329df0c2b5e31f26fd50be0ac8d7b67c9d9efaf0505dac00d952c64550b18f08b4 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 new file mode 100644 index 0000000..5da32be --- /dev/null +++ b/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch @@ -0,0 +1,29 @@ +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/files/vte-0.56.2-ds-mc.diff b/x11-libs/vte/files/vte-0.56.2-ds-mc.diff new file mode 100644 index 0000000..cfa411e --- /dev/null +++ b/x11-libs/vte/files/vte-0.56.2-ds-mc.diff @@ -0,0 +1,82 @@ +Description: DarkSoft mc patches + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + vte2.91 (0.56.2-1ubuntu1~19.04.1) disco; urgency=medium + . + * Backport bugfix release to disco (LP: #1827207) +Author: Iain Lane <iain.lane@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1827207 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: https://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: 2019-07-07 + +--- vte2.91-0.56.2.orig/ChangeLog ++++ vte2.91-0.56.2/ChangeLog +@@ -1,3 +1,9 @@ ++Author: Suren A. Chilingaryan <csa@suren.me> ++Date: Sun Jul 7 11:16:00 2019 +0200 ++ ++ mc integration ++ ++ + commit 9a079492ea698f573dfc7129f1c79e4a865803b4 + Author: Christian Persch <chpe@src.gnome.org> + Date: Sat Apr 20 19:41:46 2019 +0200 +--- vte2.91-0.56.2.orig/src/vte.cc ++++ vte2.91-0.56.2/src/vte.cc +@@ -4763,7 +4763,9 @@ Terminal::widget_key_press(GdkEventKey * + break; + case GDK_KEY_KP_Insert: + case GDK_KEY_Insert: +- if (m_modifiers & GDK_SHIFT_MASK) { ++ //printf("%lx %s\n", modifiers, terminal->window_title); ++ if (strncmp(vte_terminal_get_window_title(m_terminal), "mc", 2)) { ++ if (m_modifiers & GDK_SHIFT_MASK) { + if (m_modifiers & GDK_CONTROL_MASK) { + emit_paste_clipboard(); + handled = TRUE; +@@ -4773,11 +4775,29 @@ Terminal::widget_key_press(GdkEventKey * + handled = TRUE; + suppress_meta_esc = TRUE; + } +- } else if (m_modifiers & GDK_CONTROL_MASK) { ++ } else if (m_modifiers & GDK_CONTROL_MASK) { + emit_copy_clipboard(); + handled = TRUE; + suppress_meta_esc = TRUE; ++ } + } ++ ++ if ((m_modifiers & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { ++ widget_paste(GDK_SELECTION_PRIMARY); ++ handled = TRUE; ++ suppress_meta_esc = TRUE; ++ } else if (m_modifiers & (GDK_MOD1_MASK|GDK_META_MASK|0x2000)) { ++ if (m_modifiers & GDK_CONTROL_MASK) { ++ emit_copy_clipboard(); ++ handled = TRUE; ++ suppress_meta_esc = TRUE; ++ } else if (m_modifiers & GDK_SHIFT_MASK) { ++ widget_paste(GDK_SELECTION_PRIMARY); ++ handled = TRUE; ++ suppress_meta_esc = TRUE; ++ } ++ } ++ + break; + /* Keypad/motion keys. */ + case GDK_KEY_KP_Up: diff --git a/x11-libs/vte/vte-0.56.2.ebuild b/x11-libs/vte/vte-0.56.2.ebuild new file mode 100644 index 0000000..855df81 --- /dev/null +++ b/x11-libs/vte/vte-0.56.2.ebuild @@ -0,0 +1,94 @@ +# 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 + + # 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 +#SDS + eapply "${FILESDIR}"/${PN}-0.56.2-ds-mc.diff || die +#EDS + + 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 + + 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 +} |