cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to feh-2.6.1

Browse Source
This commit is contained in:
dcoppa 2012-09-18 12:51:17 +00:00
parent 35f8ebd598
commit 7cc9b10711
6 changed files with 15 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/feh/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.42 2012/07/17 11:23:17 dcoppa Exp $
# $OpenBSD: Makefile,v 1.43 2012/09/18 12:51:17 dcoppa Exp $
COMMENT= lightweight image viewer
DISTNAME= feh-2.5
REVISION= 2
DISTNAME= feh-2.6.1
EXTRACT_SUFX= .tar.bz2
CATEGORIES= graphics

7
graphics/feh/distinfo
View File

@ -1,5 +1,2 @@
MD5 (feh-2.5.tar.bz2) = 1fYEj3kAXAW1EGC+r9HwjQ==
RMD160 (feh-2.5.tar.bz2) = GMZD+6RuWF1QDUEzufIOQDyHmCs=
SHA1 (feh-2.5.tar.bz2) = 0b9/qOxrXRzhbCke3zjUXeAfJS0=
SHA256 (feh-2.5.tar.bz2) = UppqNJv+yHqKB7F3UmhhSbcCzyRorFbXMGsvBADwd6o=
SIZE (feh-2.5.tar.bz2) = 2227722
SHA256 (feh-2.6.1.tar.bz2) = Nu2s7C+NDRMDUgLmjwnM9dLuXcHZUVfo7mvN6cClKDo=
SIZE (feh-2.6.1.tar.bz2) = 2238724

91
graphics/feh/patches/patch-man_feh_pre
View File

@ -1,16 +1,10 @@
$OpenBSD: patch-man_feh_pre,v 1.15 2012/07/17 11:23:18 dcoppa Exp $
$OpenBSD: patch-man_feh_pre,v 1.16 2012/09/18 12:51:17 dcoppa Exp $
fix typos
fix typo
document behaviour of duplicate key bindings
(upstream git commit 9ed58f2c8ca3dd2dc67808676ec437838c4207e6)
document reload_{plus,minus} time delta
(upstream git commit 655169fe6c2b93a58dca133d3144ca674c4e157c)
--- man/feh.pre.orig Sun Mar 25 13:16:58 2012
+++ man/feh.pre Tue Jul 17 13:20:45 2012
@@ -198,7 +198,7 @@ the caption will be looked for in
--- man/feh.pre.orig Thu Sep 13 12:12:44 2012
+++ man/feh.pre Tue Sep 18 14:44:26 2012
@@ -192,7 +192,7 @@ the caption will be looked for in
Don't display images, print image info according to
.Ar format
instead. See
@ -19,7 +13,7 @@ document reload_{plus,minus} time delta
.
.It Cm --cycle-once
.
@@ -872,7 +872,7 @@ which
@@ -878,7 +878,7 @@ which
defaults to
.Pa ~/.config/feh/ .
If the files are not found in that directory, it will also try
@ -28,78 +22,7 @@ document reload_{plus,minus} time delta
.Pp
All config files treat lines starting with a
.Qq #
@@ -902,7 +902,7 @@ An example entry would be
.
.Pp
.
-You cane use this theme in two ways. Either call
+You can use this theme in two ways. Either call
.Qo
.Nm
-Timagemap *.jpg
@@ -962,6 +962,11 @@ Available modifiers are
.Ar C No for Control ,
.Ar S No for Shift and
.Ar 1 , 4 No for Mod1 and Mod4 .
+To match an uppercase letter like
+.Qq S
+instead of
+.Qq s ,
+the Shift modifier is not required.
.
.Pp
.
@@ -971,6 +976,17 @@ without any keys unbinds it (i.e. the default bindings
.
.Pp
.
+.Em Note :
+Do not use the same keybinding for multiple actions.
+.Nm
+does not check for conflicting bindings, so their behaviour is undefined.
+.
+Either unbind the unwanted action, or bind it to another unused key.
+.
+The order in which you bind / unbind does not matter, though.
+.
+.Pp
+.
For a list of the
.Ar action
names, see
@@ -1123,11 +1139,11 @@ Go backward ~5% of the filelist
.
.It + Bq reload_plus
.
-Increase reload delay
+Increase reload delay by 1 second
.
.It - Bq reload_minus
.
-Decrease reload delay
+Decrease reload delay by 1 second
.
.It Ao delete Ac Bq remove
.
@@ -1247,6 +1263,17 @@ looks like
.
.Pp
.
+.Em Note :
+Do not use the same button for multiple actions.
+.Nm
+does not check for conflicting bindings, so their behaviour is undefined.
+.
+Either unbind the unwanted action, or bind it to another unused button.
+.
+The order in which you bind / unbind does not matter, though.
+.
+.Pp
+.
For the available modifiers, see
.Sx KEYS CONFIGURATION SYNTAX .
.
@@ -1372,7 +1399,7 @@ order it finds them on the hard disk, which is usually
@@ -1405,7 +1405,7 @@ order it finds them on the hard disk, which is usually
.
Show 128x128 pixel thumbnails, limit window width to 1024 pixels.
.

15
graphics/feh/patches/patch-src_imlib_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_imlib_c,v 1.13 2012/03/29 12:29:10 dcoppa Exp $
fix memory leak when encountering unloadable file
(upstream git commit 8c8c1d5d52096a24e751f07d94972253a0e5054c)
--- src/imlib.c.orig Thu Mar 29 14:19:43 2012
+++ src/imlib.c Thu Mar 29 14:20:19 2012
@@ -305,6 +305,7 @@ static char *feh_magick_load_image(char *filename)
if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
close(fd);
unlink(sfn);
+ free(sfn);
sfn = NULL;
if (!opt.quiet) {

8
graphics/feh/patches/patch-src_options_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_options_c,v 1.6 2012/03/26 12:53:24 dcoppa Exp $
--- src/options.c.orig Sun Mar 25 13:16:59 2012
+++ src/options.c Mon Mar 26 14:42:08 2012
@@ -153,7 +153,7 @@ static void feh_load_options_for_theme(char *theme)
$OpenBSD: patch-src_options_c,v 1.7 2012/09/18 12:51:17 dcoppa Exp $
--- src/options.c.orig Thu Sep 13 12:12:44 2012
+++ src/options.c Tue Sep 18 14:44:26 2012
@@ -152,7 +152,7 @@ static void feh_load_options_for_theme(char *theme)
free(oldrcpath);

15
graphics/feh/patches/patch-src_winwidget_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_winwidget_c,v 1.9 2012/03/29 12:29:10 dcoppa Exp $
winwidget_allocate: memset winwid to zero
(upstream git commit 82a976e0909e02ba8c25e4fd10d0e56a3e5c13ca)
--- src/winwidget.c.orig Thu Mar 29 14:20:29 2012
+++ src/winwidget.c Thu Mar 29 14:21:00 2012
@@ -42,6 +42,7 @@ static winwidget winwidget_allocate(void)
winwidget ret = NULL;
ret = emalloc(sizeof(_winwidget));
+ memset(ret, 0, sizeof(_winwidget));
ret->win = 0;
ret->w = 0;