Hello community, here is the log from the commit of package xkeycaps for openSUSE:Factory checked in at Sat Oct 3 03:47:37 CEST 2009. -------- --- xkeycaps/xkeycaps.changes 2007-10-04 21:57:10.000000000 +0200 +++ xkeycaps/xkeycaps.changes 2009-09-29 11:40:45.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 29 11:42:20 CEST 2009 - pgajdos@suse.cz + +- fixed [bnc#542499] -- xkeycaps-2.46-948.9: memory leak + * memory-leak.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xkeycaps-2.46-memory-leak.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeycaps.spec ++++++ --- /var/tmp/diff_new_pack.J5XBk0/_old 2009-10-03 03:46:58.000000000 +0200 +++ /var/tmp/diff_new_pack.J5XBk0/_new 2009-10-03 03:46:58.000000000 +0200 @@ -20,11 +20,11 @@ Name: xkeycaps BuildRequires: xorg-x11 xorg-x11-devel -License: BSD 3-Clause; X11/MIT +License: BSD 3-clause (or similar) ; MIT License (or similar) Group: System/X11/Utilities AutoReqProv: on Version: 2.46 -Release: 947 +Release: 948 Summary: A graphical frontend for "xmodmap" Url: http://www.jwz.org/xkeycaps/ Source: xkeycaps-%{version}.tar.bz2 @@ -32,6 +32,7 @@ Patch1: xkeycaps-%{version}-Xmodmap.patch Patch2: xkeycaps-%{version}-Imake.patch Patch3: %{name}-%{version}_context-menu.patch +Patch4: %{name}-%{version}-memory-leak.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%(xft-config --prefix)" == "/usr" %define _xorg7libs %_lib @@ -82,6 +83,7 @@ %patch1 %patch2 %patch3 +%patch4 %build xmkmf -a ++++++ xkeycaps-2.46-memory-leak.patch ++++++ --- guess.c +++ guess.c @@ -79,11 +79,12 @@ while (all_kbds [j].short_name) { const char *loser1 = 0, *loser2 = 0; + int freeloser2 = 0; make_long_kbd_name(all_kbds[j].vendor, all_kbds[j].kbd_style, that); if (!strcmp (all_kbds [i].short_name, all_kbds [j].short_name)) loser1 = "short names", loser2 = all_kbds [j].short_name; else if (!strcmp (this, that)) - loser1 = "long names", loser2 = strdup(that); + loser1 = "long names", (loser2 = strdup(that)) && (freeloser2 = 1); else if (all_kbds [i].server_id && all_kbds [j].server_id && !strcmp (all_kbds [i].server_id, all_kbds [j].server_id)) loser1 = "server ids", loser2 = all_kbds [j].server_id; @@ -93,6 +94,9 @@ fprintf (stderr, "%s: DATA ERROR: duplicate %s in all-kbds.h for \"%s\"\n", progname, loser1, loser2); + + if (freeloser2) + free(loser2); } i++; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org