Author: blues Date: Wed Aug 31 15:44:32 2011 GMT Module: packages Tag: HEAD ---- Log message: - release 2 - add git_fixes patch that fixes sig11 on empty image while reloading
---- Files affected: packages/feh: feh.spec (1.63 -> 1.64) , feh-git_fixes.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/feh/feh.spec diff -u packages/feh/feh.spec:1.63 packages/feh/feh.spec:1.64 --- packages/feh/feh.spec:1.63 Wed Aug 31 16:40:34 2011 +++ packages/feh/feh.spec Wed Aug 31 17:44:27 2011 @@ -4,13 +4,14 @@ Summary(pl.UTF-8): Szybki program do przeglądania/indeksowania/montowania obrazów Name: feh Version: 1.15.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: 0684ff2dad34ee328ab2b6b717281787 URL: http://feh.finalrewind.org/ Patch0: %{name}-install.patch +Patch1: %{name}-git_fixes.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.64 2011/08/31 15:44:27 blues +- release 2 - add git_fixes patch that fixes sig11 on empty image while + reloading + Revision 1.63 2011/08/31 14:40:34 blues - fix homepage ================================================================ Index: packages/feh/feh-git_fixes.patch diff -u /dev/null packages/feh/feh-git_fixes.patch:1.1 --- /dev/null Wed Aug 31 17:44:32 2011 +++ packages/feh/feh-git_fixes.patch Wed Aug 31 17:44:27 2011 @@ -0,0 +1,25 @@ +diff --git a/src/slideshow.c b/src/slideshow.c +index ba9e028..58992c3 100644 +--- a/src/slideshow.c ++++ b/src/slideshow.c +@@ -170,18 +170,8 @@ void feh_reload_image(winwidget w, int resize, int force_new) + 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_rename(w, title); +- free(title); +- free(new_title); +- filelist = feh_file_remove_from_list(filelist, w->file); +- return; +- } ++ if ((feh_load_image(&tmp, FEH_FILE(w->file->data))) == 0) ++ eprintf("failed to reload image\n"); + + if (!resize && ((old_w != gib_imlib_image_get_width(tmp)) || + (old_h != gib_imlib_image_get_height(tmp)))) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/feh/feh.spec?r1=1.63&r2=1.64&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
