From 56913dc8679143308408596f2872f3894b3ab9d0 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 24 Jul 2012 00:01:46 +0000 Subject: Tue Jul 24 00:01:46 UTC 2012 --- community/surf/PKGBUILD | 22 ++++++++++------------ community/surf/config.h | 25 +++++++++++++++++-------- 2 files changed, 27 insertions(+), 20 deletions(-) (limited to 'community/surf') diff --git a/community/surf/PKGBUILD b/community/surf/PKGBUILD index ae6a57759..ee52c3029 100644 --- a/community/surf/PKGBUILD +++ b/community/surf/PKGBUILD @@ -1,36 +1,34 @@ -# $Id: PKGBUILD 66413 2012-02-24 15:52:35Z lfleischer $ +# $Id: PKGBUILD 74178 2012-07-22 18:33:06Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Pierre Chapuis # Contributor: Ray Kohler # Contributor: Michael Witten +# Contributor: Raphael Proust pkgname=surf -pkgver=0.4.1 -pkgrel=4 -pkgdesc="A simple web browser based on WebKit/GTK+." +pkgver=0.5 +pkgrel=1 +pkgdesc='A simple web browser based on WebKit/GTK+.' arch=('i686' 'x86_64') url='http://surf.suckless.org/' license=('MIT') depends=('libwebkit' 'xorg-xprop') optdepends=('dmenu: URL-bar' + 'ca-certificates: SSL verification' + 'xterm: default download handler' 'wget: default download handler') makedepends=('pkgconfig') install='surf.install' source=("http://dl.suckless.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'config.h' - 'surf-0.4.1-link-xlib.patch') -md5sums=('28ac7a6d193d25844aa6b1db77fcbafa' - 'a1d40e130189343a74f83166410f35d7' - '475fe2b51802aba40ad9cd6b75d550ed') + 'config.h') +md5sums=('dc735a380d01203861b987b5f4c3c59c' + 'd11435f6a67af46a0d19d18a95a1620b') build() { cd "${srcdir}/${pkgname}-${pkgver}" cp "${srcdir}/config.h" config.h - # build fix from upstream (http://hg.suckless.org/surf/rev/2ea243e2ca82) - patch -p1 -i ../surf-0.4.1-link-xlib.patch - sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk diff --git a/community/surf/config.h b/community/surf/config.h index c323a6239..8f8561a71 100644 --- a/community/surf/config.h +++ b/community/surf/config.h @@ -1,21 +1,26 @@ /* modifier 0 means no modifier */ static char *useragent = "Surf/"VERSION" (X11; U; Unix; en-US) AppleWebKit/531.2+ Compatible (Safari)"; -static char *progress = "#FF0000"; +static char *progress = "#0066FF"; +static char *progress_untrust = "#FF6600"; static char *progress_trust = "#00FF00"; static char *stylefile = ".surf/style.css"; static char *scriptfile = ".surf/script.js"; static char *cookiefile = ".surf/cookies.txt"; static time_t sessiontime = 3600; -#define NOBACKGROUND 0 +static char *cafile = "/etc/ssl/certs/ca-certificates.crt"; +static char *strictssl = FALSE; /* Refuse untrusted SSL connections */ +#define HIDE_BACKGROUND FALSE +#define SPATIAL_BROWSING TRUE #define SETPROP(p, q) { .v = (char *[]){ "/bin/sh", "-c", \ "prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \ "xprop -id $2 -f $1 8s -set $1 \"$prop\"", \ p, q, winid, NULL } } -#define DOWNLOAD(d) { \ +#define DOWNLOAD(d) { \ .v = (char *[]){ "/bin/sh", "-c", \ - "xterm -e \"wget --load-cookies ~/.surf/cookies.txt '$0';\"", \ - d, NULL } } + "xterm -e \"wget '$0' \ +--load-cookies ~/.surf/cookies.txt \ +--user-agent '$1' ; sleep 5\"", d, useragent, NULL } } #define MODKEY GDK_CONTROL_MASK static Key keys[] = { /* modifier keyval function arg Focus */ @@ -29,12 +34,16 @@ static Key keys[] = { { MODKEY|GDK_SHIFT_MASK,GDK_i, zoom, { .i = 0 } }, { MODKEY, GDK_l, navigate, { .i = +1 } }, { MODKEY, GDK_h, navigate, { .i = -1 } }, - { MODKEY, GDK_j, scroll, { .i = +1 } }, - { MODKEY, GDK_k, scroll, { .i = -1 } }, + { MODKEY, GDK_j, scroll_v, { .i = +1 } }, + { MODKEY, GDK_k, scroll_v, { .i = -1 } }, + { MODKEY, GDK_b, scroll_v, { .i = -10000 } }, + { MODKEY, GDK_space, scroll_v, { .i = +10000 } }, + { MODKEY, GDK_i, scroll_h, { .i = +1 } }, + { MODKEY, GDK_u, scroll_h, { .i = -1 } }, { 0, GDK_Escape, stop, { 0 } }, { MODKEY, GDK_o, source, { 0 } }, { MODKEY, GDK_g, spawn, SETPROP("_SURF_URI", "_SURF_GO") }, - { MODKEY, GDK_slash, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") }, + { MODKEY, GDK_f, spawn, SETPROP("_SURF_FIND", "_SURF_FIND") }, { MODKEY, GDK_n, find, { .b = TRUE } }, { MODKEY|GDK_SHIFT_MASK,GDK_n, find, { .b = FALSE } }, }; -- cgit v1.2.3-54-g00ecf