From c9738c6a1d438f30dfa7363aa847343754f953ac Mon Sep 17 00:00:00 2001 From: root Date: Tue, 2 Apr 2013 00:05:43 -0700 Subject: Tue Apr 2 00:05:43 PDT 2013 --- community/sxiv/PKGBUILD | 35 +++++++++++++++++----------------- community/sxiv/config.h | 46 +++++++++++++++++++++------------------------ community/sxiv/sxiv.install | 12 ++++++------ 3 files changed, 45 insertions(+), 48 deletions(-) (limited to 'community/sxiv') diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD index 68fb8e2bd..de8f86865 100644 --- a/community/sxiv/PKGBUILD +++ b/community/sxiv/PKGBUILD @@ -1,34 +1,35 @@ +# $Id: PKGBUILD 87472 2013-04-01 10:33:39Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Bert Muennich # Contributor: Brad Fanella pkgname=sxiv -pkgver=1.0 -pkgrel=3 -pkgdesc='simple x image viewer' +pkgver=1.1 +pkgrel=1 +pkgdesc='Simple X Image Viewer' arch=('i686' 'x86_64') license=('GPL2') install=sxiv.install url='https://github.com/muennich/sxiv' depends=('libx11' 'xproto' 'imlib2' 'giflib' 'libexif' 'desktop-file-utils') -source=("https://github.com/downloads/muennich/sxiv/sxiv-${pkgver}.tar.gz" - 'sxiv.desktop' - 'config.h') -md5sums=('c887e0af1e4d5a101b285a46d288c419' - '1dda85ff6bed4de337f8fb303075ed11' - 'c3e6c4b86da6b17687699dbd32c7717b') -build() { - cd "sxiv-${pkgver}" +source=(https://github.com/muennich/sxiv/archive/$pkgver.tar.gz + sxiv.desktop + config.h) +sha256sums=('7d22b060d264be25ee0e95afff9df535299dbdd48067c9fc795133e583e2583f' + 'bd14b9b6bc6d78f18cdff8535b4d1c13b3c76e35091dd6bc675011d42a01bb47' + '61515a87692849c942bfc3cce8b4c0f19139b4a1e9b6375a994cc541c64aab5c') - cp "$srcdir/config.h" . - make +build() { + cd sxiv-$pkgver + cp "$srcdir"/config.h . + make } package() { - cd "sxiv-${pkgver}" + cd sxiv-$pkgver - make PREFIX="${pkgdir}/usr" install - install -D -m644 ${srcdir}/sxiv.desktop \ - ${pkgdir}/usr/share/applications/sxiv.desktop + make PREFIX="$pkgdir"/usr install + install -D -m644 "$srcdir"/sxiv.desktop \ + "$pkgdir"/usr/share/applications/sxiv.desktop } diff --git a/community/sxiv/config.h b/community/sxiv/config.h index cc95fd46a..cd89b5fac 100644 --- a/community/sxiv/config.h +++ b/community/sxiv/config.h @@ -1,15 +1,3 @@ -#ifdef _FEATURE_CONFIG - -/* auto-orientate jpeg files according to their exif tags? - * (requires libexif [-lexif] to be installed) - */ -#define EXIF_SUPPORT 1 -/* load all frames from gif files and support gif animations? - * (requires giflib [-lgif] to be installed) - */ -#define GIF_SUPPORT 1 - -#endif #ifdef _WINDOW_CONFIG /* default window dimensions (overwritten via -g option): */ @@ -18,11 +6,19 @@ enum { WIN_HEIGHT = 600 }; -/* default color for window background: */ -static const char * const BG_COLOR = "#777777"; -/* default color for thumbnail selection: */ -static const char * const SEL_COLOR = "#DDDDDD"; -/* (see X(7) section "COLOR NAMES" for valid values) */ +/* bar font: + * (see X(7) section "FONT NAMES" for valid values) + */ +static const char * const BAR_FONT = "-*-fixed-medium-r-*-*-13-*-*-*-*-60-*-*"; + +/* colors: + * (see X(7) section "COLOR NAMES" for valid values) + */ +static const char * const WIN_BG_COLOR = "#777777"; +static const char * const WIN_FS_COLOR = "#000000"; +static const char * const SEL_COLOR = "#DDDDDD"; +static const char * const BAR_BG_COLOR = "#222222"; +static const char * const BAR_FG_COLOR = "#EEEEEE"; #endif #ifdef _IMAGE_CONFIG @@ -43,9 +39,6 @@ static const float zoom_levels[] = { 100.0, 150.0, 200.0, 400.0, 800.0 }; -/* default slideshow delay (in sec, overwritten via -S option): */ -enum { SLIDESHOW_DELAY = 5 }; - /* default settings for multi-frame gif images: */ enum { GIF_DELAY = 100, /* delay time (in ms) */ @@ -68,8 +61,10 @@ static const keymap_t keys[] = { { false, XK_q, it_quit, (arg_t) None }, { false, XK_Return, it_switch_mode, (arg_t) None }, { false, XK_f, it_toggle_fullscreen, (arg_t) None }, + { false, XK_b, it_toggle_bar, (arg_t) None }, { false, XK_r, it_reload_image, (arg_t) None }, + { false, XK_R, t_reload_all, (arg_t) None }, { false, XK_D, it_remove_image, (arg_t) None }, { false, XK_n, i_navigate, (arg_t) +1 }, @@ -78,6 +73,7 @@ static const keymap_t keys[] = { { false, XK_BackSpace, i_navigate, (arg_t) -1 }, { false, XK_bracketright, i_navigate, (arg_t) +10 }, { false, XK_bracketleft, i_navigate, (arg_t) -10 }, + { true, XK_6, i_alternate, (arg_t) None }, { false, XK_g, it_first, (arg_t) None }, { false, XK_G, it_n_or_last, (arg_t) None }, @@ -113,16 +109,16 @@ static const keymap_t keys[] = { { false, XK_minus, i_zoom, (arg_t) -1 }, { false, XK_KP_Subtract, i_zoom, (arg_t) -1 }, { false, XK_equal, i_set_zoom, (arg_t) 100 }, - { false, XK_w, i_fit_to_win, (arg_t) None }, + { false, XK_w, i_fit_to_win, (arg_t) SCALE_FIT }, + { false, XK_e, i_fit_to_win, (arg_t) SCALE_WIDTH }, + { false, XK_E, i_fit_to_win, (arg_t) SCALE_HEIGHT }, { false, XK_W, i_fit_to_img, (arg_t) None }, { false, XK_less, i_rotate, (arg_t) DIR_LEFT }, { false, XK_greater, i_rotate, (arg_t) DIR_RIGHT }, - { false, XK_s, i_toggle_slideshow, (arg_t) None }, - { true, XK_plus, i_adjust_slideshow, (arg_t) +1 }, - { true, XK_minus, i_adjust_slideshow, (arg_t) -1 }, - { true, XK_equal, i_reset_slideshow, (arg_t) None }, + { false, XK_backslash, i_flip, (arg_t) FLIP_HORIZONTAL }, + { false, XK_bar, i_flip, (arg_t) FLIP_VERTICAL }, { false, XK_a, i_toggle_antialias, (arg_t) None }, { false, XK_A, it_toggle_alpha, (arg_t) None }, diff --git a/community/sxiv/sxiv.install b/community/sxiv/sxiv.install index f09c533f4..6302d1f8f 100644 --- a/community/sxiv/sxiv.install +++ b/community/sxiv/sxiv.install @@ -1,12 +1,12 @@ post_install () { - update-desktop-database -q + update-desktop-database -q - echo "* Edit config.h in sxiv's PKGBUILD directory (generally /var/abs/community/sxiv/)" - echo " and rebuild package if you want to change settings." - echo "* Create the directory ~/.sxiv/ to enable thumbnail caching." - echo " See sxiv(1) for more information." + echo "* Edit config.h in sxiv's PKGBUILD directory (generally /var/abs/community/sxiv/)" + echo " and rebuild package if you want to change settings." + echo "* Create the directory ~/.sxiv/ to enable thumbnail caching." + echo " See sxiv(1) for more information." } post_upgrade () { - post_install ${1} + update-desktop-database -q } -- cgit v1.2.3-54-g00ecf