Skip to content
Commits on Source (14)
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ ed7e116f
vte2.91 (0.62.3-1ubuntu1) UNRELEASED; urgency=medium
* Merge with debian. Remaining changes:
- Add 91_keep_fds.patch since gdebi still requires it (LP: #1756238)
- Breaks/Replaces with libvte-2.91-0 (<= 0.60.0-2ubuntu1)
- Ubuntu gbp.conf and debian/control VCS information
-- Gunnar Hjalmarsson <gunnarhj@ubuntu.com> Tue, 23 Feb 2021 22:53:51 +0100
vte2.91 (0.62.3-1) unstable; urgency=medium
* Team upload
* New upstream release
- Use int8_t instead of ssize_t for length of short keymap strings
* Drop patches that were applied upstream
* d/gbp.conf: Use upstream/0.62.x branch for new imports from upstream.
0.63.x releases have already happened.
-- Simon McVittie <smcv@debian.org> Wed, 17 Feb 2021 21:05:29 +0000
vte2.91 (0.62.2-1ubuntu2) hirsute; urgency=medium
* No-change rebuild to drop the udeb package.
-- Matthias Klose <doko@ubuntu.com> Mon, 22 Feb 2021 10:36:34 +0100
vte2.91 (0.62.2-1ubuntu1) hirsute; urgency=medium
* Merge with debian. Remaining changes:
......
debian/gbp.conf
View file @ ed7e116f
[DEFAULT]
pristine-tar = True
debian-branch = ubuntu/master
upstream-branch = upstream/latest
upstream-branch = upstream/0.62.x
upstream-vcs-tag = %(version)s
debian-tag = ubuntu/%(version)s
......
debian/patches/Revert-lib-Sanitise-the-passed-in-font-description.patch deleted 100644 → 0
View file @ e57ac205
From: Christian Persch <chpe@src.gnome.org>
Date: Sun, 24 Jan 2021 20:49:49 +0100
Subject: Revert "lib: Sanitise the passed-in font description"
This needed more work which is done on master but too involved for stable.
Origin: upstream, 0.62.3, commit:fd942187934a39260f1a50c8e22bc36108061f4f
---
src/vte.cc | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/vte.cc b/src/vte.cc
index f6d0a66..5a631d9 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -7340,14 +7340,6 @@ Terminal::set_font_desc(PangoFontDescription const* font_desc)
"Using default monospace font.\n");
}
- /* Sanitise the font description. Style and weight need to be default here,
- * since those are set via SGR attributes; and gravity makes no sense in vte.
- */
- pango_font_description_unset_fields(desc,
- PangoFontMask(PANGO_FONT_MASK_GRAVITY |
- PANGO_FONT_MASK_STYLE |
- PANGO_FONT_MASK_WEIGHT));
-
bool const same_desc = m_unscaled_font_desc &&
pango_font_description_equal(m_unscaled_font_desc.get(), desc);
debian/patches/Update-Norwegian-Bokm-l-translation.patch deleted 100644 → 0
View file @ e57ac205
From: Kjartan Maraas <kmaraas@gnome.org>
Date: Mon, 25 Jan 2021 14:06:37 +0000
Subject: =?utf-8?q?Update_Norwegian_Bokm=C3=A5l_translation?=
Origin: upstream, 0.62.3, commit:ed3eb69eaab8f1af5868f22a80a98cdb9b6ebf22
---
po/nb.po | 62 +++++++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 39 insertions(+), 23 deletions(-)
diff --git a/po/nb.po b/po/nb.po
index b4c1d21..56f8343 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,13 +1,13 @@
# Norwegian (bokmål) translation of vte.
-# Copyright (C) Kjartan Maraas, 2002-2014.
+# Copyright (C) Kjartan Maraas, 2002-2020.
# Free Software Foundation, 2002.
#
msgid ""
msgstr ""
-"Project-Id-Version: vte 0.46.x\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-16 12:39+0200\n"
-"PO-Revision-Date: 2016-10-16 12:38+0200\n"
+"Project-Id-Version: vte 0.62.x\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/vte/issues\n"
+"POT-Creation-Date: 2020-09-12 19:27+0000\n"
+"PO-Revision-Date: 2021-01-25 15:05+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
"Language: nb\n"
@@ -15,28 +15,44 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/iso2022.cc:73 ../src/iso2022.cc:81 ../src/iso2022.cc:111
-#: ../src/vtegtk.cc:3072
+#: src/vte.cc:7764
+msgid "WARNING"
+msgstr "ADVARSEL"
+
+#: src/vte.cc:7766
+msgid "GnuTLS not enabled; data will be written to disk unencrypted!"
+msgstr ""
+"GNUTLS er ikke aktivert; data vil bli skrevet til disk uten kryptering!"
+
+#: src/spawn.cc:111
#, c-format
-msgid "Unable to convert characters from %s to %s."
-msgstr "Kan ikke konvertere tegn fra %s til %s."
+msgid "Failed to set pipe nonblocking: %s"
+msgstr "Klarte ikke å sette rør til ikke-blokkerende: %s"
-#. Translators: %s is replaced with error message returned by strerror().
-#: ../src/vte.cc:4002
+#: src/spawn.cc:156
#, c-format
-msgid "Error reading from child: %s."
-msgstr "Feil under lesing fra underprosess: %s."
+msgid "poll error: %s"
+msgstr "feil ved henting: %s"
+
+#: src/spawn.cc:163
+msgid "Operation timed out"
+msgstr "Operasjonen fikk tidsavbrudd"
-#: ../src/vte.cc:4141
+#: src/spawn.cc:173
+msgid "Operation was cancelled"
+msgstr "Operasjonen ble avbrutt"
+
+#: src/spawn.cc:191
#, c-format
-msgid "Error (%s) converting data for child, dropping."
-msgstr "Feil (%s) ved konvertering av data for underprosess. Hopper over."
+msgid "Failed to read from child pipe (%s)"
+msgstr "Feil under lesing fra underrør (%s)"
-#: ../src/vte.cc:7910
-msgid "WARNING"
-msgstr "ADVARSEL"
+#: src/spawn.cc:621
+#, c-format
+msgid "Failed to change to directory “%s”: %s"
+msgstr "Klarte ikke å endre til katalog «%s»: %s"
-#: ../src/vte.cc:7911
-msgid "GNUTLS not enabled; data will be written to disk unencrypted!"
-msgstr ""
-"GNUTLS er ikke aktivert; data vil bli skrevet til disk uten kryptering!"
+#: src/spawn.cc:690
+#, c-format
+msgid "Failed to execute child process “%s”: "
+msgstr "Klarte ikke å kjøre underprosess «%s»: "
debian/patches/series
View file @ ed7e116f
Revert-lib-Sanitise-the-passed-in-font-description.patch
Update-Norwegian-Bokm-l-translation.patch
Allow-background-color-and-color-on-VteTerminal-widgets-t.patch
91_keep_fds.patch
meson.build
View file @ ed7e116f
......@@ -17,7 +17,7 @@
project(
'vte',
['c', 'cpp'],
version: '0.62.2',
version: '0.62.3',
license: ['LGPL-3.0-or-later', 'GPL-3.0-or-later'],
default_options: [
'buildtype=release',
......
po/nb.po
View file @ ed7e116f
# Norwegian (bokmål) translation of vte.
# Copyright (C) Kjartan Maraas, 2002-2014.
# Copyright (C) Kjartan Maraas, 2002-2020.
# Free Software Foundation, 2002.
#
msgid ""
msgstr ""
"Project-Id-Version: vte 0.46.x\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-10-16 12:39+0200\n"
"PO-Revision-Date: 2016-10-16 12:38+0200\n"
"Project-Id-Version: vte 0.62.x\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/vte/issues\n"
"POT-Creation-Date: 2020-09-12 19:27+0000\n"
"PO-Revision-Date: 2021-01-25 15:05+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
"Language: nb\n"
......@@ -15,28 +15,44 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../src/iso2022.cc:73 ../src/iso2022.cc:81 ../src/iso2022.cc:111
#: ../src/vtegtk.cc:3072
#: src/vte.cc:7764
msgid "WARNING"
msgstr "ADVARSEL"
#: src/vte.cc:7766
msgid "GnuTLS not enabled; data will be written to disk unencrypted!"
msgstr ""
"GNUTLS er ikke aktivert; data vil bli skrevet til disk uten kryptering!"
#: src/spawn.cc:111
#, c-format
msgid "Unable to convert characters from %s to %s."
msgstr "Kan ikke konvertere tegn fra %s til %s."
msgid "Failed to set pipe nonblocking: %s"
msgstr "Klarte ikke å sette rør til ikke-blokkerende: %s"
#. Translators: %s is replaced with error message returned by strerror().
#: ../src/vte.cc:4002
#: src/spawn.cc:156
#, c-format
msgid "Error reading from child: %s."
msgstr "Feil under lesing fra underprosess: %s."
msgid "poll error: %s"
msgstr "feil ved henting: %s"
#: src/spawn.cc:163
msgid "Operation timed out"
msgstr "Operasjonen fikk tidsavbrudd"
#: ../src/vte.cc:4141
#: src/spawn.cc:173
msgid "Operation was cancelled"
msgstr "Operasjonen ble avbrutt"
#: src/spawn.cc:191
#, c-format
msgid "Error (%s) converting data for child, dropping."
msgstr "Feil (%s) ved konvertering av data for underprosess. Hopper over."
msgid "Failed to read from child pipe (%s)"
msgstr "Feil under lesing fra underrør (%s)"
#: ../src/vte.cc:7910
msgid "WARNING"
msgstr "ADVARSEL"
#: src/spawn.cc:621
#, c-format
msgid "Failed to change to directory “%s”: %s"
msgstr "Klarte ikke å endre til katalog «%s»: %s"
#: ../src/vte.cc:7911
msgid "GNUTLS not enabled; data will be written to disk unencrypted!"
msgstr ""
"GNUTLS er ikke aktivert; data vil bli skrevet til disk uten kryptering!"
#: src/spawn.cc:690
#, c-format
msgid "Failed to execute child process “%s”: "
msgstr "Klarte ikke å kjøre underprosess «%s»: "
src/keymap.cc
View file @ ed7e116f
......@@ -19,6 +19,8 @@
#include "config.h"
#include <cassert>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
......@@ -74,7 +76,7 @@ struct _vte_keymap_entry {
guint keypad_mode;
guint mod_mask;
const char normal[8];
gssize normal_length;
int8_t normal_length;
};
#define X_NULL ""
......@@ -757,6 +759,7 @@ _vte_keymap_map(guint keyval,
if ((modifiers & entries[i].mod_mask) == entries[i].mod_mask) {
if (entries[i].normal_length != -1) {
*normal_length = entries[i].normal_length;
assert(entries[i].normal_length < G_MAXINT);
*normal = (char*)g_memdup(entries[i].normal,
entries[i].normal_length);
} else {
......
src/vte.cc
View file @ ed7e116f
......@@ -7340,14 +7340,6 @@ Terminal::set_font_desc(PangoFontDescription const* font_desc)
"Using default monospace font.\n");
}
/* Sanitise the font description. Style and weight need to be default here,
* since those are set via SGR attributes; and gravity makes no sense in vte.
*/
pango_font_description_unset_fields(desc,
PangoFontMask(PANGO_FONT_MASK_GRAVITY |
PANGO_FONT_MASK_STYLE |
PANGO_FONT_MASK_WEIGHT));
bool const same_desc = m_unscaled_font_desc &&
pango_font_description_equal(m_unscaled_font_desc.get(), desc);
......