diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-26 01:16:44 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-26 01:16:44 -0300 |
| commit | 92155342158c2dbcc0c840325d63d1742d3583ec (patch) | |
| tree | f0900a2867d221c79742e7a06ca4244a21abf8f3 /community/surf | |
| parent | 78fa3fcb824603de4b7bc558a423edca6bc18836 (diff) | |
| parent | e4a5730eb358cb0d78bc022204ddccac068c2bf2 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/astyle/PKGBUILD
community/gavl/PKGBUILD
community/lmms/PKGBUILD
community/portaudio/PKGBUILD
community/redshift/PKGBUILD
extra/gnutls/PKGBUILD
extra/libglade/PKGBUILD
extra/libgnome/PKGBUILD
extra/orbit2/PKGBUILD
extra/pypgsql/PKGBUILD
extra/vlc/PKGBUILD
extra/xorg-appres/PKGBUILD
extra/xorg-xdriinfo/PKGBUILD
extra/xorg-xfs/PKGBUILD
extra/xorg-xgamma/PKGBUILD
extra/xorg-xhost/PKGBUILD
extra/xorg-xkbevd/PKGBUILD
extra/xorg-xkbutils/PKGBUILD
extra/xorg-xload/PKGBUILD
extra/xorg-xlogo/PKGBUILD
extra/xorg-xlsatoms/PKGBUILD
extra/xorg-xlsclients/PKGBUILD
extra/xorg-xmag/PKGBUILD
extra/xorg-xmodmap/PKGBUILD
extra/xorg-xrdb/PKGBUILD
extra/xorg-xrefresh/PKGBUILD
extra/xorg-xsetroot/PKGBUILD
extra/xorg-xvidtune/PKGBUILD
extra/xorg-xwd/PKGBUILD
extra/xorg-xwud/PKGBUILD
extra/zile/PKGBUILD
multilib/wine/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'community/surf')
| -rw-r--r-- | community/surf/PKGBUILD | 13 | ||||
| -rw-r--r-- | community/surf/surf-0.4.1-link-xlib.patch | 28 |
2 files changed, 37 insertions, 4 deletions
diff --git a/community/surf/PKGBUILD b/community/surf/PKGBUILD index d6f3420e6..97a2900b9 100644 --- a/community/surf/PKGBUILD +++ b/community/surf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54600 2011-08-20 20:14:06Z lfleischer $ +# $Id: PKGBUILD 66413 2012-02-24 15:52:35Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Pierre Chapuis <catwell at archlinux dot us> # Contributor: Ray Kohler <ataraxia937 at gmail dot com> @@ -6,7 +6,7 @@ pkgname=surf pkgver=0.4.1 -pkgrel=3 +pkgrel=4 pkgdesc="A simple web browser based on WebKit/GTK+." arch=('i686' 'x86_64' 'mips64el') url='http://surf.suckless.org/' @@ -17,15 +17,20 @@ optdepends=('dmenu: URL-bar' makedepends=('pkgconfig') install='surf.install' source=("http://dl.suckless.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'config.h') + 'config.h' + 'surf-0.4.1-link-xlib.patch') md5sums=('28ac7a6d193d25844aa6b1db77fcbafa' - 'a1d40e130189343a74f83166410f35d7') + 'a1d40e130189343a74f83166410f35d7' + '475fe2b51802aba40ad9cd6b75d550ed') 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/surf-0.4.1-link-xlib.patch b/community/surf/surf-0.4.1-link-xlib.patch new file mode 100644 index 000000000..25949d744 --- /dev/null +++ b/community/surf/surf-0.4.1-link-xlib.patch @@ -0,0 +1,28 @@ + +diff -r 71388899ac09 -r 2ea243e2ca82 config.mk +--- a/config.mk Tue Jun 08 09:06:10 2010 +0200 ++++ b/config.mk Sun Nov 20 16:06:38 2011 +0100 +@@ -7,13 +7,15 @@ + PREFIX = /usr/local + MANPREFIX = ${PREFIX}/share/man + +-GTKINC=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0) +-GTKLIB=$(shell pkg-config --libs gtk+-2.0 webkit-1.0) ++X11INC = /usr/X11R6/include ++X11LIB = /usr/X11R6/lib + ++GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0` ++GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0` + + # includes and libs +-INCS = -I. -I/usr/include ${GTKINC} +-LIBS = -L/usr/lib -lc ${GTKLIB} -lgthread-2.0 ++INCS = -I. -I/usr/include -I${X11INC} ${GTKINC} ++LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0 + + # flags + CPPFLAGS = -DVERSION=\"${VERSION}\" + + + + |