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

update to feh-2.2

Browse Source
This commit is contained in:
dcoppa 2012-01-03 10:52:54 +00:00
parent 6feafd656c
commit 70c01a503f
6 changed files with 17 additions and 55 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.34 2011/12/27 12:23:43 dcoppa Exp $
# $OpenBSD: Makefile,v 1.35 2012/01/03 10:52:54 dcoppa Exp $
COMMENT= lightweight image viewer
DISTNAME= feh-2.1
REVISION= 1
DISTNAME= feh-2.2
EXTRACT_SUFX= .tar.bz2
CATEGORIES= graphics

10
graphics/feh/distinfo
View File

@ -1,5 +1,5 @@
MD5 (feh-2.1.tar.bz2) = t/5dttcjmQLJ7VJzPpeLOg==
RMD160 (feh-2.1.tar.bz2) = O2rj2IEmoahm0kbmvnKWL2XR+Ao=
SHA1 (feh-2.1.tar.bz2) = pZZBIr8u4mdeuUI96ng5QQgG/uk=
SHA256 (feh-2.1.tar.bz2) = jXSl+KOqiJx9tfy/jOijEkeC9Yifn0r+IZNaEXVqS7w=
SIZE (feh-2.1.tar.bz2) = 2240132
MD5 (feh-2.2.tar.bz2) = fe4oXo3TT2kFiwl3KDs6ig==
RMD160 (feh-2.2.tar.bz2) = Kmgi/ukctGWAedk9yqstdL1J3qo=
SHA1 (feh-2.2.tar.bz2) = ZV219VjNsmj/VcsIiZTXgzG9Oao=
SHA256 (feh-2.2.tar.bz2) = m5qaQHQ8h4oy0VKpR8Ah5brlYE8o9QGh3YFnZWCswWU=
SIZE (feh-2.2.tar.bz2) = 2220912

11
graphics/feh/patches/patch-config_mk
View File

@ -1,15 +1,14 @@
$OpenBSD: patch-config_mk,v 1.2 2011/05/02 21:22:58 dcoppa Exp $
$OpenBSD: patch-config_mk,v 1.3 2012/01/03 10:52:54 dcoppa Exp $
gcc3 does not like "-Wextra"
zap redundant CFLAGS
--- config.mk.orig Sat Apr 23 22:02:31 2011
+++ config.mk Mon May 2 14:17:26 2011
@@ -15,7 +15,7 @@ example_dir = ${main_dir}/share/doc/feh/examples
--- config.mk.orig Mon Jan 2 11:55:04 2012
+++ config.mk Tue Jan 3 11:43:50 2012
@@ -15,7 +15,6 @@ example_dir = ${main_dir}/share/doc/feh/examples
# default CFLAGS
CFLAGS ?= -g -O2
-CFLAGS += -Wall -Wextra -pedantic
+CFLAGS += -Wall -pedantic
curl ?= 1
debug ?= 0

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

@ -1,9 +1,9 @@
$OpenBSD: patch-man_feh_pre,v 1.9 2011/11/07 21:47:28 dcoppa Exp $
$OpenBSD: patch-man_feh_pre,v 1.10 2012/01/03 10:52:54 dcoppa Exp $
fix typo
--- man/feh.pre.orig Wed Nov 2 10:59:20 2011
+++ man/feh.pre Mon Nov 7 21:34:13 2011
--- man/feh.pre.orig Mon Jan 2 11:55:04 2012
+++ man/feh.pre Tue Jan 3 11:39:56 2012
@@ -169,7 +169,7 @@ the caption will be looked for in
Don't display images, print image info according to
.Ar format
@ -13,7 +13,7 @@ fix typo
.
.It Cm --cycle-once
.
@@ -805,7 +805,7 @@ which
@@ -812,7 +812,7 @@ which
defaults to
.Pa ~/.config/feh/ .
If the files are not found in that directory, it will also try
@ -22,7 +22,7 @@ fix typo
.Pp
All config files treat lines starting with a
.Qq #
@@ -1297,7 +1297,7 @@ order it finds them on the hard disk, which is usually
@@ -1304,7 +1304,7 @@ order it finds them on the hard disk, which is usually
.
Show 128x128 pixel thumbnails, limit window width to 1024 pixels.
.

16
graphics/feh/patches/patch-src_Makefile
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_Makefile,v 1.1 2011/11/30 14:15:39 dcoppa Exp $
src/Makefile: respect CPPFLAGS
(upstream git commit 2424b51f3df9e570612f0098600d9877b5c0160b)
--- src/Makefile.orig Wed Nov 30 15:08:18 2011
+++ src/Makefile Wed Nov 30 15:08:41 2011
@@ -19,7 +19,7 @@ help.inc: help.raw
deps.mk: ${TARGETS} ${I_DSTS}
- ${CC} -MM ${TARGETS} > $@
+ ${CC} ${CPPFLAGS} -MM ${TARGETS} > $@
clean:
rm -f feh *.o *.inc

20
graphics/feh/patches/patch-src_index_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_index_c,v 1.1 2011/12/27 12:23:43 dcoppa Exp $
Bugfix: "feh --montage" failed to create images, claiming "Low on
RAM" or segfaulting (git commit 412316900b62656d7e25ce07cb4a7af3f2bce26e)
--- src/index.c.orig Tue Dec 27 13:13:09 2011
+++ src/index.c Tue Dec 27 13:14:07 2011
@@ -425,8 +425,11 @@ void get_index_string_dim(feh_file *file, Imlib_Font f
gib_list *line, *lines;
int max_w = 0, total_h = 0;
- if (!opt.index_info)
+ if (!opt.index_info) {
+ *fw = 0;
+ *fh = 0;
return;
+ }
/* called with file = NULL in the setup phase.
* We need a fake file, otherwise feh_printf will remove format specifiers,