rpms/gnome-screensaver/F-12 popsquares-error-handling.patch, NONE, 1.1 gnome-screensaver.spec, 1.234, 1.235
Matthias Clasen
mclasen at fedoraproject.org
Fri Dec 11 18:51:36 UTC 2009
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-screensaver/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31805
Modified Files:
gnome-screensaver.spec
Added Files:
popsquares-error-handling.patch
Log Message:
Fix cmdline parsing errors in popsquares
popsquares-error-handling.patch:
popsquares.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- NEW FILE popsquares-error-handling.patch ---
diff -up gnome-screensaver-2.28.0/savers/popsquares.c.error-handling gnome-screensaver-2.28.0/savers/popsquares.c
--- gnome-screensaver-2.28.0/savers/popsquares.c.error-handling 2009-12-11 13:23:31.587245522 -0500
+++ gnome-screensaver-2.28.0/savers/popsquares.c 2009-12-11 13:33:07.221003198 -0500
@@ -45,7 +45,12 @@ main (int argc, char **argv)
error = NULL;
- gtk_init_with_args (&argc, &argv, NULL, NULL, NULL, &error);
+ if (!gtk_init_with_args (&argc, &argv, NULL, NULL, NULL, &error)) {
+ g_printerr (_("%s. See --help for usage information.\n"),
+ error->message);
+ g_error_free (error);
+ exit (1);
+ }
window = gs_theme_window_new ();
g_signal_connect (G_OBJECT (window), "delete-event",
Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/F-12/gnome-screensaver.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -p -r1.234 -r1.235
--- gnome-screensaver.spec 3 Dec 2009 14:27:56 -0000 1.234
+++ gnome-screensaver.spec 11 Dec 2009 18:51:36 -0000 1.235
@@ -14,7 +14,7 @@
Summary: GNOME Screensaver
Name: gnome-screensaver
Version: 2.28.0
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2+
Group: Amusements/Graphics
Source0: http://download.gnome.org/sources/gnome-screensaver/2.28/%{name}-%{version}.tar.bz2
@@ -30,6 +30,9 @@ Patch10: multihead-issues.patch
Patch11: ask-to-die.patch
Patch12: remove-session-inhibits.patch
+# fixed upstream
+Patch13: popsquares-error-handling.path
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://www.gnome.org
BuildRequires: gtk2-devel => %{gtk2_version}
@@ -84,6 +87,7 @@ simple, sane, secure defaults and be wel
%patch10 -p1 -b .multihead-issues
%patch11 -p1 -b .ask-to-die
%patch12 -p1 -b .remove-session-inhibits
+%patch13 -p1 -b .error-handling
libtoolize --force --copy
@@ -158,6 +162,9 @@ fi
%doc %{_mandir}/man1/*.1.gz
%changelog
+* Fri Dec 11 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-8
+- Properly handle cmdline parsing errors in popsquares (#546656)
+
* Thu Dec 3 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-7
- Drop an unwanted dependency
More information about the fedora-extras-commits
mailing list