From f07e62142044cd3959b70ad39207e57ddb9b4327 Mon Sep 17 00:00:00 2001 From: John Vogel Date: Tue, 22 May 2018 23:03:26 -0400 Subject: [PATCH] sxiv: remove config.h --- sxiv/.md5sum | 1 - sxiv/.signature | 5 +- sxiv/Pkgfile | 8 ++- sxiv/README | 15 ++++- sxiv/config.h | 160 ------------------------------------------------ 5 files changed, 21 insertions(+), 168 deletions(-) delete mode 100644 sxiv/config.h diff --git a/sxiv/.md5sum b/sxiv/.md5sum index 8cd1f9ea4..e49fc4fef 100644 --- a/sxiv/.md5sum +++ b/sxiv/.md5sum @@ -1,2 +1 @@ -d641dc83dfe760b2ce13553c3c14066f config.h a929f8ae19f947a23594fdce2b3cf38d sxiv-24.tar.gz diff --git a/sxiv/.signature b/sxiv/.signature index 2de841407..d2d6dd987 100644 --- a/sxiv/.signature +++ b/sxiv/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32hhN1530sLg72tKSQtufvJacb+eX+1tjDYMjq6LDjfQcdjNBIGZXc5bmR7w0/gils/7l7A088KuA7WRVW7+uQs= -SHA256 (Pkgfile) = 03f813d3ee17676d011de728b65a496caf38ed9aa1902f80c32136ca580241c2 +RWSagIOpLGJF3zx4msQ7hN+JUyvv/RWCTLtH6YoSj++/YUzwR8efEn8Ihg3QfOEe4KckLfEj5TSsmun2P0kapRDf/H5AnDGlyAg= +SHA256 (Pkgfile) = 739f8d2b9d208939a727e79a082e8b269bf19f63f9d9018c80dd9cd4b099d580 SHA256 (.footprint) = 54015b09139273572d41d63e394d0cd5e591f959b91be66f98425d54c1508b0b SHA256 (sxiv-24.tar.gz) = 511dc45d12962af9c31c3068ce6bca4b832a6263946b27befea49a48cf019110 -SHA256 (config.h) = f32ebb5f590777c571daeb87b935fd290863d71e3a6a7f0ab7e8a39e8600560d diff --git a/sxiv/Pkgfile b/sxiv/Pkgfile index 47b996486..b505b2aef 100644 --- a/sxiv/Pkgfile +++ b/sxiv/Pkgfile @@ -6,13 +6,15 @@ name=sxiv version=24 release=1 -source=(https://github.com/muennich/$name/archive/v$version/$name-$version.tar.gz - config.h) +source=(https://github.com/muennich/$name/archive/v$version/$name-$version.tar.gz) build () { cd $name-$version - cp $SRC/config.h . + if [ -f $PKGMK_ROOT/config.h ]; then + cp $SRC/config.h . + fi + make CC=gcc CFLAGS="$CFLAGS" make DESTDIR=$PKG PREFIX=/usr install } diff --git a/sxiv/README b/sxiv/README index 18934924f..e0d6484d6 100644 --- a/sxiv/README +++ b/sxiv/README @@ -1 +1,14 @@ -Edit config.h and rebuild the package to configure sxiv. +The configuration of sxiv is done by creating a custom config.h +and (re)compiling the source code. To create a custom config.h, +unpack the tarball, copy the file sxiv-$version/config.def.h to +sxiv's port directory, and edit to suit your preferences. Then, +when you call pkgmk in the sxiv port directory, the custom +config.h will be detected and copied into the source before +compilation. I recommend that you save a copy your custom config.h +some where other than the sxiv port directory, so that your changes +won't get nuked when updating ports or performing a prtsweep or +prtwash (see opt/prt-utils for more information about those two). + +Another solution for customizing sxiv is to create a custom and +(preferably) private port that contains your custom config and also +might include patches for added features. diff --git a/sxiv/config.h b/sxiv/config.h deleted file mode 100644 index 5af745d69..000000000 --- a/sxiv/config.h +++ /dev/null @@ -1,160 +0,0 @@ -#ifdef _WINDOW_CONFIG - -/* default window dimensions (overwritten via -g option): */ -enum { - WIN_WIDTH = 800, - WIN_HEIGHT = 600 -}; - -/* bar font: - * (see fonts-conf(5) subsection "FONT NAMES" for valid values) - */ -static const char * const BAR_FONT = "monospace:size=8"; - -/* colors: - * (see X(7) section "COLOR NAMES" for valid values) - */ -static const char * const WIN_BG_COLOR = "#555555"; -static const char * const WIN_FS_COLOR = "#000000"; -static const char * const SEL_COLOR = "#EEEEEE"; -static const char * const BAR_BG_COLOR = "#222222"; -static const char * const BAR_FG_COLOR = "#EEEEEE"; - -#endif -#ifdef _IMAGE_CONFIG - -/* levels (in percent) to use when zooming via '-' and '+': - * (first/last value is used as min/max zoom level) - */ -static const float zoom_levels[] = { - 12.5, 25.0, 50.0, 75.0, - 100.0, 150.0, 200.0, 400.0, 800.0 -}; - -/* default slideshow delay (in sec, overwritten via -S option): */ -enum { SLIDESHOW_DELAY = 5 }; - -/* gamma correction: the user-visible ranges [-GAMMA_RANGE, 0] and - * (0, GAMMA_RANGE] are mapped to the ranges [0, 1], and (1, GAMMA_MAX]. - * */ -static const double GAMMA_MAX = 10.0; -static const int GAMMA_RANGE = 32; - -/* command i_scroll pans image 1/PAN_FRACTION of screen width/height */ -static const int PAN_FRACTION = 5; - -/* if false, pixelate images at zoom level != 100%, - * toggled with 'a' key binding - */ -static const bool ANTI_ALIAS = true; - -/* if true, use a checkerboard background for alpha layer, - * toggled with 'A' key binding - */ -static const bool ALPHA_LAYER = false; - -#endif -#ifdef _THUMBS_CONFIG - -/* thumbnail sizes in pixels (width == height): */ -static const int thumb_sizes[] = { 32, 64, 96, 128, 160 }; - -/* thumbnail size at startup, index into thumb_sizes[]: */ -static const int THUMB_SIZE = 3; - -#endif -#ifdef _MAPPINGS_CONFIG - -/* keyboard mappings for image and thumbnail mode: */ -static const keymap_t keys[] = { - /* modifiers key function argument */ - { 0, XK_q, g_quit, None }, - { 0, XK_Return, g_switch_mode, None }, - { 0, XK_f, g_toggle_fullscreen, None }, - { 0, XK_b, g_toggle_bar, None }, - { ControlMask, XK_x, g_prefix_external, None }, - { 0, XK_g, g_first, None }, - { 0, XK_G, g_n_or_last, None }, - { 0, XK_r, g_reload_image, None }, - { 0, XK_D, g_remove_image, None }, - { ControlMask, XK_h, g_scroll_screen, DIR_LEFT }, - { ControlMask, XK_Left, g_scroll_screen, DIR_LEFT }, - { ControlMask, XK_j, g_scroll_screen, DIR_DOWN }, - { ControlMask, XK_Down, g_scroll_screen, DIR_DOWN }, - { ControlMask, XK_k, g_scroll_screen, DIR_UP }, - { ControlMask, XK_Up, g_scroll_screen, DIR_UP }, - { ControlMask, XK_l, g_scroll_screen, DIR_RIGHT }, - { ControlMask, XK_Right, g_scroll_screen, DIR_RIGHT }, - { 0, XK_plus, g_zoom, +1 }, - { 0, XK_KP_Add, g_zoom, +1 }, - { 0, XK_minus, g_zoom, -1 }, - { 0, XK_KP_Subtract, g_zoom, -1 }, - { 0, XK_m, g_toggle_image_mark, None }, - { 0, XK_M, g_reverse_marks, None }, - { ControlMask, XK_m, g_unmark_all, None }, - { 0, XK_N, g_navigate_marked, +1 }, - { 0, XK_P, g_navigate_marked, -1 }, - { 0, XK_braceleft, g_change_gamma, -1 }, - { 0, XK_braceright, g_change_gamma, +1 }, - { ControlMask, XK_g, g_change_gamma, 0 }, - - { 0, XK_h, t_move_sel, DIR_LEFT }, - { 0, XK_Left, t_move_sel, DIR_LEFT }, - { 0, XK_j, t_move_sel, DIR_DOWN }, - { 0, XK_Down, t_move_sel, DIR_DOWN }, - { 0, XK_k, t_move_sel, DIR_UP }, - { 0, XK_Up, t_move_sel, DIR_UP }, - { 0, XK_l, t_move_sel, DIR_RIGHT }, - { 0, XK_Right, t_move_sel, DIR_RIGHT }, - { 0, XK_R, t_reload_all, None }, - - { 0, XK_n, i_navigate, +1 }, - { 0, XK_n, i_scroll_to_edge, DIR_LEFT | DIR_UP }, - { 0, XK_space, i_navigate, +1 }, - { 0, XK_p, i_navigate, -1 }, - { 0, XK_p, i_scroll_to_edge, DIR_LEFT | DIR_UP }, - { 0, XK_BackSpace, i_navigate, -1 }, - { 0, XK_bracketright, i_navigate, +10 }, - { 0, XK_bracketleft, i_navigate, -10 }, - { ControlMask, XK_6, i_alternate, None }, - { ControlMask, XK_n, i_navigate_frame, +1 }, - { ControlMask, XK_p, i_navigate_frame, -1 }, - { ControlMask, XK_space, i_toggle_animation, None }, - { 0, XK_h, i_scroll, DIR_LEFT }, - { 0, XK_Left, i_scroll, DIR_LEFT }, - { 0, XK_j, i_scroll, DIR_DOWN }, - { 0, XK_Down, i_scroll, DIR_DOWN }, - { 0, XK_k, i_scroll, DIR_UP }, - { 0, XK_Up, i_scroll, DIR_UP }, - { 0, XK_l, i_scroll, DIR_RIGHT }, - { 0, XK_Right, i_scroll, DIR_RIGHT }, - { 0, XK_H, i_scroll_to_edge, DIR_LEFT }, - { 0, XK_J, i_scroll_to_edge, DIR_DOWN }, - { 0, XK_K, i_scroll_to_edge, DIR_UP }, - { 0, XK_L, i_scroll_to_edge, DIR_RIGHT }, - { 0, XK_equal, i_set_zoom, 100 }, - { 0, XK_w, i_fit_to_win, SCALE_DOWN }, - { 0, XK_W, i_fit_to_win, SCALE_FIT }, - { 0, XK_e, i_fit_to_win, SCALE_WIDTH }, - { 0, XK_E, i_fit_to_win, SCALE_HEIGHT }, - { 0, XK_less, i_rotate, DEGREE_270 }, - { 0, XK_greater, i_rotate, DEGREE_90 }, - { 0, XK_question, i_rotate, DEGREE_180 }, - { 0, XK_bar, i_flip, FLIP_HORIZONTAL }, - { 0, XK_underscore, i_flip, FLIP_VERTICAL }, - { 0, XK_a, i_toggle_antialias, None }, - { 0, XK_A, i_toggle_alpha, None }, - { 0, XK_s, i_slideshow, None }, -}; - -/* mouse button mappings for image mode: */ -static const button_t buttons[] = { - /* modifiers button function argument */ - { 0, 1, i_cursor_navigate, None }, - { 0, 2, i_drag, None }, - { 0, 3, g_switch_mode, None }, - { 0, 4, g_zoom, +1 }, - { 0, 5, g_zoom, -1 }, -}; - -#endif