packages: feh/feh.spec, feh/feh-git_ed5f55e967152ff6c730.patch (NEW), feh/f...

[blues]

Author: blues                        Date: Thu Sep  1 10:31:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel.3: official git_ed5f55e967152ff6c730 patch added.

---- Files affected:
packages/feh:
   feh.spec (1.65 -> 1.66) , feh-git_ed5f55e967152ff6c730.patch (NONE -> 1.1)  (NEW), feh-fix.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/feh/feh.spec
diff -u packages/feh/feh.spec:1.65 packages/feh/feh.spec:1.66
--- packages/feh/feh.spec:1.65	Thu Sep  1 11:35:03 2011
+++ packages/feh/feh.spec	Thu Sep  1 12:31:48 2011
@@ -4,14 +4,14 @@
 Summary(pl.UTF-8):	Szybki program do przeglądania/indeksowania/montowania obrazów
 Name:		feh
 Version:	1.15.1
-Release:	2.1
+Release:	3
 License:	BSD
 Group:		X11/Applications/Graphics
 Source0:	https://derf.homelinux.org/~derf/projects/feh/%{name}-%{version}.tar.bz2
 # Source0-md5:	0684ff2dad34ee328ab2b6b717281787
 URL:		http://feh.finalrewind.org/
 Patch0:		%{name}-install.patch
-Patch1:		%{name}-fix.patch
+Patch1:		%{name}-git_ed5f55e967152ff6c730.patch
 Source1:	%{name}-bash-completion
 BuildRequires:	giblib-devel >= 1.2.4
 BuildRequires:	imlib2-devel >= 1.0.0
@@ -67,7 +67,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%patch1 -p1 -R
 %{__sed} -i "s,CFLAGS ?=.*,CFLAGS = %{rpmcflags}," config.mk
 
 %build
@@ -107,6 +107,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66  2011/09/01 10:31:48  blues
+- rel.3: official git_ed5f55e967152ff6c730 patch added.
+
 Revision 1.65  2011/09/01 09:35:03  blues
 - official patch replaced with non-official and not perfect but working
   better (don't exit on reloading broken image while "reload" option set)

================================================================
Index: packages/feh/feh-git_ed5f55e967152ff6c730.patch
diff -u /dev/null packages/feh/feh-git_ed5f55e967152ff6c730.patch:1.1
--- /dev/null	Thu Sep  1 12:31:53 2011
+++ packages/feh/feh-git_ed5f55e967152ff6c730.patch	Thu Sep  1 12:31:48 2011
@@ -0,0 +1,42 @@
+--- ./src/slideshow.c.1	2011-09-01 12:18:59.303918828 +0200
++++ ./src/slideshow.c	2011-08-16 22:53:06.000000000 +0200
+@@ -149,7 +149,6 @@ void feh_reload_image(winwidget w, int r
+ 
+ 	if (!w->file) {
+ 		im_weprintf(w, "couldn't reload, this image has no file associated with it.");
+-		winwidget_render_image(w, 0, 0);
+ 		return;
+ 	}
+ 
+@@ -167,17 +166,20 @@ void feh_reload_image(winwidget w, int r
+ 	old_w = gib_imlib_image_get_width(w->im);
+ 	old_h = gib_imlib_image_get_height(w->im);
+ 
++	/* force imlib2 not to cache */
++	winwidget_free_image(w);
++
+ 	/* if the image has changed in dimensions - we gotta resize */
+ 	if ((feh_load_image(&tmp, FEH_FILE(w->file->data))) == 0) {
+ 		if (force_new) {
+ 			eprintf("failed to reload image\n");
+ 		} else {
+ 			im_weprintf(w, "Couldn't reload image. Is it still there?");
+-			winwidget_render_image(w, 0, 0);
+ 		}
+ 		winwidget_rename(w, title);
+ 		free(title);
+ 		free(new_title);
++		filelist = feh_file_remove_from_list(filelist, w->file);
+ 		return;
+ 	}
+ 
+@@ -185,9 +187,6 @@ void feh_reload_image(winwidget w, int r
+ 			(old_h != gib_imlib_image_get_height(tmp))))
+ 		resize = 1;
+ 
+-	/* force imlib2 not to cache */
+-	winwidget_free_image(w);
+-
+ 	w->im = tmp;
+ 	winwidget_reset_image(w);
+ 
================================================================

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