From ca7f26922c034482580b19c7de47d8afd2dea2c3 Mon Sep 17 00:00:00 2001 From: David Guglielmi Date: Sun, 23 Apr 2023 13:33:25 +0200 Subject: [PATCH] x11-terms/gnome-terminal: remove ebuild, available in gentoo with fedora patches --- x11-terms/gnome-terminal/Manifest | 11 - ...s-and-CSS-names-to-some-of-our-widge.patch | 66 --- .../files/0001-Restore-transparency.patch | 388 ------------------ ...tra-padding-around-transparent-termi.patch | 122 ------ ...-for-reading-current-directory-if-OS.patch | 100 ----- ...erminal-3.44.1-fix-missing-wexitcode.patch | 21 - ...-Use-clean-env-when-creating-new-tab.patch | 63 --- .../files/scrollbar-background-theming.patch | 195 --------- .../separate-new-tab-window.gschema.override | 2 - .../gnome-terminal-3.46.8.ebuild | 93 ----- x11-terms/gnome-terminal/metadata.xml | 15 - 11 files changed, 1076 deletions(-) delete mode 100644 x11-terms/gnome-terminal/Manifest delete mode 100644 x11-terms/gnome-terminal/files/0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch delete mode 100644 x11-terms/gnome-terminal/files/0001-Restore-transparency.patch delete mode 100644 x11-terms/gnome-terminal/files/0001-screen-window-Extra-padding-around-transparent-termi.patch delete mode 100644 x11-terms/gnome-terminal/files/Provide-fallback-for-reading-current-directory-if-OS.patch delete mode 100644 x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch delete mode 100644 x11-terms/gnome-terminal/files/screen-Use-clean-env-when-creating-new-tab.patch delete mode 100644 x11-terms/gnome-terminal/files/scrollbar-background-theming.patch delete mode 100644 x11-terms/gnome-terminal/files/separate-new-tab-window.gschema.override delete mode 100644 x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild delete mode 100644 x11-terms/gnome-terminal/metadata.xml diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest deleted file mode 100644 index 809f1f9..0000000 --- a/x11-terms/gnome-terminal/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch 2158 BLAKE2B f31ab43309fdab745d4ac79c0572d5fc0a31c9f8bc198876c9eb465eecdbcc8f466bfc97215c815e602baf20b36e2be3a232b4c0b2b1fdd86e7775fe7c36821d SHA512 bac7d1909421a2ef95a3c94872152a9a235c342220ba72fc86e8d8efa450714e080536f6839a69038b9ece70368f87f29aad42cfbdd9f1a6053cc8803736fe58 -AUX 0001-Restore-transparency.patch 21579 BLAKE2B 0f9e76f4d77722b79359871df5cd4fecf11f6f5465ea2ab1f97b0d6ca83142baa1cc8b0c9ff8e233ec2392559edc16fabb735c72944b57b52ca8f36fcf543278 SHA512 845a3eb1a722bdcf7c2936abf042dd8fecd8407074f0268ad9671351f233be20fa36f19bb2a8a9381bf32f5a0986cda7343617e08f84a99309de72d3ba000010 -AUX 0001-screen-window-Extra-padding-around-transparent-termi.patch 4868 BLAKE2B 26e22bf0d2221917073f27458a9c1ed1b1b0a36958a8c3dfd2ceaacd10980b8afc2b2fe0fdf686e67846968d8f8931a3455b12bfc6d45fa6e17defc50fffb185 SHA512 31e48b88f1d134cefbf5ee8d180263aa42cb4f1eb10ec76f5d097226466ebc6cb8ee3a8639b965fbed9ba756cb83ea8803a71614eda6e71b2d41492eec582967 -AUX Provide-fallback-for-reading-current-directory-if-OS.patch 3021 BLAKE2B d92614048b5d42a52f88173801ed9122a51961245cadf5b90dfaf6221fa3dab73d34b29f8b90881b588881f31a19ac10eae062a7c7df128572f7de106ca44319 SHA512 60e51dcb06c59d328d4dbb67ff13ba3d9d5a5dcb3df22f3e9b3356ab892ef6e2da8f52e6304b7f5cfb39baf047ea3365810163761382bc4d219065454b7e7500 -AUX gnome-terminal-3.44.1-fix-missing-wexitcode.patch 727 BLAKE2B 5aa58dea55d8370d66f1b356bad0f8add6dc01359387b6e45c093800276ffe3a7c0beb125935afb67cd093397ed5779ba123ba61e572f34d0fa7f28bc7cd8b11 SHA512 b03c250e1d25464dc483b6a9398ade5cde4d40ad2ddb59ee709f25bd07101f7ba22faf98e519ee7e7fb8a4d20a56d9fc08e13d3b5546d5749ffa2882156a05f4 -AUX screen-Use-clean-env-when-creating-new-tab.patch 2369 BLAKE2B 99f558ee3eba43927a20f6513a6102670f9688aa25742b665ac7c7a3eb1bb84e5ebbe57afe33ceecb00f3fda8afd2b8f6c9b6fd6e9b68848526182e6f4ca7951 SHA512 1688d90f412e418b6cc68609fd9d7ae513c21fa5650df5fdb0920afb523358030824cac1f5f7fb3f0205a5087c18d6ffdd3c25f1bebdca88a24561717c1ed2bc -AUX scrollbar-background-theming.patch 6861 BLAKE2B aed720c4fe49e335eff20a3d73b71a1312348a1ce80d5b1d393364d749798d8a8eedc449cdf662c801bf748bf380d1ef6c4a230ae695ab6bb5d372214a82a39a SHA512 2c092cc33abd86647ae14c017a44339b348d3566bdbd96b05c1a5f50835cac71c738f15bc404bf2b7147d3d25381a5574be1c3b3c6fdce7855da64187f2eed6b -AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c79c8e02215888fea4706df5c2740480d9534980f54bc1b298ac02983a56c2bc5c1fc988d02b5cadb2a8e30d6443577b745a55533 SHA512 09eee78d2756752ce32cc9379f1a445e55c6f5f01bde972a8e5801a5c7bf3b385ab081ebc4a1ddd2bc463a8a67dd1ad03f1d531c99aa36eb6e850bf4f2a2b265 -DIST gnome-terminal-3.46.8.tar.bz2 1691033 BLAKE2B efcf6aa6ab0071fd525e2b5d56bb7a6e53bd8072a5c774c3cab7b52f613e60112a5fccebbf6354953acf3a76182d60f9abc2f7122eef017e4a543a68d21b76f1 SHA512 07b8b9a31d5c1f87ff6d9902b56bfe1eb75b32f25e5b5c97448f990f4c4d6ca73709e5af30e09701d2dc55331a33b6f006fdcc696d5c9ffa83e50919ac74fdfc -EBUILD gnome-terminal-3.46.8.ebuild 2776 BLAKE2B 57949602b41dbc3e75e448ce0e87289186de9bfc1318dd5f9ca8bd6ad9d877914af17a9b26388ed3c3079b9f0fd6762b3e26c779381375dac7ad0e00c4fe6958 SHA512 7c5506f8dd2b0dac086118e4db22d80e9dd55c7752bfd4e3415c8b37b6c005a2b8e62bea0a93a461ddc98d034f29022687de77423f0e591d553cc5feb4a42d3f -MISC metadata.xml 544 BLAKE2B 9e4dda0925c1f09a6109a01a522965c0bd2d811d91e19054fecf09e2d732f6f03245410e7472c3accf83bc015e2747cf96dcf3ededb62cf4733ece3241e51389 SHA512 e53acf30ece7ccb0307f9bb750ccfb3e90bf5d468098fe42112f4efa0fd1823d10124d8f50bf1ac56fbe4ad188bb7446e1627f1a05188f602e6e11a33496b75d diff --git a/x11-terms/gnome-terminal/files/0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch b/x11-terms/gnome-terminal/files/0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch deleted file mode 100644 index 79bf65d..0000000 --- a/x11-terms/gnome-terminal/files/0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Iain Lane -Date: Fri, 24 Jun 2016 14:51:22 +0100 -Subject: [PATCH] Add style classes and CSS names to some of our widgets - ---- - src/terminal-notebook.cc | 6 ++++++ - src/terminal-screen.cc | 7 +++++++ - 2 files changed, 13 insertions(+) - -diff --git a/src/terminal-notebook.cc b/src/terminal-notebook.cc -index 6686d34..36d0c67 100644 ---- a/src/terminal-notebook.cc -+++ b/src/terminal-notebook.cc -@@ -32,6 +32,8 @@ - #include "terminal-schemas.hh" - #include "terminal-libgsystem.hh" - -+#define TERMINAL_NOTEBOOK_STYLE_CLASS "terminal-notebook" -+ - #define TERMINAL_NOTEBOOK_GET_PRIVATE(notebook)(G_TYPE_INSTANCE_GET_PRIVATE ((notebook), TERMINAL_TYPE_NOTEBOOK, TerminalNotebookPrivate)) - - struct _TerminalNotebookPrivate -@@ -387,11 +389,15 @@ static void - terminal_notebook_init (TerminalNotebook *notebook) - { - TerminalNotebookPrivate *priv; -+ GtkStyleContext *context; - - priv = notebook->priv = TERMINAL_NOTEBOOK_GET_PRIVATE (notebook); - - priv->active_screen = nullptr; - priv->policy = GTK_POLICY_AUTOMATIC; -+ -+ context = gtk_widget_get_style_context (GTK_WIDGET (notebook)); -+ gtk_style_context_add_class (context, TERMINAL_NOTEBOOK_STYLE_CLASS); - } - - static void -diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index a987f26..bf41b6c 100644 ---- a/src/terminal-screen.cc -+++ b/src/terminal-screen.cc -@@ -135,6 +135,8 @@ enum - TARGET_TAB - }; - -+#define TERMINAL_SCREEN_STYLE_CLASS "terminal-screen" -+ - static void terminal_screen_constructed (GObject *object); - static void terminal_screen_dispose (GObject *object); - static void terminal_screen_finalize (GObject *object); -@@ -537,9 +539,14 @@ terminal_screen_init (TerminalScreen *screen) - guint i; - uuid_t u; - char uuidstr[37]; -+ GtkStyleContext *context; - - priv = screen->priv = G_TYPE_INSTANCE_GET_PRIVATE (screen, TERMINAL_TYPE_SCREEN, TerminalScreenPrivate); - -+ context = gtk_widget_get_style_context (GTK_WIDGET (screen)); -+ -+ gtk_style_context_add_class (context, TERMINAL_SCREEN_STYLE_CLASS); -+ - uuid_generate (u); - uuid_unparse (u, uuidstr); - priv->uuid = g_strdup (uuidstr); diff --git a/x11-terms/gnome-terminal/files/0001-Restore-transparency.patch b/x11-terms/gnome-terminal/files/0001-Restore-transparency.patch deleted file mode 100644 index a1f1454..0000000 --- a/x11-terms/gnome-terminal/files/0001-Restore-transparency.patch +++ /dev/null @@ -1,388 +0,0 @@ -From: Debarshi Ray -Date: Mon, 12 May 2014 14:57:18 +0200 -Subject: [PATCH] Restore transparency - -The transparency settings were removed as a side effect of -2bff4b63ed3ceef6055e35563e9b0b33ad57349d - -This restores them and you will need a compositing window manager to -use it. The background image setting, also known as faux transparency, -was not restored. - -Also contains - -326c4f143511a3fae61aed1466568260a2ac1c4e Mon Sep 17 00:00:00 2001 -Lars Uebernickel -Wed, 28 May 2014 14:11:02 +0200 -[PATCH] window: Make the drawing robust across all themes - -There are lots of themes out there in the wild that do not specify a -background-color for all widgets and the default is transparent. This -is usually not a problem because GTK+ sets an opaque region on the -whole window and things without a background-color get drawn with the -theme's default background colour. However, to achieve transparency -we disable the opaque region by making the window app-paintable. This -can lead to transparent menubars or notebook tabs in some themes. We -can avoid this by ensuring that the window always renders a background. - -https://bugzilla.gnome.org/show_bug.cgi?id=730016 ---- - src/org.gnome.Terminal.gschema.xml | 14 +++++ - src/preferences.ui | 121 +++++++++++++++++++++++++++++++++++++ - src/profile-editor.cc | 17 ++++++ - src/terminal-schemas.hh | 4 ++ - src/terminal-screen.cc | 45 +++++++++++++- - src/terminal-window.cc | 28 +++++++++ - 6 files changed, 228 insertions(+), 1 deletion(-) - -diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 26b96ac..9c16b53 100644 ---- a/src/org.gnome.Terminal.gschema.xml -+++ b/src/org.gnome.Terminal.gschema.xml -@@ -349,6 +349,20 @@ - 'narrow' - Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding - -+ -+ false -+ Whether to use a transparent background -+ -+ -+ true -+ Whether to use the value of TerminalScreen-background-darkness, -+ if available, from the theme for the transparency value. -+ -+ -+ 50 -+ Adjust the amount of transparency -+ A value between 0 and 100, where 0 is opaque and 100 is fully transparent. -+ - - - -diff --git a/src/preferences.ui b/src/preferences.ui -index d1aca7b..c01f16b 100644 ---- a/src/preferences.ui -+++ b/src/preferences.ui -@@ -113,6 +113,11 @@ - - - -+ -+ 100 -+ 1 -+ 10 -+ - - - -@@ -1402,6 +1407,122 @@ - 1 - - -+ -+ -+ True -+ False -+ horizontal -+ 12 -+ -+ -+ Use t_ransparent background -+ True -+ True -+ False -+ True -+ 0 -+ True -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ False -+ horizontal -+ 6 -+ -+ -+ True -+ False -+ 0.5 -+ none -+ -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ True -+ background-transparent-adjustment -+ False -+ -+ -+ True -+ True -+ 1 -+ -+ -+ -+ -+ True -+ False -+ 0.5 -+ full -+ -+ -+ -+ False -+ False -+ 2 -+ -+ -+ -+ -+ True -+ True -+ 1 -+ -+ -+ -+ -+ True -+ True -+ 2 -+ -+ -+ -+ -+ True -+ False -+ horizontal -+ 12 -+ -+ -+ Use transparency from system theme -+ True -+ True -+ False -+ True -+ 0 -+ True -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ True -+ True -+ 3 -+ -+ - - - -diff --git a/src/profile-editor.cc b/src/profile-editor.cc -index a99fb89..a88e72d 100644 ---- a/src/profile-editor.cc -+++ b/src/profile-editor.cc -@@ -1492,6 +1492,23 @@ profile_prefs_load (const char *uuid, GSettings *profile) - GSettingsBindFlags(G_SETTINGS_BIND_GET | - G_SETTINGS_BIND_SET)); - gtk_widget_set_visible (w, (vte_get_feature_flags() & VTE_FEATURE_FLAG_SIXEL) != 0); -+ -+ profile_prefs_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, -+ gtk_builder_get_object (builder, "use-transparent-background"), -+ "active", GSettingsBindFlags(G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET)); -+ profile_prefs_settings_bind (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, -+ gtk_builder_get_object (builder, "background-transparent-scale-box"), -+ "sensitive", GSettingsBindFlags(G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY)); -+ profile_prefs_settings_bind (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT, -+ gtk_builder_get_object (builder, "background-transparent-adjustment"), -+ "value", GSettingsBindFlags(G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET)); -+ profile_prefs_settings_bind (profile, TERMINAL_PROFILE_USE_THEME_TRANSPARENCY, -+ gtk_builder_get_object (builder, "use-theme-transparency-checkbutton"), -+ "active", GSettingsBindFlags(G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET)); -+ profile_prefs_settings_bind (profile, TERMINAL_PROFILE_USE_THEME_TRANSPARENCY, -+ gtk_builder_get_object (builder, "use-transparent-background-box"), -+ "sensitive", -+ GSettingsBindFlags(G_SETTINGS_BIND_GET | G_SETTINGS_BIND_INVERT_BOOLEAN | G_SETTINGS_BIND_NO_SENSITIVITY)); - } - - /* Called once per Preferences window, to destroy stuff that doesn't depend on the profile being edited */ -diff --git a/src/terminal-schemas.hh b/src/terminal-schemas.hh -index b146ba8..b93bd02 100644 ---- a/src/terminal-schemas.hh -+++ b/src/terminal-schemas.hh -@@ -78,6 +78,10 @@ G_BEGIN_DECLS - #define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name" - #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY "word-char-exceptions" - -+#define TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND "use-transparent-background" -+#define TERMINAL_PROFILE_USE_THEME_TRANSPARENCY "use-theme-transparency" -+#define TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT "background-transparency-percent" -+ - #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" - #define TERMINAL_SETTING_CONTEXT_INFO_KEY "context-info" - #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" -diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index 0ef74f3..a987f26 100644 ---- a/src/terminal-screen.cc -+++ b/src/terminal-screen.cc -@@ -718,6 +718,14 @@ terminal_screen_class_init (TerminalScreenClass *klass) - - g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate)); - -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_float ("background-darkness", NULL, NULL, -1, 1, -1, -+ GParamFlags(G_PARAM_READABLE | -+ G_PARAM_STATIC_NAME | -+ G_PARAM_STATIC_NICK | -+ G_PARAM_STATIC_BLURB))); -+ -+ - n_url_regexes = G_N_ELEMENTS (url_regex_patterns); - precompile_regexes (url_regex_patterns, n_url_regexes, &url_regexes, &url_regex_flavors); - n_extra_regexes = G_N_ELEMENTS (extra_regex_patterns); -@@ -1112,7 +1120,10 @@ terminal_screen_profile_changed_cb (GSettings *profile, - prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY) || - prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_BACKGROUND_COLOR_KEY) || - prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_FOREGROUND_COLOR_KEY) || -- prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY)) -+ prop_name == I_(TERMINAL_PROFILE_PALETTE_KEY) || -+ prop_name == I_(TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND) || -+ prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT) || -+ prop_name == I_(TERMINAL_PROFILE_USE_THEME_TRANSPARENCY)) - update_color_scheme (screen); - - if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) -@@ -1198,6 +1209,9 @@ update_color_scheme (TerminalScreen *screen) - GdkRGBA *highlight_bgp = nullptr, *highlight_fgp = nullptr; - GtkStyleContext *context; - gboolean use_theme_colors; -+ GtkWidget *toplevel; -+ gboolean transparent, theme_transparent; -+ gfloat style_darkness; - - context = gtk_widget_get_style_context (widget); - gtk_style_context_get_color (context, gtk_style_context_get_state (context), &theme_fg); -@@ -1240,6 +1254,31 @@ update_color_scheme (TerminalScreen *screen) - } - - colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors); -+ theme_transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_THEME_TRANSPARENCY); -+ transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND); -+ -+ gtk_widget_style_get (GTK_WIDGET (screen), -+ "background-darkness", &style_darkness, -+ NULL); -+ -+ if (theme_transparent && style_darkness >= 0) -+ { -+ bg.alpha = style_darkness; -+ } -+ else if (transparent) -+ { -+ gint transparency_percent; -+ -+ transparency_percent = g_settings_get_int (profile, TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT); -+ bg.alpha = (100 - transparency_percent) / 100.0; -+ } -+ else -+ bg.alpha = 1.0; -+ -+ /* If this gets out of range, let's not crash */ -+ if (bg.alpha < 0.0 || bg.alpha > 1.0) -+ bg.alpha = 1.0; -+ - vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, - colors, n_colors); - vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); -@@ -1247,6 +1286,10 @@ update_color_scheme (TerminalScreen *screen) - vte_terminal_set_color_cursor_foreground (VTE_TERMINAL (screen), cursor_fgp); - vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); - vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); -+ -+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); -+ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) -+ gtk_widget_set_app_paintable (toplevel, transparent); - } - - static void -diff --git a/src/terminal-window.cc b/src/terminal-window.cc -index 60f4950..269514f 100644 ---- a/src/terminal-window.cc -+++ b/src/terminal-window.cc -@@ -1963,6 +1963,26 @@ terminal_window_realize (GtkWidget *widget) - terminal_window_update_size (window); - } - -+static gboolean -+terminal_window_draw (GtkWidget *widget, -+ cairo_t *cr) -+{ -+ if (gtk_widget_get_app_paintable (widget)) -+ { -+ GtkStyleContext *context; -+ int width; -+ int height; -+ -+ context = gtk_widget_get_style_context (widget); -+ width = gtk_widget_get_allocated_width (widget); -+ height = gtk_widget_get_allocated_height (widget); -+ gtk_render_background (context, cr, 0, 0, width, height); -+ gtk_render_frame (context, cr, 0, 0, width, height); -+ } -+ -+ return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); -+} -+ - static gboolean - terminal_window_state_event (GtkWidget *widget, - GdkEventWindowState *event) -@@ -2133,6 +2153,8 @@ terminal_window_init (TerminalWindow *window) - }; - TerminalWindowPrivate *priv; - TerminalApp *app; -+ GdkScreen *screen; -+ GdkVisual *visual; - GSettings *gtk_debug_settings; - GtkWindowGroup *window_group; - // GtkAccelGroup *accel_group; -@@ -2148,6 +2170,11 @@ terminal_window_init (TerminalWindow *window) - - gtk_widget_init_template (GTK_WIDGET (window)); - -+ screen = gtk_widget_get_screen (GTK_WIDGET (window)); -+ visual = gdk_screen_get_rgba_visual (screen); -+ if (visual != NULL) -+ gtk_widget_set_visual (GTK_WIDGET (window), visual); -+ - uuid_generate (u); - uuid_unparse (u, uuidstr); - priv->uuid = g_strdup (uuidstr); -@@ -2296,6 +2323,7 @@ terminal_window_class_init (TerminalWindowClass *klass) - - widget_class->show = terminal_window_show; - widget_class->realize = terminal_window_realize; -+ widget_class->draw = terminal_window_draw; - widget_class->window_state_event = terminal_window_state_event; - widget_class->screen_changed = terminal_window_screen_changed; - widget_class->style_updated = terminal_window_style_updated; diff --git a/x11-terms/gnome-terminal/files/0001-screen-window-Extra-padding-around-transparent-termi.patch b/x11-terms/gnome-terminal/files/0001-screen-window-Extra-padding-around-transparent-termi.patch deleted file mode 100644 index 4d36c04..0000000 --- a/x11-terms/gnome-terminal/files/0001-screen-window-Extra-padding-around-transparent-termi.patch +++ /dev/null @@ -1,122 +0,0 @@ -From: "Owen W. Taylor" -Date: Fri, 13 Nov 2015 15:16:42 +0100 -Subject: [PATCH] screen, - window: Extra padding around transparent terminals in Wayland - -https://bugzilla.redhat.com/show_bug.cgi?id=1207943 ---- - src/terminal-screen.cc | 40 +++++++++++++++++++++++++++++++++++++--- - src/terminal-window.cc | 18 ++++++++++++------ - 2 files changed, 49 insertions(+), 9 deletions(-) - -diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index bf41b6c..f8ede37 100644 ---- a/src/terminal-screen.cc -+++ b/src/terminal-screen.cc -@@ -154,6 +154,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *, - static gboolean terminal_screen_popup_menu (GtkWidget *widget); - static gboolean terminal_screen_button_press (GtkWidget *widget, - GdkEventButton *event); -+static void terminal_screen_hierarchy_changed (GtkWidget *widget, -+ GtkWidget *previous_toplevel); - static void terminal_screen_child_exited (VteTerminal *terminal, - int status); - -@@ -659,6 +661,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) - widget_class->drag_data_received = terminal_screen_drag_data_received; - widget_class->button_press_event = terminal_screen_button_press; - widget_class->popup_menu = terminal_screen_popup_menu; -+ widget_class->hierarchy_changed = terminal_screen_hierarchy_changed; - - terminal_class->child_exited = terminal_screen_child_exited; - -@@ -1200,6 +1203,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, - g_object_thaw_notify (object); - } - -+static void -+update_toplevel_transparency (TerminalScreen *screen) -+{ -+ GtkWidget *widget = GTK_WIDGET (screen); -+ TerminalScreenPrivate *priv = screen->priv; -+ GSettings *profile = priv->profile; -+ GtkWidget *toplevel; -+ -+ toplevel = gtk_widget_get_toplevel (widget); -+ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) -+ { -+ gboolean transparent; -+ -+ transparent = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND); -+ if (gtk_widget_get_app_paintable (toplevel) != transparent) -+ { -+ gtk_widget_set_app_paintable (toplevel, transparent); -+ -+ /* The opaque region of the toplevel isn't updated until the toplevel is allocated; -+ * set_app_paintable() doesn't force an allocation, so do that manually. -+ */ -+ gtk_widget_queue_resize (toplevel); -+ } -+ } -+} -+ - static void - update_color_scheme (TerminalScreen *screen) - { -@@ -1294,9 +1323,7 @@ update_color_scheme (TerminalScreen *screen) - vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); - vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); - -- toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); -- if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) -- gtk_widget_set_app_paintable (toplevel, transparent); -+ update_toplevel_transparency (screen); - } - - static void -@@ -1816,6 +1843,13 @@ terminal_screen_do_popup (TerminalScreen *screen, - terminal_screen_popup_info_unref (info); - } - -+static void -+terminal_screen_hierarchy_changed (GtkWidget *widget, -+ GtkWidget *previous_toplevel) -+{ -+ update_toplevel_transparency (TERMINAL_SCREEN (widget)); -+} -+ - static gboolean - terminal_screen_button_press (GtkWidget *widget, - GdkEventButton *event) -diff --git a/src/terminal-window.cc b/src/terminal-window.cc -index 269514f..96b7ba2 100644 ---- a/src/terminal-window.cc -+++ b/src/terminal-window.cc -@@ -1969,15 +1969,21 @@ terminal_window_draw (GtkWidget *widget, - { - if (gtk_widget_get_app_paintable (widget)) - { -+ GtkAllocation child_allocation; - GtkStyleContext *context; -- int width; -- int height; -+ GtkWidget *child; -+ -+ /* Get the *child* allocation, so we don't overwrite window borders */ -+ child = gtk_bin_get_child (GTK_BIN (widget)); -+ gtk_widget_get_allocation (child, &child_allocation); - - context = gtk_widget_get_style_context (widget); -- width = gtk_widget_get_allocated_width (widget); -- height = gtk_widget_get_allocated_height (widget); -- gtk_render_background (context, cr, 0, 0, width, height); -- gtk_render_frame (context, cr, 0, 0, width, height); -+ gtk_render_background (context, cr, -+ child_allocation.x, child_allocation.y, -+ child_allocation.width, child_allocation.height); -+ gtk_render_frame (context, cr, -+ child_allocation.x, child_allocation.y, -+ child_allocation.width, child_allocation.height); - } - - return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); diff --git a/x11-terms/gnome-terminal/files/Provide-fallback-for-reading-current-directory-if-OS.patch b/x11-terms/gnome-terminal/files/Provide-fallback-for-reading-current-directory-if-OS.patch deleted file mode 100644 index 8876977..0000000 --- a/x11-terms/gnome-terminal/files/Provide-fallback-for-reading-current-directory-if-OS.patch +++ /dev/null @@ -1,100 +0,0 @@ -From: Martin Pitt -Date: Sun, 31 May 2015 17:09:28 +0000 -Subject: Provide fallback for reading current directory if OSC 7 fails - -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=697475 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=712628 ---- - src/terminal-screen.cc | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 66 insertions(+) - -diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index 54e1022..943e0ef 100644 ---- a/src/terminal-screen.cc -+++ b/src/terminal-screen.cc -@@ -358,6 +358,63 @@ terminal_screen_clear_exec_data (TerminalScreen *screen, - - G_DEFINE_TYPE (TerminalScreen, terminal_screen, VTE_TYPE_TERMINAL) - -+static char * -+cwd_of_pid (int pid) -+{ -+ static const char patterns[][18] = { -+ "/proc/%d/cwd", /* Linux */ -+ "/proc/%d/path/cwd", /* Solaris >= 10 */ -+ }; -+ guint i; -+ -+ if (pid == -1) -+ return nullptr; -+ -+ /* Try to get the working directory using various OS-specific mechanisms */ -+ for (i = 0; i < G_N_ELEMENTS (patterns); ++i) -+ { -+ char cwd_file[64]; -+ char buf[PATH_MAX + 1]; -+ int len; -+ -+ /* disable "format not a string literal" error, we know what we are doing */ -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" -+ g_snprintf (cwd_file, sizeof (cwd_file), patterns[i], pid); -+#pragma GCC diagnostic pop -+ len = readlink (cwd_file, buf, sizeof (buf) - 1); -+ -+ if (len > 0 && buf[0] == '/') -+ return g_strndup (buf, len); -+ -+ /* If that didn't do it, try this hack */ -+ if (len <= 0) -+ { -+ char *cwd, *working_dir = NULL; -+ -+ cwd = g_get_current_dir (); -+ if (cwd != NULL) -+ { -+ /* On Solaris, readlink returns an empty string, but the -+ * link can be used as a directory, including as a target -+ * of chdir(). -+ */ -+ if (chdir (cwd_file) == 0) -+ { -+ working_dir = g_get_current_dir (); -+ (void) chdir (cwd); -+ } -+ g_free (cwd); -+ } -+ -+ if (working_dir) -+ return working_dir; -+ } -+ } -+ -+ return nullptr; -+} -+ - static void - free_tag_data (TagData *tagdata) - { -@@ -1830,12 +1887,21 @@ terminal_screen_button_press (GtkWidget *widget, - char * - terminal_screen_get_current_dir (TerminalScreen *screen) - { -+ TerminalScreenPrivate *priv = screen->priv; - const char *uri; - - uri = vte_terminal_get_current_directory_uri (VTE_TERMINAL (screen)); - if (uri != nullptr) - return g_filename_from_uri (uri, nullptr, nullptr); - -+ if (priv->child_pid > 0) { -+ char *cwd = cwd_of_pid (priv->child_pid); -+ if (cwd != NULL) { -+ g_debug ("terminal_screen_get_current_dir: VTE current dir n/a, reading from /proc: %s", cwd); -+ return cwd; -+ } -+ } -+ - ExecData *data = screen->priv->exec_data; - if (data && data->cwd) - return g_strdup (data->cwd); diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch deleted file mode 100644 index aff2237..0000000 --- a/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://gitlab.gnome.org/GNOME/vte/-/issues/72 -Someone already tried to upstream a similar patch to gnome vte that -would fix this but was rejected by maintainer. More info can be found -on the link above. - -W_EXITCODE is missing in musl thus causing gnome-terminal build to fail. -This patch checks if W_EXITCODE is not defined and then defines it. ---- a/src/terminal.cc -+++ b/src/terminal.cc -@@ -47,6 +47,11 @@ - GS_DEFINE_CLEANUP_FUNCTION0(TerminalOptions*, gs_local_options_free, terminal_options_free) - #define gs_free_options __attribute__ ((cleanup(gs_local_options_free))) - -+/* fix for musl */ -+#ifndef W_EXITCODE -+#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) -+#endif -+ - /* Wait-for-exit helper */ - - typedef struct { diff --git a/x11-terms/gnome-terminal/files/screen-Use-clean-env-when-creating-new-tab.patch b/x11-terms/gnome-terminal/files/screen-Use-clean-env-when-creating-new-tab.patch deleted file mode 100644 index 0a0d0a7..0000000 --- a/x11-terms/gnome-terminal/files/screen-Use-clean-env-when-creating-new-tab.patch +++ /dev/null @@ -1,63 +0,0 @@ -From: Christian Persch -Date: Mon, 23 Mar 2020 09:57:56 +0100 -Subject: screen: Use clean env when creating new tab - -https://gitlab.gnome.org/GNOME/gnome-terminal/issues/236 - -Origin: backport, https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/fd5ac772154426e2da5afd633b336414bca33be9 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1922839 -Last-Update: 2021-04-13 ---- - src/terminal-screen.cc | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index 4e004c4..7b55165 100644 ---- a/src/terminal-screen.cc -+++ b/src/terminal-screen.cc -@@ -275,8 +275,7 @@ exec_data_new (void) - } - - static ExecData * --exec_data_clone (ExecData *data, -- gboolean preserve_argv) -+exec_data_clone (ExecData *data) - { - if (data == nullptr) - return nullptr; -@@ -286,8 +285,7 @@ exec_data_clone (ExecData *data, - clone->cwd = g_strdup (data->cwd); - - /* If FDs were passed, cannot repeat argv. Return data only for env and cwd */ -- if (!preserve_argv || -- data->fd_list != nullptr) { -+ if (data->fd_list != nullptr) { - clone->as_shell = TRUE; - return clone; - } -@@ -937,7 +935,6 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, - - g_return_val_if_fail (TERMINAL_IS_SCREEN (parent_screen), FALSE); - -- terminal_unref_exec_data ExecData* data = exec_data_clone (parent_screen->priv->exec_data, FALSE); - gs_free char* cwd = terminal_screen_get_current_dir (parent_screen); - - _terminal_debug_print (TERMINAL_DEBUG_PROCESSES, -@@ -947,7 +944,7 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, - cwd); - - return terminal_screen_reexec_from_exec_data (screen, -- data, -+ nullptr /* exec data */, - nullptr /* envv */, - cwd, - cancellable, -@@ -1753,7 +1750,7 @@ spawn_result_cb (VteTerminal *terminal, - } - - /* Retain info for reexec, if possible */ -- ExecData *new_exec_data = exec_data_clone (exec_data, TRUE); -+ ExecData *new_exec_data = exec_data_clone (exec_data); - terminal_screen_clear_exec_data (screen, FALSE); - priv->exec_data = new_exec_data; - } diff --git a/x11-terms/gnome-terminal/files/scrollbar-background-theming.patch b/x11-terms/gnome-terminal/files/scrollbar-background-theming.patch deleted file mode 100644 index 0160e08..0000000 --- a/x11-terms/gnome-terminal/files/scrollbar-background-theming.patch +++ /dev/null @@ -1,195 +0,0 @@ -From: Marco Trevisan -Date: Sat, 20 Jan 2018 18:48:39 -0500 -Subject: draw proper background under the scrollbar - -Forwarded: yes, https://bugzilla.gnome.org/show_bug.cgi?id=754796 -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-terminal/+bug/1493964 ---- - src/terminal-screen-container.cc | 28 +++++++++++++++++-- - src/terminal-screen.cc | 60 ++++++++++++++++++++++++++++++++++++++++ - src/terminal-screen.hh | 2 ++ - 3 files changed, 88 insertions(+), 2 deletions(-) - -diff --git a/src/terminal-screen-container.cc b/src/terminal-screen-container.cc -index 6d85190..cedb1d9 100644 ---- a/src/terminal-screen-container.cc -+++ b/src/terminal-screen-container.cc -@@ -121,9 +121,25 @@ terminal_screen_container_init (TerminalScreenContainer *container) - priv->vscrollbar_policy = GTK_POLICY_AUTOMATIC; - } - -+static gboolean -+scrollbar_bg_draw_cb (GtkWidget *widget, cairo_t *cr, TerminalScreenContainer *container) -+{ -+ TerminalScreenContainerPrivate *priv = container->priv; -+ GdkRGBA * bg = terminal_screen_get_bg_color (priv->screen); -+ -+ cairo_save (cr); -+ cairo_set_source_rgba (cr, bg->red, bg->green, bg->blue, bg->alpha); -+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); -+ cairo_paint (cr); -+ cairo_restore (cr); -+ -+ return FALSE; -+} -+ - static void - terminal_screen_container_constructed (GObject *object) - { -+ GtkWidget *scrollbar; - TerminalScreenContainer *container = TERMINAL_SCREEN_CONTAINER (object); - TerminalScreenContainerPrivate *priv = container->priv; - -@@ -151,9 +167,12 @@ terminal_screen_container_constructed (GObject *object) - } - #else - priv->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); -+ priv->vscrollbar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - -- priv->vscrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, -- gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->screen))); -+ scrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, -+ gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->screen))); -+ -+ gtk_box_pack_start (GTK_BOX (priv->vscrollbar), scrollbar, TRUE, TRUE, 0); - - gtk_box_pack_start (GTK_BOX (priv->hbox), GTK_WIDGET (priv->screen), TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (priv->hbox), priv->vscrollbar, FALSE, FALSE, 0); -@@ -163,6 +182,11 @@ terminal_screen_container_constructed (GObject *object) - #endif - - _terminal_screen_update_scrollbar (priv->screen); -+ -+ g_signal_connect (G_OBJECT (priv->vscrollbar), "draw", -+ G_CALLBACK (scrollbar_bg_draw_cb), container); -+ g_signal_connect_swapped (priv->screen, "notify::bg-color", -+ G_CALLBACK (gtk_widget_queue_draw), priv->vscrollbar); - } - - static void -diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index 85ae885..4e004c4 100644 ---- a/src/terminal-screen.cc -+++ b/src/terminal-screen.cc -@@ -108,6 +108,8 @@ struct _TerminalScreenPrivate - gboolean exec_on_realize; - guint idle_exec_source; - ExecData *exec_data; -+ GdkRGBA bg_color; -+ GdkRGBA fg_color; - }; - - enum -@@ -123,6 +125,8 @@ enum { - PROP_0, - PROP_PROFILE, - PROP_TITLE, -+ PROP_BG_COLOR, -+ PROP_FG_COLOR - }; - - enum -@@ -616,6 +620,12 @@ terminal_screen_get_property (GObject *object, - case PROP_TITLE: - g_value_set_string (value, terminal_screen_get_title (screen)); - break; -+ case PROP_BG_COLOR: -+ g_value_set_boxed (value, terminal_screen_get_bg_color (screen)); -+ break; -+ case PROP_FG_COLOR: -+ g_value_set_boxed (value, terminal_screen_get_bg_color (screen)); -+ break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; -@@ -636,6 +646,8 @@ terminal_screen_set_property (GObject *object, - terminal_screen_set_profile (screen, (GSettings*)g_value_get_object (value)); - break; - case PROP_TITLE: -+ case PROP_FG_COLOR: -+ case PROP_BG_COLOR: - /* not writable */ - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -727,6 +739,26 @@ terminal_screen_class_init (TerminalScreenClass *klass) - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB))); - -+ g_object_class_install_property -+ (object_class, -+ PROP_BG_COLOR, -+ g_param_spec_boxed ("bg-color", NULL, NULL, -+ GDK_TYPE_RGBA, -+ GParamFlags(G_PARAM_READABLE | -+ G_PARAM_STATIC_NAME | -+ G_PARAM_STATIC_NICK | -+ G_PARAM_STATIC_BLURB))); -+ -+ g_object_class_install_property -+ (object_class, -+ PROP_FG_COLOR, -+ g_param_spec_boxed ("fg-color", NULL, NULL, -+ GDK_TYPE_RGBA, -+ GParamFlags(G_PARAM_READABLE | -+ G_PARAM_STATIC_NAME | -+ G_PARAM_STATIC_NICK | -+ G_PARAM_STATIC_BLURB))); -+ - g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate)); - - gtk_widget_class_install_style_property (widget_class, -@@ -1072,6 +1104,22 @@ terminal_screen_get_title (TerminalScreen *screen) - return vte_terminal_get_window_title (VTE_TERMINAL (screen)); - } - -+GdkRGBA* -+terminal_screen_get_bg_color (TerminalScreen *screen) -+{ -+ g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL); -+ -+ return &screen->priv->bg_color; -+} -+ -+GdkRGBA* -+terminal_screen_get_fg_color (TerminalScreen *screen) -+{ -+ g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL); -+ -+ return &screen->priv->fg_color; -+} -+ - static void - terminal_screen_profile_changed_cb (GSettings *profile, - const char *prop_name, -@@ -1324,6 +1372,18 @@ update_color_scheme (TerminalScreen *screen) - vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); - vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); - -+ if (gdk_rgba_hash (&priv->bg_color) != gdk_rgba_hash (&bg)) -+ { -+ priv->bg_color = bg; -+ g_object_notify (G_OBJECT (screen), "bg-color"); -+ } -+ -+ if (gdk_rgba_hash (&priv->fg_color) != gdk_rgba_hash (&fg)) -+ { -+ priv->fg_color = fg; -+ g_object_notify (G_OBJECT (screen), "fg-color"); -+ } -+ - update_toplevel_transparency (screen); - } - -diff --git a/src/terminal-screen.hh b/src/terminal-screen.hh -index 70d0d8c..b434052 100644 ---- a/src/terminal-screen.hh -+++ b/src/terminal-screen.hh -@@ -115,6 +115,8 @@ GSettings* terminal_screen_get_profile (TerminalScreen *screen); - GSettings* terminal_screen_ref_profile (TerminalScreen *screen); - - const char* terminal_screen_get_title (TerminalScreen *screen); -+GdkRGBA* terminal_screen_get_bg_color (TerminalScreen *screen); -+GdkRGBA* terminal_screen_get_fg_color (TerminalScreen *screen); - - char *terminal_screen_get_current_dir (TerminalScreen *screen); - diff --git a/x11-terms/gnome-terminal/files/separate-new-tab-window.gschema.override b/x11-terms/gnome-terminal/files/separate-new-tab-window.gschema.override deleted file mode 100644 index 65d39a4..0000000 --- a/x11-terms/gnome-terminal/files/separate-new-tab-window.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[org.gnome.Terminal.Legacy.Settings] -unified-menu=false diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild deleted file mode 100644 index 0f5757b..0000000 --- a/x11-terms/gnome-terminal/gnome-terminal-3.46.8.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) -inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg - -DESCRIPTION="A terminal emulator for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Terminal" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="debug +gnome-shell +nautilus vanilla" - -# Upstream is hostile and refuses to upload tarballs. -SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2" - -KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" - -# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960 -RDEPEND=" - >=dev-libs/glib-2.52:2 - >=x11-libs/gtk+-3.22.27:3 - >=x11-libs/vte-0.70.0:2.91[!vanilla?] - >=dev-libs/libpcre2-10 - >=gnome-base/gsettings-desktop-schemas-0.1.0 - sys-apps/util-linux - gnome-shell? ( gnome-base/gnome-shell ) - nautilus? ( >=gnome-base/nautilus-43.0 ) -" -DEPEND="${RDEPEND}" -# itstool required for help/* with non-en LINGUAS, see bug #549358 -# xmllint required for glib-compile-resources, see bug #549304 -BDEPEND=" - ${PYTHON_DEPS} - dev-libs/libxml2:2 - dev-libs/libxslt - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -DOC_CONTENTS="To get previous working directory inherited in new opened tab, or - notifications of long-running commands finishing, you will need - to add the following line to your ~/.bashrc:\n - . /etc/profile.d/vte-2.91.sh" - -src_prepare() { - eapply "${FILESDIR}"/${PN}-3.44.1-fix-missing-wexitcode.patch - if ! use vanilla; then - # Restore transparency and more from Ubuntu patches - eapply "${FILESDIR}"/Provide-fallback-for-reading-current-directory-if-OS.patch - eapply "${FILESDIR}"/0001-Restore-transparency.patch - eapply "${FILESDIR}"/0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch - eapply "${FILESDIR}"/0001-screen-window-Extra-padding-around-transparent-termi.patch - eapply "${FILESDIR}"/scrollbar-background-theming.patch - eapply "${FILESDIR}"/screen-Use-clean-env-when-creating-new-tab.patch - fi - default -} - -src_configure() { - local emesonargs=( - $(meson_use debug dbg) - -Ddocs=false - $(meson_use nautilus nautilus_extension) - $(meson_use gnome-shell search_provider) - ) - meson_src_configure -} - -src_install() { - meson_src_install - if ! use vanilla; then - # Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal" - insinto /usr/share/glib-2.0/schemas - newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override - fi - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - readme.gentoo_print_elog -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/x11-terms/gnome-terminal/metadata.xml b/x11-terms/gnome-terminal/metadata.xml deleted file mode 100644 index 0d5d07c..0000000 --- a/x11-terms/gnome-terminal/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - gnome@gentoo.org - Gentoo GNOME Desktop - - - Integrate with gnome-base/gnome-shell search - Build gnome-base/nautilus extension - - - GNOME/gnome-terminal - -