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

Respect -N / --no-menus option (broken in 2.17)

Browse Source 
(upstream git commit 8ad7d16318975a46aaada5c2b4ecf22c089b88f5)

Silence -Wimplicit-fallthrough= warning (missing break)
(upstream git commit a0e2ed52478480513dc1f6963f3114c7841a0d87)
This commit is contained in:
dcoppa 2017-09-04 11:18:17 +00:00
parent c95357b686
commit 2584cd4515
3 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphics/feh/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.85 2017/08/22 10:05:57 dcoppa Exp $
# $OpenBSD: Makefile,v 1.86 2017/09/04 11:18:17 dcoppa Exp $
COMMENT= lightweight image viewer
DISTNAME= feh-2.19.3
REVISION= 0
EXTRACT_SUFX= .tar.bz2
CATEGORIES= graphics

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

@ -1,4 +1,11 @@
$OpenBSD: patch-src_keyevents_c,v 1.13 2017/08/16 06:38:37 dcoppa Exp $
$OpenBSD: patch-src_keyevents_c,v 1.14 2017/09/04 11:18:17 dcoppa Exp $
commit 8ad7d16318975a46aaada5c2b4ecf22c089b88f5
Author: Daniel Friesel <derf@finalrewind.org>
Date: Sat Sep 2 07:23:55 2017
Respect -N / --no-menus option (broken in 2.17)
Index: src/keyevents.c
--- src/keyevents.c.orig
+++ src/keyevents.c
@ -11,3 +18,12 @@ Index: src/keyevents.c
return;
while (fgets(line, sizeof(line), conf)) {
@@ -743,7 +743,7 @@ void feh_event_handle_generic(winwidget winwid, unsign
else if (feh_is_kp(&keys.size_to_image, state, keysym, button)) {
winwidget_size_to_image(winwid);
}
- else if (feh_is_kp(&keys.toggle_menu, state, keysym, button)) {
+ else if (!opt.no_menus && feh_is_kp(&keys.toggle_menu, state, keysym, button)) {
winwidget_show_menu(winwid);
}
else if (feh_is_kp(&keys.close, state, keysym, button)) {

22
graphics/feh/patches/patch-src_options_c
View File

@ -1,6 +1,14 @@
$OpenBSD: patch-src_options_c,v 1.11 2015/10/05 07:15:26 dcoppa Exp $
--- src/options.c.orig Sun Oct 4 10:03:43 2015
+++ src/options.c Mon Oct 5 09:13:40 2015
$OpenBSD: patch-src_options_c,v 1.12 2017/09/04 11:18:17 dcoppa Exp $
commit a0e2ed52478480513dc1f6963f3114c7841a0d87
Author: orbea <ovariegata@yahoo.com>
Date: Fri Aug 25 21:03:39 2017
Silence -Wimplicit-fallthrough= warning
Index: src/options.c
--- src/options.c.orig
+++ src/options.c
@@ -156,7 +156,7 @@ static void feh_load_options_for_theme(char *theme)
free(oldrcpath);
@ -10,3 +18,11 @@ $OpenBSD: patch-src_options_c,v 1.11 2015/10/05 07:15:26 dcoppa Exp $
return;
/* Oooh. We have an options file :) */
@@ -768,6 +768,7 @@ static void feh_parse_option_array(int argc, char **ar
break;
case 240:
opt.insecure_ssl = 1;
+ break;
case 241:
opt.recursive = 0;
default: