commit: 5348105f56d714ba66f35d356bd34875a12548e4 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Apr 29 01:13:19 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Apr 29 01:13:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5348105f
gnome-extra/gnome-system-monitor: Add patch to fix running under non-GNOME Closes: https://bugs.gentoo.org/784890 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> ...-gnome-workaround-causing-crash-fixes-182.patch | 44 ++++++++++++++++++++++ ....ebuild => gnome-system-monitor-40.0-r1.ebuild} | 4 ++ 2 files changed, 48 insertions(+) diff --git a/gnome-extra/gnome-system-monitor/files/40.0-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch b/gnome-extra/gnome-system-monitor/files/40.0-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch new file mode 100644 index 00000000000..595870bbabe --- /dev/null +++ b/gnome-extra/gnome-system-monitor/files/40.0-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch @@ -0,0 +1,44 @@ +From ba93af5b3e429db5a9c4dd7e2d06b800735a9071 Mon Sep 17 00:00:00 2001 +From: Robert Roth <robert.roth....@gmail.com> +Date: Sun, 28 Mar 2021 20:33:40 +0300 +Subject: [PATCH] Dropped non-gnome workaround causing crash (fixes #182) + +--- + src/interface.cpp | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/src/interface.cpp b/src/interface.cpp +index 48b42d0b..65e52682 100644 +--- a/src/interface.cpp ++++ b/src/interface.cpp +@@ -698,7 +698,6 @@ create_main_window (GsmApplication *app) + GdkDisplay *display; + GdkMonitor *monitor; + GdkRectangle monitor_geometry; +- const char* session; + + int width, height, xpos, ypos; + +@@ -715,19 +714,6 @@ create_main_window (GsmApplication *app) + gtk_application_window_set_help_overlay (GTK_APPLICATION_WINDOW (app->main_window), + GTK_SHORTCUTS_WINDOW (gtk_builder_get_object (builder, "help_overlay"))); + +- session = g_getenv ("XDG_CURRENT_DESKTOP"); +- if (session && !strstr (session, "GNOME")){ +- GtkBox *mainbox; +- HdyHeaderBar *headerbar; +- +- mainbox = GTK_BOX (gtk_builder_get_object (builder, "main_box")); +- headerbar = HDY_HEADER_BAR (gtk_builder_get_object (builder, "header_bar")); +- gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (headerbar)), "titlebar"); +- gtk_window_set_titlebar (GTK_WINDOW (main_window), NULL); +- hdy_header_bar_set_show_close_button (headerbar, FALSE); +- gtk_box_pack_start (mainbox, GTK_WIDGET (headerbar), FALSE, FALSE, 0); +- } +- + g_settings_get (app->settings->gobj(), GSM_SETTING_WINDOW_STATE, "(iiii)", + &width, &height, &xpos, &ypos); + +-- +2.26.3 + diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0-r1.ebuild similarity index 92% rename from gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0.ebuild rename to gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0-r1.ebuild index 2a765ffce9b..61f0a37382f 100644 --- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0.ebuild +++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0-r1.ebuild @@ -35,6 +35,10 @@ BDEPEND=" >=sys-auth/polkit-0.114 " # polkit needed at buildtime for ITS rules of policy files, first available in 0.114 +PATCHES=( + "${FILESDIR}"/${PV}-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch +) + src_configure() { local emesonargs=( $(meson_use X wnck)
