Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package vte for openSUSE:Factory checked in
at 2021-11-06 18:15:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vte (Old)
and /work/SRC/openSUSE:Factory/.vte.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vte"
Sat Nov 6 18:15:23 2021 rev:135 rq:929593 version:0.66.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/vte/vte.changes 2021-09-29 20:18:50.794962997
+0200
+++ /work/SRC/openSUSE:Factory/.vte.new.1890/vte.changes 2021-11-06
18:17:35.064870687 +0100
@@ -1,0 +2,15 @@
+Sat Oct 30 18:42:01 UTC 2021 - bjorn....@gmail.com
+
+- Update to version 0.66.1:
+ + app: Add option to set initial title
+ + vte.sh: Fix the check for PROMPT_COMMAND when it is unset
+ + Updated translations.
+- Drop vte-silence-COMMAND_PROMPT.patch: Fixed upstream.
+
+-------------------------------------------------------------------
+Wed Oct 27 00:46:24 UTC 2021 - Daike Yu <yu.da...@suse.com>
+
+- Add vte-revert-back-to-c++17.patch
+ revert c++20 features back to c++17 to build on SLE/Leap
+
+-------------------------------------------------------------------
Old:
----
vte-0.66.0.obscpio
vte-silence-COMMAND_PROMPT.patch
New:
----
vte-0.66.1.obscpio
vte-revert-back-to-c++17.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vte.spec ++++++
--- /var/tmp/diff_new_pack.FP1bQb/_old 2021-11-06 18:17:36.032871188 +0100
+++ /var/tmp/diff_new_pack.FP1bQb/_new 2021-11-06 18:17:36.032871188 +0100
@@ -23,7 +23,7 @@
%define _name vte
Name: vte
-Version: 0.66.0
+Version: 0.66.1
Release: 0
Summary: Terminal Emulator Library
License: CC-BY-4.0 AND LGPL-3.0-or-later AND GPL-3.0-or-later AND MIT
@@ -32,8 +32,8 @@
Source: %{_name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE vte-enable-build-flag-pie.patch yfji...@suse.com --
enable PIE flag to be compatible with gcc default linking option
Patch0: vte-enable-build-flag-pie.patch
-# PATCH-FIX-UPSTREAM vte-silence-COMMAND_PROMPT.patch dims...@opensuse.org --
Silence warning when opening terminal
-Patch1: vte-silence-COMMAND_PROMPT.patch
+# PATCH-FIX-SLE vte-revert-back-to-c++17.patch yu.da...@suse.com -- revert
c++20 features back to c++17
+Patch100: vte-revert-back-to-c++17.patch
BuildRequires: c++_compiler
BuildRequires: fdupes
@@ -133,7 +133,11 @@
%lang_package
%prep
-%autosetup -n %{_name}-%{version} -p1
+%autosetup -n %{_name}-%{version} -N
+%patch0 -p1
+%if 0%{?sle_version}
+%patch100 -p1
+%endif
%build
%meson \
++++++ _service ++++++
--- /var/tmp/diff_new_pack.FP1bQb/_old 2021-11-06 18:17:36.076871210 +0100
+++ /var/tmp/diff_new_pack.FP1bQb/_new 2021-11-06 18:17:36.080871213 +0100
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
- <param name="revision">refs/tags/0.66.0</param>
+ <param name="revision">refs/tags/0.66.1</param>
<param name="exclude">doc/vttest.*</param>
</service>
<service mode="buildtime" name="tar" />
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.FP1bQb/_old 2021-11-06 18:17:36.104871225 +0100
+++ /var/tmp/diff_new_pack.FP1bQb/_new 2021-11-06 18:17:36.108871227 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://gitlab.gnome.org/GNOME/vte.git</param>
- <param
name="changesrevision">956d3bbd265279c296c56d9fb5ada1fee94768ee</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">29bc0a2d7fefc0e8bc5f60b72c3a666809d490f9</param></service></servicedata>
\ No newline at end of file
++++++ vte-0.66.0.obscpio -> vte-0.66.1.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vte-0.66.0/meson.build new/vte-0.66.1/meson.build
--- old/vte-0.66.0/meson.build 2021-09-22 18:41:17.000000000 +0200
+++ new/vte-0.66.1/meson.build 2021-10-08 19:27:02.000000000 +0200
@@ -17,7 +17,7 @@
project(
'vte',
['c', 'cpp'],
- version: '0.66.0',
+ version: '0.66.1',
license: ['LGPL-3.0-or-later', 'GPL-3.0-or-later'],
default_options: [
'buildtype=release',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vte-0.66.0/po/he.po new/vte-0.66.1/po/he.po
--- old/vte-0.66.0/po/he.po 2021-09-22 18:41:17.000000000 +0200
+++ new/vte-0.66.1/po/he.po 2021-10-08 19:27:02.000000000 +0200
@@ -8,42 +8,64 @@
msgid ""
msgstr ""
"Project-Id-Version: vte.HEAD.he\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-09 20:35+0300\n"
-"PO-Revision-Date: 2016-08-09 20:35+0300\n"
-"Last-Translator: Yosef Or Boczko <yosef...@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/vte/issues\n";
+"POT-Creation-Date: 2021-08-26 18:15+0000\n"
+"PO-Revision-Date: 2021-09-27 11:49+0300\n"
+"Last-Translator: Yaron Shahrabani <sh.ya...@gmail.com>\n"
"Language-Team: ?????????? <>\n"
"Language: he\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.6\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.0\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==2 ? 1 : n>10 && n%10==0 ? 2 :
3);\n"
-#: ../src/iso2022.cc:73 ../src/iso2022.cc:81 ../src/iso2022.cc:111
-#: ../src/vtegtk.cc:3069
+#: src/vte.cc:7670
+msgid "WARNING"
+msgstr "??????????"
+
+#: src/vte.cc:7672
+msgid "GnuTLS not enabled; data will be written to disk unencrypted!"
+msgstr "???GnuTLS ???????? ????????, ?????????????? ???????????? ??????????
?????? ??????????!"
+
+#: src/spawn.cc:110
#, c-format
-msgid "Unable to convert characters from %s to %s."
-msgstr "???? ???????? ?????????? ?????????? ????%s ????%s."
+msgid "Failed to set pipe nonblocking: %s"
+msgstr "?????????? ???????????????? ???? ?????? ?????????? ??????????: %s"
-#. Translators: %s is replaced with error message returned by strerror().
-#: ../src/vte.cc:4003
+#: src/spawn.cc:155
#, c-format
-msgid "Error reading from child: %s."
-msgstr "?????????? ???????????? ??????????: %s."
+msgid "poll error: %s"
+msgstr "?????????? ??????????: %s"
-#: ../src/vte.cc:4142
+#: src/spawn.cc:162
+msgid "Operation timed out"
+msgstr "???????? ???????????? ???????????? ????????????"
+
+#: src/spawn.cc:172
+msgid "Operation was cancelled"
+msgstr "???????????? ??????????"
+
+#: src/spawn.cc:190
#, c-format
-msgid "Error (%s) converting data for child, dropping."
-msgstr "?????????? (%s) ?????????? ???????? ????????, ????????."
+msgid "Failed to read from child pipe (%s)"
+msgstr "???????????? ???????????????? ?????????? (%s) ??????????"
-#: ../src/vte.cc:7911
-msgid "WARNING"
-msgstr "WARNING"
+#: src/spawn.cc:620
+#, c-format
+msgid "Failed to change to directory ???%s???: %s"
+msgstr "???????? ?????????????? ???????? ???%s??? ????????: %s"
+
+#: src/spawn.cc:689
+#, c-format
+msgid "Failed to execute child process ???%s???: "
+msgstr "?????????? ???????????? ?????????? ???%s??? ??????????: "
+
+#~ msgid "Unable to convert characters from %s to %s."
+#~ msgstr "???? ???????? ?????????? ?????????? ????%s ????%s."
-#: ../src/vte.cc:7912
-msgid "GNUTLS not enabled; data will be written to disk unencrypted!"
-msgstr "GNUTLS not enabled; data will be written to disk unencrypted!"
+#~ msgid "Error (%s) converting data for child, dropping."
+#~ msgstr "?????????? (%s) ?????????? ???????? ????????, ????????."
#~ msgid "Copy"
#~ msgstr "??????????"
@@ -120,8 +142,7 @@
#~ msgid "Using fontset \"%s\", which is missing these character sets: %s."
#~ msgstr "?????????? ?????????? ?????????? \"%s\", ?????? ?????? ????
?????????? ??????????: %s."
-#~ msgid ""
-#~ "Failed to load Xft font pattern \"%s\", falling back to default font."
+#~ msgid "Failed to load Xft font pattern \"%s\", falling back to default
font."
#~ msgstr "???????? ???????????? ???????? ?????????????? ???? Xft \"%s\",
???????? ?????????? ?????????? ??????????."
#~ msgid "Failed to load default Xft font."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vte-0.66.0/src/app/app.cc
new/vte-0.66.1/src/app/app.cc
--- old/vte-0.66.0/src/app/app.cc 2021-09-22 18:41:17.000000000 +0200
+++ new/vte-0.66.1/src/app/app.cc 2021-10-08 19:27:02.000000000 +0200
@@ -96,6 +96,7 @@
char* font_string{nullptr};
char* geometry{nullptr};
char* output_filename{nullptr};
+ char* title{nullptr};
char* word_char_exceptions{nullptr};
char* working_directory{nullptr};
char** dingus{nullptr};
@@ -621,6 +622,7 @@
"Use pixels as scroll unit", nullptr },
{ "scrollback-lines", 'n', 0, G_OPTION_ARG_INT,
&scrollback_lines,
"Specify the number of scrollback-lines (-1 for
infinite)", nullptr },
+ { "title", 0, 0, G_OPTION_ARG_STRING, &title, "Set the
initial title of the window", "TITLE" },
{ "transparent", 'T', 0, G_OPTION_ARG_INT,
&transparency_percent,
"Enable the use of a transparent background",
"0..100" },
{ "track-clipboard-targets", 0, G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_NONE, &track_clipboard_targets,
@@ -2200,12 +2202,7 @@
VteappWindow* window)
{
auto const title = vte_terminal_get_window_title(window->terminal);
-#if VTE_GTK == 3
- gtk_window_set_title(GTK_WINDOW(window), title);
-#elif VTE_GTK == 4
- auto toplevel =
GDK_TOPLEVEL(gtk_native_get_surface(GTK_NATIVE(window)));
- gdk_toplevel_set_title(toplevel, title);
-#endif
+ gtk_window_set_title(GTK_WINDOW(window), title && title[0] ? title :
"Terminal");
}
static void
@@ -2381,7 +2378,8 @@
G_OBJECT_CLASS(vteapp_window_parent_class)->constructed(object);
- gtk_window_set_title(GTK_WINDOW(window), "Terminal");
+ gtk_window_set_title(GTK_WINDOW(window),
+ options.title && options.title[0] ? options.title
: "Terminal");
if (options.no_decorations)
gtk_window_set_decorated(GTK_WINDOW(window), false);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vte-0.66.0/src/vte.sh.in new/vte-0.66.1/src/vte.sh.in
--- old/vte-0.66.0/src/vte.sh.in 2021-09-22 18:41:17.000000000 +0200
+++ new/vte-0.66.1/src/vte.sh.in 2021-10-08 19:27:02.000000000 +0200
@@ -48,7 +48,7 @@
# On older bash, we can only overwrite the whole PROMPT_COMMAND, so must
# use the __vte_prompt_command function which also sets the title.
- if [[ "$(declare -p PROMPT_COMMAND)" =~ "declare -a" ]]; then
+ if [[ "$(declare -p PROMPT_COMMAND 2>&1)" =~ "declare -a" ]]; then
PROMPT_COMMAND+=(__vte_osc7)
else
PROMPT_COMMAND="__vte_prompt_command"
++++++ vte-revert-back-to-c++17.patch ++++++
diff --color -Naur vte-0.66.0.orig/meson.build vte-0.66.0/meson.build
--- vte-0.66.0.orig/meson.build 2021-10-26 15:49:40.539203281 +0800
+++ vte-0.66.0/meson.build 2021-10-26 15:51:22.749208116 +0800
@@ -30,9 +30,9 @@
# Compiler requirements
c_req_std = 'gnu11'
-cxx_req_std = 'gnu++20'
-gxx_req_version = '10.0'
-clangxx_req_version = '11.0'
+cxx_req_std = 'gnu++17'
+gxx_req_version = '7.0'
+clangxx_req_version = '8.0'
# Version requirements
diff --color -Naur vte-0.66.0.orig/src/widget.cc vte-0.66.0/src/widget.cc
--- vte-0.66.0.orig/src/widget.cc 2021-10-26 15:49:40.548203282 +0800
+++ vte-0.66.0/src/widget.cc 2021-10-27 04:08:33.405300452 +0800
@@ -402,7 +402,11 @@
#endif /* VTE_GTK == 4 */
Widget::Widget(VteTerminal* t)
- : m_widget{&t->widget}
+ : m_widget{&t->widget},
+ m_hscroll_policy(GTK_SCROLL_NATURAL),
+ m_vscroll_policy(GTK_SCROLL_NATURAL),
+ m_scroll_unit_is_pixels(false),
+ m_changing_scroll_position(false)
{
// Create a default adjustment
set_vadjustment({});
diff --color -Naur vte-0.66.0.orig/src/widget.hh vte-0.66.0/src/widget.hh
--- vte-0.66.0.orig/src/widget.hh 2021-10-26 15:49:40.548203282 +0800
+++ vte-0.66.0/src/widget.hh 2021-10-27 04:08:52.888301374 +0800
@@ -577,10 +577,10 @@
vte::glib::RefPtr<GtkAdjustment> m_vadjustment{};
vte::glib::RefPtr<GtkAdjustment> m_hadjustment{};
- unsigned m_hscroll_policy:1{GTK_SCROLL_NATURAL};
- unsigned m_vscroll_policy:1{GTK_SCROLL_NATURAL};
- unsigned m_scroll_unit_is_pixels:1{false};
- unsigned m_changing_scroll_position:1{false};
+ unsigned m_hscroll_policy:1;
+ unsigned m_vscroll_policy:1;
+ unsigned m_scroll_unit_is_pixels:1;
+ unsigned m_changing_scroll_position:1;
};
} // namespace platform
++++++ vte.obsinfo ++++++
--- /var/tmp/diff_new_pack.FP1bQb/_old 2021-11-06 18:17:36.332871342 +0100
+++ /var/tmp/diff_new_pack.FP1bQb/_new 2021-11-06 18:17:36.332871342 +0100
@@ -1,5 +1,5 @@
name: vte
-version: 0.66.0
-mtime: 1632328877
-commit: 956d3bbd265279c296c56d9fb5ada1fee94768ee
+version: 0.66.1
+mtime: 1633714022
+commit: 29bc0a2d7fefc0e8bc5f60b72c3a666809d490f9
