gentoo resync : 04.05.2021

4 files changed, 106 insertions, 1 deletions

diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index d5b045c5d3bc..ad4ba3a59d30 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,8 @@
+AUX 40.0-Dropped-non-gnome-workaround-causing-crash-fixes-182.patch 1728 BLAKE2B 00c009a738b3144e7d097ae6ade1edb6b6f8ce373087e501a67569a9cfc2e860bd9cfdd67fe25a15d97aa55ffc4256359ba6755cbbe587ec3ac39a7b9cf84804 SHA512 22038ac59ac904089c4ad9d704cfdddbf0224f3a99f63887412fddd5ad88430985a4f650d55e8478a30fe1288e05f340e827ab5be07a3c3c870f185052dbb9f8
 DIST gnome-system-monitor-3.38.0.tar.xz 712320 BLAKE2B a59fbe39a8c04793c5584f645dbe0e0bcb9747394c0b923532afc95443aadeeb17ca211248a5c61747699eb95d4f8530fcc18076753bcc6d28cf2ce47a4f6825 SHA512 9f54045fa837b85d40a80bc8b519f91513ae27ca157e07f415860e906444bf144b7a7a66e4a2a9a5b1fea4e69305414cf081bb34624c91d1476265b37b59368c
 DIST gnome-system-monitor-40.0.tar.xz 763344 BLAKE2B 3a9b0f7a823eda4a00b58ece53604a127047a0d087fdc74584d5e1453744063332bb084ab32dc624812d80fa233a0fbbb39c20e2cc18b962dbd248799d587a3a SHA512 b0e326c3abdca0a3b5807976a04b7090861717840b11829d75fe5da91ef7adb34b80d2952aee4c1ff843bd5356dab7490d1c2e403712fd3c1381baddb8542501
+DIST gnome-system-monitor-40.1.tar.xz 763720 BLAKE2B 50d69ed95173301a566078d5bf32c48c011eb297a7fcb598dad1c515ee2900731362c9637dbf7793bb95d31a5584f7f84192b1c726b1a8362dc364b695f54263 SHA512 a6c870ae4e58c5fabdc87c290e10326b051398b3408f7ff159c854eef5c7940371e83766f37c6a713631d49ee5ee7b2670f441a462e2453fa849cba2f3255be4
 EBUILD gnome-system-monitor-3.38.0.ebuild 1158 BLAKE2B 5e44fb20f0873e29a0b965d1e8f40365bdde874694bd4d01906f88f62170e61cd46a1f7865df998970ab34b57a4e1305c5b76413ae82498ae4d2b553a398dd99 SHA512 68584c47b3c529ac63d605e19d8a36aedbbfecc0f92844a9a9a70f470cc9a043a8bc3e7b86f2f57fcba76f2641519fe1f97e068f39c9e2d093d03b30af57ed6b
-EBUILD gnome-system-monitor-40.0.ebuild 1214 BLAKE2B bd64c30c1463b52acd4d1f9e5341fc98a15059349253d7ed3a7dbe9e62f46f7b7a773ab5f90294e6d19fd849cc9cbf207994626f5fc4306efaa6d05b6bf2891c SHA512 29c824fe1ac1b93c3a4965ed147fa03a9f101e4d96a8a827ff0333d1f2b615491535a9eb39acfc47bfe07fa6e0e9ffa805fc0f17db3f6d314ab5fa0eb175be34
+EBUILD gnome-system-monitor-40.0-r1.ebuild 1307 BLAKE2B 6b9f3d4e3b26300f95509ee9ef6e029b057d12e544dc84f49bb8f179678f3fa1140691ac902997d1b947af1a3a1aa9c333c9166954776f1de04440e867783a36 SHA512 216f16f1e128463cea0d8c277e727f6f1b7221d9f5eb7ffdbe7215c903a4398d6a7b18a3bf8eb49554576f6717a7ee95d7b07ddc5e926c6d085bd708d7870076
+EBUILD gnome-system-monitor-40.1.ebuild 1214 BLAKE2B bd64c30c1463b52acd4d1f9e5341fc98a15059349253d7ed3a7dbe9e62f46f7b7a773ab5f90294e6d19fd849cc9cbf207994626f5fc4306efaa6d05b6bf2891c SHA512 29c824fe1ac1b93c3a4965ed147fa03a9f101e4d96a8a827ff0333d1f2b615491535a9eb39acfc47bfe07fa6e0e9ffa805fc0f17db3f6d314ab5fa0eb175be34
 MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
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 000000000000..595870bbabe2
--- /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.off@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-r1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0-r1.ebuild
new file mode 100644
index 000000000000..61f0a37382fa
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Gnome System Monitor"
+HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="systemd X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.46:2
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.22:3[X(+)]
+	>=dev-cpp/gtkmm-3.3.18:3.0
+	>=dev-cpp/atkmm-2.28:0
+	>=gnome-base/libgtop-2.37.2:2=
+	>=gui-libs/libhandy-1.0.0:1=
+	>=gnome-base/librsvg-2.35:2
+	>=dev-libs/libxml2-2.0:2
+	X? ( >=x11-libs/libwnck-2.91.0:3 )
+	systemd? ( >=sys-apps/systemd-44:0= )
+"
+# eautoreconf requires gnome-base/gnome-common
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	>=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)
+		$(meson_use systemd)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.1.ebuild
index 2a765ffce9bf..2a765ffce9bf 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.0.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-40.1.ebuild