* [PR PATCH] vte: remove
@ 2020-12-30 15:31 sgn
2020-12-30 16:00 ` [PR PATCH] [Updated] vte+gtkdialog: remove sgn
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: sgn @ 2020-12-30 15:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages vte-remove
https://github.com/void-linux/void-packages/pull/27556
vte: remove
A patch file from https://github.com/void-linux/void-packages/pull/27556.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vte-remove-27556.patch --]
[-- Type: text/x-diff, Size: 23348 bytes --]
From d0aa68095506d357e036752de28d7f03ba4fc7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 29 Dec 2020 08:01:59 +0700
Subject: [PATCH 1/4] genius: update to 1.0.25.
---
srcpkgs/genius/template | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index d8228ab28be..395d5c530a0 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,16 +1,23 @@
# Template file for 'genius'
pkgname=genius
-version=1.0.24
-revision=2
+version=1.0.25
+revision=1
build_style=gnu-configure
-configure_args="--disable-update-mimedb"
-hostmakedepends="intltool pkg-config"
-makedepends="gtksourceview2-devel mpfr-devel readline-devel vte-devel"
+configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
+ GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
+hostmakedepends="intltool pkg-config glib-devel automake libtool bison flex"
+makedepends="gtksourceview4-devel mpfr-devel readline-devel ncurses-devel
+ gtk+3-devel amtk-devel libglib-devel vte3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Advanced calculator including a mathematical programming language"
maintainer="Samadi van Koten <samadi@vktec.co.uk>"
license="GPL-3.0-or-later"
homepage="http://www.jirka.org/genius.html"
distfiles="http://ftp.5z.com/pub/genius/genius-${version}.tar.xz"
-checksum=8dea7f386821f39a438c66d5201a741904555c878dc670b96b8a22a8a96dca50
-nocross="https://travis-ci.org/voidlinux/void-packages/jobs/252374514"
+checksum=0e92c9a22f903012ef331c20ada5b30b6c666c0f11753958b8e38d720deb6e0c
+nocross="run the binaries"
+
+post_patch() {
+ vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
+ autoreconf -fi
+}
From c827e7c806f2df6096d98a96998d9f7838de359b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 29 Dec 2020 08:16:58 +0700
Subject: [PATCH 2/4] gtkdialog: remove
Abandon upstream from at least 2007
---
srcpkgs/gtkdialog/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/gtkdialog/template
diff --git a/srcpkgs/gtkdialog/template b/srcpkgs/gtkdialog/template
deleted file mode 100644
index 7311db4ef1e..00000000000
--- a/srcpkgs/gtkdialog/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'gtkdialog'
-pkgname=gtkdialog
-version=0.8.3
-revision=4
-build_style=gnu-configure
-make_install_args="UPDATE_ICON_CACHE=true"
-hostmakedepends="pkg-config flex"
-makedepends="gtk+-devel libglade-devel vte-devel"
-depends="hicolor-icon-theme"
-short_desc="A small utility for fast and easy GUI building"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://code.google.com/p/gtkdialog/"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gtkdialog/gtkdialog-${version}.tar.gz"
-checksum=ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e
-
-CFLAGS="-fcommon"
-
-post_install() {
- vmkdir usr/share/doc/$pkgname
- cp -a examples ${DESTDIR}/usr/share/doc/$pkgname/examples
-}
From 32a20508aebdc3168d8a75027fb99a6c57338145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 29 Dec 2020 08:50:40 +0700
Subject: [PATCH 3/4] lilyterm: update to 0.9.9.4+20190725.
---
srcpkgs/lilyterm/patches/lilyterm-musl.patch | 17 ++++---
.../lilyterm/patches/lilyterm-pkgconfig.patch | 22 ---------
.../no-empty-environment-variables.patch | 21 +++++++++
srcpkgs/lilyterm/template | 45 ++++++++++++++++---
4 files changed, 69 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch
create mode 100644 srcpkgs/lilyterm/patches/no-empty-environment-variables.patch
diff --git a/srcpkgs/lilyterm/patches/lilyterm-musl.patch b/srcpkgs/lilyterm/patches/lilyterm-musl.patch
index 28778e85799..5cd2fe64014 100644
--- a/srcpkgs/lilyterm/patches/lilyterm-musl.patch
+++ b/srcpkgs/lilyterm/patches/lilyterm-musl.patch
@@ -1,14 +1,17 @@
---- src/profile.c.orig 2016-05-07 00:22:09.702161948 +0900
-+++ src/profile.c 2016-05-07 00:24:21.566170424 +0900
-@@ -2660,11 +2660,7 @@
+diff --git src/profile.c src/profile.c
+index 3de9fb5..b7dc71f 100644
+--- src/profile.c
++++ src/profile.c
+@@ -2974,12 +2974,8 @@ GString *save_user_settings(GtkWidget *widget, struct Window *win_data)
// g_debug("save_user_settings(): profile = %s", profile);
// g_debug("\n%s", contents->str);
--#ifdef BSD
- gchar *real_file_name = realpath((const gchar *)profile, NULL);
--#else
+-# ifdef BSD
+ gchar resolved_patch[PATH_MAX+1];
+ gchar *real_file_name = g_strdup(realpath((const gchar *)profile, resolved_patch));
+-# else
- gchar *real_file_name = canonicalize_file_name((const gchar *)profile);
--#endif
+-# endif
if (real_file_name==NULL)
{
//if (access(profile, F_OK))
diff --git a/srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch b/srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch
deleted file mode 100644
index 6bff0be35a9..00000000000
--- a/srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig 2016-05-08 15:18:37.105172865 +0900
-+++ configure 2016-05-08 15:18:25.159172097 +0900
-@@ -138,7 +138,7 @@
- exit 0
- fi
-
--PKGCONFIG=`whereis "pkg-config" | tr -s ' ' '\n' | grep "bin/""pkg-config""$" | head -n 1`
-+PKGCONFIG=`which pkg-config`
- if [ -z "$PKGCONFIG" ]; then
- ERR "\n ERROR: \`"
- WARN "pkg-config"
---- src/Makefile.orig 2016-05-08 15:19:20.502175654 +0900
-+++ src/Makefile 2016-05-08 15:20:22.909179665 +0900
-@@ -22,7 +22,7 @@
- include ../.default
- -include ../.config
-
--PKGCONFIG := $(shell whereis "pkg-config" | tr -s ' ' '\n' | grep "bin/""pkg-config""$$" | head -n 1)
-+PKGCONFIG := $(shell which pkg-config)
-
- VTE ?= ""
-
diff --git a/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch b/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch
new file mode 100644
index 00000000000..69b8a8f3c51
--- /dev/null
+++ b/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch
@@ -0,0 +1,21 @@
+diff --git src/notebook.c src/notebook.c
+index eb4d973..0789a33 100644
+--- src/notebook.c
++++ src/notebook.c
+@@ -158,13 +158,13 @@ struct Page *add_page(struct Window *win_data,
+ #ifdef ENABLE_SET_EMULATION
+ # ifdef SAFEMODE
+ if (win_data->emulate_term == NULL)
+- g_string_append_printf (environ_str, "TERM=xterm");
++ g_string_append_printf (environ_str, "TERM=xterm\t");
+ else
+ # endif
+- g_string_append_printf (environ_str, "TERM=%s", win_data->emulate_term);
++ g_string_append_printf (environ_str, "TERM=%s\t", win_data->emulate_term);
+ #endif
+ // set colorterm
+- g_string_append_printf (environ_str, "\tCOLORTERM=lilyterm");
++ g_string_append_printf (environ_str, "COLORTERM=lilyterm");
+
+ // ---- Setting the VTE_CJK_WIDTH environment ---- //
+
diff --git a/srcpkgs/lilyterm/template b/srcpkgs/lilyterm/template
index 7728486a60e..9882680422f 100644
--- a/srcpkgs/lilyterm/template
+++ b/srcpkgs/lilyterm/template
@@ -1,15 +1,46 @@
# Template file for 'lilyterm'
pkgname=lilyterm
-version=0.9.9.4
-revision=2
-build_style="gnu-configure"
-hostmakedepends="pkg-config which"
-makedepends="vte-devel gtk+-devel"
+_githash=faf1254f46049edfb1fd6e9191e78b1b23b9c51d
+version=0.9.9.4+20190725
+revision=1
+wrksrc=LilyTerm-$_githash
+build_style="gnu-makefile"
+hostmakedepends="pkg-config gettext"
+makedepends="vte3-devel gtk+3-devel"
short_desc="Fast and lightweight terminal emulator based off of libvte"
maintainer="Kris Scott <kris@syntosis.net>"
license="GPL-3.0-or-later"
homepage="http://lilyterm.luna.com.tw"
-distfiles="http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"
+# distfiles="http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"
+distfiles="https://github.com/Tetralet/LilyTerm/archive/$_githash.tar.gz"
conf_files="/etc/lilyterm.conf"
-checksum="b72626431d4f5645e0e0f18449319fbb69bef4eab4345d5e37cde0ae712a5d74"
+checksum=e777122cb4db0c75b893368aa5a3ae7de1bdfe27e1efb8fad8f9c19acb0a802e
CFLAGS="-Wno-deprecated-declarations"
+
+post_patch() {
+ vsed -i -e '/LDFLAGS.*BINARY/s/$/ -lX11/' src/Makefile
+}
+
+do_configure() {
+ cat <<-_EOF >.config
+ BSD = 0
+ PREFIX = /usr
+ prefix = /usr
+ ETCDIR = /etc
+ NLS = Y
+ VERBOSITY = Y
+ DEBUG = N
+ SAFEMODE = Y
+ FORCE_ENABLE_VTE_BACKGROUND = N
+ CC = $CC
+ STRIP = $STRIP
+ CPPFLAGS = $CPPFLAGS
+ CFLAGS = $CFLAGS
+ LDFLAGS = $LDFLAGS
+ MAKE = make
+ GTK = gtk+-3.0
+ VTE = vte-2.91
+ GNOME_CONTROL_CENTER = N
+ PACKAGE = lilyterm
+ _EOF
+}
From ff646d5a9a98084c8aa794b640bc179df1e7bd62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 22:30:08 +0700
Subject: [PATCH 4/4] vte: remove
---
srcpkgs/vte-devel | 1 -
srcpkgs/vte-python | 1 -
srcpkgs/vte/patches/CVE-2012-2738.patch | 137 ------------------------
srcpkgs/vte/patches/alt-key.patch | 70 ------------
srcpkgs/vte/patches/fix-includes.patch | 10 --
srcpkgs/vte/patches/scroll_region.patch | 65 -----------
srcpkgs/vte/template | 43 --------
srcpkgs/vte/update | 1 -
8 files changed, 328 deletions(-)
delete mode 120000 srcpkgs/vte-devel
delete mode 120000 srcpkgs/vte-python
delete mode 100644 srcpkgs/vte/patches/CVE-2012-2738.patch
delete mode 100644 srcpkgs/vte/patches/alt-key.patch
delete mode 100644 srcpkgs/vte/patches/fix-includes.patch
delete mode 100644 srcpkgs/vte/patches/scroll_region.patch
delete mode 100644 srcpkgs/vte/template
delete mode 100644 srcpkgs/vte/update
diff --git a/srcpkgs/vte-devel b/srcpkgs/vte-devel
deleted file mode 120000
index 82ac3e647ab..00000000000
--- a/srcpkgs/vte-devel
+++ /dev/null
@@ -1 +0,0 @@
-vte
\ No newline at end of file
diff --git a/srcpkgs/vte-python b/srcpkgs/vte-python
deleted file mode 120000
index 82ac3e647ab..00000000000
--- a/srcpkgs/vte-python
+++ /dev/null
@@ -1 +0,0 @@
-vte
\ No newline at end of file
diff --git a/srcpkgs/vte/patches/CVE-2012-2738.patch b/srcpkgs/vte/patches/CVE-2012-2738.patch
deleted file mode 100644
index 0a900a4f62c..00000000000
--- a/srcpkgs/vte/patches/CVE-2012-2738.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Upstream-Status: Backport
-CVE: CVE-2012-2738
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From e524b0b3bd8fad844ffa73927c199545b892cdbd Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Sat, 19 May 2012 19:36:09 +0200
-Subject: [PATCH 1/2] 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
----
- src/table.c | 2 +-
- src/vteseq.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/table.c b/src/table.c
-index 140e8c8..85cf631 100644
---- src/table.c
-+++ 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 7ef4c8c..10991db 100644
---- src/vteseq.c
-+++ 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
---
-2.4.9 (Apple Git-60)
-
-
-From cf1ad453a8def873c49cf6d88162593402f32bb2 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Sat, 19 May 2012 20:04:12 +0200
-Subject: [PATCH 2/2] emulation: Limit repetitions
-
-Don't allow malicious sequences to cause excessive repetitions.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=676090
----
- src/vteseq.c | 25 ++++++++++++++++++-------
- 1 file changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/src/vteseq.c b/src/vteseq.c
-index 10991db..209522f 100644
---- src/vteseq.c
-+++ src/vteseq.c
-@@ -1392,7 +1392,7 @@ vte_sequence_handler_dc (VteTerminal *terminal, GValueArray *params)
- static void
- vte_sequence_handler_DC (VteTerminal *terminal, GValueArray *params)
- {
-- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_dc);
-+ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_dc);
- }
-
- /* Delete a line at the current cursor position. */
-@@ -1785,7 +1785,7 @@ vte_sequence_handler_reverse_index (VteTerminal *terminal, GValueArray *params)
- static void
- vte_sequence_handler_RI (VteTerminal *terminal, GValueArray *params)
- {
-- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_nd);
-+ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_nd);
- }
-
- /* Save cursor (position). */
-@@ -2777,8 +2777,7 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
- {
- GValue *value;
- VteScreen *screen;
-- long param, end, row;
-- int i;
-+ long param, end, row, i, limit;
- screen = terminal->pvt->screen;
- /* The default is one. */
- param = 1;
-@@ -2796,7 +2795,13 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
- } else {
- end = screen->insert_delta + terminal->row_count - 1;
- }
-- /* Insert the new lines at the cursor. */
-+
-+ /* Only allow to insert as many lines as there are between this row
-+ * and the end of the scrolling region. See bug #676090.
-+ */
-+ limit = end - row + 1;
-+ param = MIN (param, limit);
-+
- for (i = 0; i < param; i++) {
- /* Clear a line off the end of the region and add one to the
- * top of the region. */
-@@ -2817,8 +2822,7 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
- {
- GValue *value;
- VteScreen *screen;
-- long param, end, row;
-- int i;
-+ long param, end, row, i, limit;
-
- screen = terminal->pvt->screen;
- /* The default is one. */
-@@ -2837,6 +2841,13 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
- } else {
- end = screen->insert_delta + terminal->row_count - 1;
- }
-+
-+ /* Only allow to delete as many lines as there are between this row
-+ * and the end of the scrolling region. See bug #676090.
-+ */
-+ limit = end - row + 1;
-+ param = MIN (param, limit);
-+
- /* Clear them from below the current cursor. */
- for (i = 0; i < param; i++) {
- /* Insert a line at the end of the region and remove one from
---
-2.4.9 (Apple Git-60)
-
-
diff --git a/srcpkgs/vte/patches/alt-key.patch b/srcpkgs/vte/patches/alt-key.patch
deleted file mode 100644
index ad8d2fcedfc..00000000000
--- a/srcpkgs/vte/patches/alt-key.patch
+++ /dev/null
@@ -1,70 +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(-)
-
---- src/keymap.c
-+++ 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;
---- src/keymap.h
-+++ 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/srcpkgs/vte/patches/fix-includes.patch b/srcpkgs/vte/patches/fix-includes.patch
deleted file mode 100644
index f810501110a..00000000000
--- a/srcpkgs/vte/patches/fix-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/pty.c
-+++ src/pty.c
-@@ -28,6 +28,7 @@
- * Since: 0.26
- */
-
-+#define _GNU_SOURCE
- #include <config.h>
-
- #include "vtepty.h"
diff --git a/srcpkgs/vte/patches/scroll_region.patch b/srcpkgs/vte/patches/scroll_region.patch
deleted file mode 100644
index 1def57e8f0d..00000000000
--- a/srcpkgs/vte/patches/scroll_region.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/vte.c 2010-11-30 23:04:53.000000000 -0800
-+++ src/vte.c 2010-12-07 20:05:07.865548000 -0800
-@@ -3862,6 +3862,7 @@ vte_terminal_process_incoming(VteTermina
- 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;
-
-@@ -3881,6 +3882,10 @@ vte_terminal_process_incoming(VteTermina
- 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));
-@@ -3979,6 +3984,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,
-@@ -3989,12 +3996,20 @@ 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);
-@@ -4014,6 +4029,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
diff --git a/srcpkgs/vte/template b/srcpkgs/vte/template
deleted file mode 100644
index ce765732e52..00000000000
--- a/srcpkgs/vte/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'vte'
-pkgname=vte
-version=0.28.2
-revision=16
-build_style=gnu-configure
-configure_args="PYTHON=python2 --disable-static --with-gtk=2.0"
-hostmakedepends="automake gettext-devel gtk-doc gobject-introspection libtool
- pkg-config intltool python-devel glib-devel pygtk-devel"
-makedepends="gtk+-devel ncurses-devel python-devel pygtk-devel"
-short_desc="Terminal widget with improved accessibility and I18N support"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/vte/0.28/${pkgname}-${version}.tar.bz2"
-checksum=8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903
-
-pre_configure() {
- NOCONFIGURE=1 autoreconf -fi
- if [ "$CROSS_BUILD" ]; then
- sed -i "s,\(PYTHON_INCLUDES\)=.*,\1=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
- fi
-}
-
-vte-python_package() {
- lib32disabled=yes
- depends="pygtk"
- short_desc+=" -- Python bindings"
- pkg_install() {
- vmove "usr/lib/python*"
- vmove "usr/share/pygtk*"
- }
-}
-
-vte-devel_package() {
- depends="libglib-devel pango-devel cairo-devel gtk+-devel vte>=${version}_${revision}"
- short_desc+=" -- development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/share/gtk-doc
- }
-}
diff --git a/srcpkgs/vte/update b/srcpkgs/vte/update
deleted file mode 100644
index 13baac4b856..00000000000
--- a/srcpkgs/vte/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[!0].* 0.[!2]*"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] vte+gtkdialog: remove
2020-12-30 15:31 [PR PATCH] vte: remove sgn
@ 2020-12-30 16:00 ` sgn
2021-01-02 1:24 ` [PR REVIEW] " ericonr
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2020-12-30 16:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 306 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages vte-remove
https://github.com/void-linux/void-packages/pull/27556
vte+gtkdialog: remove
A patch file from https://github.com/void-linux/void-packages/pull/27556.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vte-remove-27556.patch --]
[-- Type: text/x-diff, Size: 23428 bytes --]
From d0aa68095506d357e036752de28d7f03ba4fc7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 29 Dec 2020 08:01:59 +0700
Subject: [PATCH 1/4] genius: update to 1.0.25.
---
srcpkgs/genius/template | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index d8228ab28be..395d5c530a0 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,16 +1,23 @@
# Template file for 'genius'
pkgname=genius
-version=1.0.24
-revision=2
+version=1.0.25
+revision=1
build_style=gnu-configure
-configure_args="--disable-update-mimedb"
-hostmakedepends="intltool pkg-config"
-makedepends="gtksourceview2-devel mpfr-devel readline-devel vte-devel"
+configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
+ GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
+hostmakedepends="intltool pkg-config glib-devel automake libtool bison flex"
+makedepends="gtksourceview4-devel mpfr-devel readline-devel ncurses-devel
+ gtk+3-devel amtk-devel libglib-devel vte3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Advanced calculator including a mathematical programming language"
maintainer="Samadi van Koten <samadi@vktec.co.uk>"
license="GPL-3.0-or-later"
homepage="http://www.jirka.org/genius.html"
distfiles="http://ftp.5z.com/pub/genius/genius-${version}.tar.xz"
-checksum=8dea7f386821f39a438c66d5201a741904555c878dc670b96b8a22a8a96dca50
-nocross="https://travis-ci.org/voidlinux/void-packages/jobs/252374514"
+checksum=0e92c9a22f903012ef331c20ada5b30b6c666c0f11753958b8e38d720deb6e0c
+nocross="run the binaries"
+
+post_patch() {
+ vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
+ autoreconf -fi
+}
From c827e7c806f2df6096d98a96998d9f7838de359b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 29 Dec 2020 08:16:58 +0700
Subject: [PATCH 2/4] gtkdialog: remove
Abandon upstream from at least 2007
---
srcpkgs/gtkdialog/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/gtkdialog/template
diff --git a/srcpkgs/gtkdialog/template b/srcpkgs/gtkdialog/template
deleted file mode 100644
index 7311db4ef1e..00000000000
--- a/srcpkgs/gtkdialog/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'gtkdialog'
-pkgname=gtkdialog
-version=0.8.3
-revision=4
-build_style=gnu-configure
-make_install_args="UPDATE_ICON_CACHE=true"
-hostmakedepends="pkg-config flex"
-makedepends="gtk+-devel libglade-devel vte-devel"
-depends="hicolor-icon-theme"
-short_desc="A small utility for fast and easy GUI building"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://code.google.com/p/gtkdialog/"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gtkdialog/gtkdialog-${version}.tar.gz"
-checksum=ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e
-
-CFLAGS="-fcommon"
-
-post_install() {
- vmkdir usr/share/doc/$pkgname
- cp -a examples ${DESTDIR}/usr/share/doc/$pkgname/examples
-}
From a88d253b1f82b25f9ebd7d0c3a366f5b3477450a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 29 Dec 2020 08:50:40 +0700
Subject: [PATCH 3/4] lilyterm: update to 0.9.9.4+20190725.
---
srcpkgs/lilyterm/patches/lilyterm-musl.patch | 17 ++++---
.../lilyterm/patches/lilyterm-pkgconfig.patch | 22 ---------
.../no-empty-environment-variables.patch | 21 ++++++++
srcpkgs/lilyterm/template | 49 ++++++++++++++++---
4 files changed, 73 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch
create mode 100644 srcpkgs/lilyterm/patches/no-empty-environment-variables.patch
diff --git a/srcpkgs/lilyterm/patches/lilyterm-musl.patch b/srcpkgs/lilyterm/patches/lilyterm-musl.patch
index 28778e85799..5cd2fe64014 100644
--- a/srcpkgs/lilyterm/patches/lilyterm-musl.patch
+++ b/srcpkgs/lilyterm/patches/lilyterm-musl.patch
@@ -1,14 +1,17 @@
---- src/profile.c.orig 2016-05-07 00:22:09.702161948 +0900
-+++ src/profile.c 2016-05-07 00:24:21.566170424 +0900
-@@ -2660,11 +2660,7 @@
+diff --git src/profile.c src/profile.c
+index 3de9fb5..b7dc71f 100644
+--- src/profile.c
++++ src/profile.c
+@@ -2974,12 +2974,8 @@ GString *save_user_settings(GtkWidget *widget, struct Window *win_data)
// g_debug("save_user_settings(): profile = %s", profile);
// g_debug("\n%s", contents->str);
--#ifdef BSD
- gchar *real_file_name = realpath((const gchar *)profile, NULL);
--#else
+-# ifdef BSD
+ gchar resolved_patch[PATH_MAX+1];
+ gchar *real_file_name = g_strdup(realpath((const gchar *)profile, resolved_patch));
+-# else
- gchar *real_file_name = canonicalize_file_name((const gchar *)profile);
--#endif
+-# endif
if (real_file_name==NULL)
{
//if (access(profile, F_OK))
diff --git a/srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch b/srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch
deleted file mode 100644
index 6bff0be35a9..00000000000
--- a/srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig 2016-05-08 15:18:37.105172865 +0900
-+++ configure 2016-05-08 15:18:25.159172097 +0900
-@@ -138,7 +138,7 @@
- exit 0
- fi
-
--PKGCONFIG=`whereis "pkg-config" | tr -s ' ' '\n' | grep "bin/""pkg-config""$" | head -n 1`
-+PKGCONFIG=`which pkg-config`
- if [ -z "$PKGCONFIG" ]; then
- ERR "\n ERROR: \`"
- WARN "pkg-config"
---- src/Makefile.orig 2016-05-08 15:19:20.502175654 +0900
-+++ src/Makefile 2016-05-08 15:20:22.909179665 +0900
-@@ -22,7 +22,7 @@
- include ../.default
- -include ../.config
-
--PKGCONFIG := $(shell whereis "pkg-config" | tr -s ' ' '\n' | grep "bin/""pkg-config""$$" | head -n 1)
-+PKGCONFIG := $(shell which pkg-config)
-
- VTE ?= ""
-
diff --git a/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch b/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch
new file mode 100644
index 00000000000..69b8a8f3c51
--- /dev/null
+++ b/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch
@@ -0,0 +1,21 @@
+diff --git src/notebook.c src/notebook.c
+index eb4d973..0789a33 100644
+--- src/notebook.c
++++ src/notebook.c
+@@ -158,13 +158,13 @@ struct Page *add_page(struct Window *win_data,
+ #ifdef ENABLE_SET_EMULATION
+ # ifdef SAFEMODE
+ if (win_data->emulate_term == NULL)
+- g_string_append_printf (environ_str, "TERM=xterm");
++ g_string_append_printf (environ_str, "TERM=xterm\t");
+ else
+ # endif
+- g_string_append_printf (environ_str, "TERM=%s", win_data->emulate_term);
++ g_string_append_printf (environ_str, "TERM=%s\t", win_data->emulate_term);
+ #endif
+ // set colorterm
+- g_string_append_printf (environ_str, "\tCOLORTERM=lilyterm");
++ g_string_append_printf (environ_str, "COLORTERM=lilyterm");
+
+ // ---- Setting the VTE_CJK_WIDTH environment ---- //
+
diff --git a/srcpkgs/lilyterm/template b/srcpkgs/lilyterm/template
index 7728486a60e..31bc2ad9dc0 100644
--- a/srcpkgs/lilyterm/template
+++ b/srcpkgs/lilyterm/template
@@ -1,15 +1,50 @@
# Template file for 'lilyterm'
pkgname=lilyterm
-version=0.9.9.4
-revision=2
-build_style="gnu-configure"
-hostmakedepends="pkg-config which"
-makedepends="vte-devel gtk+-devel"
+_githash=faf1254f46049edfb1fd6e9191e78b1b23b9c51d
+version=0.9.9.4+20190725
+revision=1
+wrksrc=LilyTerm-$_githash
+build_style="gnu-makefile"
+hostmakedepends="pkg-config gettext"
+makedepends="vte3-devel gtk+3-devel"
short_desc="Fast and lightweight terminal emulator based off of libvte"
maintainer="Kris Scott <kris@syntosis.net>"
license="GPL-3.0-or-later"
homepage="http://lilyterm.luna.com.tw"
-distfiles="http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"
+# distfiles="http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"
+distfiles="https://github.com/Tetralet/LilyTerm/archive/$_githash.tar.gz"
conf_files="/etc/lilyterm.conf"
-checksum="b72626431d4f5645e0e0f18449319fbb69bef4eab4345d5e37cde0ae712a5d74"
+checksum=e777122cb4db0c75b893368aa5a3ae7de1bdfe27e1efb8fad8f9c19acb0a802e
CFLAGS="-Wno-deprecated-declarations"
+
+post_patch() {
+ vsed -i -e '/LDFLAGS.*BINARY/s/$/ -lX11/' \
+ -e '/^PKGCONFIG :=/d' \
+ -e '/^STRIP :=/d' \
+ src/Makefile
+}
+
+do_configure() {
+ cat <<-_EOF >.config
+ BSD = 0
+ PREFIX = /usr
+ prefix = /usr
+ ETCDIR = /etc
+ NLS = Y
+ VERBOSITY = Y
+ DEBUG = N
+ SAFEMODE = Y
+ FORCE_ENABLE_VTE_BACKGROUND = N
+ CC = $CC
+ STRIP = $STRIP
+ CPPFLAGS = $CPPFLAGS
+ CFLAGS = $CFLAGS
+ LDFLAGS = $LDFLAGS
+ MAKE = make
+ GTK = gtk+-3.0
+ VTE = vte-2.91
+ GNOME_CONTROL_CENTER = N
+ PACKAGE = lilyterm
+ PKGCONFIG = $PKG_CONFIG
+ _EOF
+}
From bbeea142ed5a905e6351dc6f5d90884f33811da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 22:30:08 +0700
Subject: [PATCH 4/4] vte: remove
---
srcpkgs/vte-devel | 1 -
srcpkgs/vte-python | 1 -
srcpkgs/vte/patches/CVE-2012-2738.patch | 137 ------------------------
srcpkgs/vte/patches/alt-key.patch | 70 ------------
srcpkgs/vte/patches/fix-includes.patch | 10 --
srcpkgs/vte/patches/scroll_region.patch | 65 -----------
srcpkgs/vte/template | 43 --------
srcpkgs/vte/update | 1 -
8 files changed, 328 deletions(-)
delete mode 120000 srcpkgs/vte-devel
delete mode 120000 srcpkgs/vte-python
delete mode 100644 srcpkgs/vte/patches/CVE-2012-2738.patch
delete mode 100644 srcpkgs/vte/patches/alt-key.patch
delete mode 100644 srcpkgs/vte/patches/fix-includes.patch
delete mode 100644 srcpkgs/vte/patches/scroll_region.patch
delete mode 100644 srcpkgs/vte/template
delete mode 100644 srcpkgs/vte/update
diff --git a/srcpkgs/vte-devel b/srcpkgs/vte-devel
deleted file mode 120000
index 82ac3e647ab..00000000000
--- a/srcpkgs/vte-devel
+++ /dev/null
@@ -1 +0,0 @@
-vte
\ No newline at end of file
diff --git a/srcpkgs/vte-python b/srcpkgs/vte-python
deleted file mode 120000
index 82ac3e647ab..00000000000
--- a/srcpkgs/vte-python
+++ /dev/null
@@ -1 +0,0 @@
-vte
\ No newline at end of file
diff --git a/srcpkgs/vte/patches/CVE-2012-2738.patch b/srcpkgs/vte/patches/CVE-2012-2738.patch
deleted file mode 100644
index 0a900a4f62c..00000000000
--- a/srcpkgs/vte/patches/CVE-2012-2738.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Upstream-Status: Backport
-CVE: CVE-2012-2738
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From e524b0b3bd8fad844ffa73927c199545b892cdbd Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Sat, 19 May 2012 19:36:09 +0200
-Subject: [PATCH 1/2] 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
----
- src/table.c | 2 +-
- src/vteseq.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/table.c b/src/table.c
-index 140e8c8..85cf631 100644
---- src/table.c
-+++ 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 7ef4c8c..10991db 100644
---- src/vteseq.c
-+++ 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
---
-2.4.9 (Apple Git-60)
-
-
-From cf1ad453a8def873c49cf6d88162593402f32bb2 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Sat, 19 May 2012 20:04:12 +0200
-Subject: [PATCH 2/2] emulation: Limit repetitions
-
-Don't allow malicious sequences to cause excessive repetitions.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=676090
----
- src/vteseq.c | 25 ++++++++++++++++++-------
- 1 file changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/src/vteseq.c b/src/vteseq.c
-index 10991db..209522f 100644
---- src/vteseq.c
-+++ src/vteseq.c
-@@ -1392,7 +1392,7 @@ vte_sequence_handler_dc (VteTerminal *terminal, GValueArray *params)
- static void
- vte_sequence_handler_DC (VteTerminal *terminal, GValueArray *params)
- {
-- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_dc);
-+ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_dc);
- }
-
- /* Delete a line at the current cursor position. */
-@@ -1785,7 +1785,7 @@ vte_sequence_handler_reverse_index (VteTerminal *terminal, GValueArray *params)
- static void
- vte_sequence_handler_RI (VteTerminal *terminal, GValueArray *params)
- {
-- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_nd);
-+ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_nd);
- }
-
- /* Save cursor (position). */
-@@ -2777,8 +2777,7 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
- {
- GValue *value;
- VteScreen *screen;
-- long param, end, row;
-- int i;
-+ long param, end, row, i, limit;
- screen = terminal->pvt->screen;
- /* The default is one. */
- param = 1;
-@@ -2796,7 +2795,13 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
- } else {
- end = screen->insert_delta + terminal->row_count - 1;
- }
-- /* Insert the new lines at the cursor. */
-+
-+ /* Only allow to insert as many lines as there are between this row
-+ * and the end of the scrolling region. See bug #676090.
-+ */
-+ limit = end - row + 1;
-+ param = MIN (param, limit);
-+
- for (i = 0; i < param; i++) {
- /* Clear a line off the end of the region and add one to the
- * top of the region. */
-@@ -2817,8 +2822,7 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
- {
- GValue *value;
- VteScreen *screen;
-- long param, end, row;
-- int i;
-+ long param, end, row, i, limit;
-
- screen = terminal->pvt->screen;
- /* The default is one. */
-@@ -2837,6 +2841,13 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
- } else {
- end = screen->insert_delta + terminal->row_count - 1;
- }
-+
-+ /* Only allow to delete as many lines as there are between this row
-+ * and the end of the scrolling region. See bug #676090.
-+ */
-+ limit = end - row + 1;
-+ param = MIN (param, limit);
-+
- /* Clear them from below the current cursor. */
- for (i = 0; i < param; i++) {
- /* Insert a line at the end of the region and remove one from
---
-2.4.9 (Apple Git-60)
-
-
diff --git a/srcpkgs/vte/patches/alt-key.patch b/srcpkgs/vte/patches/alt-key.patch
deleted file mode 100644
index ad8d2fcedfc..00000000000
--- a/srcpkgs/vte/patches/alt-key.patch
+++ /dev/null
@@ -1,70 +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(-)
-
---- src/keymap.c
-+++ 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;
---- src/keymap.h
-+++ 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/srcpkgs/vte/patches/fix-includes.patch b/srcpkgs/vte/patches/fix-includes.patch
deleted file mode 100644
index f810501110a..00000000000
--- a/srcpkgs/vte/patches/fix-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/pty.c
-+++ src/pty.c
-@@ -28,6 +28,7 @@
- * Since: 0.26
- */
-
-+#define _GNU_SOURCE
- #include <config.h>
-
- #include "vtepty.h"
diff --git a/srcpkgs/vte/patches/scroll_region.patch b/srcpkgs/vte/patches/scroll_region.patch
deleted file mode 100644
index 1def57e8f0d..00000000000
--- a/srcpkgs/vte/patches/scroll_region.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/vte.c 2010-11-30 23:04:53.000000000 -0800
-+++ src/vte.c 2010-12-07 20:05:07.865548000 -0800
-@@ -3862,6 +3862,7 @@ vte_terminal_process_incoming(VteTermina
- 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;
-
-@@ -3881,6 +3882,10 @@ vte_terminal_process_incoming(VteTermina
- 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));
-@@ -3979,6 +3984,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,
-@@ -3989,12 +3996,20 @@ 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);
-@@ -4014,6 +4029,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
diff --git a/srcpkgs/vte/template b/srcpkgs/vte/template
deleted file mode 100644
index ce765732e52..00000000000
--- a/srcpkgs/vte/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'vte'
-pkgname=vte
-version=0.28.2
-revision=16
-build_style=gnu-configure
-configure_args="PYTHON=python2 --disable-static --with-gtk=2.0"
-hostmakedepends="automake gettext-devel gtk-doc gobject-introspection libtool
- pkg-config intltool python-devel glib-devel pygtk-devel"
-makedepends="gtk+-devel ncurses-devel python-devel pygtk-devel"
-short_desc="Terminal widget with improved accessibility and I18N support"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/vte/0.28/${pkgname}-${version}.tar.bz2"
-checksum=8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903
-
-pre_configure() {
- NOCONFIGURE=1 autoreconf -fi
- if [ "$CROSS_BUILD" ]; then
- sed -i "s,\(PYTHON_INCLUDES\)=.*,\1=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
- fi
-}
-
-vte-python_package() {
- lib32disabled=yes
- depends="pygtk"
- short_desc+=" -- Python bindings"
- pkg_install() {
- vmove "usr/lib/python*"
- vmove "usr/share/pygtk*"
- }
-}
-
-vte-devel_package() {
- depends="libglib-devel pango-devel cairo-devel gtk+-devel vte>=${version}_${revision}"
- short_desc+=" -- development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/share/gtk-doc
- }
-}
diff --git a/srcpkgs/vte/update b/srcpkgs/vte/update
deleted file mode 100644
index 13baac4b856..00000000000
--- a/srcpkgs/vte/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[!0].* 0.[!2]*"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR REVIEW] vte+gtkdialog: remove
2020-12-30 15:31 [PR PATCH] vte: remove sgn
2020-12-30 16:00 ` [PR PATCH] [Updated] vte+gtkdialog: remove sgn
@ 2021-01-02 1:24 ` ericonr
2021-01-06 0:34 ` sgn
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-01-02 1:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27556#discussion_r550828401
Comment:
Unfortunate, but I think it's worth it being able to drop vte.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR REVIEW] vte+gtkdialog: remove
2020-12-30 15:31 [PR PATCH] vte: remove sgn
2020-12-30 16:00 ` [PR PATCH] [Updated] vte+gtkdialog: remove sgn
2021-01-02 1:24 ` [PR REVIEW] " ericonr
@ 2021-01-06 0:34 ` sgn
2021-01-06 0:59 ` [PR PATCH] [Updated] " sgn
2021-01-06 12:00 ` [PR PATCH] [Merged]: " sgn
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2021-01-06 0:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/27556#discussion_r552289364
Comment:
Other distros also ships some git version, too.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] vte+gtkdialog: remove
2020-12-30 15:31 [PR PATCH] vte: remove sgn
` (2 preceding siblings ...)
2021-01-06 0:34 ` sgn
@ 2021-01-06 0:59 ` sgn
2021-01-06 12:00 ` [PR PATCH] [Merged]: " sgn
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2021-01-06 0:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 306 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages vte-remove
https://github.com/void-linux/void-packages/pull/27556
vte+gtkdialog: remove
A patch file from https://github.com/void-linux/void-packages/pull/27556.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vte-remove-27556.patch --]
[-- Type: text/x-diff, Size: 24175 bytes --]
From 886240dff9e41c645ae0dd90a38f07bc4623ba55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 29 Dec 2020 08:01:59 +0700
Subject: [PATCH 1/4] genius: update to 1.0.25.
---
srcpkgs/genius/template | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index d8228ab28be..395d5c530a0 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,16 +1,23 @@
# Template file for 'genius'
pkgname=genius
-version=1.0.24
-revision=2
+version=1.0.25
+revision=1
build_style=gnu-configure
-configure_args="--disable-update-mimedb"
-hostmakedepends="intltool pkg-config"
-makedepends="gtksourceview2-devel mpfr-devel readline-devel vte-devel"
+configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
+ GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
+hostmakedepends="intltool pkg-config glib-devel automake libtool bison flex"
+makedepends="gtksourceview4-devel mpfr-devel readline-devel ncurses-devel
+ gtk+3-devel amtk-devel libglib-devel vte3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Advanced calculator including a mathematical programming language"
maintainer="Samadi van Koten <samadi@vktec.co.uk>"
license="GPL-3.0-or-later"
homepage="http://www.jirka.org/genius.html"
distfiles="http://ftp.5z.com/pub/genius/genius-${version}.tar.xz"
-checksum=8dea7f386821f39a438c66d5201a741904555c878dc670b96b8a22a8a96dca50
-nocross="https://travis-ci.org/voidlinux/void-packages/jobs/252374514"
+checksum=0e92c9a22f903012ef331c20ada5b30b6c666c0f11753958b8e38d720deb6e0c
+nocross="run the binaries"
+
+post_patch() {
+ vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
+ autoreconf -fi
+}
From 254b03945c1458e9dcc96789624ed21826179032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 29 Dec 2020 08:16:58 +0700
Subject: [PATCH 2/4] gtkdialog: remove
Abandon upstream from at least 2007
---
srcpkgs/gtkdialog/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/gtkdialog/template
diff --git a/srcpkgs/gtkdialog/template b/srcpkgs/gtkdialog/template
deleted file mode 100644
index 7311db4ef1e..00000000000
--- a/srcpkgs/gtkdialog/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'gtkdialog'
-pkgname=gtkdialog
-version=0.8.3
-revision=4
-build_style=gnu-configure
-make_install_args="UPDATE_ICON_CACHE=true"
-hostmakedepends="pkg-config flex"
-makedepends="gtk+-devel libglade-devel vte-devel"
-depends="hicolor-icon-theme"
-short_desc="A small utility for fast and easy GUI building"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://code.google.com/p/gtkdialog/"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gtkdialog/gtkdialog-${version}.tar.gz"
-checksum=ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e
-
-CFLAGS="-fcommon"
-
-post_install() {
- vmkdir usr/share/doc/$pkgname
- cp -a examples ${DESTDIR}/usr/share/doc/$pkgname/examples
-}
From 63640b378092516735635483c77a32bd1cdd666e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 29 Dec 2020 08:50:40 +0700
Subject: [PATCH 3/4] lilyterm: update to 0.9.9.4+20190725.
---
srcpkgs/lilyterm/patches/lilyterm-musl.patch | 17 ++++---
.../lilyterm/patches/lilyterm-pkgconfig.patch | 22 ---------
.../no-empty-environment-variables.patch | 21 ++++++++
srcpkgs/lilyterm/template | 49 ++++++++++++++++---
4 files changed, 73 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch
create mode 100644 srcpkgs/lilyterm/patches/no-empty-environment-variables.patch
diff --git a/srcpkgs/lilyterm/patches/lilyterm-musl.patch b/srcpkgs/lilyterm/patches/lilyterm-musl.patch
index 28778e85799..5cd2fe64014 100644
--- a/srcpkgs/lilyterm/patches/lilyterm-musl.patch
+++ b/srcpkgs/lilyterm/patches/lilyterm-musl.patch
@@ -1,14 +1,17 @@
---- src/profile.c.orig 2016-05-07 00:22:09.702161948 +0900
-+++ src/profile.c 2016-05-07 00:24:21.566170424 +0900
-@@ -2660,11 +2660,7 @@
+diff --git src/profile.c src/profile.c
+index 3de9fb5..b7dc71f 100644
+--- src/profile.c
++++ src/profile.c
+@@ -2974,12 +2974,8 @@ GString *save_user_settings(GtkWidget *widget, struct Window *win_data)
// g_debug("save_user_settings(): profile = %s", profile);
// g_debug("\n%s", contents->str);
--#ifdef BSD
- gchar *real_file_name = realpath((const gchar *)profile, NULL);
--#else
+-# ifdef BSD
+ gchar resolved_patch[PATH_MAX+1];
+ gchar *real_file_name = g_strdup(realpath((const gchar *)profile, resolved_patch));
+-# else
- gchar *real_file_name = canonicalize_file_name((const gchar *)profile);
--#endif
+-# endif
if (real_file_name==NULL)
{
//if (access(profile, F_OK))
diff --git a/srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch b/srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch
deleted file mode 100644
index 6bff0be35a9..00000000000
--- a/srcpkgs/lilyterm/patches/lilyterm-pkgconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig 2016-05-08 15:18:37.105172865 +0900
-+++ configure 2016-05-08 15:18:25.159172097 +0900
-@@ -138,7 +138,7 @@
- exit 0
- fi
-
--PKGCONFIG=`whereis "pkg-config" | tr -s ' ' '\n' | grep "bin/""pkg-config""$" | head -n 1`
-+PKGCONFIG=`which pkg-config`
- if [ -z "$PKGCONFIG" ]; then
- ERR "\n ERROR: \`"
- WARN "pkg-config"
---- src/Makefile.orig 2016-05-08 15:19:20.502175654 +0900
-+++ src/Makefile 2016-05-08 15:20:22.909179665 +0900
-@@ -22,7 +22,7 @@
- include ../.default
- -include ../.config
-
--PKGCONFIG := $(shell whereis "pkg-config" | tr -s ' ' '\n' | grep "bin/""pkg-config""$$" | head -n 1)
-+PKGCONFIG := $(shell which pkg-config)
-
- VTE ?= ""
-
diff --git a/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch b/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch
new file mode 100644
index 00000000000..69b8a8f3c51
--- /dev/null
+++ b/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch
@@ -0,0 +1,21 @@
+diff --git src/notebook.c src/notebook.c
+index eb4d973..0789a33 100644
+--- src/notebook.c
++++ src/notebook.c
+@@ -158,13 +158,13 @@ struct Page *add_page(struct Window *win_data,
+ #ifdef ENABLE_SET_EMULATION
+ # ifdef SAFEMODE
+ if (win_data->emulate_term == NULL)
+- g_string_append_printf (environ_str, "TERM=xterm");
++ g_string_append_printf (environ_str, "TERM=xterm\t");
+ else
+ # endif
+- g_string_append_printf (environ_str, "TERM=%s", win_data->emulate_term);
++ g_string_append_printf (environ_str, "TERM=%s\t", win_data->emulate_term);
+ #endif
+ // set colorterm
+- g_string_append_printf (environ_str, "\tCOLORTERM=lilyterm");
++ g_string_append_printf (environ_str, "COLORTERM=lilyterm");
+
+ // ---- Setting the VTE_CJK_WIDTH environment ---- //
+
diff --git a/srcpkgs/lilyterm/template b/srcpkgs/lilyterm/template
index 7728486a60e..31bc2ad9dc0 100644
--- a/srcpkgs/lilyterm/template
+++ b/srcpkgs/lilyterm/template
@@ -1,15 +1,50 @@
# Template file for 'lilyterm'
pkgname=lilyterm
-version=0.9.9.4
-revision=2
-build_style="gnu-configure"
-hostmakedepends="pkg-config which"
-makedepends="vte-devel gtk+-devel"
+_githash=faf1254f46049edfb1fd6e9191e78b1b23b9c51d
+version=0.9.9.4+20190725
+revision=1
+wrksrc=LilyTerm-$_githash
+build_style="gnu-makefile"
+hostmakedepends="pkg-config gettext"
+makedepends="vte3-devel gtk+3-devel"
short_desc="Fast and lightweight terminal emulator based off of libvte"
maintainer="Kris Scott <kris@syntosis.net>"
license="GPL-3.0-or-later"
homepage="http://lilyterm.luna.com.tw"
-distfiles="http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"
+# distfiles="http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"
+distfiles="https://github.com/Tetralet/LilyTerm/archive/$_githash.tar.gz"
conf_files="/etc/lilyterm.conf"
-checksum="b72626431d4f5645e0e0f18449319fbb69bef4eab4345d5e37cde0ae712a5d74"
+checksum=e777122cb4db0c75b893368aa5a3ae7de1bdfe27e1efb8fad8f9c19acb0a802e
CFLAGS="-Wno-deprecated-declarations"
+
+post_patch() {
+ vsed -i -e '/LDFLAGS.*BINARY/s/$/ -lX11/' \
+ -e '/^PKGCONFIG :=/d' \
+ -e '/^STRIP :=/d' \
+ src/Makefile
+}
+
+do_configure() {
+ cat <<-_EOF >.config
+ BSD = 0
+ PREFIX = /usr
+ prefix = /usr
+ ETCDIR = /etc
+ NLS = Y
+ VERBOSITY = Y
+ DEBUG = N
+ SAFEMODE = Y
+ FORCE_ENABLE_VTE_BACKGROUND = N
+ CC = $CC
+ STRIP = $STRIP
+ CPPFLAGS = $CPPFLAGS
+ CFLAGS = $CFLAGS
+ LDFLAGS = $LDFLAGS
+ MAKE = make
+ GTK = gtk+-3.0
+ VTE = vte-2.91
+ GNOME_CONTROL_CENTER = N
+ PACKAGE = lilyterm
+ PKGCONFIG = $PKG_CONFIG
+ _EOF
+}
From e929d9ab1ce3e351f1bf896189282dda0dc0f89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 22:30:08 +0700
Subject: [PATCH 4/4] vte: remove
---
srcpkgs/removed-packages/template | 5 +-
srcpkgs/vte-devel | 1 -
srcpkgs/vte-python | 1 -
srcpkgs/vte/patches/CVE-2012-2738.patch | 137 ------------------------
srcpkgs/vte/patches/alt-key.patch | 70 ------------
srcpkgs/vte/patches/fix-includes.patch | 10 --
srcpkgs/vte/patches/scroll_region.patch | 65 -----------
srcpkgs/vte/template | 43 --------
srcpkgs/vte/update | 1 -
9 files changed, 4 insertions(+), 329 deletions(-)
delete mode 120000 srcpkgs/vte-devel
delete mode 120000 srcpkgs/vte-python
delete mode 100644 srcpkgs/vte/patches/CVE-2012-2738.patch
delete mode 100644 srcpkgs/vte/patches/alt-key.patch
delete mode 100644 srcpkgs/vte/patches/fix-includes.patch
delete mode 100644 srcpkgs/vte/patches/scroll_region.patch
delete mode 100644 srcpkgs/vte/template
delete mode 100644 srcpkgs/vte/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bc175313071..e0f6a5c17b8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=1
+revision=2
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -77,6 +77,9 @@ replaces="
urlmatch-git<=20141116_2
v8<=3.24.35.33_4
varnish<=6.1.1_3
+ vte<=0.28.2_16
+ vte-devel<=0.28.2_16
+ vte-python<=0.28.2_16
wireguard-go<=0.0.20181222_2
wireshark-gtk<=3.0.7_1
yt-play<=20140117_2
diff --git a/srcpkgs/vte-devel b/srcpkgs/vte-devel
deleted file mode 120000
index 82ac3e647ab..00000000000
--- a/srcpkgs/vte-devel
+++ /dev/null
@@ -1 +0,0 @@
-vte
\ No newline at end of file
diff --git a/srcpkgs/vte-python b/srcpkgs/vte-python
deleted file mode 120000
index 82ac3e647ab..00000000000
--- a/srcpkgs/vte-python
+++ /dev/null
@@ -1 +0,0 @@
-vte
\ No newline at end of file
diff --git a/srcpkgs/vte/patches/CVE-2012-2738.patch b/srcpkgs/vte/patches/CVE-2012-2738.patch
deleted file mode 100644
index 0a900a4f62c..00000000000
--- a/srcpkgs/vte/patches/CVE-2012-2738.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Upstream-Status: Backport
-CVE: CVE-2012-2738
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From e524b0b3bd8fad844ffa73927c199545b892cdbd Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Sat, 19 May 2012 19:36:09 +0200
-Subject: [PATCH 1/2] 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
----
- src/table.c | 2 +-
- src/vteseq.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/table.c b/src/table.c
-index 140e8c8..85cf631 100644
---- src/table.c
-+++ 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 7ef4c8c..10991db 100644
---- src/vteseq.c
-+++ 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
---
-2.4.9 (Apple Git-60)
-
-
-From cf1ad453a8def873c49cf6d88162593402f32bb2 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Sat, 19 May 2012 20:04:12 +0200
-Subject: [PATCH 2/2] emulation: Limit repetitions
-
-Don't allow malicious sequences to cause excessive repetitions.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=676090
----
- src/vteseq.c | 25 ++++++++++++++++++-------
- 1 file changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/src/vteseq.c b/src/vteseq.c
-index 10991db..209522f 100644
---- src/vteseq.c
-+++ src/vteseq.c
-@@ -1392,7 +1392,7 @@ vte_sequence_handler_dc (VteTerminal *terminal, GValueArray *params)
- static void
- vte_sequence_handler_DC (VteTerminal *terminal, GValueArray *params)
- {
-- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_dc);
-+ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_dc);
- }
-
- /* Delete a line at the current cursor position. */
-@@ -1785,7 +1785,7 @@ vte_sequence_handler_reverse_index (VteTerminal *terminal, GValueArray *params)
- static void
- vte_sequence_handler_RI (VteTerminal *terminal, GValueArray *params)
- {
-- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_nd);
-+ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_nd);
- }
-
- /* Save cursor (position). */
-@@ -2777,8 +2777,7 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
- {
- GValue *value;
- VteScreen *screen;
-- long param, end, row;
-- int i;
-+ long param, end, row, i, limit;
- screen = terminal->pvt->screen;
- /* The default is one. */
- param = 1;
-@@ -2796,7 +2795,13 @@ vte_sequence_handler_insert_lines (VteTerminal *terminal, GValueArray *params)
- } else {
- end = screen->insert_delta + terminal->row_count - 1;
- }
-- /* Insert the new lines at the cursor. */
-+
-+ /* Only allow to insert as many lines as there are between this row
-+ * and the end of the scrolling region. See bug #676090.
-+ */
-+ limit = end - row + 1;
-+ param = MIN (param, limit);
-+
- for (i = 0; i < param; i++) {
- /* Clear a line off the end of the region and add one to the
- * top of the region. */
-@@ -2817,8 +2822,7 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
- {
- GValue *value;
- VteScreen *screen;
-- long param, end, row;
-- int i;
-+ long param, end, row, i, limit;
-
- screen = terminal->pvt->screen;
- /* The default is one. */
-@@ -2837,6 +2841,13 @@ vte_sequence_handler_delete_lines (VteTerminal *terminal, GValueArray *params)
- } else {
- end = screen->insert_delta + terminal->row_count - 1;
- }
-+
-+ /* Only allow to delete as many lines as there are between this row
-+ * and the end of the scrolling region. See bug #676090.
-+ */
-+ limit = end - row + 1;
-+ param = MIN (param, limit);
-+
- /* Clear them from below the current cursor. */
- for (i = 0; i < param; i++) {
- /* Insert a line at the end of the region and remove one from
---
-2.4.9 (Apple Git-60)
-
-
diff --git a/srcpkgs/vte/patches/alt-key.patch b/srcpkgs/vte/patches/alt-key.patch
deleted file mode 100644
index ad8d2fcedfc..00000000000
--- a/srcpkgs/vte/patches/alt-key.patch
+++ /dev/null
@@ -1,70 +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(-)
-
---- src/keymap.c
-+++ 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;
---- src/keymap.h
-+++ 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/srcpkgs/vte/patches/fix-includes.patch b/srcpkgs/vte/patches/fix-includes.patch
deleted file mode 100644
index f810501110a..00000000000
--- a/srcpkgs/vte/patches/fix-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/pty.c
-+++ src/pty.c
-@@ -28,6 +28,7 @@
- * Since: 0.26
- */
-
-+#define _GNU_SOURCE
- #include <config.h>
-
- #include "vtepty.h"
diff --git a/srcpkgs/vte/patches/scroll_region.patch b/srcpkgs/vte/patches/scroll_region.patch
deleted file mode 100644
index 1def57e8f0d..00000000000
--- a/srcpkgs/vte/patches/scroll_region.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/vte.c 2010-11-30 23:04:53.000000000 -0800
-+++ src/vte.c 2010-12-07 20:05:07.865548000 -0800
-@@ -3862,6 +3862,7 @@ vte_terminal_process_incoming(VteTermina
- 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;
-
-@@ -3881,6 +3882,10 @@ vte_terminal_process_incoming(VteTermina
- 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));
-@@ -3979,6 +3984,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,
-@@ -3989,12 +3996,20 @@ 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);
-@@ -4014,6 +4029,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
diff --git a/srcpkgs/vte/template b/srcpkgs/vte/template
deleted file mode 100644
index ce765732e52..00000000000
--- a/srcpkgs/vte/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'vte'
-pkgname=vte
-version=0.28.2
-revision=16
-build_style=gnu-configure
-configure_args="PYTHON=python2 --disable-static --with-gtk=2.0"
-hostmakedepends="automake gettext-devel gtk-doc gobject-introspection libtool
- pkg-config intltool python-devel glib-devel pygtk-devel"
-makedepends="gtk+-devel ncurses-devel python-devel pygtk-devel"
-short_desc="Terminal widget with improved accessibility and I18N support"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/vte/0.28/${pkgname}-${version}.tar.bz2"
-checksum=8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903
-
-pre_configure() {
- NOCONFIGURE=1 autoreconf -fi
- if [ "$CROSS_BUILD" ]; then
- sed -i "s,\(PYTHON_INCLUDES\)=.*,\1=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
- fi
-}
-
-vte-python_package() {
- lib32disabled=yes
- depends="pygtk"
- short_desc+=" -- Python bindings"
- pkg_install() {
- vmove "usr/lib/python*"
- vmove "usr/share/pygtk*"
- }
-}
-
-vte-devel_package() {
- depends="libglib-devel pango-devel cairo-devel gtk+-devel vte>=${version}_${revision}"
- short_desc+=" -- development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/share/gtk-doc
- }
-}
diff --git a/srcpkgs/vte/update b/srcpkgs/vte/update
deleted file mode 100644
index 13baac4b856..00000000000
--- a/srcpkgs/vte/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[!0].* 0.[!2]*"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: vte+gtkdialog: remove
2020-12-30 15:31 [PR PATCH] vte: remove sgn
` (3 preceding siblings ...)
2021-01-06 0:59 ` [PR PATCH] [Updated] " sgn
@ 2021-01-06 12:00 ` sgn
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2021-01-06 12:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 155 bytes --]
There's a merged pull request on the void-packages repository
vte+gtkdialog: remove
https://github.com/void-linux/void-packages/pull/27556
Description:
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-01-06 12:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-30 15:31 [PR PATCH] vte: remove sgn
2020-12-30 16:00 ` [PR PATCH] [Updated] vte+gtkdialog: remove sgn
2021-01-02 1:24 ` [PR REVIEW] " ericonr
2021-01-06 0:34 ` sgn
2021-01-06 0:59 ` [PR PATCH] [Updated] " sgn
2021-01-06 12:00 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).