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

Update to feh-2.8

Browse Source
This commit is contained in:
dcoppa 2012-12-31 12:03:09 +00:00
parent 55bffdb81b
commit a333032179
5 changed files with 13 additions and 52 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.46 2012/12/05 13:44:35 dcoppa Exp $
# $OpenBSD: Makefile,v 1.47 2012/12/31 12:03:09 dcoppa Exp $
COMMENT= lightweight image viewer
DISTNAME= feh-2.7
REVISION= 0
DISTNAME= feh-2.8
EXTRACT_SUFX= .tar.bz2
CATEGORIES= graphics

4
graphics/feh/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (feh-2.7.tar.bz2) = Ts7u0AeqiCVJSXCnBTVrkaimSKuPilhNAegChWRjPgE=
SIZE (feh-2.7.tar.bz2) = 2239395
SHA256 (feh-2.8.tar.bz2) = PVe8olR3rWiHt34eN12rZd+POonsVSF78ynubyGjun4=
SIZE (feh-2.8.tar.bz2) = 2079527

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

@ -1,20 +1,7 @@
$OpenBSD: patch-man_feh_pre,v 1.19 2012/12/05 13:44:35 dcoppa Exp $
--- man/feh.pre.orig Tue Oct 16 06:31:41 2012
+++ man/feh.pre Wed Dec 5 15:26:34 2012
@@ -558,8 +558,10 @@ theme.
Same as Index mode, but the thumbnails are clickable image launchers.
Note that
.Cm --fullscreen
-does not affect the thumbnail window. It does, however, work for the image
-windows launched from thumbnail mode.
+and
+.Cm --scale-down
+do not affect the thumbnail window. They do, however, work for image windows
+launched from thumbnail mode.
Also supports
.Sx MONTAGE MODE OPTIONS .
.
@@ -895,7 +897,7 @@ which
$OpenBSD: patch-man_feh_pre,v 1.20 2012/12/31 12:03:09 dcoppa Exp $
--- man/feh.pre.orig Mon Dec 24 15:47:25 2012
+++ man/feh.pre Mon Dec 31 12:57:08 2012
@@ -901,7 +901,7 @@ which
defaults to
.Pa ~/.config/feh/ .
If the files are not found in that directory, it will also try
@ -23,7 +10,7 @@ $OpenBSD: patch-man_feh_pre,v 1.19 2012/12/05 13:44:35 dcoppa Exp $
.Pp
All config files treat lines starting with a
.Qq #
@@ -1432,7 +1434,7 @@ order it finds them on the hard disk, which is usually
@@ -1444,7 +1444,7 @@ order it finds them on the hard disk, which is usually
.
Show 128x128 pixel thumbnails, limit window width to 1024 pixels.
.

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

@ -1,7 +1,7 @@
$OpenBSD: patch-src_events_c,v 1.3 2011/10/11 07:49:07 dcoppa Exp $
--- src/events.c.orig Tue Oct 11 09:21:18 2011
+++ src/events.c Tue Oct 11 09:23:17 2011
@@ -121,7 +121,7 @@ void init_buttonbindings(void)
$OpenBSD: patch-src_events_c,v 1.4 2012/12/31 12:03:09 dcoppa Exp $
--- src/events.c.orig Mon Dec 24 15:47:25 2012
+++ src/events.c Mon Dec 31 12:57:08 2012
@@ -124,7 +124,7 @@ void init_buttonbindings(void)
free(confpath);

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

@ -1,25 +0,0 @@
$OpenBSD: patch-src_winwidget_c,v 1.11 2012/12/05 13:44:35 dcoppa Exp $
Do not apply --scale-down to a thumbnail window
(upstream git commit 7c00adf853acc76520d43a12eb63ec151924d5ab)
--- src/winwidget.c.orig Tue Oct 16 06:31:41 2012
+++ src/winwidget.c Wed Dec 5 15:26:34 2012
@@ -402,6 +402,7 @@ void winwidget_render_image(winwidget winwid, int resi
if (!winwid->full_screen && opt.scale_down && ((winwid->w < winwid->im_w)
|| (winwid->h < winwid->im_h)) &&
+ (winwid->type != WIN_TYPE_THUMBNAIL) &&
(winwid->old_zoom == 1.0)) {
D(("scaling down image %dx%d\n", winwid->w, winwid->h));
@@ -512,7 +513,8 @@ void winwidget_render_image(winwidget winwid, int resi
winwid->im_y = (int) (max_h - (winwid->im_h * winwid->zoom)) >> 1;
}
}
- else if (need_center && !winwid->full_screen && opt.scale_down) {
+ else if (need_center && !winwid->full_screen && opt.scale_down
+ && (winwid->type != WIN_TYPE_THUMBNAIL)) {
winwid->im_x = (int) (winwid->w - (winwid->im_w * winwid->zoom)) >> 1;
winwid->im_y = (int) (winwid->h - (winwid->im_h * winwid->zoom)) >> 1;
}