Author: blues Date: Fri Sep 2 11:18:18 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel.4: git_fixes added in place of git_ed5f55e967152ff6c730. Additionally fix memleak on image reload from http.
---- Files affected: packages/feh: feh.spec (1.66 -> 1.67) , feh-git_fixes.patch (1.2 -> 1.3) , feh-git_ed5f55e967152ff6c730.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/feh/feh.spec diff -u packages/feh/feh.spec:1.66 packages/feh/feh.spec:1.67 --- packages/feh/feh.spec:1.66 Thu Sep 1 12:31:48 2011 +++ packages/feh/feh.spec Fri Sep 2 13:18:13 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: 3 +Release: 4 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_ed5f55e967152ff6c730.patch +Patch1: %{name}-git_fixes.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 -R +%patch1 -p1 %{__sed} -i "s,CFLAGS ?=.*,CFLAGS = %{rpmcflags}," config.mk %build @@ -107,6 +107,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.67 2011/09/02 11:18:13 blues +- rel.4: git_fixes added in place of git_ed5f55e967152ff6c730. Additionally + fix memleak on image reload from http. + Revision 1.66 2011/09/01 10:31:48 blues - rel.3: official git_ed5f55e967152ff6c730 patch added. ================================================================ Index: packages/feh/feh-git_fixes.patch diff -u /dev/null packages/feh/feh-git_fixes.patch:1.3 --- /dev/null Fri Sep 2 13:18:18 2011 +++ packages/feh/feh-git_fixes.patch Fri Sep 2 13:18:13 2011 @@ -0,0 +1,64 @@ +--- ./src/slideshow.c.org 2011-09-02 12:55:22.245365638 +0200 ++++ ./src/slideshow.c 2011-09-02 12:55:29.089016324 +0200 +@@ -96,6 +96,11 @@ void cb_reload_timer(void *data) + + /* save the current filename for refinding it in new list */ + current_filename = estrdup(FEH_FILE(current_file->data)->filename); ++ ++ for (l = filelist; l; l = l->next) { ++ feh_file_free(l->data); ++ l->data = NULL; ++ } + gib_list_free_and_data(filelist); + filelist = NULL; + filelist_len = 0; +@@ -109,8 +114,7 @@ void cb_reload_timer(void *data) + add_file_to_filelist_recursively(".", FILELIST_FIRST); + + if (!(filelist_len = gib_list_length(filelist))) { +- fprintf(stderr, "No files found to reload.\n"); +- exit(1); ++ eprintf("No files found to reload."); + } + + /* find the previously current file */ +@@ -149,6 +153,7 @@ 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; + } + +@@ -166,20 +171,17 @@ 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; + } + +@@ -187,6 +189,9 @@ 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.66&r2=1.67&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/feh/feh-git_fixes.patch?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
