From 6f517514304f6ac2771c3439ee86105ea656f337 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Go=C5=82aszewski?= Date: Wed, 31 Aug 2011 15:44:27 +0000 Subject: [PATCH] - release 2 - add git_fixes patch that fixes sig11 on empty image while reloading Changed files: feh-git_fixes.patch -> 1.1 feh.spec -> 1.64 --- feh-git_fixes.patch | 25 +++++++++++++++++++++++++ feh.spec | 4 +++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 feh-git_fixes.patch diff --git a/feh-git_fixes.patch b/feh-git_fixes.patch new file mode 100644 index 0000000..01a49c2 --- /dev/null +++ b/feh-git_fixes.patch @@ -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)))) diff --git a/feh.spec b/feh.spec index bd7f7cf..4962b2e 100644 --- a/feh.spec +++ b/feh.spec @@ -3,13 +3,14 @@ Summary(hu.UTF-8): Gyors képnézegető/indexelő/montázsoló 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 @@ -65,6 +66,7 @@ bashowe dopełnianie linii poleceń programu feh. %prep %setup -q %patch0 -p1 +%patch1 -p1 %{__sed} -i "s,CFLAGS ?=.*,CFLAGS = %{rpmcflags}," config.mk %build -- 2.43.0