Accepting request 184178 from home:WernerFink:branches:X11:windowmanagers

- Add patch fvwm-2.6.5-eventcrash.patch which should avoid that not
  set icon names will be freed  (bnc#778347)

OBS-URL: https://build.opensuse.org/request/show/184178
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/fvwm2?expand=0&rev=27
This commit is contained in:
Togan Muftuoglu 2013-07-24 15:31:43 +00:00 committed by Git OBS Bridge
parent be7e7f0893
commit b7e0105b67
3 changed files with 23 additions and 0 deletions

View File

@ -0,0 +1,12 @@
--- fvwm/events.c
+++ fvwm/events.c 2013-07-24 10:29:01.563288010 +0000
@@ -3383,8 +3383,7 @@ void HandlePropertyNotify(const evh_args
* if the icon name is NoName, set the name of the icon to be
* the same as the window
*/
- if (!WAS_ICON_NAME_PROVIDED(fw) || (fw->icon_name.name &&
- (fw->icon_name.name != fw->name.name)))
+ if (!WAS_ICON_NAME_PROVIDED(fw))
{
fw->icon_name = fw->name;
setup_visible_name(fw, True);

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jul 24 10:33:41 UTC 2013 - werner@suse.de
- Add patch fvwm-2.6.5-eventcrash.patch which should avoid that not
set icon names will be freed (bnc#778347)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 18 11:58:36 UTC 2013 - werner@suse.de Thu Jul 18 11:58:36 UTC 2013 - werner@suse.de

View File

@ -62,6 +62,8 @@ Patch5: fvwm-2.5.26-charset_in_title.patch
Patch7: fvwm-2.5.26-no-copy-dt-needed-entries.patch Patch7: fvwm-2.5.26-no-copy-dt-needed-entries.patch
#PATCH-FIX-OPENSUSE Avoid including internal rsvg-cairo.h #PATCH-FIX-OPENSUSE Avoid including internal rsvg-cairo.h
Patch8: fvwm-rsvg.patch Patch8: fvwm-rsvg.patch
#PATCH-FIX-UPSTREAM Avoid crash due freeing inot set icon names
Patch9: fvwm-2.6.5-eventcrash.patch
#PATCH-FIX-OPENSUSE Update to snapshot 2012/10/11 #PATCH-FIX-OPENSUSE Update to snapshot 2012/10/11
Patch42: fvwm-snapshot.patch Patch42: fvwm-snapshot.patch
@ -88,7 +90,10 @@ compatible with the Motif MWM.
%patch3 %patch3
%patch5 %patch5
%patch7 -p1 %patch7 -p1
%if 0%{suse_version} > 1220
%patch8 %patch8
%endif
%patch9
find . -name *sv_SE* |xargs rename sv_SE sv find . -name *sv_SE* |xargs rename sv_SE sv
mkdir icons mkdir icons
tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2 tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2