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

Update to feh-1.9

Browse Source 
OK sthen@, ajacoutot@
This commit is contained in:
dcoppa 2010-09-13 07:24:23 +00:00
parent 917fa88ae6
commit 80e418d430
5 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/feh/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.11 2010/07/11 14:46:13 dcoppa Exp $
# $OpenBSD: Makefile,v 1.12 2010/09/13 07:24:23 dcoppa Exp $
COMMENT= lightweight image viewer
DISTNAME= feh-1.8
DISTNAME= feh-1.9
EXTRACT_SUFX= .tar.bz2
CATEGORIES= graphics
@ -22,6 +22,9 @@ MASTER_SITES= ${HOMEPAGE}
LIB_DEPENDS= giblib.>=1::devel/giblib
# needed for jpegtran on NO_SHARED_LIBS archs
RUN_DEPENDS= ::graphics/jpeg
CFLAGS+= -I${LOCALBASE}/include \
-I${LOCALBASE}/include/libpng \
-I${X11BASE}/include

10
graphics/feh/distinfo
View File

@ -1,5 +1,5 @@
MD5 (feh-1.8.tar.bz2) = /oEzSAX02ptfHjW0XERKGg==
RMD160 (feh-1.8.tar.bz2) = H2xQ+a8iYykIgUHSaSeQcUTsyNY=
SHA1 (feh-1.8.tar.bz2) = FHtWCCgbgb6NH3z5RP12HouGrgY=
SHA256 (feh-1.8.tar.bz2) = nuPw2dG5cErgExo7UcgiDnAevj0EV64hEicz+ukVsKw=
SIZE (feh-1.8.tar.bz2) = 358172
MD5 (feh-1.9.tar.bz2) = d2my+8tmEX8VnM5MPz39iw==
RMD160 (feh-1.9.tar.bz2) = LgvTGpT9nFSez6n8QUESRIPYCIs=
SHA1 (feh-1.9.tar.bz2) = ZDtboIXtG383+25IKTd5+QVvym4=
SHA256 (feh-1.9.tar.bz2) = /IJUZyZPX7/6XIykBDh4TpN30wsNzbg+ZIwXhvtsDEU=
SIZE (feh-1.9.tar.bz2) = 336047

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

@ -1,6 +1,6 @@
$OpenBSD: patch-src_imlib_c,v 1.1 2010/07/11 14:46:13 dcoppa Exp $
--- src/imlib.c.orig Fri Jun 25 17:13:11 2010
+++ src/imlib.c Wed Jul 7 12:12:42 2010
$OpenBSD: patch-src_imlib_c,v 1.2 2010/09/13 07:24:24 dcoppa Exp $
--- src/imlib.c.orig Fri Sep 10 16:00:01 2010
+++ src/imlib.c Fri Sep 10 16:03:36 2010
@@ -435,6 +435,7 @@ char *feh_http_load_image(char *url)
close(sockno);
fclose(fp);
@ -19,16 +19,16 @@ $OpenBSD: patch-src_imlib_c,v 1.1 2010/07/11 14:46:13 dcoppa Exp $
- quiet = estrdup("-q");
-
- execlp("wget", "wget", "--cache=off", "-O", tmpname, url, quiet, NULL);
- eprintf("url: exec failed: wget:");
+ if (!opt.verbose) {
+ if ((fd = open("/dev/null", O_WRONLY)) != -1) {
- eprintf("url: Is 'wget' installed? Failed to exec wget:");
+ if (!opt.verbose) {
+ if ((fd = open("/dev/null", O_WRONLY)) != -1) {
+ dup2(fd, fileno(stdout));
+ dup2(fd, fileno(stderr));
+ }
+ if (fd > 2) close(fd);
+ }
+ execlp("ftp", "ftp", "-o", tmpname, url, (char *)NULL);
+ eprintf("url: exec failed: ftp:");
+ eprintf("url: Is 'ftp' installed? Failed to exec ftp:");
} else {
waitpid(pid, &status, 0);
@ -45,5 +45,5 @@ $OpenBSD: patch-src_imlib_c,v 1.1 2010/07/11 14:46:13 dcoppa Exp $
- rotate_str, "-outfile", file_str, file_str, NULL);
+ rotate_str, "-outfile", file_str, file_str, (char *)NULL);
eprintf("lossless rotate: exec failed: jpegtran:");
eprintf("lossless rotate: Is 'jpegtran' installed? Failed to exec:");
} else {

17
graphics/feh/patches/patch-src_keyevents_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_keyevents_c,v 1.1 2010/07/11 14:46:13 dcoppa Exp $
--- src/keyevents.c.orig Mon Jul 5 08:53:35 2010
+++ src/keyevents.c Mon Jul 5 08:54:09 2010
@@ -261,11 +261,13 @@ void feh_event_handle_keypress(XEvent * ev)
/* erroneously recognized as '+' in the *kbuf switch. Work around this. */
len = 0;
winwid->zoom = winwid->zoom * 1.25;
+ winwidget_sanitise_offsets(winwid);
winwidget_render_image(winwid, 0, 0);
break;
case XK_KP_Subtract:
len = 0;
winwid->zoom = winwid->zoom * 0.75;
+ winwidget_sanitise_offsets(winwid);
winwidget_render_image(winwid, 0, 0);
break;
case XK_KP_Multiply:

5
graphics/feh/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2010/07/11 14:46:13 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.4 2010/09/13 07:24:24 dcoppa Exp $
@bin bin/feh
bin/feh-cam
bin/gen-cam-menu
@ -21,8 +21,5 @@ share/feh/images/menubg_aluminium.png
share/feh/images/menubg_aqua.png
share/feh/images/menubg_black.png
share/feh/images/menubg_brushed.png
share/feh/images/menubg_chrome.png
share/feh/images/menubg_default.png
share/feh/images/menubg_pastel.png
share/feh/images/menubg_sky.png
share/feh/images/menubg_wood.png