Accepting request 611076 from home:iznogood
New stable rel OBS-URL: https://build.opensuse.org/request/show/611076 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=205
This commit is contained in:
Git OBS Bridge
parent
aa9da36681
commit
e64e0100f0
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f7a6a0189a0b0fbf7845d092e5444fc6303225c2d9ef87bfaae3f80845801cc3
|
||||
size 2093716
|
||||
3
gnome-terminal-3.28.2.tar.xz
Normal file
3
gnome-terminal-3.28.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a283dca4980eecf9184a55aac03fef99f85748461ff190423a2253f3b4557279
|
||||
size 2094920
|
||||
@ -1,61 +0,0 @@
|
||||
From 47a949167af299e40b47fb6caf08ec06373b33d5 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@src.gnome.org>
|
||||
Date: Wed, 2 May 2018 19:32:52 +0200
|
||||
Subject: client: legacy: Fix output commenting
|
||||
|
||||
Make sure each line starts with '#' even if the message
|
||||
contains embedded newlines.
|
||||
|
||||
(cherry picked from commit d62c6ee988371cdf2af84a7898cee686c484aff8)
|
||||
---
|
||||
src/terminal-options.c | 28 +++++++++++++---------------
|
||||
1 file changed, 13 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/src/terminal-options.c b/src/terminal-options.c
|
||||
index e00ca92..d1e8a4a 100644
|
||||
--- a/src/terminal-options.c
|
||||
+++ b/src/terminal-options.c
|
||||
@@ -41,27 +41,25 @@
|
||||
|
||||
static int verbosity = 1;
|
||||
|
||||
-/* @freeme is a workaround for Clang; see gnome-terminal bug 790318. */
|
||||
-static char * G_GNUC_FORMAT (2)
|
||||
-format_as_comment (char** freeme, const char *format)
|
||||
-{
|
||||
- return *freeme = g_strdup_printf ("# %s", format);
|
||||
-}
|
||||
-
|
||||
void
|
||||
terminal_fprintf (FILE* fp,
|
||||
int verbosity_level,
|
||||
const char* format,
|
||||
...)
|
||||
{
|
||||
- if (verbosity < verbosity_level)
|
||||
- return;
|
||||
-
|
||||
- gs_free char* freeme;
|
||||
- va_list args;
|
||||
- va_start(args, format);
|
||||
- g_vfprintf(fp, format_as_comment(&freeme, format), args);
|
||||
- va_end(args);
|
||||
+ if (verbosity < verbosity_level)
|
||||
+ return;
|
||||
+
|
||||
+ va_list args;
|
||||
+ va_start(args, format);
|
||||
+ gs_free char *str = g_strdup_vprintf(format, args);
|
||||
+ va_end(args);
|
||||
+
|
||||
+ gs_strfreev char **lines = g_strsplit_set(str, "\n\r", -1);
|
||||
+ for (gsize i = 0; lines[i]; ++i) {
|
||||
+ if (lines[i][0] != '\0')
|
||||
+ g_fprintf(fp, "# %s\n", lines[i]);
|
||||
+ }
|
||||
}
|
||||
|
||||
#if GLIB_CHECK_VERSION (2, 50, 0)
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 1828cb6d523f80c2aad69b8d452825ab9f737db0 Mon Sep 17 00:00:00 2001
|
||||
From: Egmont Koblinger <egmont@gmail.com>
|
||||
Date: Wed, 18 Apr 2018 22:02:05 +0200
|
||||
Subject: prefs: editor: Translate encoding names
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=795358
|
||||
(cherry picked from commit 8fe4a989c5a518e16aabf9b5ea310d3b23a37e94)
|
||||
---
|
||||
src/terminal-encoding.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/terminal-encoding.c b/src/terminal-encoding.c
|
||||
index 5937ff4..77c4be1 100644
|
||||
--- a/src/terminal-encoding.c
|
||||
+++ b/src/terminal-encoding.c
|
||||
@@ -230,7 +230,7 @@ terminal_encodings_list_store_new (int column_id,
|
||||
|
||||
for (guint i = 0; i < G_N_ELEMENTS (encodings); i++) {
|
||||
gs_free char *name = g_strdup_printf ("%s " EM_DASH " %s",
|
||||
- encodings[i].name, encodings[i].charset);
|
||||
+ _(encodings[i].name), encodings[i].charset);
|
||||
|
||||
GtkTreeIter iter;
|
||||
gtk_list_store_insert_with_values (store, &iter, -1,
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon May 21 22:27:33 UTC 2018 - bjorn.lie@gmail.com
|
||||
|
||||
- Update to version 3.28.2:
|
||||
+ client: legacy: Fix output commenting.
|
||||
+ prefs: editor: Translate encoding names (bgo#795358).
|
||||
+ Updated translations.
|
||||
- Drop gnome-terminal-fix-output-commenting.patch and
|
||||
gnome-terminal-translate-encoding-names.patch: Fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 3 12:04:03 UTC 2018 - bjorn.lie@gmail.com
|
||||
|
||||
|
||||
@ -17,17 +17,14 @@
|
||||
|
||||
|
||||
Name: gnome-terminal
|
||||
Version: 3.28.1
|
||||
Version: 3.28.2
|
||||
Release: 0
|
||||
Summary: GNOME Terminal
|
||||
License: GPL-3.0-or-later AND LGPL-2.1-or-later
|
||||
Group: System/X11/Terminals
|
||||
URL: https://wiki.gnome.org/Apps/Terminal
|
||||
Source: http://download.gnome.org/sources/gnome-terminal/3.28/%{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM gnome-terminal-translate-encoding-names.patch bgo#795358 -- prefs: editor: Translate encoding names
|
||||
Patch0: gnome-terminal-translate-encoding-names.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-terminal-fix-output-commenting.patch -- client: legacy: Fix output commenting
|
||||
Patch1: gnome-terminal-fix-output-commenting.patch
|
||||
|
||||
BuildRequires: fdupes
|
||||
# Needed for search provider. It should not be needed in my opionion, we have to take this up with upstream, or just provide search provider interface definition file as source.
|
||||
BuildRequires: gnome-shell
|
||||
@ -45,7 +42,7 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0
|
||||
BuildRequires: pkgconfig(libnautilus-extension) >= 3.0.0
|
||||
BuildRequires: pkgconfig(libpcre2-8) >= 10.00
|
||||
BuildRequires: pkgconfig(uuid)
|
||||
BuildRequires: pkgconfig(vte-2.91) >= 0.52.1
|
||||
BuildRequires: pkgconfig(vte-2.91) >= 0.52.2
|
||||
BuildRequires: pkgconfig(x11)
|
||||
Requires(pre): filesystem
|
||||
Recommends: %{name}-lang
|
||||
|
||||
Loading…
Reference in New Issue
Block a user