From 7a0ff6c8bee46c89008859f22cb0bfcaec010b04 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Go=C5=82aszewski?= Date: Thu, 1 Sep 2011 09:35:03 +0000 Subject: [PATCH] - official patch replaced with non-official and not perfect but working better (don't exit on reloading broken image while "reload" option set) Changed files: feh-fix.patch -> 1.1 feh-git_fixes.patch -> 1.2 feh.spec -> 1.65 --- feh-fix.patch | 19 +++++++++++++++++++ feh-git_fixes.patch | 25 ------------------------- feh.spec | 4 ++-- 3 files changed, 21 insertions(+), 27 deletions(-) create mode 100644 feh-fix.patch delete mode 100644 feh-git_fixes.patch diff --git a/feh-fix.patch b/feh-fix.patch new file mode 100644 index 0000000..7c9223b --- /dev/null +++ b/feh-fix.patch @@ -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; + } + diff --git a/feh-git_fixes.patch b/feh-git_fixes.patch deleted file mode 100644 index 01a49c2..0000000 --- a/feh-git_fixes.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 4962b2e..9206b38 100644 --- a/feh.spec +++ b/feh.spec @@ -3,14 +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: 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 -- 2.43.0