From 14c964b5a5e5f9ba6da85b7c05f97cf0c676af86 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Fri, 6 Dec 2019 11:54:54 +0100 Subject: community/gnome-session: remove stale patches --- community/gnome-session/fail-whale-dialog.patch | 35 ------------------------- community/gnome-session/no-rpmatch.patch | 15 ----------- 2 files changed, 50 deletions(-) delete mode 100644 community/gnome-session/fail-whale-dialog.patch delete mode 100644 community/gnome-session/no-rpmatch.patch diff --git a/community/gnome-session/fail-whale-dialog.patch b/community/gnome-session/fail-whale-dialog.patch deleted file mode 100644 index e7a54f57f0..0000000000 --- a/community/gnome-session/fail-whale-dialog.patch +++ /dev/null @@ -1,35 +0,0 @@ -$OpenBSD: patch-gnome-session_gsm-fail-whale-dialog_c,v 1.1 2017/05/30 18:14:03 ajacoutot Exp $ - -https://bugzilla.gnome.org/show_bug.cgi?id=775463 - -Index: gnome-session/gsm-fail-whale-dialog.c ---- a/gnome-session/gsm-fail-whale-dialog.c.orig -+++ b/gnome-session/gsm-fail-whale-dialog.c -@@ -371,13 +371,20 @@ int main (int argc, char *argv[]) - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - -- gtk_init_with_args (&argc, &argv, " - fail whale", -- entries, GETTEXT_PACKAGE, -- &error); -- if (error != NULL) { -- g_warning ("%s", error->message); -- exit (1); -- } -+ if (!gtk_init_with_args (&argc, &argv, " - fail whale", -+ entries, GETTEXT_PACKAGE, -+ &error)) { -+ if (error != NULL) { -+ g_warning ("%s", error->message); -+ exit (1); -+ } -+ -+ /* display server probably went away. Could be for legitimate reasons, could be for -+ * unexpected reasons. If it went away unexpectantly, that's logged elsewhere, so -+ * let's not add noise by logging here. -+ */ -+ return 0; -+ } - - fail_dialog = g_object_new (GSM_TYPE_FAIL_WHALE_DIALOG, NULL); - fail_dialog->priv->debug_mode = debug_mode; diff --git a/community/gnome-session/no-rpmatch.patch b/community/gnome-session/no-rpmatch.patch deleted file mode 100644 index ea41bf46e5..0000000000 --- a/community/gnome-session/no-rpmatch.patch +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-gnome-session_main_c,v 1.19 2017/04/17 10:51:02 ajacoutot Exp $ - -XXX no rpmatch(3) on OpenBSD - ---- a/gnome-session/main.c.orig Wed Apr 12 16:35:48 2017 -+++ b/gnome-session/main.c Mon Apr 17 12:40:35 2017 -@@ -311,7 +311,7 @@ main (int argc, char **argv) - - debug_string = g_getenv ("GNOME_SESSION_DEBUG"); - if (debug_string != NULL) { -- debug = rpmatch (debug_string) == TRUE || atoi (debug_string) == 1; -+ debug = atoi (debug_string) == 1; - } - - error = NULL; -- cgit v1.2.3