Accepting request 427088 from GNOME:Next
New unstable, resub with bumped vte min OBS-URL: https://build.opensuse.org/request/show/427088 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=171
This commit is contained in:
Git OBS Bridge
parent
e175633535
commit
713e80cafb
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2bb5a63389b320f65e21cba812cccb2a1e52274e3ed0855eec57bf1bcf5407ab
|
||||
size 1900556
|
||||
3
gnome-terminal-3.21.92.tar.xz
Normal file
3
gnome-terminal-3.21.92.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:74baa6c3913382a4863f93d11f6b423734e7035e9cd378bc40c08230dd7c0a31
|
||||
size 1930892
|
||||
@ -1,85 +0,0 @@
|
||||
From 441aece5b5f012c04307fe6df652ffaea1eeda0a Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@gnome.org>
|
||||
Date: Wed, 17 Aug 2016 08:20:19 +0200
|
||||
Subject: Revert "window: Fix CSD size calculations with long titles"
|
||||
|
||||
This reverts commit 40d9d5b78067caa6a28e83e32b87c0b51d14c091.
|
||||
|
||||
The commit introduced a regression on non-CSD, see
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=769898#c5
|
||||
---
|
||||
src/terminal-window.c | 34 ++++++++++++----------------------
|
||||
1 file changed, 12 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/src/terminal-window.c b/src/terminal-window.c
|
||||
index b86e76f..46676a5 100644
|
||||
--- a/src/terminal-window.c
|
||||
+++ b/src/terminal-window.c
|
||||
@@ -3615,11 +3615,11 @@ terminal_window_update_geometry (TerminalWindow *window)
|
||||
GtkWidget *widget;
|
||||
GdkGeometry hints;
|
||||
GtkBorder padding;
|
||||
- GtkRequisition vbox_request, widget_request;
|
||||
+ GtkRequisition toplevel_request, vbox_request, widget_request;
|
||||
int grid_width, grid_height;
|
||||
int char_width, char_height;
|
||||
int chrome_width, chrome_height;
|
||||
- int csd_width = 0, csd_height = 0;
|
||||
+ int csd_width, csd_height;
|
||||
|
||||
if (priv->active_screen == NULL)
|
||||
return;
|
||||
@@ -3650,30 +3650,20 @@ terminal_window_update_geometry (TerminalWindow *window)
|
||||
_terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "content area requests %dx%d px\n",
|
||||
vbox_request.width, vbox_request.height);
|
||||
|
||||
+ gtk_widget_get_preferred_size (GTK_WIDGET (window), NULL, &toplevel_request);
|
||||
+ _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "window requests %dx%d px\n",
|
||||
+ toplevel_request.width, toplevel_request.height);
|
||||
|
||||
chrome_width = vbox_request.width - (char_width * grid_width);
|
||||
chrome_height = vbox_request.height - (char_height * grid_height);
|
||||
_terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "chrome: %dx%d px\n",
|
||||
chrome_width, chrome_height);
|
||||
|
||||
- if (priv->realized)
|
||||
- {
|
||||
- /* Only when having been realize the CSD can be calculated. Do this by
|
||||
- * using the actual allocation rather then the preferred size as the
|
||||
- * the preferred size takes the natural size of e.g. the title bar into
|
||||
- * account which can be far wider then the contents size when using a
|
||||
- * very long title */
|
||||
- GtkAllocation toplevel_allocation;
|
||||
-
|
||||
- gtk_widget_get_allocation (GTK_WIDGET (window), &toplevel_allocation);
|
||||
- _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "window allocation %dx%d px\n",
|
||||
- toplevel_allocation.width, toplevel_allocation.height);
|
||||
-
|
||||
- csd_width = toplevel_allocation.width - vbox_request.width;
|
||||
- csd_height = toplevel_allocation.height - vbox_request.height;
|
||||
- _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "CSDs: %dx%d px\n",
|
||||
- csd_width, csd_height);
|
||||
- }
|
||||
+ csd_width = toplevel_request.width - vbox_request.width;
|
||||
+ csd_height = toplevel_request.height - vbox_request.height;
|
||||
+ _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "CSDs: %dx%d px%s\n",
|
||||
+ csd_width, csd_height,
|
||||
+ priv->realized ? "" : " (just a guess)");
|
||||
|
||||
gtk_widget_get_preferred_size (widget, NULL, &widget_request);
|
||||
_terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "terminal widget requests %dx%d px\n",
|
||||
@@ -3682,8 +3672,8 @@ terminal_window_update_geometry (TerminalWindow *window)
|
||||
if (!priv->realized)
|
||||
{
|
||||
/* Don't actually set the geometry hints until we have been realized,
|
||||
- * because we don't know how large the client-side decorations are going
|
||||
- * to be. We also avoid setting priv->old_csd_width or
|
||||
+ * because we don't know precisely how large the client-side decorations
|
||||
+ * are going to be. We also avoid setting priv->old_csd_width or
|
||||
* priv->old_csd_height, so that next time through this function we'll
|
||||
* definitely recalculate the hints.
|
||||
*
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From 69e82e354de26cd7e6957b95740c724ed1c31c10 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Henriksson <andreas@fatal.se>
|
||||
Date: Mon, 25 Jul 2016 19:38:18 +0200
|
||||
Subject: notebook: avoid crash on tab DND
|
||||
|
||||
See "gtk_notebook_detach_tab" API documentation. Using it instead
|
||||
of gtk_container_remove avoids an assertion crash in gtk+ when
|
||||
dragging and dropping a tab between terminal windows.
|
||||
|
||||
See also original bug report at
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=825818
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=769161
|
||||
(cherry picked from commit 85b448f7c9e219e82d4d8abafe405d73349c08c1)
|
||||
---
|
||||
src/terminal-notebook.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/terminal-notebook.c b/src/terminal-notebook.c
|
||||
index 9d488fc..b054676 100644
|
||||
--- a/src/terminal-notebook.c
|
||||
+++ b/src/terminal-notebook.c
|
||||
@@ -152,8 +152,13 @@ terminal_notebook_remove_screen (TerminalMdiContainer *container,
|
||||
update_tab_visibility (notebook, -1);
|
||||
|
||||
screen_container = terminal_screen_container_get_from_screen (screen);
|
||||
+#if GTK_CHECK_VERSION(3, 16, 0)
|
||||
+ gtk_notebook_detach_tab (GTK_NOTEBOOK (notebook),
|
||||
+ GTK_WIDGET (screen_container));
|
||||
+#else
|
||||
gtk_container_remove (GTK_CONTAINER (notebook),
|
||||
GTK_WIDGET (screen_container));
|
||||
+#endif
|
||||
}
|
||||
|
||||
static TerminalScreen *
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 12 19:30:38 UTC 2016 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 3.21.92:
|
||||
+ search: Always set PCRE2_MULTILINE flag. It's required by vte.
|
||||
+ window:
|
||||
- Fix CSD size calculations with long titles.
|
||||
- Make inspector available in non-debug builds.
|
||||
+ screen: Add unittest for very long regex match.
|
||||
+ client: legacy: Add command line option to show the
|
||||
preferences.
|
||||
+ server: Make prefs dialogue an app window.
|
||||
+ Updated translations.
|
||||
- Drop gnome-terminal-fix-csd-calculation.patch: Fixed upstream
|
||||
- Drop gnome-terminal-notebook-avoid-crash-on-tab-DND.patch: It was
|
||||
reverted upstream, and drag and drop of tabs disabled.
|
||||
- Conditionally apply translations-update-upstream BuildRequires
|
||||
and macro for non-openSUSE only.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 18 08:34:10 UTC 2016 - zaitor@opensuse.org
|
||||
|
||||
|
||||
@ -17,22 +17,20 @@
|
||||
|
||||
|
||||
Name: gnome-terminal
|
||||
Version: 3.21.90
|
||||
Version: 3.21.92
|
||||
Release: 0
|
||||
Summary: GNOME Terminal
|
||||
License: GPL-3.0+ and LGPL-2.1+
|
||||
Group: System/X11/Terminals
|
||||
Url: http://www.gnome.org
|
||||
Source: http://download.gnome.org/sources/gnome-terminal/3.21/%{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM gnome-terminal-notebook-avoid-crash-on-tab-DND.patch bgo#769161 zaitor@opensuse.org -- notebook: avoid crash on tab DND
|
||||
Patch0: gnome-terminal-notebook-avoid-crash-on-tab-DND.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-terminal-fix-csd-calculation.patch zaitor@opensuse.org -- Revert commit to keep gt from shrinking in certain situations.
|
||||
Patch1: gnome-terminal-fix-csd-calculation.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
|
||||
BuildRequires: intltool >= 0.50.0
|
||||
%if !0%{?is_opensuse}
|
||||
BuildRequires: translation-update-upstream
|
||||
%endif
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: vala >= 0.26
|
||||
BuildRequires: yelp-tools
|
||||
@ -47,7 +45,7 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.19.8
|
||||
BuildRequires: pkgconfig(libnautilus-extension) >= 3.0.0
|
||||
BuildRequires: pkgconfig(libpcre2-8) >= 10.00
|
||||
BuildRequires: pkgconfig(uuid)
|
||||
BuildRequires: pkgconfig(vte-2.91) >= 0.45.90
|
||||
BuildRequires: pkgconfig(vte-2.91) >= 0.45.92
|
||||
BuildRequires: pkgconfig(x11)
|
||||
Recommends: %{name}-lang
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -84,9 +82,9 @@ arbitrary folders.
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%if !0%{?is_opensuse}
|
||||
translation-update-upstream
|
||||
%endif
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user