rpm/mate-utils
SHA256
1
0
Fork 0
forked from pool/mate-utils
Code Pull Requests Activity

Compare commits

merge into: rpm:factory
Branches Tags
rpm:factory pool:factory pool:leap-16.0 pool:leap-16.1
...
pull from: pool:factory
Branches Tags
pool:factory pool:leap-16.0 pool:leap-16.1 rpm:factory

2 Commits
factory ... factory

Author SHA256 Message Date
Dominique Leuenberger
141a5c2ad6 Accepting request 1317150 from X11:MATE:Factory 
- Add fix-save-issue.patch, fix cannot save the screenshot(boo#1253170) (forwarded request 1317149 from hillwood)

OBS-URL: https://build.opensuse.org/request/show/1317150
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mate-utils?expand=0&rev=32
 2025-11-11 18:22:35 +00:00
Hillwood Yang
7ea2ebdfad - Add fix-save-issue.patch, fix cannot save the screenshot(boo#1253170) 
OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/mate-utils?expand=0&rev=73
 2025-11-11 15:55:23 +00:00
3 changed files with 315 additions and 2 deletions
Expand all files Collapse all files

307
fix-save-issue.patch Normal file
View File

@@ -0,0 +1,307 @@
From 4aeaa30cfbcb6f9b3bf494165bb33239edbb9851 Mon Sep 17 00:00:00 2001
From: Victor Kareh <vkareh@redhat.com>
Date: Mon, 25 Aug 2025 15:14:46 -0400
Subject: [PATCH] mate-screenshot: Replace fork save with sync save
Newer versions of gdk-pixbuf use libglycin's asynchronous image save
mechanism. This makes the fork-save redundant and has a potential of
hanging when saving a screenshot.
---
mate-screenshot/src/screenshot-save.c | 227 +++++---------------------
1 file changed, 44 insertions(+), 183 deletions(-)
diff --git a/mate-screenshot/src/screenshot-save.c b/mate-screenshot/src/screenshot-save.c
index 1acf898f5..dd9c032ca 100644
--- a/mate-screenshot/src/screenshot-save.c
+++ b/mate-screenshot/src/screenshot-save.c
@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
-#include <signal.h>
#include <string.h>
#include <glib/gi18n.h>
@@ -33,150 +32,53 @@
static char *parent_dir = NULL;
static char *tmp_filename = NULL;
-static SaveFunction save_callback = NULL;
-static gpointer save_user_data = NULL;
-
-/* Strategy for saving:
- *
- * We keep another process around to handle saving the image. This is
- * done for two reasons. One, the saving takes a non-zero amount of
- * time (about a quarter of a second on my box.) This will make it
- * more interactive. The second reason is to make the child
- * responsible for cleaning up the temp dir. If the parent process is
- * killed or segfaults, the child process can clean up the temp dir.
- */
static void
-clean_up_temporary_dir (gboolean gui_on_error)
+clean_up_temporary_dir (void)
{
char *message;
gboolean error_occurred = FALSE;
- if (g_file_test (tmp_filename, G_FILE_TEST_EXISTS))
+ if (tmp_filename && g_file_test (tmp_filename, G_FILE_TEST_EXISTS))
error_occurred = unlink (tmp_filename);
- if (g_file_test (parent_dir, G_FILE_TEST_EXISTS))
+ if (parent_dir && g_file_test (parent_dir, G_FILE_TEST_EXISTS))
error_occurred = rmdir (parent_dir) || error_occurred;
if (error_occurred)
{
message = g_strdup_printf (_("Unable to clear the temporary folder:\n%s"),
tmp_filename);
- if (gui_on_error)
- {
- GtkWidget *dialog;
-
- dialog = gtk_message_dialog_new (NULL, 0,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- "%s", message);
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- }
- else
- {
- g_warning ("%s", message);
- }
+ g_warning ("%s", message);
g_free (message);
}
g_free (tmp_filename);
g_free (parent_dir);
-}
-
-static void
-child_done_notification (GPid pid,
- gint status,
- gpointer data)
-{
- /* This should never be called. */
-
- /* We expect the child to die after the parent. If the child dies
- * than it either segfaulted, or was randomly killed. In either
- * case, we can't reasonably continue. */
- GtkWidget *dialog;
-
- dialog = gtk_message_dialog_new (NULL, 0,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- _("The child save process unexpectedly exited. We are unable to write the screenshot to disk."));
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-
- clean_up_temporary_dir (TRUE);
-
- exit (1);
-}
-
-static gboolean
-read_pipe_from_child (GIOChannel *source,
- GIOCondition condition,
- gpointer data)
-{
- if (condition & G_IO_IN)
- {
- gchar *message = NULL;
- gchar *error_message = NULL;
- GtkWidget *dialog;
- GIOStatus status;
-
- status = g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
-
- if (status == G_IO_STATUS_NORMAL)
- {
- message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
- dialog = gtk_message_dialog_new (NULL, 0,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- "%s", message);
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- exit (1);
- }
- }
-
- (*save_callback) (save_user_data);
-
- return FALSE;
+ tmp_filename = NULL;
+ parent_dir = NULL;
}
static char *
make_temp_directory (void)
{
- gint result, i;
gchar *dir_name;
- i = 0;
- do
- {
- gchar *tmp_dir = g_strdup_printf ("mate-screenshot.%u.%d",
- (unsigned int) getpid (),
- i++);
-
- dir_name = g_build_filename (g_get_tmp_dir (),
- tmp_dir,
- NULL);
- g_free (tmp_dir);
-
- result = g_mkdir_with_parents (dir_name, 0777);
- if (result < 0)
- {
- g_free (dir_name);
+ // mkdtemp uses XXXXXX as a template to create a unique name for the temp dir
+ dir_name = g_build_filename (g_get_tmp_dir (),
+ "mate-screenshot.XXXXXX",
+ NULL);
- if (errno != EEXIST)
- return NULL;
- else
- continue;
- }
- else
- return dir_name;
+ if (mkdtemp (dir_name) == NULL)
+ {
+ g_warning ("Failed to create temporary directory: %s", g_strerror (errno));
+ g_free (dir_name);
+ return NULL;
}
- while (TRUE);
+
+ return dir_name;
}
static void
-signal_handler (int sig)
+cleanup_handler (void)
{
- clean_up_temporary_dir (FALSE);
-
- signal (sig, SIG_DFL);
- kill (getpid (), sig);
+ clean_up_temporary_dir ();
}
void
@@ -184,87 +86,46 @@ screenshot_save_start (GdkPixbuf *pixbuf,
SaveFunction callback,
gpointer user_data)
{
- GPid pid;
- int parent_exit_notification[2];
- int pipe_from_child[2];
+ GError *error = NULL;
- if (pipe (parent_exit_notification) == -1)
- perror("pipe error");
+ static gboolean cleanup_registered = FALSE;
+ if (!cleanup_registered)
+ {
+ atexit (cleanup_handler);
+ cleanup_registered = TRUE;
+ }
- if (pipe (pipe_from_child) == -1)
- perror("pipe error");
+ clean_up_temporary_dir ();
parent_dir = make_temp_directory ();
if (parent_dir == NULL)
- return;
+ {
+ if (callback)
+ callback (user_data);
+ return;
+ }
tmp_filename = g_build_filename (parent_dir,
_("Screenshot.png"),
NULL);
- save_callback = callback;
- save_user_data = user_data;
- pid = fork ();
- if (pid == 0)
+ if (! gdk_pixbuf_save (pixbuf, tmp_filename,
+ "png", &error,
+ "tEXt::Software", "mate-screenshot",
+ NULL))
{
- GError *error = NULL;
- char c;
-
- signal (SIGINT, signal_handler);
- signal (SIGTERM, signal_handler);
-
- close (parent_exit_notification [1]);
- close (pipe_from_child [0]);
-
- if (! gdk_pixbuf_save (pixbuf, tmp_filename,
- "png", &error,
- "tEXt::Software", "mate-screenshot",
- NULL))
- {
- if (error && error->message)
- {
- if (write (pipe_from_child[1], error->message, strlen (error->message)) == -1)
- perror("write error");
- }
- else
- {
-#define ERROR_MESSAGE _("Unknown error saving screenshot to disk")
- if (write (pipe_from_child[1], ERROR_MESSAGE, strlen (ERROR_MESSAGE)) == -1)
- perror("write error");
- }
- }
- /* By closing the pipe, we let the main process know that we're
- * done saving it. */
- close (pipe_from_child[1]);
+ if (error && error->message)
+ g_warning ("Failed to save screenshot: %s", error->message);
+ else
+ g_warning ("Failed to save screenshot: Unknown error");
- if (read (parent_exit_notification[0], &c, 1) == -1)
- perror("read error");
+ g_error_free (error);
- clean_up_temporary_dir (FALSE);
- _exit (0);
+ clean_up_temporary_dir ();
}
- else if (pid > 0)
- {
- GIOChannel *channel;
- close (parent_exit_notification[0]);
- close (pipe_from_child[1]);
-
- channel = g_io_channel_unix_new (pipe_from_child[0]);
- g_io_add_watch (channel,
- G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
- read_pipe_from_child,
- NULL);
- g_io_channel_unref (channel);
- g_child_watch_add (pid, child_done_notification, NULL);
- }
- else
- /* George awesomely wrote code originally to handle the
- * could-not-fork case synchronously. I'm not copying it, as I'm
- * guessing that the system is pretty hosed if that's the case.
- * However, he gets major kudos for trying. (-:
- */
- g_assert_not_reached ();
+ if (callback)
+ callback (user_data);
}
const char *

5
mate-utils.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 10 15:12:33 UTC 2025 - Hillwood Yang <hillwood@opensuse.org>
- Add fix-save-issue.patch, fix cannot save the screenshot(boo#1253170)
-------------------------------------------------------------------
Mon Mar 25 07:40:17 UTC 2024 - Hillwood Yang <hillwood@opensuse.org>

5
mate-utils.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package mate-utils
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,6 +29,7 @@ License: GFDL-1.1-only AND GPL-2.0-or-later AND LGPL-2.0-or-later
Group: System/X11/Utilities
URL: https://mate-desktop.org/
Source: https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz
Patch0: fix-save-issue.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: inkscape
@@ -194,7 +195,7 @@ BuildArch: noarch
This package contains the documentation for mate-utils
%prep
%autosetup
%autosetup -p1
# Do not build the pt lingua for the search tool help to solve build issues.
sed -i 's/^\(IGNORE_HELP_LINGUAS =\)/\1 pt/' gsearchtool/help/Makefile.am