diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-07 17:33:04 -0300 |
| commit | 2302f1d28510fadb2dcfa119f28ed28f164845bf (patch) | |
| tree | e7040e1c743f46bc60a7844275516e4404f6ac30 /extra/libwebkit | |
| parent | 2a9d1292ab60e8a2356fb3eeb36b8c3cfc22759b (diff) | |
| parent | 5442e9b8f357932ed5d6cb46e90fcbf6f453469f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fotoxx/PKGBUILD
community/gtkdialog/PKGBUILD
community/hubbub/PKGBUILD
community/libgdamm/PKGBUILD
community/libparserutils/PKGBUILD
community/mingw32-binutils/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/mtpaint/PKGBUILD
community/netsurf/PKGBUILD
community/patchage/PKGBUILD
community/qgo/PKGBUILD
community/tomoyo-tools/PKGBUILD
community/tre/PKGBUILD
community/virtualbox/PKGBUILD
core/net-tools/PKGBUILD
core/openldap/PKGBUILD
extra/epiphany/PKGBUILD
extra/evince/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/evolution/PKGBUILD
extra/exiv2/PKGBUILD
extra/folks/PKGBUILD
extra/gimp-ufraw/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gvfs/PKGBUILD
extra/jack/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdepim/PKGBUILD
extra/koffice/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/nautilus/PKGBUILD
extra/openmpi/PKGBUILD
extra/pavucontrol/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pygobject2/PKGBUILD
extra/swt/PKGBUILD
extra/tomcat/PKGBUILD
extra/totem/PKGBUILD
extra/vigra/PKGBUILD
extra/vte/PKGBUILD
extra/xulrunner/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/lib32-atk/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glew/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-jack/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/wine/PKGBUILD
social/miniupnpc/PKGBUILD
testing/icedtea-web-java7/PKGBUILD
testing/sqlite3/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'extra/libwebkit')
| -rw-r--r-- | extra/libwebkit/PKGBUILD | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD index d7fa4a87d..40985ac43 100644 --- a/extra/libwebkit/PKGBUILD +++ b/extra/libwebkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138139 2011-09-17 11:15:02Z foutrelis $ +# $Id: PKGBUILD 139389 2011-10-01 19:00:15Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=libwebkit -pkgname=('libwebkit' 'libwebkit3') -pkgver=1.4.3 +pkgname=(libwebkit libwebkit3) +pkgver=1.6.1 pkgrel=1 pkgdesc="An opensource web content engine" arch=('i686' 'x86_64' 'mips64el') @@ -12,16 +12,15 @@ license=('custom') depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant') checkdepends=('hspell') makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3') -options=('!libtool') +options=('!libtool' '!emptydirs') install=libwebkit.install source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz fix-mips-n32.patch) -md5sums=('86a4354e65853687bf942100763225bb' +md5sums=('c11743694b1b71dad287b2e7a9e73b05' '1e1971b0214f6705ceb4f816c4b52af9') build() { cd "${srcdir}/webkit-${pkgver}" -# patch -Np1 -i "${srcdir}/replace-switch-with-given-when.patch" mkdir build-gtk{2,3} # WebKit knows only O32, not aligning memory on N32, also wants to @@ -56,9 +55,6 @@ check() { package_libwebkit() { pkgdesc+=" (for GTK2)" depends+=(gtk2) - provides=('webkitgtk-svn') - conflicts=('webkitgtk-svn') - replaces=('webkitgtk-svn') cd "$srcdir/webkit-$pkgver/build-gtk2" make DESTDIR="${pkgdir}" install |