| 1 |
commit: 5348105f56d714ba66f35d356bd34875a12548e4 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 29 01:13:19 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 29 01:13:47 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5348105f |
| 7 |
|
| 8 |
gnome-extra/gnome-system-monitor: Add patch to fix running under non-GNOME |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/784890 |
| 11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 12 |
|
| 13 |
...-gnome-workaround-causing-crash-fixes-182.patch | 44 ++++++++++++++++++++++ |
| 14 |
....ebuild => gnome-system-monitor-40.0-r1.ebuild} | 4 ++ |
| 15 |
2 files changed, 48 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..595870bbabe |
| 20 |
--- /dev/null |
| 21 |
+++ b/gnome-extra/gnome-system-monitor/files/40.0-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch |
| 22 |
@@ -0,0 +1,44 @@ |
| 23 |
+From ba93af5b3e429db5a9c4dd7e2d06b800735a9071 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Robert Roth <robert.roth.off@×××××.com> |
| 25 |
+Date: Sun, 28 Mar 2021 20:33:40 +0300 |
| 26 |
+Subject: [PATCH] Dropped non-gnome workaround causing crash (fixes #182) |
| 27 |
+ |
| 28 |
+--- |
| 29 |
+ src/interface.cpp | 14 -------------- |
| 30 |
+ 1 file changed, 14 deletions(-) |
| 31 |
+ |
| 32 |
+diff --git a/src/interface.cpp b/src/interface.cpp |
| 33 |
+index 48b42d0b..65e52682 100644 |
| 34 |
+--- a/src/interface.cpp |
| 35 |
++++ b/src/interface.cpp |
| 36 |
+@@ -698,7 +698,6 @@ create_main_window (GsmApplication *app) |
| 37 |
+ GdkDisplay *display; |
| 38 |
+ GdkMonitor *monitor; |
| 39 |
+ GdkRectangle monitor_geometry; |
| 40 |
+- const char* session; |
| 41 |
+ |
| 42 |
+ int width, height, xpos, ypos; |
| 43 |
+ |
| 44 |
+@@ -715,19 +714,6 @@ create_main_window (GsmApplication *app) |
| 45 |
+ gtk_application_window_set_help_overlay (GTK_APPLICATION_WINDOW (app->main_window), |
| 46 |
+ GTK_SHORTCUTS_WINDOW (gtk_builder_get_object (builder, "help_overlay"))); |
| 47 |
+ |
| 48 |
+- session = g_getenv ("XDG_CURRENT_DESKTOP"); |
| 49 |
+- if (session && !strstr (session, "GNOME")){ |
| 50 |
+- GtkBox *mainbox; |
| 51 |
+- HdyHeaderBar *headerbar; |
| 52 |
+- |
| 53 |
+- mainbox = GTK_BOX (gtk_builder_get_object (builder, "main_box")); |
| 54 |
+- headerbar = HDY_HEADER_BAR (gtk_builder_get_object (builder, "header_bar")); |
| 55 |
+- gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (headerbar)), "titlebar"); |
| 56 |
+- gtk_window_set_titlebar (GTK_WINDOW (main_window), NULL); |
| 57 |
+- hdy_header_bar_set_show_close_button (headerbar, FALSE); |
| 58 |
+- gtk_box_pack_start (mainbox, GTK_WIDGET (headerbar), FALSE, FALSE, 0); |
| 59 |
+- } |
| 60 |
+- |
| 61 |
+ g_settings_get (app->settings->gobj(), GSM_SETTING_WINDOW_STATE, "(iiii)", |
| 62 |
+ &width, &height, &xpos, &ypos); |
| 63 |
+ |
| 64 |
+-- |
| 65 |
+2.26.3 |
| 66 |
+ |
| 67 |
|
| 68 |
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 |
| 69 |
similarity index 92% |
| 70 |
rename from gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0.ebuild |
| 71 |
rename to gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0-r1.ebuild |
| 72 |
index 2a765ffce9b..61f0a37382f 100644 |
| 73 |
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0.ebuild |
| 74 |
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0-r1.ebuild |
| 75 |
@@ -35,6 +35,10 @@ BDEPEND=" |
| 76 |
>=sys-auth/polkit-0.114 |
| 77 |
" # polkit needed at buildtime for ITS rules of policy files, first available in 0.114 |
| 78 |
|
| 79 |
+PATCHES=( |
| 80 |
+ "${FILESDIR}"/${PV}-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch |
| 81 |
+) |
| 82 |
+ |
| 83 |
src_configure() { |
| 84 |
local emesonargs=( |
| 85 |
$(meson_use X wnck) |
Archives