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

Update to feh-2.13

Browse Source
This commit is contained in:
dcoppa 2015-05-18 08:12:20 +00:00
parent 1f5850fd2f
commit a871b870e2
4 changed files with 9 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/feh/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.63 2015/04/23 05:54:04 dcoppa Exp $
# $OpenBSD: Makefile,v 1.64 2015/05/18 08:12:20 dcoppa Exp $
COMMENT= lightweight image viewer
DISTNAME= feh-2.12.1
DISTNAME= feh-2.13
EXTRACT_SUFX= .tar.bz2
CATEGORIES= graphics

4
graphics/feh/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (feh-2.12.1.tar.bz2) = kCbs4B15Vg4e/5cV+hdl7vguIsdm2lmU7nh5hKb0ZqE=
SIZE (feh-2.12.1.tar.bz2) = 2116784
SHA256 (feh-2.13.tar.bz2) = 9pXRXzImPRdNGlHPI4kgbiungUp08AkSHSbeH+BPyhk=
SIZE (feh-2.13.tar.bz2) = 2117181

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

@ -1,7 +1,7 @@
$OpenBSD: patch-man_feh_pre,v 1.26 2015/04/23 05:54:04 dcoppa Exp $
--- man/feh.pre.orig Wed Apr 8 11:21:11 2015
+++ man/feh.pre Thu Apr 23 07:46:02 2015
@@ -956,7 +956,7 @@ which
$OpenBSD: patch-man_feh_pre,v 1.27 2015/05/18 08:12:20 dcoppa Exp $
--- man/feh.pre.orig Sun May 17 20:41:45 2015
+++ man/feh.pre Mon May 18 10:08:34 2015
@@ -974,7 +974,7 @@ which
defaults to
.Pa ~/.config/feh/ .
If the files are not found in that directory, it will also try
@ -10,7 +10,7 @@ $OpenBSD: patch-man_feh_pre,v 1.26 2015/04/23 05:54:04 dcoppa Exp $
.Pp
All config files treat lines starting with a
.Qq #
@@ -1515,7 +1515,7 @@ order it finds them on the hard disk, which is usually
@@ -1541,7 +1541,7 @@ order it finds them on the hard disk, which is usually
.
Show 128x128 pixel thumbnails, limit window width to 1024 pixels.
.

37
graphics/feh/patches/patch-src_exif_c
View File

@ -1,37 +0,0 @@
$OpenBSD: patch-src_exif_c,v 1.1 2015/02/08 14:20:39 dcoppa Exp $
commit 89256a02f51edc44b556f759998eadfd8cf01b17
Author: Daniel Friesel <derf@finalrewind.org>
Date: Fri Dec 5 18:48:36 2014 +0100
exif.c: do sort-of-bounds-check before accessing the exif array (closes #179)
--- src/exif.c.orig Thu May 15 16:43:07 2014
+++ src/exif.c Sun Feb 8 08:14:04 2015
@@ -259,7 +259,7 @@ void exif_get_info(ExifData * ed, char *buffer, unsign
else
{
/* show normal exif tags. list must be defined in exif_cfg.h */
- while ( (Exif_tag_list[i].ifd != EXIF_IFD_COUNT) && (i < USHRT_MAX) )
+ while ( (i < USHRT_MAX) && (Exif_tag_list[i].ifd != EXIF_IFD_COUNT) )
{
exif_get_tag(ed, Exif_tag_list[i].ifd, Exif_tag_list[i].tag, buffer + strlen(buffer), maxsize - strlen(buffer));
i++;
@@ -281,7 +281,7 @@ void exif_get_info(ExifData * ed, char *buffer, unsign
{
/* show nikon makernote exif tags. list must be defined in exif_cfg.h */
i=0;
- while ( (Exif_makernote_nikon_tag_list[i] != EXIF_NIKON_MAKERNOTE_END) && (i < USHRT_MAX) )
+ while ( (i < USHRT_MAX) && (Exif_makernote_nikon_tag_list[i] != EXIF_NIKON_MAKERNOTE_END) )
{
exn_get_mnote_nikon_tags(ed, Exif_makernote_nikon_tag_list[i],
buffer + strlen(buffer), maxsize - strlen(buffer));
@@ -293,7 +293,7 @@ void exif_get_info(ExifData * ed, char *buffer, unsign
{
/* show canon makernote exif tags. list must be defined in exif_cfg.h */
i=0;
- while ( (Exif_makernote_canon_tag_list[i] != EXIF_CANON_MAKERNOTE_END) && (i < USHRT_MAX) )
+ while ( (i < USHRT_MAX) && (Exif_makernote_canon_tag_list[i] != EXIF_CANON_MAKERNOTE_END) )
{
exc_get_mnote_canon_tags(ed, Exif_makernote_canon_tag_list[i],
buffer + strlen(buffer), maxsize - strlen(buffer));