diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile index 541a6198852..7ed8253e537 100644 --- a/graphics/feh/Makefile +++ b/graphics/feh/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.21 2011/05/04 11:43:31 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.22 2011/05/20 10:57:56 dcoppa Exp $ COMMENT= lightweight image viewer -DISTNAME= feh-1.13 -REVISION= 0 +DISTNAME= feh-1.14.1 EXTRACT_SUFX= .tar.bz2 CATEGORIES= graphics diff --git a/graphics/feh/distinfo b/graphics/feh/distinfo index eda30a67fa3..f2f216d50de 100644 --- a/graphics/feh/distinfo +++ b/graphics/feh/distinfo @@ -1,5 +1,5 @@ -MD5 (feh-1.13.tar.bz2) = Y4Pa0JXBJEfozastNXHISg== -RMD160 (feh-1.13.tar.bz2) = VJZO2pl3qVdwTtx0VVYIP8MBhQI= -SHA1 (feh-1.13.tar.bz2) = iyyCUBN+29pjC5IOXrfKe6WBil4= -SHA256 (feh-1.13.tar.bz2) = FgqgEtIDFWjBW9ZLKntUunDKhtGFv76O0LBy1tssHss= -SIZE (feh-1.13.tar.bz2) = 2290720 +MD5 (feh-1.14.1.tar.bz2) = iIF3YfL6VWKfSCZSjfO55Q== +RMD160 (feh-1.14.1.tar.bz2) = 6Dh5uqd5EMqBgavnUUyAkm7jvXc= +SHA1 (feh-1.14.1.tar.bz2) = TTWxTEHNinU+bY0zS6shbGk2Fog= +SHA256 (feh-1.14.1.tar.bz2) = YeIbNvodA80aMhtNWm6PVBUSyAbRR077ll74U6+YWrU= +SIZE (feh-1.14.1.tar.bz2) = 2229518 diff --git a/graphics/feh/patches/patch-man_feh_pre b/graphics/feh/patches/patch-man_feh_pre deleted file mode 100644 index 4660990f16b..00000000000 --- a/graphics/feh/patches/patch-man_feh_pre +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-man_feh_pre,v 1.1 2011/05/04 11:43:31 dcoppa Exp $ ---- man/feh.pre.orig Wed May 4 13:25:01 2011 -+++ man/feh.pre Wed May 4 13:25:36 2011 -@@ -669,7 +669,7 @@ can also be used as a background setter. It will stor - necessary to set the background in - .Pa ~/.fehbg , - so to have your background restored everytime you start X, you can add --.Qq `cat ~/.fehbg` -+.Qq `eval cat ~/.fehbg` - to your X startup script - .Pq like Pa ~/.xinitrc . - . diff --git a/graphics/feh/patches/patch-src_imlib_c b/graphics/feh/patches/patch-src_imlib_c deleted file mode 100644 index a09becb62db..00000000000 --- a/graphics/feh/patches/patch-src_imlib_c +++ /dev/null @@ -1,29 +0,0 @@ -$OpenBSD: patch-src_imlib_c,v 1.5 2011/05/04 11:43:31 dcoppa Exp $ - -Fix use-after-free -(commit 1c420e26c23f302e54c28d6e473fe2f95e970a8e) - -Fix rotate arg in error message -(commit ef3f1979c2d443823bfc761d98b30c232992494a) - ---- src/imlib.c.orig Sat Apr 23 22:02:31 2011 -+++ src/imlib.c Wed May 4 13:22:06 2011 -@@ -291,8 +291,8 @@ char *feh_http_load_image(char *url) - return sfn; - } else { - weprintf("open url: fdopen failed:"); -- free(sfn); - unlink(sfn); -+ free(sfn); - close(fd); - } - } else { -@@ -857,7 +857,7 @@ void feh_edit_inplace_lossless_rotate(winwidget w, int - if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { - weprintf("lossless rotate: Got exitcode %d from jpegtran." - " Commandline was:\n" -- "jpegtran -copy all -rotate %d -outfile %s %s\n", -+ "jpegtran -copy all -rotate %s -outfile %s %s\n", - status >> 8, rotate_str, file_str, file_str); - return; - } diff --git a/graphics/feh/patches/patch-src_options_c b/graphics/feh/patches/patch-src_options_c index 17c5b20c326..b733c40b63f 100644 --- a/graphics/feh/patches/patch-src_options_c +++ b/graphics/feh/patches/patch-src_options_c @@ -1,20 +1,7 @@ -$OpenBSD: patch-src_options_c,v 1.1 2011/05/02 21:22:58 dcoppa Exp $ - -Improve '.fehrc -> .config/feh/themes' warning message -(commit bd3aa36a5ab8d8d221d64f15202525dddb149365) - ---- src/options.c.orig Mon May 2 15:23:04 2011 -+++ src/options.c Mon May 2 15:22:47 2011 -@@ -166,12 +166,14 @@ static void feh_load_options_for_theme(char *theme) - free(rcpath); - - if (!fp && ((fp = fopen(oldrcpath, "r")) != NULL)) -- weprintf("the config is now read from .config/feh/themes, " -- "please update your path!"); -+ weprintf("The theme config file was moved from ~/.fehrc to " -+ "~/.config/feh/themes. Run\n" -+ " mkdir -p ~/.config/feh; mv ~/.fehrc ~/.config/feh/themes\n" -+ "to fix this."); +$OpenBSD: patch-src_options_c,v 1.2 2011/05/20 10:57:57 dcoppa Exp $ +--- src/options.c.orig Fri May 20 12:42:07 2011 ++++ src/options.c Fri May 20 12:42:36 2011 +@@ -173,7 +173,7 @@ static void feh_load_options_for_theme(char *theme) free(oldrcpath); diff --git a/graphics/feh/patches/patch-src_winwidget_c b/graphics/feh/patches/patch-src_winwidget_c deleted file mode 100644 index 3179892f5a4..00000000000 --- a/graphics/feh/patches/patch-src_winwidget_c +++ /dev/null @@ -1,34 +0,0 @@ -$OpenBSD: patch-src_winwidget_c,v 1.3 2011/05/04 11:43:31 dcoppa Exp $ - -Use NETWM for fullscreen windows only -(commit bce956523f56b88ec04c074cd55041c5b9a81c90) - ---- src/winwidget.c.orig Wed May 4 13:20:06 2011 -+++ src/winwidget.c Wed May 4 13:20:06 2011 -@@ -774,15 +774,17 @@ void winwidget_resize(winwidget winwid, int w, int h) - winwid->w = (w > scr->width) ? scr->width : w; - winwid->h = (h > scr->height) ? scr->height : h; - } -- /* XResizeWindow(disp, winwid->win, winwid->w, winwid->h); */ -- XGetWindowAttributes(disp, winwid->win, &attributes); -- XTranslateCoordinates(disp, winwid->win, attributes.root, -- -attributes.border_width - -- attributes.x, -- -attributes.border_width - attributes.y, &tc_x, &tc_y, &ignored_window); -- winwid->x = tc_x; -- winwid->y = tc_y; -- XMoveResizeWindow(disp, winwid->win, tc_x, tc_y, winwid->w, winwid->h); -+ if (winwid->full_screen) { -+ XGetWindowAttributes(disp, winwid->win, &attributes); -+ XTranslateCoordinates(disp, winwid->win, attributes.root, -+ -attributes.border_width - -+ attributes.x, -+ -attributes.border_width - attributes.y, &tc_x, &tc_y, &ignored_window); -+ winwid->x = tc_x; -+ winwid->y = tc_y; -+ XMoveResizeWindow(disp, winwid->win, tc_x, tc_y, winwid->w, winwid->h); -+ } else -+ XResizeWindow(disp, winwid->win, winwid->w, winwid->h); - - winwid->had_resize = 1; - XFlush(disp); diff --git a/graphics/feh/pkg/PLIST b/graphics/feh/pkg/PLIST index 8304e3a90f7..e67c2136dc3 100644 --- a/graphics/feh/pkg/PLIST +++ b/graphics/feh/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2011/05/02 21:22:58 dcoppa Exp $ +@comment $OpenBSD: PLIST,v 1.7 2011/05/20 10:57:57 dcoppa Exp $ @bin bin/feh bin/feh-cam bin/gen-cam-menu @@ -22,7 +22,6 @@ share/feh/fonts/black.style share/feh/fonts/menu.style share/feh/fonts/yudit.ttf share/feh/images/ -share/feh/images/about.png share/feh/images/logo.svg share/feh/images/menubg_aluminium.png share/feh/images/menubg_aqua.png