From a7a35c09d74632a5ab670c389b5264090112ee26975b2c0278a4b3711c2305bf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 3 May 2021 16:13:56 +0000 Subject: [PATCH] Accepting request 890074 from GNOME:Next Scripted push from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/890074 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-system-monitor?expand=0&rev=198 --- ...af5b3e429db5a9c4dd7e2d06b800735a9071.patch | 44 ------------------- gnome-system-monitor-40.0.tar.xz | 3 -- gnome-system-monitor-40.1.tar.xz | 3 ++ gnome-system-monitor.changes | 10 +++++ gnome-system-monitor.spec | 4 +- 5 files changed, 14 insertions(+), 50 deletions(-) delete mode 100644 ba93af5b3e429db5a9c4dd7e2d06b800735a9071.patch delete mode 100644 gnome-system-monitor-40.0.tar.xz create mode 100644 gnome-system-monitor-40.1.tar.xz diff --git a/ba93af5b3e429db5a9c4dd7e2d06b800735a9071.patch b/ba93af5b3e429db5a9c4dd7e2d06b800735a9071.patch deleted file mode 100644 index 25211b9..0000000 --- a/ba93af5b3e429db5a9c4dd7e2d06b800735a9071.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ba93af5b3e429db5a9c4dd7e2d06b800735a9071 Mon Sep 17 00:00:00 2001 -From: Robert Roth -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); - --- -GitLab - diff --git a/gnome-system-monitor-40.0.tar.xz b/gnome-system-monitor-40.0.tar.xz deleted file mode 100644 index fb846d9..0000000 --- a/gnome-system-monitor-40.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64e550f7f55552b09a79e1620aaebaae705d1668e4538e604e14c0ca323ae756 -size 763344 diff --git a/gnome-system-monitor-40.1.tar.xz b/gnome-system-monitor-40.1.tar.xz new file mode 100644 index 0000000..be23bac --- /dev/null +++ b/gnome-system-monitor-40.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdb30f4367907aab86d7c2bb76a7b773ba850b765c9666a39f42abfe22691d1a +size 763720 diff --git a/gnome-system-monitor.changes b/gnome-system-monitor.changes index 1846ae0..fffa6c0 100644 --- a/gnome-system-monitor.changes +++ b/gnome-system-monitor.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Apr 30 16:15:40 UTC 2021 - Dominique Leuenberger + +- Update to version 40.1: + + Fixed headerbar buttons jumping around. + + Dropped non-gnome workaround causing crash. + + Updated translations. +- Drop ba93af5b3e429db5a9c4dd7e2d06b800735a9071.patch: fixed + upstrteam. + ------------------------------------------------------------------- Tue Apr 27 09:56:42 UTC 2021 - Dominique Leuenberger diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec index d469629..a6b2d3f 100644 --- a/gnome-system-monitor.spec +++ b/gnome-system-monitor.spec @@ -17,15 +17,13 @@ Name: gnome-system-monitor -Version: 40.0 +Version: 40.1 Release: 0 Summary: A process monitor for the GNOME desktop License: GPL-2.0-or-later Group: System/GUI/GNOME URL: https://wiki.gnome.org/Apps/SystemMonitor Source0: https://download.gnome.org/sources/gnome-system-monitor/40/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM ba93af5b3e429db5a9c4dd7e2d06b800735a9071.patch boo#1185340 dimstar@opensuse.org -- Fix crash on non-GNOME desktops -Patch0: https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/commit/ba93af5b3e429db5a9c4dd7e2d06b800735a9071.patch BuildRequires: fdupes BuildRequires: gcc-c++