packages: feh/feh.spec, feh/feh-fix.patch (NEW), feh/feh-git_fixes.patch (R...

[blues]

Author: blues                        Date: Thu Sep  1 09:35:09 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- official patch replaced with non-official and not perfect but working
  better (don't exit on reloading broken image while "reload" option set)

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

---- Diffs:

================================================================
Index: packages/feh/feh.spec
diff -u packages/feh/feh.spec:1.64 packages/feh/feh.spec:1.65
--- packages/feh/feh.spec:1.64	Wed Aug 31 17:44:27 2011
+++ packages/feh/feh.spec	Thu Sep  1 11:35:03 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
+Release:	2.1
 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}-git_fixes.patch
+Patch1:		%{name}-fix.patch
 Source1:	%{name}-bash-completion
 BuildRequires:	giblib-devel >= 1.2.4
 BuildRequires:	imlib2-devel >= 1.0.0
@@ -107,6 +107,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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)
+
 Revision 1.64  2011/08/31 15:44:27  blues
 - release 2 - add git_fixes patch that fixes sig11 on empty image while
   reloading

================================================================
Index: packages/feh/feh-fix.patch
diff -u /dev/null packages/feh/feh-fix.patch:1.1
--- /dev/null	Thu Sep  1 11:35:09 2011
+++ packages/feh/feh-fix.patch	Thu Sep  1 11:35:03 2011
@@ -0,0 +1,19 @@
+--- ./src/slideshow.c.org	2011-09-01 11:24:04.424019451 +0200
++++ ./src/slideshow.c	2011-09-01 11:23:57.240352664 +0200
+@@ -171,15 +171,7 @@ void feh_reload_image(winwidget w, int r
+ 
+ 	/* 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_rename(w, title);
+-		free(title);
+-		free(new_title);
+-		filelist = feh_file_remove_from_list(filelist, w->file);
++		weprintf("failed to reload image\n");
+ 		return;
+ 	}
+ 
================================================================

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