diff --git a/xlockmore-nose_mode_crash.patch b/xlockmore-nose_mode_crash.patch new file mode 100644 index 0000000..f9360f6 --- /dev/null +++ b/xlockmore-nose_mode_crash.patch @@ -0,0 +1,16 @@ +Index: xlockmore-5.43/modes/nose.c +=================================================================== +--- xlockmore-5.43.orig/modes/nose.c 2013-02-18 15:53:14.000000000 +0100 ++++ xlockmore-5.43/modes/nose.c 2015-03-10 20:44:01.731745516 +0100 +@@ -584,6 +584,11 @@ talk(ModeInfo * mi, Bool force_erase) + register char *p, *p2; + char buf[BUFSIZ], args[MAXLINES][MAXWIDTH]; + ++ /* don't try to talk without a graphics context */ ++ if (!np->text_bg_gc) { ++ return; ++ } ++ + /* clear what we've written */ + if (np->talking || force_erase) { + if (!np->talking) diff --git a/xlockmore.changes b/xlockmore.changes index ec1ebab..23ada9e 100644 --- a/xlockmore.changes +++ b/xlockmore.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 10 17:12:23 UTC 2015 - vcizek@suse.com + +- fix a crash in nose mode (bnc#882747) + * added xlockmore-nose_mode_crash.patch + ------------------------------------------------------------------- Tue Mar 10 08:27:10 UTC 2015 - pgajdos@suse.com diff --git a/xlockmore.spec b/xlockmore.spec index 7ae5032..f236d29 100644 --- a/xlockmore.spec +++ b/xlockmore.spec @@ -40,6 +40,7 @@ Patch8: xlockmore-no-copy-dt-needed-entries.patch # PATCH-FIX-UPSTREAM xlockmore-extend-freetype-include-search.patch -- search only for freetype.h, not the half path. Also, # extended list of directories where could freetype be found Patch9: xlockmore-extend-freetype-include-search.patch +Patch10: xlockmore-nose_mode_crash.patch BuildRequires: ImageMagick-devel BuildRequires: automake BuildRequires: bc @@ -85,6 +86,7 @@ chmod -x README docs/Revisions %patch7 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build aclocal