Drop upstreamed patch
This commit is contained in:
Debarshi Ray
parent
14c93d7614
commit
324c6b7494
@ -1,127 +0,0 @@
|
||||
From 2c1021b22f9e3e98f779d040d03f292e2cff3d1d Mon Sep 17 00:00:00 2001
|
||||
From: Yanko Kaneti <yaneti@declera.com>
|
||||
Date: Thu, 19 Feb 2015 02:00:04 +0200
|
||||
Subject: [PATCH] all: Fix various format specifiers for -Wformat-signedness in
|
||||
gcc5
|
||||
|
||||
---
|
||||
src/profile-editor.c | 4 ++--
|
||||
src/terminal-accels.c | 2 +-
|
||||
src/terminal-app.c | 2 +-
|
||||
src/terminal-nautilus.c | 2 +-
|
||||
src/terminal-screen.c | 2 +-
|
||||
src/terminal-util.c | 2 +-
|
||||
src/terminal-window.c | 8 ++++----
|
||||
7 files changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/src/profile-editor.c b/src/profile-editor.c
|
||||
index 8e5732d..ca53175 100644
|
||||
--- a/src/profile-editor.c
|
||||
+++ b/src/profile-editor.c
|
||||
@@ -839,11 +839,11 @@ terminal_profile_edit (GSettings *profile,
|
||||
|
||||
g_object_set_data (G_OBJECT (w), "palette-entry-index", GUINT_TO_POINTER (i));
|
||||
|
||||
- text = g_strdup_printf (_("Choose Palette Color %d"), i + 1);
|
||||
+ text = g_strdup_printf (_("Choose Palette Color %u"), i + 1);
|
||||
gtk_color_button_set_title (GTK_COLOR_BUTTON (w), text);
|
||||
g_free (text);
|
||||
|
||||
- text = g_strdup_printf (_("Palette entry %d"), i + 1);
|
||||
+ text = g_strdup_printf (_("Palette entry %u"), i + 1);
|
||||
gtk_widget_set_tooltip_text (w, text);
|
||||
g_free (text);
|
||||
|
||||
diff --git a/src/terminal-accels.c b/src/terminal-accels.c
|
||||
index 8a036ce..4ab1aa6 100644
|
||||
--- a/src/terminal-accels.c
|
||||
+++ b/src/terminal-accels.c
|
||||
@@ -318,7 +318,7 @@ terminal_accels_init (GApplication *application,
|
||||
if (tabs_entries[i].user_visible_name != NULL)
|
||||
continue;
|
||||
|
||||
- name = g_strdup_printf (_("Switch to Tab %d"), j++);
|
||||
+ name = g_strdup_printf (_("Switch to Tab %u"), j++);
|
||||
tabs_entries[i].user_visible_name = g_intern_string (name);
|
||||
}
|
||||
|
||||
diff --git a/src/terminal-app.c b/src/terminal-app.c
|
||||
index 8a9434f..94fa35b 100644
|
||||
--- a/src/terminal-app.c
|
||||
+++ b/src/terminal-app.c
|
||||
@@ -122,7 +122,7 @@ maybe_migrate_settings (TerminalApp *app)
|
||||
version = g_settings_get_uint (terminal_app_get_global_settings (app), TERMINAL_SETTING_SCHEMA_VERSION);
|
||||
if (version >= TERMINAL_SCHEMA_VERSION) {
|
||||
_terminal_debug_print (TERMINAL_DEBUG_SERVER | TERMINAL_DEBUG_PROFILE,
|
||||
- "Schema version is %d, already migrated.\n", version);
|
||||
+ "Schema version is %u, already migrated.\n", version);
|
||||
return;
|
||||
}
|
||||
|
||||
diff --git a/src/terminal-nautilus.c b/src/terminal-nautilus.c
|
||||
index 3474783..341e09e 100644
|
||||
--- a/src/terminal-nautilus.c
|
||||
+++ b/src/terminal-nautilus.c
|
||||
@@ -257,7 +257,7 @@ ssh_argv (const char *uri,
|
||||
|
||||
if (host_port != 0) {
|
||||
argv[argc++] = g_strdup ("-p");
|
||||
- argv[argc++] = g_strdup_printf ("%d", host_port);
|
||||
+ argv[argc++] = g_strdup_printf ("%u", host_port);
|
||||
}
|
||||
|
||||
/* FIXME to we have to consider the remote file encoding? */
|
||||
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
|
||||
index 8813295..df3fdde 100644
|
||||
--- a/src/terminal-screen.c
|
||||
+++ b/src/terminal-screen.c
|
||||
@@ -1098,7 +1098,7 @@ get_child_environment (TerminalScreen *screen,
|
||||
{
|
||||
/* FIXME: moving the tab between windows, or the window between displays will make the next two invalid... */
|
||||
g_hash_table_replace (env_table, g_strdup ("WINDOWID"),
|
||||
- g_strdup_printf ("%ld",
|
||||
+ g_strdup_printf ("%lu",
|
||||
GDK_WINDOW_XID (gtk_widget_get_window (window))));
|
||||
g_hash_table_replace (env_table, g_strdup ("DISPLAY"), g_strdup (gdk_display_get_name (gtk_widget_get_display (window))));
|
||||
}
|
||||
diff --git a/src/terminal-util.c b/src/terminal-util.c
|
||||
index 26de789..90fcb15 100644
|
||||
--- a/src/terminal-util.c
|
||||
+++ b/src/terminal-util.c
|
||||
@@ -215,7 +215,7 @@ terminal_util_show_about (GtkWindow *transient_parent)
|
||||
|
||||
licence_text = terminal_util_get_licence_text ();
|
||||
|
||||
- vte_version = g_strdup_printf (_("Using VTE version %d.%d.%d"),
|
||||
+ vte_version = g_strdup_printf (_("Using VTE version %u.%u.%u"),
|
||||
vte_get_major_version (),
|
||||
vte_get_minor_version (),
|
||||
vte_get_micro_version ());
|
||||
diff --git a/src/terminal-window.c b/src/terminal-window.c
|
||||
index d147ed8..65e8227 100644
|
||||
--- a/src/terminal-window.c
|
||||
+++ b/src/terminal-window.c
|
||||
@@ -1203,16 +1203,16 @@ profile_visible_name_notify_cb (GSettings *profile,
|
||||
free_me = display_name;
|
||||
if (num < 10)
|
||||
/* Translators: This is the label of a menu item to choose a profile.
|
||||
- * _%d is used as the accelerator (with d between 1 and 9), and
|
||||
+ * _%u is used as the accelerator (with u between 1 and 9), and
|
||||
* the %s is the name of the terminal profile.
|
||||
*/
|
||||
- display_name = g_strdup_printf (_("_%d. %s"), num, display_name);
|
||||
+ display_name = g_strdup_printf (_("_%u. %s"), num, display_name);
|
||||
else if (num < 36)
|
||||
/* Translators: This is the label of a menu item to choose a profile.
|
||||
- * _%c is used as the accelerator (it will be a character between A and Z),
|
||||
+ * _%u is used as the accelerator (it will be a character between A and Z),
|
||||
* and the %s is the name of the terminal profile.
|
||||
*/
|
||||
- display_name = g_strdup_printf (_("_%c. %s"), ('A' + num - 10), display_name);
|
||||
+ display_name = g_strdup_printf (_("_%u. %s"), ('A' + num - 10), display_name);
|
||||
else
|
||||
free_me = NULL;
|
||||
}
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -16,8 +16,7 @@ URL: http://www.gnome.org/
|
||||
Source0: http://download.gnome.org/sources/gnome-terminal/3.15/gnome-terminal-%{version}.tar.xz
|
||||
Source1: org.gnome.Terminal.gschema.override
|
||||
|
||||
Patch0: 0001-all-Fix-various-format-specifiers-for-Wformat-signed.patch
|
||||
Patch1: 0001-build-Don-t-treat-warnings-as-errors.patch
|
||||
Patch0: 0001-build-Don-t-treat-warnings-as-errors.patch
|
||||
|
||||
Patch100: gnome-terminal-restore-transparency.patch
|
||||
Patch101: gnome-terminal-restore-dark.patch
|
||||
@ -60,8 +59,7 @@ option to the right-click context menu in Nautilus.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .format
|
||||
%patch1 -p1 -b .warnings
|
||||
%patch0 -p1 -b .warnings
|
||||
%patch100 -p1 -b .transparency
|
||||
%patch101 -p1 -b .dark
|
||||
%patch102 -p1 -b .command-notify
|
||||
@ -111,6 +109,7 @@ fi
|
||||
%changelog
|
||||
* Tue Mar 17 2015 Debarshi Ray <rishi@fedoraproject.org> - 3.15.92-1
|
||||
- Update to 3.15.92
|
||||
- Drop upstreamed patch
|
||||
- Rebase the translations for transparency strings
|
||||
|
||||
* Mon Mar 16 2015 Debarshi Ray <rishi@fedoraproject.org> - 3.15.90-2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user