diff -Nru gnome-terminal-3.38.0/debian/changelog gnome-terminal-3.38.0/debian/changelog --- gnome-terminal-3.38.0/debian/changelog 2020-09-22 19:03:04.000000000 +0000 +++ gnome-terminal-3.38.0/debian/changelog 2020-11-06 14:58:37.000000000 +0000 @@ -1,3 +1,10 @@ +gnome-terminal (3.38.0-1ubuntu1.1) groovy; urgency=medium + + * debian/patches/show-font-weight-and-style-in-profile-editor.patch: + - Reverses upstream commit e5c0b4f5 for now (LP: #1900729) + + -- Gunnar Hjalmarsson Fri, 06 Nov 2020 15:58:37 +0100 + gnome-terminal (3.38.0-1ubuntu1) groovy; urgency=medium * Merge with debian, remaining changes: diff -Nru gnome-terminal-3.38.0/debian/patches/series gnome-terminal-3.38.0/debian/patches/series --- gnome-terminal-3.38.0/debian/patches/series 2020-09-22 19:03:04.000000000 +0000 +++ gnome-terminal-3.38.0/debian/patches/series 2020-11-06 14:58:37.000000000 +0000 @@ -6,3 +6,4 @@ 52_support_apturl.patch 60_add_lp_handler.patch scrollbar-background-theming.patch +show-font-weight-and-style-in-profile-editor.patch diff -Nru gnome-terminal-3.38.0/debian/patches/show-font-weight-and-style-in-profile-editor.patch gnome-terminal-3.38.0/debian/patches/show-font-weight-and-style-in-profile-editor.patch --- gnome-terminal-3.38.0/debian/patches/show-font-weight-and-style-in-profile-editor.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-terminal-3.38.0/debian/patches/show-font-weight-and-style-in-profile-editor.patch 2020-11-06 14:58:37.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Show font weight and style in the profile editor + This patch effectively reverses this commit: + https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/e5c0b4f5 + Since it currently picks a weight/style randomly instead of choosing the + regular font, showing all the monospace fonts makes more sense. +Bug-Ubuntu: https://launchpad.net/bugs/1900729 +Bug-GNOME: https://gitlab.gnome.org/GNOME/pango/-/issues/483 +Author: Gunnar Hjalmarsson + +--- a/src/profile-editor.c ++++ b/src/profile-editor.c +@@ -1295,8 +1295,8 @@ + w = (GtkWidget*) gtk_builder_get_object (builder, "font-selector"); + gtk_font_chooser_set_filter_func (GTK_FONT_CHOOSER (w), monospace_filter, NULL, NULL); + #if GTK_CHECK_VERSION (3, 24, 0) +- gtk_font_chooser_set_level (GTK_FONT_CHOOSER (w), GTK_FONT_CHOOSER_LEVEL_FAMILY | +- GTK_FONT_CHOOSER_LEVEL_SIZE); ++// gtk_font_chooser_set_level (GTK_FONT_CHOOSER (w), GTK_FONT_CHOOSER_LEVEL_FAMILY | ++// GTK_FONT_CHOOSER_LEVEL_SIZE); + #endif + + profile_prefs_settings_bind (profile, TERMINAL_PROFILE_FONT_KEY,