packages: feh/feh.spec, feh/feh-non_memleak.patch (NEW) - rel.2 - non_memle...

[blues]

Author: blues                        Date: Tue Sep 13 08:13:31 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel.2 - non_memleak patch added. Fixes memory leak caused by
  not-a-real-memleak.

---- Files affected:
packages/feh:
   feh.spec (1.69 -> 1.70) , feh-non_memleak.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/feh/feh.spec
diff -u packages/feh/feh.spec:1.69 packages/feh/feh.spec:1.70
--- packages/feh/feh.spec:1.69	Mon Sep 12 09:57:20 2011
+++ packages/feh/feh.spec	Tue Sep 13 10:13:26 2011
@@ -4,13 +4,14 @@
 Summary(pl.UTF-8):	Szybki program do przeglądania/indeksowania/montowania obrazów
 Name:		feh
 Version:	1.16.1
-Release:	1
+Release:	2
 License:	BSD
 Group:		X11/Applications/Graphics
 Source0:	https://derf.homelinux.org/~derf/projects/feh/%{name}-%{version}.tar.bz2
 # Source0-md5:	1bb080c7b0021db50884a52161251990
 URL:		http://feh.finalrewind.org/
 Patch0:		%{name}-install.patch
+Patch1:		%{name}-non_memleak.patch
 Source1:	%{name}-bash-completion
 BuildRequires:	giblib-devel >= 1.2.4
 BuildRequires:	imlib2-devel >= 1.0.0
@@ -66,6 +67,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %{__sed} -i "s,CFLAGS ?=.*,CFLAGS = %{rpmcflags}," config.mk
 
 %build
@@ -105,6 +107,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.70  2011/09/13 08:13:26  blues
+- rel.2 - non_memleak patch added. Fixes memory leak caused by
+  not-a-real-memleak.
+
 Revision 1.69  2011/09/12 07:57:20  uzsolt
 - 1.16.1
 

================================================================
Index: packages/feh/feh-non_memleak.patch
diff -u /dev/null packages/feh/feh-non_memleak.patch:1.1
--- /dev/null	Tue Sep 13 10:13:31 2011
+++ packages/feh/feh-non_memleak.patch	Tue Sep 13 10:13:26 2011
@@ -0,0 +1,19 @@
+--- ./src/imlib.c.org	2011-09-13 10:09:21.351470521 +0200
++++ ./src/imlib.c	2011-09-13 10:09:38.442241678 +0200
+@@ -151,13 +151,14 @@ int feh_load_image(Imlib_Image * im, feh
+ 			/* Http, no reload, slideshow. Let's keep this image on hand... */
+ 			free(file->filename);
+ 			file->filename = estrdup(tmpname);
++
++			if (!opt.keep_http)
++				add_file_to_rm_filelist(tmpname);
+ 		} else {
+ 			/* Don't cache the image if we're doing reload + http (webcams etc) */
+ 			if (!opt.keep_http)
+ 				unlink(tmpname);
+ 		}
+-		if (!opt.keep_http)
+-			add_file_to_rm_filelist(tmpname);
+ 		free(tmpname);
+ 	} else {
+ 		*im = imlib_load_image_with_error_return(file->filename, &err);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/feh/feh.spec?r1=1.69&r2=1.70&f=u